minor #32865 Add polyfill for TestCase::createMock() (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 82aace322832 · 2019-08-01T14:51:37.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Add polyfill for TestCase::createMock() | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32844 | License | MIT | Doc PR | - Commits ------- abcd45a Add polyfill for TestCase::createMock()
diff --git a/src/Symfony/Bridge/PhpUnit/ForwardCompatTestTrait.php b/src/Symfony/Bridge/PhpUnit/ForwardCompatTestTrait.php
@@ -15,14 +15,21 @@
 
 // A trait to provide forward compatibility with newest PHPUnit versions
 
-if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {
+$r = new \ReflectionClass(TestCase::class);
+
+if (\PHP_VERSION_ID < 70000 || !$r->hasMethod('createMock') || !$r->getMethod('createMock')->hasReturnType()) {
+    trait ForwardCompatTestTrait
+    {
+        use Legacy\ForwardCompatTestTraitForV5;
+    }
+} elseif ($r->getMethod('tearDown')->hasReturnType()) {
     trait ForwardCompatTestTrait
     {
         use Legacy\ForwardCompatTestTraitForV8;
     }
 } else {
     trait ForwardCompatTestTrait
     {
-        use Legacy\ForwardCompatTestTraitForV5;
+        use Legacy\ForwardCompatTestTraitForV7;
     }
 }
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV5.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Bridge\PhpUnit\Legacy;
 
+use PHPUnit\Framework\MockObject\MockObject;
+
 /**
  * @internal
  */
@@ -80,6 +82,25 @@ private function doTearDown()
         parent::tearDown();
     }
 
+    /**
+     * @param string $originalClassName
+     *
+     * @return MockObject
+     */
+    protected function createMock($originalClassName)
+    {
+        $mock = $this->getMockBuilder($originalClassName)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning();
+
+        if (method_exists($mock, 'disallowMockingUnknownTypes')) {
+            $mock = $mock->disallowMockingUnknownTypes();
+        }
+
+        return $mock->getMock();
+    }
+
     /**
      * @param string $message
      *
diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV7.php b/src/Symfony/Bridge/PhpUnit/Legacy/ForwardCompatTestTraitForV7.php
@@ -0,0 +1,35 @@
+<?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;
+
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * @internal
+ */
+trait ForwardCompatTestTraitForV7
+{
+    use ForwardCompatTestTraitForV5;
+
+    /**
+     * @param string|string[] $originalClassName
+     */
+    protected function createMock($originalClassName): MockObject
+    {
+        return $this->getMockBuilder($originalClassName)
+            ->disableOriginalConstructor()
+            ->disableOriginalClone()
+            ->disableArgumentCloning()
+            ->disallowMockingUnknownTypes()
+                ->getMock();
+    }
+}
diff --git a/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php b/src/Symfony/Component/Validator/Tests/DataCollector/ValidatorDataCollectorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\DataCollector;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\DataCollector\ValidatorDataCollector;
@@ -20,6 +21,8 @@
 
 class ValidatorDataCollectorTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testCollectsValidatorCalls()
     {
         $originalValidator = $this->createMock(ValidatorInterface::class);
@@ -71,9 +74,4 @@ public function testReset()
         $this->assertCount(0, $collector->getCalls());
         $this->assertSame(0, $collector->getViolationsCount());
     }
-
-    protected function createMock($classname)
-    {
-        return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock();
-    }
 }
diff --git a/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php b/src/Symfony/Component/Validator/Tests/Validator/TraceableValidatorTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Validator\Tests\Validator;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -23,6 +24,8 @@
 
 class TraceableValidatorTest extends TestCase
 {
+    use ForwardCompatTestTrait;
+
     public function testValidate()
     {
         $originalValidator = $this->createMock(ValidatorInterface::class);
@@ -95,9 +98,4 @@ public function testForwardsToOriginalValidator()
         $expects('validatePropertyValue')->willReturn($expected = new ConstraintViolationList());
         $this->assertSame($expected, $validator->validatePropertyValue(new \stdClass(), 'property', 'value'), 'returns original validator validatePropertyValue() result');
     }
-
-    protected function createMock($classname)
-    {
-        return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock();
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,21 @@`
`15`	`15`
`16`	`16`	`// A trait to provide forward compatibility with newest PHPUnit versions`
`17`	`17`
`18`		`-if (method_exists(\ReflectionMethod::class, 'hasReturnType') && (new \ReflectionMethod(TestCase::class, 'tearDown'))->hasReturnType()) {`
	`18`	`+$r = new \ReflectionClass(TestCase::class);`
	`19`	`+`
	`20`	`+if (\PHP_VERSION_ID < 70000 \|\| !$r->hasMethod('createMock') \|\| !$r->getMethod('createMock')->hasReturnType()) {`
	`21`	`+ trait ForwardCompatTestTrait`
	`22`	`+ {`
	`23`	`+ use Legacy\ForwardCompatTestTraitForV5;`
	`24`	`+ }`
	`25`	`+} elseif ($r->getMethod('tearDown')->hasReturnType()) {`
`19`	`26`	`trait ForwardCompatTestTrait`
`20`	`27`	`{`
`21`	`28`	`use Legacy\ForwardCompatTestTraitForV8;`
`22`	`29`	`}`
`23`	`30`	`} else {`
`24`	`31`	`trait ForwardCompatTestTrait`
`25`	`32`	`{`
`26`		`- use Legacy\ForwardCompatTestTraitForV5;`
	`33`	`+ use Legacy\ForwardCompatTestTraitForV7;`
`27`	`34`	`}`
`28`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`namespace Symfony\Component\Validator\Tests\DataCollector;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\TestCase;`
	`15`	`+use Symfony\Bridge\PhpUnit\ForwardCompatTestTrait;`
`15`	`16`	`use Symfony\Component\Validator\ConstraintViolation;`
`16`	`17`	`use Symfony\Component\Validator\ConstraintViolationList;`
`17`	`18`	`use Symfony\Component\Validator\DataCollector\ValidatorDataCollector;`
`@@ -20,6 +21,8 @@`
`20`	`21`
`21`	`22`	`class ValidatorDataCollectorTest extends TestCase`
`22`	`23`	`{`
	`24`	`+ use ForwardCompatTestTrait;`
	`25`	`+`
`23`	`26`	`public function testCollectsValidatorCalls()`
`24`	`27`	`{`
`25`	`28`	`$originalValidator = $this->createMock(ValidatorInterface::class);`
`@@ -71,9 +74,4 @@ public function testReset()`
`71`	`74`	`$this->assertCount(0, $collector->getCalls());`
`72`	`75`	`$this->assertSame(0, $collector->getViolationsCount());`
`73`	`76`	`}`
`74`		`-`
`75`		`- protected function createMock($classname)`
`76`		`- {`
`77`		`- return $this->getMockBuilder($classname)->disableOriginalConstructor()->getMock();`
`78`		`- }`
`79`	`77`	`}`