Partially revert "DX: PHP CS Fixer - update excluded paths and apply some minor CS"

nicolas-grekas · nicolas-grekas · commit 447e28401433 · 2023-10-20T18:29:30.000+02:00
This partially reverts commit 749ba568b14ec81997f3e284bfe1ff3be352ab88.
diff --git a/DeprecationErrorHandler.php b/DeprecationErrorHandler.php
@@ -96,7 +96,7 @@ public static function collectDeprecations($outputFile)
     {
         $deprecations = [];
         $previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$previousErrorHandler) {
-            if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || !str_contains($msg, '" targeting switch is equivalent to "break'))) {
+            if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || false === strpos($msg, '" targeting switch is equivalent to "break'))) {
                 if ($previousErrorHandler) {
                     return $previousErrorHandler($type, $msg, $file, $line, $context);
                 }
@@ -128,7 +128,7 @@ public static function collectDeprecations($outputFile)
      */
     public function handleError($type, $msg, $file, $line, $context = [])
     {
-        if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || !str_contains($msg, '" targeting switch is equivalent to "break'))) || !$this->getConfiguration()->isEnabled()) {
+        if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || false === strpos($msg, '" targeting switch is equivalent to "break'))) || !$this->getConfiguration()->isEnabled()) {
             return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
         }
 
diff --git a/DeprecationErrorHandler/Deprecation.php b/DeprecationErrorHandler/Deprecation.php
@@ -104,7 +104,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation
                     $this->getOriginalFilesStack();
                     array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);
 
-                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || (!str_contains($message, '()" will return') && !str_contains($message, 'native return type declaration') && preg_match('/^(?:The|Method) "([^":]++)/', $message, $m))) {
+                    if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || (false === strpos($message, '()" will return') && false === strpos($message, 'native return type declaration') && preg_match('/^(?:The|Method) "([^":]++)/', $message, $m))) {
                         $this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();
                         array_unshift($this->originalFilesStack, $this->triggeringFile);
                     }
@@ -142,7 +142,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation
             return;
         }
 
-        if (!isset($line['class'], $trace[$i - 2]['function']) || !str_starts_with($line['class'], SymfonyTestsListenerFor::class)) {
+        if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
             $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
             $this->originMethod = $line['function'];
 
@@ -169,7 +169,7 @@ private function lineShouldBeSkipped(array $line)
         }
         $class = $line['class'];
 
