Merge branch '6.4' into 7.0

fabpot · fabpot · commit e3bd13f51840 · 2023-10-20T08:14:02.000+02:00
* 6.4:
  DX: PHP CS Fixer - update excluded paths and apply some minor CS
  [AssetMapper] Optimize memory usage (load only "compilable" assets)
  [AssetMapper] Split ImportmapManager into 2
  Rename fixtures paths to be consistent
  Add WorflowGuardListenerPass only if it exists
  [AssetMapper] Using ?specifier=* does not match unstable packages on jsdelivr
  [Worflow] Add a TraceableWorkflow
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 || false === strpos($msg, '" targeting switch is equivalent to "break'))) {
+            if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || !str_contains($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 || false === strpos($msg, '" targeting switch is equivalent to "break'))) || !$this->getConfiguration()->isEnabled()) {
+        if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || !str_contains($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
@@ -99,7 +99,7 @@ public function __construct(string $message, array $trace, string $file, bool $l
                     $this->getOriginalFilesStack();
                     array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);
 
-                    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))) {
+                    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))) {
                         $this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();
                         array_unshift($this->originalFilesStack, $this->triggeringFile);
                     }
@@ -137,7 +137,7 @@ public function __construct(string $message, array $trace, string $file, bool $l
             return;
         }
 
-        if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
+        if (!isset($line['class'], $trace[$i - 2]['function']) || !str_starts_with($line['class'], SymfonyTestsListenerFor::class)) {
             $this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
             $this->originMethod = $line['function'];
 
@@ -161,7 +161,7 @@ private function lineShouldBeSkipped(array $line): bool
         }
         $class = $line['class'];
 
-        return 'ReflectionMethod' === $class || 0 === strpos($class, 'PHPUnit\\');
+        return 'ReflectionMethod' === $class || str_starts_with($class, 'PHPUnit\\');
     }
 
     public function originatesFromDebugClassLoader(): bool
@@ -191,7 +191,7 @@ public function originatingClass(): string
 
         $class = $this->originClass;
 
-        return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
+        return str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
     }
 
     public function originatingMethod(): string
@@ -217,9 +217,9 @@ public function isLegacy(): bool
         $method = $this->originatingMethod();
         $groups = class_exists(Groups::class, false) ? [new Groups(), 'groups'] : [Test::class, 'getGroups'];
 
-        return 0 === strpos($method, 'testLegacy')
-            || 0 === strpos($method, 'provideLegacy')
-            || 0 === strpos($method, 'getLegacy')
+        return str_starts_with($method, 'testLegacy')
+            || str_starts_with($method, 'provideLegacy')
+            || str_starts_with($method, 'getLegacy')
             || strpos($this->originClass, '\Legacy')
             || \in_array('legacy', $groups($this->originClass, $method), true);
     }
@@ -230,10 +230,10 @@ public function isMuted(): bool
             return false;
         }
         if (isset($this->trace[1]['class'])) {
-            return 0 === strpos($this->trace[1]['class'], 'PHPUnit\\');
+            return str_starts_with($this->trace[1]['class'], 'PHPUnit\\');
         }
 
