ConstraintTrait.php

@@ -20,9 +20,19 @@ trait ConstraintTrait
     {
         use Legacy\ConstraintTraitForV6;
     }
-} else {
+} elseif ($r->getProperty('exporter')->isProtected()) {
     trait ConstraintTrait
     {
         use Legacy\ConstraintTraitForV7;
     }
+} elseif (\PHP_VERSION < 70100 || !$r->getMethod('evaluate')->hasReturnType()) {
+    trait ConstraintTrait
+    {
+        use Legacy\ConstraintTraitForV8;
+    }
+} else {
+    trait ConstraintTrait
+    {
+        use Legacy\ConstraintTraitForV9;
+    }
 }

Legacy/ConstraintLogicTrait.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+/**
+ * @internal
+ */
+trait ConstraintLogicTrait
+{
+    private function doEvaluate($other, $description, $returnResult)
+    {
+        $success = false;
+
+        if ($this->matches($other)) {
+            $success = true;
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+
+        return null;
+    }
+
+    private function doAdditionalFailureDescription($other): string
+    {
+        return '';
+    }
+
+    private function doCount(): int
+    {
+        return 1;
+    }
+
+    private function doFailureDescription($other): string
+    {
+        return $this->exporter()->export($other).' '.$this->toString();
+    }
+
+    private function doMatches($other): bool
+    {
+        return false;
+    }
+
+    private function doToString(): string
+    {
+        return '';
+    }
+}

Legacy/ConstraintTraitForV6.php

@@ -18,6 +18,14 @@
  */
 trait ConstraintTraitForV6
 {
+    /**
+     * @return bool|null
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        return $this->doEvaluate($other, $description, $returnResult);
+    }
+
     /**
      * @return int
      */
@@ -86,6 +94,25 @@ private function doCount()
         return 1;
     }
 
+    private function doEvaluate($other, $description, $returnResult)
+    {
+        $success = false;
+
+        if ($this->matches($other)) {
+            $success = true;
+        }
+
+        if ($returnResult) {
+            return $success;
+        }
+
+        if (!$success) {
+            $this->fail($other, $description);
+        }
+
+        return null;
+    }
+
     private function doFailureDescription($other)
     {
         return $this->exporter()->export($other).' '.$this->toString();

Legacy/ConstraintTraitForV7.php

@@ -11,11 +11,23 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use SebastianBergmann\Exporter\Exporter;
+
 /**
  * @internal
  */
 trait ConstraintTraitForV7
 {
+    use ConstraintLogicTrait;
+
+    /**
+     * @return bool|null
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        return $this->doEvaluate($other, $description, $returnResult);
+    }
+
     public function count(): int
     {
         return $this->doCount();
@@ -31,38 +43,22 @@ protected function additionalFailureDescription($other): string
         return $this->doAdditionalFailureDescription($other);
     }
 
-    protected function failureDescription($other): string
-    {
-        return $this->doFailureDescription($other);
-    }
-
-    protected function matches($other): bool
-    {
-        return $this->doMatches($other);
-    }
-
-    private function doAdditionalFailureDescription($other): string
-    {
-        return '';
-    }
-
-    private function doCount(): int
+    protected function exporter(): Exporter
     {
-        return 1;
-    }
+        if (null !== $this->exporter) {
+            $this->exporter = new Exporter();
+        }
 
-    private function doFailureDescription($other): string
-    {
-        return $this->exporter()->export($other).' '.$this->toString();
+        return $this->exporter;
     }
 
-    private function doMatches($other): bool
+    protected function failureDescription($other): string
     {
-        return false;
+        return $this->doFailureDescription($other);
     }
 
-    private function doToString(): string
+    protected function matches($other): bool
     {
-        return '';
+        return $this->doMatches($other);
     }
 }

Legacy/ConstraintTraitForV8.php

@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+/**
+ * @internal
+ */
+trait ConstraintTraitForV8
+{
+    use ConstraintLogicTrait;
+
+    /**
+     * @return bool|null
+     */
+    public function evaluate($other, $description = '', $returnResult = false)
+    {
+        return $this->doEvaluate($other, $description, $returnResult);
+    }
+
+    public function count(): int
+    {
+        return $this->doCount();
+    }
+
+    public function toString(): string
+    {
+        return $this->doToString();
+    }
+
+    protected function additionalFailureDescription($other): string
+    {
+        return $this->doAdditionalFailureDescription($other);
+    }
+
+    protected function failureDescription($other): string
+    {
+        return $this->doFailureDescription($other);
+    }
+
+    protected function matches($other): bool
+    {
+        return $this->doMatches($other);
+    }
+}

Legacy/ConstraintTraitForV9.php

@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bridge\PhpUnit\Legacy;
+
+/**
+ * @internal
+ */
+trait ConstraintTraitForV9
+{
+    use ConstraintLogicTrait;
+
+    public function evaluate($other, string $description = '', bool $returnResult = false): ?bool
+    {
+        return $this->doEvaluate($other, $description, $returnResult);
+    }
+
+    public function count(): int
+    {
+        return $this->doCount();
+    }
+
+    public function toString(): string
+    {
+        return $this->doToString();
+    }
+
+    protected function additionalFailureDescription($other): string
+    {
+        return $this->doAdditionalFailureDescription($other);
+    }
+
+    protected function failureDescription($other): string
+    {
+        return $this->doFailureDescription($other);
+    }
+
+    protected function matches($other): bool
+    {
+        return $this->doMatches($other);
+    }
+}

Legacy/PolyfillTestCaseTrait.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use PHPUnit\Framework\Error\Error;
+use PHPUnit\Framework\Error\Notice;
+use PHPUnit\Framework\Error\Warning;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
@@ -66,9 +69,7 @@ protected function createPartialMock($originalClassName, array $methods)
      */
     public function expectException($exception)
     {
-        $property = new \ReflectionProperty(TestCase::class, 'expectedException');
-        $property->setAccessible(true);
-        $property->setValue($this, $exception);
+        $this->doExpectException($exception);
     }
 
     /**
@@ -116,4 +117,95 @@ public function expectExceptionMessageRegExp($messageRegExp)
         $property->setAccessible(true);
         $property->setValue($this, $messageRegExp);
     }
+
+    /**
+     * @return void
+     */
+    public function expectNotice()
+    {
+        $this->doExpectException(Notice::class);
+    }
+
+    /**
+     * @param string $message
+     *
+     * @return void
+     */
+    public function expectNoticeMessage($message)
+    {
+        $this->expectExceptionMessage($message);
+    }
+
+    /**
+     * @param string $regularExpression
+     *
+     * @return void
+     */
+    public function expectNoticeMessageMatches($regularExpression)
+    {
+        $this->expectExceptionMessageMatches($regularExpression);
+    }
+
+    /**
+     * @return void
+     */
+    public function expectWarning()
+    {
+        $this->doExpectException(Warning::class);
+    }
+
+    /**
+     * @param string $message
+     *
+     * @return void
+     */
+    public function expectWarningMessage($message)
+    {
+        $this->expectExceptionMessage($message);
+    }
+
+    /**
+     * @param string $regularExpression
+     *
+     * @return void
+     */
+    public function expectWarningMessageMatches($regularExpression)
+    {
+        $this->expectExceptionMessageMatches($regularExpression);
+    }
+
+    /**
+     * @return void
+     */
+    public function expectError()
+    {
+        $this->doExpectException(Error::class);
+    }
+
+    /**
+     * @param string $message
+     *
+     * @return void
+     */
+    public function expectErrorMessage($message)
+    {
+        $this->expectExceptionMessage($message);
+    }
+
+    /**
+     * @param string $regularExpression
+     *
+     * @return void
+     */
+    public function expectErrorMessageMatches($regularExpression)
+    {
+        $this->expectExceptionMessageMatches($regularExpression);
+    }
+
+    private function doExpectException($exception)
+    {
+        $property = new \ReflectionProperty(TestCase::class, 'expectedException');
+        $property->setAccessible(true);
+        $property->setValue($this, $exception);
+    }
 }

Tests/DeprecationErrorHandler/DeprecationTest.php

@@ -41,7 +41,7 @@ private static function getVendorDir()
         }
 
         self::$vendorDir = $vendorDir;
-        mkdir($vendorDir.'/myfakevendor/myfakepackage2');
+        @mkdir($vendorDir.'/myfakevendor/myfakepackage2');
         touch($vendorDir.'/myfakevendor/myfakepackage1/MyFakeFile1.php');
         touch($vendorDir.'/myfakevendor/myfakepackage1/MyFakeFile2.php');
         touch($vendorDir.'/myfakevendor/myfakepackage2/MyFakeFile.php');

bin/simple-phpunit.php

@@ -95,7 +95,7 @@
 
 if (\PHP_VERSION_ID >= 80000) {
     // PHP 8 requires PHPUnit 9.3+
-    $PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.3');
+    $PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '9.4');
 } elseif (\PHP_VERSION_ID >= 70200) {
     // PHPUnit 8 requires PHP 7.2+
     $PHPUNIT_VERSION = $getEnvVar('SYMFONY_PHPUNIT_VERSION', '8.3');
@@ -196,7 +196,7 @@
         'requires' => ['php' => '*'],
     ];
 
