Fixed DefinitionIsChildOfConstraintTest to use newer Symfony code (#88)

* Fixed DefinitionIsChildOfConstraintTest to use newer Symfony code

* Fixed DefinitionIsChildOfConstraint to support new Symfony code

* Fixed typo in DefinitionIsChildOfConstraint class

* Added christians suggestion

* Update DefinitionIsChildOfConstraint.php

* Removing elseif

* Removed type hint

* Updated data provider

Author: stloyd

PhpUnit/DefinitionIsChildOfConstraint.php

@@ -3,6 +3,7 @@
 namespace Matthias\SymfonyDependencyInjectionTest\PhpUnit;
 
 use PHPUnit\Framework\Constraint\Constraint;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
@@ -19,7 +20,7 @@ public function __construct($expectedParentServiceId)
 
     public function evaluate($other, $description = '', $returnResult = false)
     {
-        if (!($other instanceof Definition)) {
+        if (!$other instanceof Definition) {
             throw new \InvalidArgumentException(
                 'Expected an instance of Symfony\Component\DependencyInjection\Definition'
             );
@@ -46,7 +47,7 @@ public function toString()
 
     private function evaluateDefinitionIsDecorator(Definition $definition, $returnResult)
     {
-        if (!($definition instanceof DefinitionDecorator)) {
+        if (!$definition instanceof ChildDefinition && !$definition instanceof DefinitionDecorator) {
             if ($returnResult) {
                 return false;
             }
@@ -57,7 +58,7 @@ private function evaluateDefinitionIsDecorator(Definition $definition, $returnRe
         return true;
     }
 
-    private function evaluateDefinitionHasExpectedParentService(DefinitionDecorator $definition, $returnResult)
+    private function evaluateDefinitionHasExpectedParentService($definition, $returnResult)
     {
         $actualParentService = $this->expectedParentServiceId;
 

Tests/PhpUnit/DefinitionHasArgumentConstraintTest.php

@@ -5,7 +5,7 @@
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\DefinitionHasArgumentConstraint;
 use PHPUnit\Framework\ExpectationFailedException;
 use PHPUnit\Framework\TestCase;
-use stdClass;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
@@ -32,7 +32,13 @@ public function definitionProvider()
         $arguments = array(0 => 'first argument', 1 => $rightValue);
         $definitionWithArguments->setArguments($arguments);
 
-        $decoratedDefinitionWithArguments = new DefinitionDecorator('parent_service_id');
+        $parentServiceId = 'parent_service_id';
+        if (class_exists(ChildDefinition::class)) {
+            $decoratedDefinitionWithArguments = new ChildDefinition($parentServiceId);
+        } else {
+            $decoratedDefinitionWithArguments = new DefinitionDecorator($parentServiceId);
+        }
+
         $decoratedDefinitionWithArguments->setArguments(array(0 => 'first argument', 1 => $wrongValue));
         $decoratedDefinitionWithArguments->replaceArgument(1, $rightValue);
 
@@ -69,7 +75,7 @@ public function validates_definitionIndex($argument, $exceptionMessage)
     public function invalid_definition_indexes()
     {
         yield [
-            new stdClass(), 'Expected either a string or a positive integer for $argumentIndex.'
+            new \stdClass(), 'Expected either a string or a positive integer for $argumentIndex.'
         ];
 
         yield [
@@ -175,5 +181,4 @@ public function named_arguments()
         yield ['$bar'];
         yield ['$a'];
     }
-
 }

Tests/PhpUnit/DefinitionIsChildOfConstraintTest.php

@@ -1,10 +1,10 @@
 <?php
 
-
 namespace Matthias\DependencyInjectionTests\Test\DependencyInjection;
 
 use Matthias\SymfonyDependencyInjectionTest\PhpUnit\DefinitionIsChildOfConstraint;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\DefinitionDecorator;
 
@@ -24,7 +24,11 @@ public function match(Definition $definition, $parentServiceId, $expectedToMatch
     public function definitionProvider()
     {
         $definition = new Definition();
-        $decoratedDefinition = new DefinitionDecorator('parent_service_id');
+        if (class_exists(ChildDefinition::class)) {
+            $decoratedDefinition = new ChildDefinition('parent_service_id');
+        } else {
+            $decoratedDefinition = new DefinitionDecorator('parent_service_id');
+        }
 
         return array(
             // the provided definition has the same parent service id