-        return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
+        return str_contains($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
     }
 
     /**
@@ -302,7 +302,7 @@ private function getPackage(string $path): string
     {
         $path = realpath($path) ?: $path;
         foreach (self::getVendors() as $vendorRoot) {
-            if (0 === strpos($path, $vendorRoot)) {
+            if (str_starts_with($path, $vendorRoot)) {
                 $relativePath = substr($path, \strlen($vendorRoot) + 1);
                 $vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true);
                 if (false === $vendor) {
@@ -328,7 +328,7 @@ private static function getVendors(): array
                 self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());
             }
             foreach (get_declared_classes() as $class) {
-                if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
+                if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {
                     $r = new \ReflectionClass($class);
                     $v = \dirname($r->getFileName(), 2);
                     if (file_exists($v.'/composer/installed.json')) {
@@ -343,7 +343,7 @@ private static function getVendors(): array
             }
             foreach ($paths as $path) {
                 foreach (self::$vendors as $vendor) {
-                    if (0 !== strpos($path, $vendor)) {
+                    if (!str_starts_with($path, $vendor)) {
                         self::$internalPaths[] = $path;
                     }
                 }
@@ -373,13 +373,13 @@ private function getPathType(string $path): string
             return self::PATH_TYPE_UNDETERMINED;
         }
         foreach (self::getVendors() as $vendor) {
-            if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
+            if (str_starts_with($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
                 return self::PATH_TYPE_VENDOR;
             }
         }
 
         foreach (self::$internalPaths as $internalPath) {
-            if (0 === strpos($realPath, $internalPath)) {
+            if (str_starts_with($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 (false === strpos($output, 'FooCov')) {
+        if (!str_contains($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 (0 === strpos($cliArgument, '-c')) {
+            if (str_starts_with($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,6 +23,7 @@
     "require-dev": {
         "symfony/deprecation-contracts": "^2.5|^3.0",
         "symfony/error-handler": "^5.4|^6.4|^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 \|\| false === strpos($msg, '" targeting switch is equivalent to "break'))) {`
	`99`	`+ if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| !str_contains($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 \|\| false === strpos($msg, '" targeting switch is equivalent to "break'))) \|\| !$this->getConfiguration()->isEnabled()) {`
	`131`	`+ if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| !str_contains($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
`@@ -99,7 +99,7 @@ public function __construct(string $message, array $trace, string $file, bool $l`
`99`	`99`	`$this->getOriginalFilesStack();`
`100`	`100`	`array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);`
`101`	`101`
`102`		`- 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))) {`
	`102`	`+ 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))) {`
`103`	`103`	`$this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();`
`104`	`104`	`array_unshift($this->originalFilesStack, $this->triggeringFile);`
`105`	`105`	`}`
`@@ -137,7 +137,7 @@ public function __construct(string $message, array $trace, string $file, bool $l`
`137`	`137`	`return;`
`138`	`138`	`}`
`139`	`139`
`140`		`- if (!isset($line['class'], $trace[$i - 2]['function']) \|\| 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {`
	`140`	`+ if (!isset($line['class'], $trace[$i - 2]['function']) \|\| !str_starts_with($line['class'], SymfonyTestsListenerFor::class)) {`
`141`	`141`	`$this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];`
`142`	`142`	`$this->originMethod = $line['function'];`
`143`	`143`
`@@ -161,7 +161,7 @@ private function lineShouldBeSkipped(array $line): bool`
`161`	`161`	`}`
`162`	`162`	`$class = $line['class'];`
`163`	`163`
`164`		`- return 'ReflectionMethod' === $class \|\| 0 === strpos($class, 'PHPUnit\\');`
	`164`	`+ return 'ReflectionMethod' === $class \|\| str_starts_with($class, 'PHPUnit\\');`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`public function originatesFromDebugClassLoader(): bool`
`@@ -191,7 +191,7 @@ public function originatingClass(): string`
`191`	`191`
`192`	`192`	`$class = $this->originClass;`
`193`	`193`
`194`		`- return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;`
	`194`	`+ return str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`public function originatingMethod(): string`
`@@ -217,9 +217,9 @@ public function isLegacy(): bool`
`217`	`217`	`$method = $this->originatingMethod();`
`218`	`218`	`$groups = class_exists(Groups::class, false) ? [new Groups(), 'groups'] : [Test::class, 'getGroups'];`
`219`	`219`
`220`		`- return 0 === strpos($method, 'testLegacy')`
`221`		`- \|\| 0 === strpos($method, 'provideLegacy')`
`222`		`- \|\| 0 === strpos($method, 'getLegacy')`
	`220`	`+ return str_starts_with($method, 'testLegacy')`
	`221`	`+ \|\| str_starts_with($method, 'provideLegacy')`
	`222`	`+ \|\| str_starts_with($method, 'getLegacy')`
`223`	`223`	`\|\| strpos($this->originClass, '\Legacy')`
`224`	`224`	`\|\| \in_array('legacy', $groups($this->originClass, $method), true);`
`225`	`225`	`}`
`@@ -230,10 +230,10 @@ public function isMuted(): bool`
`230`	`230`	`return false;`
`231`	`231`	`}`
`232`	`232`	`if (isset($this->trace[1]['class'])) {`
`233`		`- return 0 === strpos($this->trace[1]['class'], 'PHPUnit\\');`
	`233`	`+ return str_starts_with($this->trace[1]['class'], 'PHPUnit\\');`
`234`	`234`	`}`
`235`	`235`
`236`		`- return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);`
	`236`	`+ return str_contains($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`/**`
`@@ -302,7 +302,7 @@ private function getPackage(string $path): string`
`302`	`302`	`{`
`303`	`303`	`$path = realpath($path) ?: $path;`
`304`	`304`	`foreach (self::getVendors() as $vendorRoot) {`
`305`		`- if (0 === strpos($path, $vendorRoot)) {`
	`305`	`+ if (str_starts_with($path, $vendorRoot)) {`
`306`	`306`	`$relativePath = substr($path, \strlen($vendorRoot) + 1);`
`307`	`307`	`$vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true);`
`308`	`308`	`if (false === $vendor) {`
`@@ -328,7 +328,7 @@ private static function getVendors(): array`
`328`	`328`	`self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());`
`329`	`329`	`}`
`330`	`330`	`foreach (get_declared_classes() as $class) {`
`331`		`- if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {`
	`331`	`+ if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {`
`332`	`332`	`$r = new \ReflectionClass($class);`
`333`	`333`	`$v = \dirname($r->getFileName(), 2);`
`334`	`334`	`if (file_exists($v.'/composer/installed.json')) {`
`@@ -343,7 +343,7 @@ private static function getVendors(): array`
`343`	`343`	`}`
`344`	`344`	`foreach ($paths as $path) {`
`345`	`345`	`foreach (self::$vendors as $vendor) {`
`346`		`- if (0 !== strpos($path, $vendor)) {`
	`346`	`+ if (!str_starts_with($path, $vendor)) {`
`347`	`347`	`self::$internalPaths[] = $path;`
`348`	`348`	`}`
`349`	`349`	`}`
`@@ -373,13 +373,13 @@ private function getPathType(string $path): string`
`373`	`373`	`return self::PATH_TYPE_UNDETERMINED;`
`374`	`374`	`}`
`375`	`375`	`foreach (self::getVendors() as $vendor) {`
`376`		`- if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {`
	`376`	`+ if (str_starts_with($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {`
`377`	`377`	`return self::PATH_TYPE_VENDOR;`
`378`	`378`	`}`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`foreach (self::$internalPaths as $internalPath) {`
`382`		`- if (0 === strpos($realPath, $internalPath)) {`
	`382`	`+ if (str_starts_with($realPath, $internalPath)) {`
`383`	`383`	`return self::PATH_TYPE_SELF;`
`384`	`384`	`}`
`385`	`385`	`}`
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 (0 === strpos($cliArgument, '-c')) {`
	`60`	`+ if (str_starts_with($cliArgument, '-c')) {`
`61`	`61`	`if ('-c' === $cliArgument && array_key_exists($cliArgumentIndex + 1, $argv)) {`
`62`	`62`	`$phpunitConfigFilename = $getPhpUnitConfig($argv[$cliArgumentIndex + 1]);`
`63`	`63`	`} else {`