Merge branch 'feature/exception-consistency' of https://github.com/jrfnl/PHP_CodeSniffer

gsherwood · gsherwood · commit c436252a6edc · 2019-09-09T13:00:53.000+10:00
diff --git a/package.xml b/package.xml
@@ -44,6 +44,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - JSON reports now end with a newline character
   - The phpcs.xsd schema now validates phpcs-only and phpcbf-only attributes correctly
     -- Thanks to Juliette Reinders Folmer for the patch
+  - All helper methods inside the File class now throw RuntimeException instead of TokenizerException
+    -- Some tokenizer methods were also throwing RuntimeExpection but now correctly throw TokenizerException
+    -- Thanks to Juliette Reinders Folmer for the patch
   - The File::getMethodParameters() method now returns more information, and supports closure USE groups
     -- If a type hint is specified, the position of the last token in the hint will be set in a "type_hint_end_token" array index
     -- If a default is specified, the position of the first token in the default value will be set in a "default_token" array index
diff --git a/src/Config.php b/src/Config.php
@@ -584,6 +584,7 @@ public function restoreDefaults()
      * @param int    $pos The position of the argument on the command line.
      *
      * @return void
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     public function processShortArgument($arg, $pos)
     {
@@ -688,6 +689,7 @@ public function processShortArgument($arg, $pos)
      * @param int    $pos The position of the argument on the command line.
      *
      * @return void
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     public function processLongArgument($arg, $pos)
     {
@@ -1249,6 +1251,7 @@ public function processLongArgument($arg, $pos)
      * @param int    $pos The position of the argument on the command line.
      *
      * @return void
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     public function processUnknownArgument($arg, $pos)
     {
@@ -1274,6 +1277,7 @@ public function processUnknownArgument($arg, $pos)
      * @param string $path The path to the file to add.
      *
      * @return void
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     public function processFilePath($path)
     {
@@ -1560,7 +1564,7 @@ public static function getExecutablePath($name)
      *
      * @return bool
      * @see    getConfigData()
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the config file can not be written.
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the config file can not be written.
      */
     public static function setConfigData($key, $value, $temp=false)
     {
@@ -1641,6 +1645,7 @@ public static function setConfigData($key, $value, $temp=false)
      *
      * @return array<string, string>
      * @see    getConfigData()
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the config file could not be read.
      */
     public static function getAllConfigData()
     {
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -1303,22 +1303,22 @@ public function getDeclarationName($stackPtr)
      *                      to acquire the parameters for.
      *
      * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified $stackPtr is not of
-     *                                                        type T_FUNCTION or T_CLOSURE.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified $stackPtr is not of
+     *                                                      type T_FUNCTION, T_CLOSURE, or T_USE.
      */
     public function getMethodParameters($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
             && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
             && $this->tokens[$stackPtr]['code'] !== T_USE
         ) {
-            throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or T_USE');
+            throw new RuntimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or T_USE');
         }
 
         if ($this->tokens[$stackPtr]['code'] === T_USE) {
             $opener = $this->findNext(T_OPEN_PARENTHESIS, ($stackPtr + 1));
             if ($opener === false || isset($this->tokens[$opener]['parenthesis_owner']) === true) {
-                throw new TokenizerException('$stackPtr was not a valid T_USE');
+                throw new RuntimeException('$stackPtr was not a valid T_USE');
             }
         } else {
             $opener = $this->tokens[$stackPtr]['parenthesis_opener'];
@@ -1530,15 +1530,15 @@ public function getMethodParameters($stackPtr)
      *                      acquire the properties for.
      *
      * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
-     *                                                        T_FUNCTION token.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      T_FUNCTION token.
      */
     public function getMethodProperties($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION
             && $this->tokens[$stackPtr]['code'] !== T_CLOSURE
         ) {
-            throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
+            throw new RuntimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');
         }
 
         if ($this->tokens[$stackPtr]['code'] === T_FUNCTION) {
@@ -1684,14 +1684,14 @@ public function getMethodProperties($stackPtr)
      *                      acquire the properties for.
      *
      * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
-     *                                                        T_VARIABLE token, or if the position is not
-     *                                                        a class member variable.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      T_VARIABLE token, or if the position is not
+     *                                                      a class member variable.
      */
     public function getMemberProperties($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] !== T_VARIABLE) {
-            throw new TokenizerException('$stackPtr must be of type T_VARIABLE');
+            throw new RuntimeException('$stackPtr must be of type T_VARIABLE');
         }
 
         $conditions = array_keys($this->tokens[$stackPtr]['conditions']);
@@ -1716,7 +1716,7 @@ public function getMemberProperties($stackPtr)
                     return [];
                 }
             } else {
-                throw new TokenizerException('$stackPtr is not a class member var');
+                throw new RuntimeException('$stackPtr is not a class member var');
             }
         }
 
@@ -1728,7 +1728,7 @@ public function getMemberProperties($stackPtr)
                 && isset($this->tokens[$deepestOpen]['parenthesis_owner']) === true
                 && $this->tokens[$this->tokens[$deepestOpen]['parenthesis_owner']]['code'] === T_FUNCTION
             ) {
-                throw new TokenizerException('$stackPtr is not a class member var');
+                throw new RuntimeException('$stackPtr is not a class member var');
             }
         }
 
@@ -1847,13 +1847,13 @@ public function getMemberProperties($stackPtr)
      *                      acquire the properties for.
      *
      * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a
-     *                                                        T_CLASS token.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a
+     *                                                      T_CLASS token.
      */
     public function getClassProperties($stackPtr)
     {
         if ($this->tokens[$stackPtr]['code'] !== T_CLASS) {
-            throw new TokenizerException('$stackPtr must be of type T_CLASS');
+            throw new RuntimeException('$stackPtr must be of type T_CLASS');
         }
 
         $valid = [
@@ -2034,6 +2034,7 @@ public function isReference($stackPtr)
      *                          content should be used.
      *
      * @return string The token contents.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position does not exist.
      */
     public function getTokensAsString($start, $length, $origContent=false)
     {
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
@@ -136,6 +136,7 @@ public function addFile($path, $file=null)
      * Get the class name of the filter being used for the run.
      *
      * @return string
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the specified filter could not be found.
      */
     private function getFilterClass()
     {
diff --git a/src/Reporter.php b/src/Reporter.php
@@ -92,7 +92,8 @@ class Reporter
      * @param \PHP_CodeSniffer\Config $config The config data for the run.
      *
      * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report is not available.
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If a custom report class could not be found.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException  If a report class is incorrectly set up.
      */
     public function __construct(Config $config)
     {
diff --git a/src/Reports/Cbf.php b/src/Reports/Cbf.php
@@ -34,6 +34,7 @@ class Cbf implements Report
      * @param int                   $width       Maximum allowed line width.
      *
      * @return bool
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)
     {
diff --git a/src/Reports/Gitblame.php b/src/Reports/Gitblame.php
@@ -63,6 +63,7 @@ protected function getAuthor($line)
      * @param string $filename File to blame.
      *
      * @return array
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     protected function getBlameContent($filename)
     {
diff --git a/src/Reports/Hgblame.php b/src/Reports/Hgblame.php
@@ -64,6 +64,7 @@ protected function getAuthor($line)
      * @param string $filename File to blame.
      *
      * @return array
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     protected function getBlameContent($filename)
     {
diff --git a/src/Reports/Svnblame.php b/src/Reports/Svnblame.php
@@ -49,6 +49,7 @@ protected function getAuthor($line)
      * @param string $filename File to blame.
      *
      * @return array
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
      */
     protected function getBlameContent($filename)
     {
diff --git a/src/Ruleset.php b/src/Ruleset.php
@@ -122,6 +122,7 @@ class Ruleset
      * @param \PHP_CodeSniffer\Config $config The config data for the run.
      *
      * @return void
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If no sniffs were registered.
      */
     public function __construct(Config $config)
     {
@@ -304,7 +305,8 @@ public function explain()
      *                            is only used for debug output.
      *
      * @return string[]
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the ruleset path is invalid.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException - If the ruleset path is invalid.
+     *                                                      - If a specified autoload file could not be found.
      */
     public function processRuleset($rulesetPath, $depth=0)
     {
diff --git a/src/Runner.php b/src/Runner.php
@@ -233,7 +233,7 @@ public function runPHPCBF()
      * Exits if the minimum requirements of PHP_CodeSniffer are not met.
      *
      * @return array
-     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the requirements are not met.
      */
     public function checkRequirements()
     {
@@ -281,7 +281,7 @@ public function checkRequirements()
      * Init the rulesets and other high-level settings.
      *
      * @return void
-     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException
+     * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If a referenced standard is not installed.
      */
     public function init()
     {
diff --git a/src/Sniffs/AbstractScopeSniff.php b/src/Sniffs/AbstractScopeSniff.php
@@ -66,7 +66,8 @@ abstract class AbstractScopeSniff implements Sniff
      *                               processTokenOutsideScope method.
      *
      * @see    PHP_CodeSniffer.getValidScopeTokeners()
-     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified tokens array is empty.
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified tokens arrays are empty
+     *                                                      or invalid.
      */
     public function __construct(
         array $scopeTokens,
diff --git a/src/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php b/src/Standards/Squiz/Sniffs/Debug/JavaScriptLintSniff.php
@@ -45,6 +45,7 @@ public function register()
      *                                               the token was found.
      *
      * @return void
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If Javascript Lint ran into trouble.
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/src/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php b/src/Standards/Zend/Sniffs/Debug/CodeAnalyzerSniff.php
@@ -39,6 +39,7 @@ public function register()
      *                                               the token was found.
      *
      * @return int
+     * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If ZendCodeAnalyzer could not be run.
      */
     public function process(File $phpcsFile, $stackPtr)
     {
diff --git a/src/Tokenizers/Tokenizer.php b/src/Tokenizers/Tokenizer.php
@@ -9,7 +9,7 @@
 
 namespace PHP_CodeSniffer\Tokenizers;
 
-use PHP_CodeSniffer\Exceptions\RuntimeException;
+use PHP_CodeSniffer\Exceptions\TokenizerException;
 use PHP_CodeSniffer\Util;
 
 abstract class Tokenizer
@@ -900,6 +900,7 @@ private function createScopeMap()
      * @param int $ignore   How many curly braces we are ignoring.
      *
      * @return int The position in the stack that closed the scope.
+     * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the nesting level gets too deep.
      */
     private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
     {
@@ -1236,7 +1237,7 @@ private function recurseScopeMap($stackPtr, $depth=1, &$ignore=0)
                             echo '* reached maximum nesting level; aborting *'.PHP_EOL;
                         }
 
-                        throw new RuntimeException('Maximum nesting level reached; file could not be processed');
+                        throw new TokenizerException('Maximum nesting level reached; file could not be processed');
                     }
 
                     $oldDepth = $depth;
diff --git a/tests/Core/File/GetMemberPropertiesTest.php b/tests/Core/File/GetMemberPropertiesTest.php
@@ -469,7 +469,7 @@ public function dataGetMemberProperties()
      *
      * @param string $identifier Comment which precedes the test case.
      *
-     * @expectedException        PHP_CodeSniffer\Exceptions\TokenizerException
+     * @expectedException        PHP_CodeSniffer\Exceptions\RuntimeException
      * @expectedExceptionMessage $stackPtr is not a class member var
      *
      * @dataProvider dataNotClassProperty
@@ -508,7 +508,7 @@ public function dataNotClassProperty()
     /**
      * Test receiving an expected exception when a non variable is passed.
      *
-     * @expectedException        PHP_CodeSniffer\Exceptions\TokenizerException
+     * @expectedException        PHP_CodeSniffer\Exceptions\RuntimeException
      * @expectedExceptionMessage $stackPtr must be of type T_VARIABLE
      *
      * @return void

Original file line number	Diff line number	Diff line change
`@@ -584,6 +584,7 @@ public function restoreDefaults()`
`584`	`584`	`* @param int $pos The position of the argument on the command line.`
`585`	`585`	`*`
`586`	`586`	`* @return void`
	`587`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`587`	`588`	`*/`
`588`	`589`	`public function processShortArgument($arg, $pos)`
`589`	`590`	`{`
`@@ -688,6 +689,7 @@ public function processShortArgument($arg, $pos)`
`688`	`689`	`* @param int $pos The position of the argument on the command line.`
`689`	`690`	`*`
`690`	`691`	`* @return void`
	`692`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`691`	`693`	`*/`
`692`	`694`	`public function processLongArgument($arg, $pos)`
`693`	`695`	`{`
`@@ -1249,6 +1251,7 @@ public function processLongArgument($arg, $pos)`
`1249`	`1251`	`* @param int $pos The position of the argument on the command line.`
`1250`	`1252`	`*`
`1251`	`1253`	`* @return void`
	`1254`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`1252`	`1255`	`*/`
`1253`	`1256`	`public function processUnknownArgument($arg, $pos)`
`1254`	`1257`	`{`
`@@ -1274,6 +1277,7 @@ public function processUnknownArgument($arg, $pos)`
`1274`	`1277`	`* @param string $path The path to the file to add.`
`1275`	`1278`	`*`
`1276`	`1279`	`* @return void`
	`1280`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`1277`	`1281`	`*/`
`1278`	`1282`	`public function processFilePath($path)`
`1279`	`1283`	`{`
`@@ -1560,7 +1564,7 @@ public static function getExecutablePath($name)`
`1560`	`1564`	`*`
`1561`	`1565`	`* @return bool`
`1562`	`1566`	`* @see getConfigData()`
`1563`		`- * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the config file can not be written.`
	`1567`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the config file can not be written.`
`1564`	`1568`	`*/`
`1565`	`1569`	`public static function setConfigData($key, $value, $temp=false)`
`1566`	`1570`	`{`
`@@ -1641,6 +1645,7 @@ public static function setConfigData($key, $value, $temp=false)`
`1641`	`1645`	`*`
`1642`	`1646`	`* @return array<string, string>`
`1643`	`1647`	`* @see getConfigData()`
	`1648`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the config file could not be read.`
`1644`	`1649`	`*/`
`1645`	`1650`	`public static function getAllConfigData()`
`1646`	`1651`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1303,22 +1303,22 @@ public function getDeclarationName($stackPtr)`
`1303`	`1303`	`* to acquire the parameters for.`
`1304`	`1304`	`*`
`1305`	`1305`	`* @return array`
`1306`		`- * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified $stackPtr is not of`
`1307`		`- * type T_FUNCTION or T_CLOSURE.`
	`1306`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified $stackPtr is not of`
	`1307`	`+ * type T_FUNCTION, T_CLOSURE, or T_USE.`
`1308`	`1308`	`*/`
`1309`	`1309`	`public function getMethodParameters($stackPtr)`
`1310`	`1310`	`{`
`1311`	`1311`	`if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION`
`1312`	`1312`	`&& $this->tokens[$stackPtr]['code'] !== T_CLOSURE`
`1313`	`1313`	`&& $this->tokens[$stackPtr]['code'] !== T_USE`
`1314`	`1314`	`) {`
`1315`		`- throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or T_USE');`
	`1315`	`+ throw new RuntimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE or T_USE');`
`1316`	`1316`	`}`
`1317`	`1317`
`1318`	`1318`	`if ($this->tokens[$stackPtr]['code'] === T_USE) {`
`1319`	`1319`	`$opener = $this->findNext(T_OPEN_PARENTHESIS, ($stackPtr + 1));`
`1320`	`1320`	`if ($opener === false \|\| isset($this->tokens[$opener]['parenthesis_owner']) === true) {`
`1321`		`- throw new TokenizerException('$stackPtr was not a valid T_USE');`
	`1321`	`+ throw new RuntimeException('$stackPtr was not a valid T_USE');`
`1322`	`1322`	`}`
`1323`	`1323`	`} else {`
`1324`	`1324`	`$opener = $this->tokens[$stackPtr]['parenthesis_opener'];`
`@@ -1530,15 +1530,15 @@ public function getMethodParameters($stackPtr)`
`1530`	`1530`	`* acquire the properties for.`
`1531`	`1531`	`*`
`1532`	`1532`	`* @return array`
`1533`		`- * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a`
`1534`		`- * T_FUNCTION token.`
	`1533`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a`
	`1534`	`+ * T_FUNCTION token.`
`1535`	`1535`	`*/`
`1536`	`1536`	`public function getMethodProperties($stackPtr)`
`1537`	`1537`	`{`
`1538`	`1538`	`if ($this->tokens[$stackPtr]['code'] !== T_FUNCTION`
`1539`	`1539`	`&& $this->tokens[$stackPtr]['code'] !== T_CLOSURE`
`1540`	`1540`	`) {`
`1541`		`- throw new TokenizerException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');`
	`1541`	`+ throw new RuntimeException('$stackPtr must be of type T_FUNCTION or T_CLOSURE');`
`1542`	`1542`	`}`
`1543`	`1543`
`1544`	`1544`	`if ($this->tokens[$stackPtr]['code'] === T_FUNCTION) {`
`@@ -1684,14 +1684,14 @@ public function getMethodProperties($stackPtr)`
`1684`	`1684`	`* acquire the properties for.`
`1685`	`1685`	`*`
`1686`	`1686`	`* @return array`
`1687`		`- * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a`
`1688`		`- * T_VARIABLE token, or if the position is not`
`1689`		`- * a class member variable.`
	`1687`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a`
	`1688`	`+ * T_VARIABLE token, or if the position is not`
	`1689`	`+ * a class member variable.`
`1690`	`1690`	`*/`
`1691`	`1691`	`public function getMemberProperties($stackPtr)`
`1692`	`1692`	`{`
`1693`	`1693`	`if ($this->tokens[$stackPtr]['code'] !== T_VARIABLE) {`
`1694`		`- throw new TokenizerException('$stackPtr must be of type T_VARIABLE');`
	`1694`	`+ throw new RuntimeException('$stackPtr must be of type T_VARIABLE');`
`1695`	`1695`	`}`
`1696`	`1696`
`1697`	`1697`	`$conditions = array_keys($this->tokens[$stackPtr]['conditions']);`
`@@ -1716,7 +1716,7 @@ public function getMemberProperties($stackPtr)`
`1716`	`1716`	`return [];`
`1717`	`1717`	`}`
`1718`	`1718`	`} else {`
`1719`		`- throw new TokenizerException('$stackPtr is not a class member var');`
	`1719`	`+ throw new RuntimeException('$stackPtr is not a class member var');`
`1720`	`1720`	`}`
`1721`	`1721`	`}`
`1722`	`1722`
`@@ -1728,7 +1728,7 @@ public function getMemberProperties($stackPtr)`
`1728`	`1728`	`&& isset($this->tokens[$deepestOpen]['parenthesis_owner']) === true`
`1729`	`1729`	`&& $this->tokens[$this->tokens[$deepestOpen]['parenthesis_owner']]['code'] === T_FUNCTION`
`1730`	`1730`	`) {`
`1731`		`- throw new TokenizerException('$stackPtr is not a class member var');`
	`1731`	`+ throw new RuntimeException('$stackPtr is not a class member var');`
`1732`	`1732`	`}`
`1733`	`1733`	`}`
`1734`	`1734`
`@@ -1847,13 +1847,13 @@ public function getMemberProperties($stackPtr)`
`1847`	`1847`	`* acquire the properties for.`
`1848`	`1848`	`*`
`1849`	`1849`	`* @return array`
`1850`		`- * @throws \PHP_CodeSniffer\Exceptions\TokenizerException If the specified position is not a`
`1851`		`- * T_CLASS token.`
	`1850`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position is not a`
	`1851`	`+ * T_CLASS token.`
`1852`	`1852`	`*/`
`1853`	`1853`	`public function getClassProperties($stackPtr)`
`1854`	`1854`	`{`
`1855`	`1855`	`if ($this->tokens[$stackPtr]['code'] !== T_CLASS) {`
`1856`		`- throw new TokenizerException('$stackPtr must be of type T_CLASS');`
	`1856`	`+ throw new RuntimeException('$stackPtr must be of type T_CLASS');`
`1857`	`1857`	`}`
`1858`	`1858`
`1859`	`1859`	`$valid = [`
`@@ -2034,6 +2034,7 @@ public function isReference($stackPtr)`
`2034`	`2034`	`* content should be used.`
`2035`	`2035`	`*`
`2036`	`2036`	`* @return string The token contents.`
	`2037`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the specified position does not exist.`
`2037`	`2038`	`*/`
`2038`	`2039`	`public function getTokensAsString($start, $length, $origContent=false)`
`2039`	`2040`	`{`
Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ public function addFile($path, $file=null)`
`136`	`136`	`* Get the class name of the filter being used for the run.`
`137`	`137`	`*`
`138`	`138`	`* @return string`
	`139`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If the specified filter could not be found.`
`139`	`140`	`*/`
`140`	`141`	`private function getFilterClass()`
`141`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,8 @@ class Reporter`
`92`	`92`	`* @param \PHP_CodeSniffer\Config $config The config data for the run.`
`93`	`93`	`*`
`94`	`94`	`* @return void`
`95`		`- * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report is not available.`
	`95`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException If a custom report class could not be found.`
	`96`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If a report class is incorrectly set up.`
`96`	`97`	`*/`
`97`	`98`	`public function __construct(Config $config)`
`98`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ class Cbf implements Report`
`34`	`34`	`* @param int $width Maximum allowed line width.`
`35`	`35`	`*`
`36`	`36`	`* @return bool`
	`37`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`37`	`38`	`*/`
`38`	`39`	`public function generateFileReport($report, File $phpcsFile, $showSources=false, $width=80)`
`39`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ protected function getAuthor($line)`
`63`	`63`	`* @param string $filename File to blame.`
`64`	`64`	`*`
`65`	`65`	`* @return array`
	`66`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`66`	`67`	`*/`
`67`	`68`	`protected function getBlameContent($filename)`
`68`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ protected function getAuthor($line)`
`64`	`64`	`* @param string $filename File to blame.`
`65`	`65`	`*`
`66`	`66`	`* @return array`
	`67`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`67`	`68`	`*/`
`68`	`69`	`protected function getBlameContent($filename)`
`69`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ protected function getAuthor($line)`
`49`	`49`	`* @param string $filename File to blame.`
`50`	`50`	`*`
`51`	`51`	`* @return array`
	`52`	`+ * @throws \PHP_CodeSniffer\Exceptions\DeepExitException`
`52`	`53`	`*/`
`53`	`54`	`protected function getBlameContent($filename)`
`54`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ class Ruleset`
`122`	`122`	`* @param \PHP_CodeSniffer\Config $config The config data for the run.`
`123`	`123`	`*`
`124`	`124`	`* @return void`
	`125`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If no sniffs were registered.`
`125`	`126`	`*/`
`126`	`127`	`public function __construct(Config $config)`
`127`	`128`	`{`
`@@ -304,7 +305,8 @@ public function explain()`
`304`	`305`	`* is only used for debug output.`
`305`	`306`	`*`
`306`	`307`	`* @return string[]`
`307`		`- * @throws \PHP_CodeSniffer\Exceptions\RuntimeException If the ruleset path is invalid.`
	`308`	`+ * @throws \PHP_CodeSniffer\Exceptions\RuntimeException - If the ruleset path is invalid.`
	`309`	`+ * - If a specified autoload file could not be found.`
`308`	`310`	`*/`
`309`	`311`	`public function processRuleset($rulesetPath, $depth=0)`
`310`	`312`	`{`