Refactor to be compatible with PHPUnit 8

Author: TiSiE

src/Constraint/ExtendsOrImplements.php

@@ -11,13 +11,15 @@
 
 namespace Cross\TestUtils\Constraint;
 
+use PHPUnit\Framework\Constraint\Constraint as BaseConstraint;
+
 /**
  * Constraint to assert the extending or implementing of specific classes and interfaces.
  *
  * @author Mathias Gelhausen <[email protected]>
  * @todo write tets.
  */
-class ExtendsOrImplements extends \PHPUnit_Framework_Constraint
+class ExtendsOrImplements extends BaseConstraint
 {
     /**
      * The FQCN of the classes and interfaces which the tested object
@@ -42,7 +44,6 @@ class ExtendsOrImplements extends \PHPUnit_Framework_Constraint
     public function __construct(iterable $parentsAndInterfaces = [])
     {
         $this->parentsAndInterfaces = (array) $parentsAndInterfaces;
-        parent::__construct();
     }
 
     public function count(): int

src/Constraint/UsesTraits.php

@@ -11,14 +11,16 @@
 
 namespace Cross\TestUtils\Constraint;
 
+use PHPUnit\Framework\Constraint\Constraint as BaseConstraint;
+
 /**
  * Constraint to assert that a class uses specific traits.
  *
  * @author Mathias Gelhausen <[email protected]>
  * @since  0.26
  * @since  0.29 matches() accepts instances of \ReflectionClass.
  */
-class UsesTraits extends \PHPUnit_Framework_Constraint
+class UsesTraits extends BaseConstraint
 {
     /**
      * The traits that must be used.
@@ -42,7 +44,6 @@ class UsesTraits extends \PHPUnit_Framework_Constraint
     public function __construct(iterable $expectedTraits = [])
     {
         $this->expectedTraits = (array) $expectedTraits;
-        parent::__construct();
     }
 
     public function count(): int

src/Exception/InvalidUsageException.php

@@ -17,7 +17,7 @@
  * @author Mathias Gelhausen <[email protected]>
  * @todo write tests
  */
-class InvalidUsageException extends \PHPUnit_Framework_Exception implements ExceptionInterface
+class InvalidUsageException extends \PHPUnit\Framework\Exception implements ExceptionInterface
 {
     use TemplatedMessageExceptionTrait;
 }

src/TestCase/AssertInheritanceTrait.php

@@ -30,8 +30,6 @@ trait AssertInheritanceTrait
      * @param iterable $parentsAndInterfaces
      * @param object|\ReflectionClass|string   $objectOrClass
      * @param string   $message
-     *
-     * @throws \PHPUnit_Framework_Exception
      */
     public static function assertInheritance(
         iterable $parentsAndInterfaces,

src/TestCase/SetupTargetTrait.php

@@ -24,7 +24,7 @@
 trait SetupTargetTrait
 {
 
-    public function setup()
+    protected function setUp(): void
     {
         $this->setupTarget();
     }
@@ -107,7 +107,7 @@ public function setup()
      *
      * @return void
      */
-    public function setupTarget(): void
+    private function setupTarget(): void
     {
         if (!property_exists($this, 'target')) {
             return;

src/TestCase/TestSetterAndGetterTrait.php

@@ -48,19 +48,6 @@
  * * 'value_callback': callable || method name (in the TestCase class)
  *                     The return value of that callback is taken as value for the test.
  *
- * * 'property': If there is no getter method, you may want to test, wether the setter has set
- *               a property on the SUT properly. This key may be
- *               - true:   The name equals the property to check
- *               - string: Name of property to hold the expected value
- *               - [{PropertyName, }expected value (if differs from 'value']
- *
- * * 'property_assert': callback for property assertion.
- *                      see 'assert'. But please note:
- *                      strings are 'converted' to 'assertAttribute*' methods.
- *                      The callback gets passed the expected value, the name of the
- *                      property ('property') and the SUT instance.
- *                      DEFAULT: 'equals' ( => static::assertAttributeEquals)
- *
  * * 'getter': - Name of getter method (a '*' gets replaced by the property name)
  *             - [GetterName, [arg, arg, ...]]
  *               Use this format to provide arguments to the getter method.
@@ -167,17 +154,7 @@ public function testSetterAndGetter($name, $spec = null): void
             }
         }
 
-        // Test property
-        if (null !== $spec['property']) {
-            [$propertyName, $propertyValue] = $spec['property'];
-            if ('__VALUE__' == $propertyValue) {
-                $propertyValue = $value;
-            }
-
-            $spec['property_assert']($propertyValue, $propertyName, $target);
-
-        // Test getter
-        } elseif (false !== $spec['getter'][0]) {
+        if (false !== $spec['getter'][0]) {
             $getter = str_replace('*', $name, $spec['getter'][0]);
             $getterValue = $target->$getter(...$spec['getter'][1]);
             $spec['assert']($value, $getterValue);
@@ -196,8 +173,6 @@ public function testSetterAndGetter($name, $spec = null): void
     private function setterAndGetterNormalizeSpec($spec, string $name, object $target): array
     {
         $normalized = [
-            'property' => null,
-            'property_assert' => [static::class, 'assertAttributeEquals'],
             'getter' => ["get*", []],
             'assert' => [static::class, 'assertEquals'],
             'setter' => ["set*", []],
@@ -215,31 +190,14 @@ private function setterAndGetterNormalizeSpec($spec, string $name, object $targe
         $err = __TRAIT__ . ': ' . get_class($this) . ': ';
 
         if (!is_array($spec)) {
-            throw new \PHPUnit_Framework_Exception($err . 'Invalid specification. Must be array.');
+            throw new \PHPUnit\Framework\Exception($err . 'Invalid specification. Must be array.');
         }
 
         foreach ($spec as $key => $value) {
             switch ($key) {
                 default:
                     break;
 
-                case 'property':
-                    if (true === $value) {
-                        $value = [$name, '__VALUE__'];
-                        break;
-                    }
-
-                    if (is_array($value)) {
-                        $value = isset($value[1])
-                            ? [true === $value[0] ? $name : $value[0], $value[1]]
-                            : [$name, $value[0]]
-                        ;
-                        break;
-                    }
-
-                    $value = [$value, '__VALUE__'];
-                    break;
-
                 case 'setter_value':
                     if ('__SELF__' == $value) {
                         $value = $target;
@@ -286,7 +244,7 @@ private function setterAndGetterNormalizeSpec($spec, string $name, object $targe
                     }
 
                     if (!is_callable($value)) {
-                        throw new \PHPUnit_Framework_Exception($err . 'Invalid value callback.');
+                        throw new \PHPUnit\Framework\Exception($err . 'Invalid value callback.');
                     }
 
                     $key = substr($key, 0, -9);
@@ -295,19 +253,17 @@ private function setterAndGetterNormalizeSpec($spec, string $name, object $targe
 
                 case 'setter_assert':
                 case 'assert':
-                case 'property_assert':
                     if (is_string($value)) {
                         if (method_exists($this, $value)) {
                             $value = [$this, $value];
                             break;
                         }
-                        $attr = 'property_assert' == $key ? 'Attribute' : '';
-                        $value = [static::class, "assert$attr$value"];
+                        $value = [static::class, "assert$value"];
                         break;
                     }
 
                     if (!is_callable($value)) {
-                        throw new \PHPUnit_Framework_Exception($err . 'Invalid assert callback.');
+                        throw new \PHPUnit\Framework\Exception($err . 'Invalid assert callback.');
                     }
 
                     break;

src/Utils/Target.php

@@ -67,7 +67,7 @@ public static function get(
             if (is_object($target)) {
                 return $target;
             }
-            
+
             if (!$forceObject && is_string($target) && '!' != $target{0}) {
                 return $target;
             }
@@ -115,6 +115,6 @@ public static function get(
             }
         }
 
-        throw new \PHPUnit_Framework_Exception('Could not find or create a target instance.');
+        throw new \PHPUnit\Framework\Exception('Could not find or create a target instance.');
     }
 }