Revert all changes in PhpUnit Bridge

javiereguiluz · javiereguiluz · commit 3fedb5321ec8 · 2023-02-04T18:59:31.000+01:00
diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -111,7 +111,7 @@ public static function register($class)
         if (0 < strpos($class, '\\Tests\\')) {
             $ns = str_replace('\\Tests\\', '\\', $class);
             $mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
-        } elseif (str_starts_with($class, 'Tests\\')) {
+        } elseif (0 === strpos($class, 'Tests\\')) {
             $mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);
         }
         foreach ($mockedNs as $ns) {
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -90,7 +90,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);
                 }
@@ -122,7 +122,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/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php
@@ -89,7 +89,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);
                     }
@@ -176,7 +176,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;
     }
 
     /**
@@ -230,7 +230,7 @@ public function isMuted()
             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);
     }
 
     /**
diff --git a/src/Symfony/Bridge/PhpUnit/DnsMock.php b/src/Symfony/Bridge/PhpUnit/DnsMock.php
@@ -169,7 +169,7 @@ public static function register($class)
         if (0 < strpos($class, '\\Tests\\')) {
             $ns = str_replace('\\Tests\\', '\\', $class);
             $mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));
-        } elseif (str_starts_with($class, 'Tests\\')) {
+        } elseif (0 === strpos($class, 'Tests\\')) {
             $mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);
         }
         foreach ($mockedNs as $ns) {

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public static function register($class)`
`111`	`111`	`if (0 < strpos($class, '\\Tests\\')) {`
`112`	`112`	`$ns = str_replace('\\Tests\\', '\\', $class);`
`113`	`113`	`$mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));`
`114`		`- } elseif (str_starts_with($class, 'Tests\\')) {`
	`114`	`+ } elseif (0 === strpos($class, 'Tests\\')) {`
`115`	`115`	`$mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);`
`116`	`116`	`}`
`117`	`117`	`foreach ($mockedNs as $ns) {`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public static function collectDeprecations($outputFile)`
`90`	`90`	`{`
`91`	`91`	`$deprecations = [];`
`92`	`92`	`$previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$previousErrorHandler) {`
`93`		`- if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| !str_contains($msg, '" targeting switch is equivalent to "break'))) {`
	`93`	`+ if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| false === strpos($msg, '" targeting switch is equivalent to "break'))) {`
`94`	`94`	`if ($previousErrorHandler) {`
`95`	`95`	`return $previousErrorHandler($type, $msg, $file, $line, $context);`
`96`	`96`	`}`
`@@ -122,7 +122,7 @@ public static function collectDeprecations($outputFile)`
`122`	`122`	`*/`
`123`	`123`	`public function handleError($type, $msg, $file, $line, $context = [])`
`124`	`124`	`{`
`125`		`- if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| !str_contains($msg, '" targeting switch is equivalent to "break'))) \|\| !$this->getConfiguration()->isEnabled()) {`
	`125`	`+ if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type \|\| false === strpos($msg, '" targeting switch is equivalent to "break'))) \|\| !$this->getConfiguration()->isEnabled()) {`
`126`	`126`	`return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);`
`127`	`127`	`}`
`128`	`128`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation`
`89`	`89`	`$this->getOriginalFilesStack();`
`90`	`90`	`array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);`
`91`	`91`
`92`		`- 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))) {`
	`92`	`+ 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))) {`
`93`	`93`	`$this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();`
`94`	`94`	`array_unshift($this->originalFilesStack, $this->triggeringFile);`
`95`	`95`	`}`
`@@ -176,7 +176,7 @@ public function originatingClass()`
`176`	`176`
`177`	`177`	`$class = $this->originClass;`
`178`	`178`
`179`		`- return str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;`
	`179`	`+ return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;`
`180`	`180`	`}`
`181`	`181`
`182`	`182`	`/**`
`@@ -230,7 +230,7 @@ public function isMuted()`
`230`	`230`	`return 0 === strpos($this->trace[1]['class'], 'PHPUnit\\');`
`231`	`231`	`}`
`232`	`232`
`233`		`- return str_contains($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);`
	`233`	`+ return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public static function register($class)`
`169`	`169`	`if (0 < strpos($class, '\\Tests\\')) {`
`170`	`170`	`$ns = str_replace('\\Tests\\', '\\', $class);`
`171`	`171`	`$mockedNs[] = substr($ns, 0, strrpos($ns, '\\'));`
`172`		`- } elseif (str_starts_with($class, 'Tests\\')) {`
	`172`	`+ } elseif (0 === strpos($class, 'Tests\\')) {`
`173`	`173`	`$mockedNs[] = substr($class, 6, strrpos($class, '\\') - 6);`
`174`	`174`	`}`
`175`	`175`	`foreach ($mockedNs as $ns) {`