-    $stableVersions = array_filter($info['versions'], function($v) {
+    $stableVersions = array_filter($info['versions'], function ($v) {
         return !preg_match('/-dev$|^dev-/', $v);
     });
 
@@ -264,11 +264,11 @@ class SymfonyExcludeListPhpunit {}
 if (method_exists('PHPUnit\Util\ExcludeList', 'addDirectory')) {
     (new PHPUnit\Util\Excludelist())->getExcludedDirectories();
     PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListPhpunit'))->getFileName()));
-    PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListSimplePhpunit'))->getFileName()));
+    class_exists('SymfonyExcludeListSimplePhpunit', false) && PHPUnit\Util\ExcludeList::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListSimplePhpunit'))->getFileName()));
 } elseif (method_exists('PHPUnit\Util\Blacklist', 'addDirectory')) {
     (new PHPUnit\Util\BlackList())->getBlacklistedDirectories();
     PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListPhpunit'))->getFileName()));
-    PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListSimplePhpunit'))->getFileName()));
+    class_exists('SymfonyExcludeListSimplePhpunit', false) && PHPUnit\Util\Blacklist::addDirectory(\dirname((new \ReflectionClass('SymfonyExcludeListSimplePhpunit'))->getFileName()));
 } else {
     PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListPhpunit'] = 1;
     PHPUnit\Util\Blacklist::$blacklistedClassNames['SymfonyExcludeListSimplePhpunit'] = 1;

composer.json

@@ -38,9 +38,6 @@
     ],
     "minimum-stability": "dev",
     "extra": {
-        "branch-alias": {
-            "dev-master": "4.4-dev"
-        },
         "thanks": {
             "name": "phpunit/phpunit",
             "url": "https://github.com/sebastianbergmann/phpunit"