-        return 'ReflectionMethod' === $class || str_starts_with($class, 'PHPUnit\\');
+        return 'ReflectionMethod' === $class || 0 === strpos($class, 'PHPUnit\\');
     }
 
     /**
@@ -211,7 +211,7 @@ public function originatingClass()
 
         $class = $this->originClass;
 
-        return str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
+        return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
     }
 
     /**
@@ -246,9 +246,9 @@ public function isLegacy()
         $method = $this->originatingMethod();
         $groups = class_exists(Groups::class, false) ? [new Groups(), 'groups'] : [Test::class, 'getGroups'];
 
-        return str_starts_with($method, 'testLegacy')
-            || str_starts_with($method, 'provideLegacy')
-            || str_starts_with($method, 'getLegacy')
+        return 0 === strpos($method, 'testLegacy')
+            || 0 === strpos($method, 'provideLegacy')
+            || 0 === strpos($method, 'getLegacy')
             || strpos($this->originClass, '\Legacy')
             || \in_array('legacy', $groups($this->originClass, $method), true);
     }
@@ -262,10 +262,10 @@ public function isMuted()
             return false;
         }
         if (isset($this->trace[1]['class'])) {
-            return str_starts_with($this->trace[1]['class'], 'PHPUnit\\');
+            return 0 === strpos($this->trace[1]['class'], 'PHPUnit\\');
         }
 
-        return str_contains($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
+        return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
     }
 
     /**
@@ -340,7 +340,7 @@ private function getPackage($path)
     {
         $path = realpath($path) ?: $path;
         foreach (self::getVendors() as $vendorRoot) {
-            if (str_starts_with($path, $vendorRoot)) {
+            if (0 === strpos($path, $vendorRoot)) {
                 $relativePath = substr($path, \strlen($vendorRoot) + 1);
                 $vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true);
                 if (false === $vendor) {
@@ -366,7 +366,7 @@ private static function getVendors()
                 self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());
             }
             foreach (get_declared_classes() as $class) {
-                if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {
+                if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
                     $r = new \ReflectionClass($class);
                     $v = \dirname($r->getFileName(), 2);
                     if (file_exists($v.'/composer/installed.json')) {
@@ -381,7 +381,7 @@ private static function getVendors()
             }
             foreach ($paths as $path) {
                 foreach (self::$vendors as $vendor) {
-                    if (!str_starts_with($path, $vendor)) {
+                    if (0 !== strpos($path, $vendor)) {
                         self::$internalPaths[] = $path;
                     }
                 }
@@ -416,13 +416,13 @@ private function getPathType($path)
             return self::PATH_TYPE_UNDETERMINED;
         }
         foreach (self::getVendors() as $vendor) {
-            if (str_starts_with($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
+            if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
                 return self::PATH_TYPE_VENDOR;
             }
         }
 
         foreach (self::$internalPaths as $internalPath) {
-            if (str_starts_with($realPath, $internalPath)) {
+            if (0 === strpos($realPath, $internalPath)) {
                 return self::PATH_TYPE_SELF;
             }
         }
diff --git a/Tests/CoverageListenerTest.php b/Tests/CoverageListenerTest.php
@@ -43,7 +43,7 @@ public function test()
         exec("$php $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text --colors=never 2> /dev/null", $output);
         $output = implode("\n", $output);
 
-        if (!str_contains($output, 'FooCov')) {
+        if (false === strpos($output, 'FooCov')) {
             $this->addToAssertionCount(1);
         } else {
             $this->assertMatchesRegularExpression('/FooCov\n\s*Methods:\s+0.00%[^\n]+Lines:\s+0.00%/', $output);
diff --git a/bin/simple-phpunit.php b/bin/simple-phpunit.php
@@ -57,7 +57,7 @@
                 break;
             }
             // short option
-            if (str_starts_with($cliArgument, '-c')) {
+            if (0 === strpos($cliArgument, '-c')) {
                 if ('-c' === $cliArgument && array_key_exists($cliArgumentIndex + 1, $argv)) {
                     $phpunitConfigFilename = $getPhpUnitConfig($argv[$cliArgumentIndex + 1]);
                 } else {
diff --git a/composer.json b/composer.json
@@ -23,7 +23,6 @@
     "require-dev": {
         "symfony/deprecation-contracts": "^2.5|^3.0",
         "symfony/error-handler": "^5.4|^6.0|^7.0",
-        "symfony/polyfill-php80": "^1.27",
         "symfony/polyfill-php81": "^1.27"
     },
     "conflict": {

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public static function collectDeprecations($outputFile)`
`96`	`96`	`{`
`97`	`97`	`$deprecations = [];`
`98`	`98`	`$previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$previousErrorHandler) {`
`99`		`- if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| !str_contains($msg, '" targeting switch is equivalent to "break'))) {`
	`99`	`+ if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| false === strpos($msg, '" targeting switch is equivalent to "break'))) {`
`100`	`100`	`if ($previousErrorHandler) {`
`101`	`101`	`return $previousErrorHandler($type, $msg, $file, $line, $context);`
`102`	`102`	`}`
`@@ -128,7 +128,7 @@ public static function collectDeprecations($outputFile)`
`128`	`128`	`*/`
`129`	`129`	`public function handleError($type, $msg, $file, $line, $context = [])`
`130`	`130`	`{`
`131`		`- if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| !str_contains($msg, '" targeting switch is equivalent to "break'))) \|\| !$this->getConfiguration()->isEnabled()) {`
	`131`	`+ if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| false === strpos($msg, '" targeting switch is equivalent to "break'))) \|\| !$this->getConfiguration()->isEnabled()) {`
`132`	`132`	`return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);`
`133`	`133`	`}`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation`
`104`	`104`	`$this->getOriginalFilesStack();`
`105`	`105`	`array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);`
`106`	`106`
`107`		`- if (preg_match('/(?\|"([^"]++)" that is deprecated\|should implement method "(?:static )?([^:]++))/', $message, $m) \|\| (!str_contains($message, '()" will return') && !str_contains($message, 'native return type declaration') && preg_match('/^(?:The\|Method) "([^":]++)/', $message, $m))) {`
	`107`	`+ if (preg_match('/(?\|"([^"]++)" that is deprecated\|should implement method "(?:static )?([^:]++))/', $message, $m) \|\| (false === strpos($message, '()" will return') && false === strpos($message, 'native return type declaration') && preg_match('/^(?:The\|Method) "([^":]++)/', $message, $m))) {`
`108`	`108`	`$this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();`
`109`	`109`	`array_unshift($this->originalFilesStack, $this->triggeringFile);`
`110`	`110`	`}`
`@@ -142,7 +142,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`	`144`
`145`		`- if (!isset($line['class'], $trace[$i - 2]['function']) \|\| !str_starts_with($line['class'], SymfonyTestsListenerFor::class)) {`
	`145`	`+ if (!isset($line['class'], $trace[$i - 2]['function']) \|\| 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {`
