Merge branch 'feature/girlscouting-various-minor-fixes' of https://github.com/jrfnl/PHP_CodeSniffer

gsherwood · gsherwood · commit f78fa6f75c47 · 2019-01-07T08:50:16.000+11:00
diff --git a/src/Files/File.php b/src/Files/File.php
@@ -895,9 +895,9 @@ protected function addMessage($error, $message, $line, $column, $code, $data, $s
         // due to the use of the --sniffs command line argument.
         if ($includeAll === false
             && ((empty($this->configCache['sniffs']) === false
-            && in_array(strtolower($listenerCode), $this->configCache['sniffs']) === false)
+            && in_array(strtolower($listenerCode), $this->configCache['sniffs'], true) === false)
             || (empty($this->configCache['exclude']) === false
-            && in_array(strtolower($listenerCode), $this->configCache['exclude']) === true))
+            && in_array(strtolower($listenerCode), $this->configCache['exclude'], true) === true))
         ) {
             return false;
         }
@@ -2346,7 +2346,7 @@ public function hasCondition($stackPtr, $types)
         $conditions = $this->tokens[$stackPtr]['conditions'];
 
         foreach ($types as $type) {
-            if (in_array($type, $conditions) === true) {
+            if (in_array($type, $conditions, true) === true) {
                 // We found a token with the required type.
                 return true;
             }
diff --git a/src/Files/FileList.php b/src/Files/FileList.php
@@ -11,6 +11,7 @@
 
 namespace PHP_CodeSniffer\Files;
 
+use PHP_CodeSniffer\Autoload;
 use PHP_CodeSniffer\Util;
 use PHP_CodeSniffer\Ruleset;
 use PHP_CodeSniffer\Config;
@@ -151,7 +152,7 @@ private function getFilterClass()
                     throw new DeepExitException($error, 3);
                 }
 
-                $filterClass = \PHP_CodeSniffer\Autoload::loadFile($filename);
+                $filterClass = Autoload::loadFile($filename);
             } else {
                 $filterClass = '\PHP_CodeSniffer\Filters\\'.$filterType;
             }
