Minor fixes

symfony · Apr 25, 2018 · b86307d · b86307d
1 parent 8d09841
commit b86307d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/src/Php73/bootstrap.php b/src/Php73/bootstrap.php
@@ -11,8 +11,6 @@
 
 if (PHP_VERSION_ID < 70300) {
     if (!function_exists('is_countable')) {
-        function is_countable($var) {
-            return is_array($var) || $var instanceof Countable;
-        }
+        function is_countable($var) { return is_array($var) || $var instanceof Countable; }
     }
 }
diff --git a/tests/Php72/Php72Test.php b/tests/Php72/Php72Test.php
@@ -87,7 +87,7 @@ public function testSapiWindowsVt100SupportWarnsOnInvalidInputType()
             $this->markTestSkipped('Windows only test');
         }
 
-        $this->setExpectedException('PHPUnit_Framework_Error_Warning', 'expects parameter 1 to be resource');
+        $this->setExpectedException('PHPUnit\Framework\Error\Warning', 'expects parameter 1 to be resource');
         sapi_windows_vt100_support('foo', true);
     }
 
@@ -100,7 +100,7 @@ public function testSapiWindowsVt100SupportWarnsOnInvalidStream()
             $this->markTestSkipped('Windows only test');
         }
 
-        $this->setExpectedException('PHPUnit_Framework_Error_Warning', 'was not able to analyze the specified stream');
+        $this->setExpectedException('PHPUnit\Framework\Error\Warning', 'was not able to analyze the specified stream');
         sapi_windows_vt100_support(fopen('php://memory', 'wb'), true);
     }
 
@@ -119,7 +119,20 @@ public function testStreamIsatty()
      */
     public function testStreamIsattyWarnsOnInvalidInputType()
     {
-        $this->setExpectedException('PHPUnit_Framework_Error_Warning', 'expects parameter 1 to be resource');
+        $this->setExpectedException('PHPUnit\Framework\Error\Warning', 'expects parameter 1 to be resource');
         stream_isatty('foo');
     }
+
+    public function setExpectedException($exception, $message = '', $code = null)
+    {
+        if (!class_exists('PHPUnit\Framework\Error\Notice')) {
+            $exception = str_replace('PHPUnit\\Framework\\Error\\', 'PHPUnit_Framework_Error_', $exception);
+        }
+        if (method_exists($this, 'expectException')) {
+            $this->expectException($exception);
+            $this->expectExceptionMessage($message);
+        } else {
+            parent::setExpectedException($exception, $message, $code);
+        }
+    }
 }
diff --git a/tests/Php73/Php73Test.php b/tests/Php73/Php73Test.php
@@ -18,9 +18,6 @@
  */
 class Php73Test extends TestCase
 {
-    /**
-     * @covers Symfony\Polyfill\Php73\Php73::is_countable
-     */
     public function testIsCountable()
     {
         $this->assertTrue(is_countable(array(1, 2, '3')));
@@ -30,7 +27,6 @@ public function testIsCountable()
     }
 
     /**
-     * @covers Symfony\Polyfill\Php73\Php73::is_countable
      * @requires PHP 5.5
      */
     public function testIsCountableForGenerator()