`146`	`146`	`$this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];`
`147`	`147`	`$this->originMethod = $line['function'];`
`148`	`148`
`@@ -169,7 +169,7 @@ private function lineShouldBeSkipped(array $line)`
`169`	`169`	`}`
`170`	`170`	`$class = $line['class'];`
`171`	`171`
`172`		`- return 'ReflectionMethod' === $class \|\| str_starts_with($class, 'PHPUnit\\');`
	`172`	`+ return 'ReflectionMethod' === $class \|\| 0 === strpos($class, 'PHPUnit\\');`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`/**`
`@@ -211,7 +211,7 @@ public function originatingClass()`
`211`	`211`
`212`	`212`	`$class = $this->originClass;`
`213`	`213`
`214`		`- return str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;`
	`214`	`+ return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`/**`
`@@ -246,9 +246,9 @@ public function isLegacy()`
`246`	`246`	`$method = $this->originatingMethod();`
`247`	`247`	`$groups = class_exists(Groups::class, false) ? [new Groups(), 'groups'] : [Test::class, 'getGroups'];`
`248`	`248`
`249`		`- return str_starts_with($method, 'testLegacy')`
`250`		`- \|\| str_starts_with($method, 'provideLegacy')`
`251`		`- \|\| str_starts_with($method, 'getLegacy')`
	`249`	`+ return 0 === strpos($method, 'testLegacy')`
	`250`	`+ \|\| 0 === strpos($method, 'provideLegacy')`
	`251`	`+ \|\| 0 === strpos($method, 'getLegacy')`
`252`	`252`	`\|\| strpos($this->originClass, '\Legacy')`
`253`	`253`	`\|\| \in_array('legacy', $groups($this->originClass, $method), true);`
`254`	`254`	`}`
`@@ -262,10 +262,10 @@ public function isMuted()`
`262`	`262`	`return false;`
`263`	`263`	`}`
`264`	`264`	`if (isset($this->trace[1]['class'])) {`
`265`		`- return str_starts_with($this->trace[1]['class'], 'PHPUnit\\');`
	`265`	`+ return 0 === strpos($this->trace[1]['class'], 'PHPUnit\\');`
`266`	`266`	`}`
`267`	`267`
`268`		`- return str_contains($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);`
	`268`	`+ return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`/**`
`@@ -340,7 +340,7 @@ private function getPackage($path)`
`340`	`340`	`{`
`341`	`341`	`$path = realpath($path) ?: $path;`
`342`	`342`	`foreach (self::getVendors() as $vendorRoot) {`
`343`		`- if (str_starts_with($path, $vendorRoot)) {`
	`343`	`+ if (0 === strpos($path, $vendorRoot)) {`
`344`	`344`	`$relativePath = substr($path, \strlen($vendorRoot) + 1);`
`345`	`345`	`$vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true);`
`346`	`346`	`if (false === $vendor) {`
`@@ -366,7 +366,7 @@ private static function getVendors()`
`366`	`366`	`self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());`
`367`	`367`	`}`
`368`	`368`	`foreach (get_declared_classes() as $class) {`
`369`		`- if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {`
	`369`	`+ if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {`
`370`	`370`	`$r = new \ReflectionClass($class);`
`371`	`371`	`$v = \dirname($r->getFileName(), 2);`
`372`	`372`	`if (file_exists($v.'/composer/installed.json')) {`
`@@ -381,7 +381,7 @@ private static function getVendors()`
`381`	`381`	`}`
`382`	`382`	`foreach ($paths as $path) {`
`383`	`383`	`foreach (self::$vendors as $vendor) {`
`384`		`- if (!str_starts_with($path, $vendor)) {`
	`384`	`+ if (0 !== strpos($path, $vendor)) {`
`385`	`385`	`self::$internalPaths[] = $path;`
`386`	`386`	`}`
`387`	`387`	`}`
`@@ -416,13 +416,13 @@ private function getPathType($path)`
`416`	`416`	`return self::PATH_TYPE_UNDETERMINED;`
`417`	`417`	`}`
`418`	`418`	`foreach (self::getVendors() as $vendor) {`
`419`		`- if (str_starts_with($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {`
	`419`	`+ if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {`
`420`	`420`	`return self::PATH_TYPE_VENDOR;`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`foreach (self::$internalPaths as $internalPath) {`
`425`		`- if (str_starts_with($realPath, $internalPath)) {`
	`425`	`+ if (0 === strpos($realPath, $internalPath)) {`
`426`	`426`	`return self::PATH_TYPE_SELF;`
`427`	`427`	`}`
`428`	`428`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`break;`
`58`	`58`	`}`
`59`	`59`	`// short option`
`60`		`- if (str_starts_with($cliArgument, '-c')) {`
	`60`	`+ if (0 === strpos($cliArgument, '-c')) {`
`61`	`61`	`if ('-c' === $cliArgument && array_key_exists($cliArgumentIndex + 1, $argv)) {`
`62`	`62`	`$phpunitConfigFilename = $getPhpUnitConfig($argv[$cliArgumentIndex + 1]);`
`63`	`63`	`} else {`