diff --git a/src/Reports/Notifysend.php b/src/Reports/Notifysend.php
@@ -68,7 +68,7 @@ public function __construct()
 
         $showOk = Config::getConfigData('notifysend_showok');
         if ($showOk !== null) {
-            $this->showOk = (boolean) $showOk;
+            $this->showOk = (bool) $showOk;
         }
 
         $this->version = str_replace(
diff --git a/src/Ruleset.php b/src/Ruleset.php
@@ -410,7 +410,7 @@ public function processRuleset($rulesetPath, $depth=0)
                     }
                 } else if (empty($newSniffs) === false) {
                     $newSniff = $newSniffs[0];
-                    if (in_array($newSniff, $ownSniffs) === false) {
+                    if (in_array($newSniff, $ownSniffs, true) === false) {
                         // Including a sniff that hasn't been included higher up, but
                         // only including a single message from it. So turn off all messages in
                         // the sniff, except this one.
@@ -578,7 +578,7 @@ public function processRuleset($rulesetPath, $depth=0)
         // sniff list, but filter out any excluded sniffs.
         $files = [];
         foreach ($includedSniffs as $sniff) {
-            if (in_array($sniff, $excludedSniffs) === true) {
+            if (in_array($sniff, $excludedSniffs, true) === true) {
                 continue;
             } else {
                 $files[] = Util\Common::realpath($sniff);
@@ -715,7 +715,7 @@ private function expandRulesetReference($ref, $rulesetDir, $depth=0)
             if (Util\Common::isPharFile($path) === true && strpos($path, 'ruleset.xml') === false) {
                 // If the ruleset exists inside the phar file, use it.
                 if (file_exists($path.DIRECTORY_SEPARATOR.'ruleset.xml') === true) {
-                    $path = $path.DIRECTORY_SEPARATOR.'ruleset.xml';
+                    $path .= DIRECTORY_SEPARATOR.'ruleset.xml';
                 } else {
                     $path = null;
                 }
diff --git a/src/Sniffs/AbstractPatternSniff.php b/src/Sniffs/AbstractPatternSniff.php
@@ -195,7 +195,7 @@ final public function process(File $phpcsFile, $stackPtr)
 
         $tokens = $phpcsFile->getTokens();
 
-        if (in_array($tokens[$stackPtr]['code'], $this->supplementaryTokens) === true) {
+        if (in_array($tokens[$stackPtr]['code'], $this->supplementaryTokens, true) === true) {
             $this->processSupplementary($phpcsFile, $stackPtr);
         }
 
diff --git a/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php b/src/Standards/Generic/Sniffs/ControlStructures/InlineControlStructureSniff.php
@@ -153,7 +153,7 @@ public function process(File $phpcsFile, $stackPtr)
                 break;
             }
 
-            if (in_array($tokens[$end]['code'], $fixableScopeOpeners) === true
+            if (in_array($tokens[$end]['code'], $fixableScopeOpeners, true) === true
                 && isset($tokens[$end]['scope_opener']) === false
             ) {
                 // The best way to fix nested inline scopes is middle-out.
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowAlternativePHPTagsSniff.php
@@ -48,7 +48,7 @@ public function register()
         }
 
         if ($this->phpVersion < 70000) {
-            $this->aspTags = (boolean) ini_get('asp_tags');
+            $this->aspTags = (bool) ini_get('asp_tags');
         }
 
         return [
diff --git a/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php b/src/Standards/Generic/Sniffs/PHP/DisallowShortOpenTagSniff.php
@@ -29,7 +29,7 @@ public function register()
             T_OPEN_TAG_WITH_ECHO,
         ];
 
-        $shortOpenTags = (boolean) ini_get('short_open_tag');
+        $shortOpenTags = (bool) ini_get('short_open_tag');
         if ($shortOpenTags === false) {
             $targets[] = T_INLINE_HTML;
         }
diff --git a/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php b/src/Standards/Generic/Sniffs/PHP/ForbiddenFunctionsSniff.php
@@ -173,7 +173,7 @@ public function process(File $phpcsFile, $stackPtr)
             // Remove the pattern delimiters and modifier.
             $pattern = substr($pattern, 1, -2);
         } else {
-            if (in_array($function, $this->forbiddenFunctionNames) === false) {
+            if (in_array($function, $this->forbiddenFunctionNames, true) === false) {
                 return;
             }
         }//end if
diff --git a/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php b/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -776,7 +776,7 @@ public function process(File $phpcsFile, $stackPtr)
 
             if ($checkToken !== null
                 && isset(Tokens::$scopeOpeners[$tokens[$checkToken]['code']]) === true
-                && in_array($tokens[$checkToken]['code'], $this->nonIndentingScopes) === false
+                && in_array($tokens[$checkToken]['code'], $this->nonIndentingScopes, true) === false
                 && isset($tokens[$checkToken]['scope_opener']) === true
             ) {
                 $exact = true;
@@ -1133,7 +1133,7 @@ public function process(File $phpcsFile, $stackPtr)
 
                 $condition = $tokens[$tokens[$i]['scope_condition']]['code'];
                 if (isset(Tokens::$scopeOpeners[$condition]) === true
-                    && in_array($condition, $this->nonIndentingScopes) === false
+                    && in_array($condition, $this->nonIndentingScopes, true) === false
                 ) {
                     if ($this->debug === true) {
                         $line = $tokens[$i]['line'];
diff --git a/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowAlternativePHPTagsUnitTest.php
@@ -28,7 +28,7 @@ protected function getTestFiles($testFileBase)
 
         $aspTags = false;
         if (PHP_VERSION_ID < 70000) {
-            $aspTags = (boolean) ini_get('asp_tags');
+            $aspTags = (bool) ini_get('asp_tags');
         }
 
         if ($aspTags === true) {
diff --git a/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php b/src/Standards/Generic/Tests/PHP/DisallowShortOpenTagUnitTest.php
@@ -26,7 +26,7 @@ protected function getTestFiles($testFileBase)
     {
         $testFiles = [$testFileBase.'1.inc'];
 
-        $option = (boolean) ini_get('short_open_tag');
+        $option = (bool) ini_get('short_open_tag');
         if ($option === true) {
             $testFiles[] = $testFileBase.'2.inc';
         } else {
diff --git a/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php b/src/Standards/Generic/Tests/PHP/SyntaxUnitTest.php
@@ -10,7 +10,6 @@
 
 namespace PHP_CodeSniffer\Standards\Generic\Tests\PHP;
 
-use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
 
 class SyntaxUnitTest extends AbstractSniffUnitTest
diff --git a/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/PEAR/Sniffs/Commenting/FileCommentSniff.php
@@ -161,7 +161,7 @@ public function process(File $phpcsFile, $stackPtr)
             T_PROPERTY,
         ];
 
-        if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
+        if (in_array($tokens[$nextToken]['code'], $ignore, true) === true) {
             $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
             return ($phpcsFile->numTokens + 1);
diff --git a/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php b/src/Standards/PSR12/Sniffs/Functions/NullableTypeDeclarationSniff.php
@@ -11,7 +11,6 @@
 
 use PHP_CodeSniffer\Files\File;
 use PHP_CodeSniffer\Sniffs\Sniff;
-use PHP_CodeSniffer\Util\Tokens;
 
 class NullableTypeDeclarationSniff implements Sniff
 {
diff --git a/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Classes/ClassDeclarationSniff.php
@@ -71,7 +71,7 @@ public function processOpen(File $phpcsFile, $stackPtr)
                 $blankSpace = substr($prevContent, strpos($prevContent, $phpcsFile->eolChar));
                 $spaces     = strlen($blankSpace);
 
-                if (in_array($tokens[($stackPtr - 2)]['code'], [T_ABSTRACT, T_FINAL]) === true
+                if (in_array($tokens[($stackPtr - 2)]['code'], [T_ABSTRACT, T_FINAL], true) === true
                     && $spaces !== 1
                 ) {
                     $prevContent = strtolower($tokens[($stackPtr - 2)]['content']);
diff --git a/src/Standards/Squiz/Sniffs/CSS/ForbiddenStylesSniff.php b/src/Standards/Squiz/Sniffs/CSS/ForbiddenStylesSniff.php
@@ -115,7 +115,7 @@ public function process(File $phpcsFile, $stackPtr)
             // Remove the pattern delimiters and modifier.
             $pattern = substr($pattern, 1, -2);
         } else {
-            if (in_array($style, $this->forbiddenStyleNames) === false) {
+            if (in_array($style, $this->forbiddenStyleNames, true) === false) {
                 return;
             }
         }//end if
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FileCommentSniff.php
@@ -99,7 +99,7 @@ public function process(File $phpcsFile, $stackPtr)
             T_REQUIRE_ONCE,
         ];
 
-        if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
+        if (in_array($tokens[$nextToken]['code'], $ignore, true) === true) {
             $phpcsFile->addError('Missing file doc comment', $stackPtr, 'Missing');
             $phpcsFile->recordMetric($stackPtr, 'File has doc comment', 'no');
             return ($phpcsFile->numTokens + 1);
@@ -133,7 +133,7 @@ public function process(File $phpcsFile, $stackPtr)
             $name       = $tokens[$tag]['content'];
             $isRequired = isset($required[$name]);
 
-            if ($isRequired === true && in_array($name, $foundTags) === true) {
+            if ($isRequired === true && in_array($name, $foundTags, true) === true) {
                 $error = 'Only one %s tag is allowed in a file comment';
                 $data  = [$name];
                 $phpcsFile->addError($error, $tag, 'Duplicate'.ucfirst(substr($name, 1)).'Tag', $data);
@@ -183,7 +183,7 @@ public function process(File $phpcsFile, $stackPtr)
         // Check if the tags are in the correct position.
         $pos = 0;
         foreach ($required as $tag => $true) {
-            if (in_array($tag, $foundTags) === false) {
+            if (in_array($tag, $foundTags, true) === false) {
                 $error = 'Missing %s tag in file comment';
                 $data  = [$tag];
                 $phpcsFile->addError($error, $commentEnd, 'Missing'.ucfirst(substr($tag, 1)).'Tag', $data);
diff --git a/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/FunctionCommentSniff.php
@@ -78,7 +78,7 @@ protected function processReturn(File $phpcsFile, $stackPtr, $commentStart)
                 $suggestedNames = [];
                 foreach ($typeNames as $i => $typeName) {
                     $suggestedName = Common::suggestType($typeName);
-                    if (in_array($suggestedName, $suggestedNames) === false) {
+                    if (in_array($suggestedName, $suggestedNames, true) === false) {
                         $suggestedNames[] = $suggestedName;
                     }
                 }
@@ -397,7 +397,7 @@ protected function processParams(File $phpcsFile, $stackPtr, $commentStart)
                     $suggestedTypeHint = 'callable';
                 } else if (strpos($suggestedName, 'callback') !== false) {
                     $suggestedTypeHint = 'callable';
-                } else if (in_array($suggestedName, Common::$allowedTypes) === false) {
+                } else if (in_array($suggestedName, Common::$allowedTypes, true) === false) {
                     $suggestedTypeHint = $suggestedName;
                 }
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/InlineCommentSniff.php
@@ -86,7 +86,7 @@ public function process(File $phpcsFile, $stackPtr)
                 T_REQUIRE_ONCE,
             ];
 
-            if (in_array($tokens[$nextToken]['code'], $ignore) === true) {
+            if (in_array($tokens[$nextToken]['code'], $ignore, true) === true) {
                 return;
             }
 
@@ -266,7 +266,7 @@ public function process(File $phpcsFile, $stackPtr)
                 'or question marks' => '?',
             ];
 
-            if (in_array($commentCloser, $acceptedClosers) === false) {
+            if (in_array($commentCloser, $acceptedClosers, true) === false) {
                 $error = 'Inline comments must end in %s';
                 $ender = '';
                 foreach ($acceptedClosers as $closerName => $symbol) {
diff --git a/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/LongConditionClosingCommentSniff.php
@@ -93,7 +93,7 @@ public function process(File $phpcsFile, $stackPtr)
         $endBrace       = $tokens[$stackPtr];
 
         // We are only interested in some code blocks.
-        if (in_array($startCondition['code'], self::$openers) === false) {
+        if (in_array($startCondition['code'], self::$openers, true) === false) {
             return;
         }
 
diff --git a/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/VariableCommentSniff.php
@@ -111,7 +111,7 @@ public function processMemberVar(File $phpcsFile, $stackPtr)
         $suggestedNames = [];
         foreach ($typeNames as $i => $typeName) {
             $suggestedName = Common::suggestType($typeName);
-            if (in_array($suggestedName, $suggestedNames) === false) {
+            if (in_array($suggestedName, $suggestedNames, true) === false) {
                 $suggestedNames[] = $suggestedName;
             }
         }
diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
@@ -166,7 +166,7 @@ public function process(File $phpcsFile, $stackPtr)
                     // We allow simple operations to not be bracketed.
                     // For example, ceil($one / $two).
                     for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
-                        if (in_array($tokens[$prev]['code'], $allowed) === true) {
+                        if (in_array($tokens[$prev]['code'], $allowed, true) === true) {
                             continue;
                         }
 
@@ -182,7 +182,7 @@ public function process(File $phpcsFile, $stackPtr)
                     }
 
                     for ($next = ($stackPtr + 1); $next < $endBracket; $next++) {
-                        if (in_array($tokens[$next]['code'], $allowed) === true) {
+                        if (in_array($tokens[$next]['code'], $allowed, true) === true) {
                             continue;
                         }
 
@@ -198,7 +198,7 @@ public function process(File $phpcsFile, $stackPtr)
                     }
                 }//end if
 
-                if (in_array($prevCode, Tokens::$scopeOpeners) === true) {
+                if (in_array($prevCode, Tokens::$scopeOpeners, true) === true) {
                     // This operation is inside a control structure like FOREACH
                     // or IF, but has no bracket of it's own.
                     // The only control structure allowed to do this is SWITCH.
diff --git a/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php b/src/Standards/Squiz/Sniffs/Functions/FunctionDuplicateArgumentSniff.php
@@ -48,7 +48,7 @@ public function process(File $phpcsFile, $stackPtr)
         for ($i = ($openBracket + 1); $i < $closeBracket; $i++) {
             if ($tokens[$i]['code'] === T_VARIABLE) {
                 $variable = $tokens[$i]['content'];
-                if (in_array($variable, $foundVariables) === true) {
+                if (in_array($variable, $foundVariables, true) === true) {
                     $error = 'Variable "%s" appears more than once in function declaration';
                     $data  = [$variable];
                     $phpcsFile->addError($error, $i, 'Found', $data);
diff --git a/src/Tokenizers/JS.php b/src/Tokenizers/JS.php
@@ -832,7 +832,7 @@ public function tokenize($string)
                 $numLines   = count($tokenLines);
 
                 for ($i = 0; $i < $numLines; $i++) {
-                    $newToken['content'] = $tokenLines[$i];
+                    $newToken = ['content' => $tokenLines[$i]];
                     if ($i === ($numLines - 1)) {
                         if ($tokenLines[$i] === '') {
                             break;
diff --git a/src/Tokenizers/PHP.php b/src/Tokenizers/PHP.php
@@ -782,8 +782,8 @@ protected function tokenize($string)
                 && strtolower($tokens[($stackPtr + 2)][1]) === 'from'
             ) {
                 // Could be multi-line, so just the token stack.
-                $token[0] = T_YIELD_FROM;
-                $token[1] = $token[1].$tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
+                $token[0]  = T_YIELD_FROM;
+                $token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
 
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
@@ -816,8 +816,8 @@ protected function tokenize($string)
                     && strtolower($tokens[($stackPtr + 2)][1]) === 'from'
                 ) {
                     // Could be multi-line, so just just the token stack.
-                    $token[0] = T_YIELD_FROM;
-                    $token[1] = $token[1].$tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
+                    $token[0]  = T_YIELD_FROM;
+                    $token[1] .= $tokens[($stackPtr + 1)][1].$tokens[($stackPtr + 2)][1];
 
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         for ($i = ($stackPtr + 1); $i <= ($stackPtr + 2); $i++) {
@@ -1001,7 +1001,7 @@ protected function tokenize($string)
                         $newToken['code'] = T_NULLABLE;
                         $newToken['type'] = 'T_NULLABLE';
                         break;
-                    } else if (in_array($tokenType, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';']) === true) {
+                    } else if (in_array($tokenType, [T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO, '=', '{', ';'], true) === true) {
                         $newToken['code'] = T_INLINE_THEN;
                         $newToken['type'] = 'T_INLINE_THEN';
 
diff --git a/src/Util/Common.php b/src/Util/Common.php
diff --git a/tests/AllTests.php b/tests/AllTests.php
diff --git a/tests/Core/File/GetMemberPropertiesTest.php b/tests/Core/File/GetMemberPropertiesTest.php
diff --git a/tests/Standards/AbstractSniffUnitTest.php b/tests/Standards/AbstractSniffUnitTest.php
diff --git a/tests/Standards/AllSniffs.php b/tests/Standards/AllSniffs.php

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace PHP_CodeSniffer\Files;`
`13`	`13`
	`14`	`+use PHP_CodeSniffer\Autoload;`
`14`	`15`	`use PHP_CodeSniffer\Util;`
`15`	`16`	`use PHP_CodeSniffer\Ruleset;`
`16`	`17`	`use PHP_CodeSniffer\Config;`
`@@ -151,7 +152,7 @@ private function getFilterClass()`
`151`	`152`	`throw new DeepExitException($error, 3);`
`152`	`153`	`}`
`153`	`154`
`154`		`- $filterClass = \PHP_CodeSniffer\Autoload::loadFile($filename);`
	`155`	`+ $filterClass = Autoload::loadFile($filename);`
`155`	`156`	`} else {`
`156`	`157`	`$filterClass = '\PHP_CodeSniffer\Filters\\'.$filterType;`
`157`	`158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function __construct()`
`68`	`68`
`69`	`69`	`$showOk = Config::getConfigData('notifysend_showok');`
`70`	`70`	`if ($showOk !== null) {`
`71`		`- $this->showOk = (boolean) $showOk;`
	`71`	`+ $this->showOk = (bool) $showOk;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`$this->version = str_replace(`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ final public function process(File $phpcsFile, $stackPtr)`
`195`	`195`
`196`	`196`	`$tokens = $phpcsFile->getTokens();`
`197`	`197`
`198`		`- if (in_array($tokens[$stackPtr]['code'], $this->supplementaryTokens) === true) {`
	`198`	`+ if (in_array($tokens[$stackPtr]['code'], $this->supplementaryTokens, true) === true) {`
`199`	`199`	`$this->processSupplementary($phpcsFile, $stackPtr);`
`200`	`200`	`}`
`201`	`201`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ public function process(File $phpcsFile, $stackPtr)`
`153`	`153`	`break;`
`154`	`154`	`}`
`155`	`155`
`156`		`- if (in_array($tokens[$end]['code'], $fixableScopeOpeners) === true`
	`156`	`+ if (in_array($tokens[$end]['code'], $fixableScopeOpeners, true) === true`
`157`	`157`	`&& isset($tokens[$end]['scope_opener']) === false`
`158`	`158`	`) {`
`159`	`159`	`// The best way to fix nested inline scopes is middle-out.`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function register()`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`if ($this->phpVersion < 70000) {`
`51`		`- $this->aspTags = (boolean) ini_get('asp_tags');`
	`51`	`+ $this->aspTags = (bool) ini_get('asp_tags');`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`return [`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function register()`
`29`	`29`	`T_OPEN_TAG_WITH_ECHO,`
`30`	`30`	`];`
`31`	`31`
`32`		`- $shortOpenTags = (boolean) ini_get('short_open_tag');`
	`32`	`+ $shortOpenTags = (bool) ini_get('short_open_tag');`
`33`	`33`	`if ($shortOpenTags === false) {`
`34`	`34`	`$targets[] = T_INLINE_HTML;`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public function process(File $phpcsFile, $stackPtr)`
`173`	`173`	`// Remove the pattern delimiters and modifier.`
`174`	`174`	`$pattern = substr($pattern, 1, -2);`
`175`	`175`	`} else {`
`176`		`- if (in_array($function, $this->forbiddenFunctionNames) === false) {`
	`176`	`+ if (in_array($function, $this->forbiddenFunctionNames, true) === false) {`
`177`	`177`	`return;`
`178`	`178`	`}`
`179`	`179`	`}//end if`