Merge pull request #20 from boldare/feat/upgrade-of-tests-and-depencies

Upgrade of tests and dependencies.

Author: Emiosy

Tests/Unit/DependencyInjection/CompilerPass/ModelFactoryCollectionCompilerPassTest.php

@@ -2,14 +2,14 @@
 
 namespace Xsolve\ModelFactoryBundle\Tests\Unit\DependencyInjection\CompilerPass;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 use Xsolve\ModelFactoryBundle\DependencyInjection\CompilerPass\ModelFactoryCollectionCompilerPass;
 
-class ModelFactoryCollectionCompilerPassTest extends PHPUnit_Framework_TestCase
+class ModelFactoryCollectionCompilerPassTest extends TestCase
 {
     /**
      * @test
@@ -38,9 +38,10 @@ public function will_inject_factories_into_collections()
                         count($args) === 1
                         && $args[0] instanceof Reference
                         && (string) $args[0] === 'model_factory.foo'
-                    ;
+                        ;
                 })
             )
+            ->willReturn($modelFactoryCollectionDefinitionFirst->reveal())
             ->shouldBeCalledTimes(1);
         $modelFactoryCollectionDefinitionFirst
             ->addMethodCall(
@@ -50,9 +51,10 @@ public function will_inject_factories_into_collections()
                         count($args) === 1
                         && $args[0] instanceof Reference
                         && (string) $args[0] === 'model_factory.bar'
-                    ;
+                        ;
                 })
             )
+            ->willReturn($modelFactoryCollectionDefinitionFirst->reveal())
             ->shouldBeCalledTimes(1);
         $modelFactoryCollectionDefinitionFirst = $modelFactoryCollectionDefinitionFirst->reveal();
 
@@ -65,9 +67,10 @@ public function will_inject_factories_into_collections()
                         count($args) === 1
                         && $args[0] instanceof Reference
                         && (string) $args[0] === 'model_factory.bar'
-                    ;
+                        ;
                 })
             )
+            ->willReturn($modelFactoryCollectionDefinitionSecond->reveal())
             ->shouldBeCalledTimes(1);
         $modelFactoryCollectionDefinitionSecond
             ->addMethodCall(
@@ -77,9 +80,10 @@ public function will_inject_factories_into_collections()
                         count($args) === 1
                         && $args[0] instanceof Reference
                         && (string) $args[0] === 'model_factory.baz'
-                    ;
+                        ;
                 })
             )
+            ->willReturn($modelFactoryCollectionDefinitionSecond->reveal())
             ->shouldBeCalledTimes(1);
         $modelFactoryCollectionDefinitionSecond = $modelFactoryCollectionDefinitionSecond->reveal();
 

Tests/Unit/XsolveModelFactoryBundleTest.php

@@ -2,23 +2,24 @@
 
 namespace Xsolve\ModelFactoryBundle\Tests\Unit;
 
-use PHPUnit_Framework_TestCase;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Xsolve\ModelFactoryBundle\DependencyInjection\CompilerPass\ModelFactoryCollectionCompilerPass;
 use Xsolve\ModelFactoryBundle\XsolveModelFactoryBundle;
 
-class XsolveModelFactoryBundleTest extends PHPUnit_Framework_TestCase
+class XsolveModelFactoryBundleTest extends TestCase
 {
     public function test_build()
     {
         $container = $this->prophesize(ContainerBuilder::class);
         $container
             ->addCompilerPass(Argument::type(ModelFactoryCollectionCompilerPass::class))
+            ->willReturn($container->reveal())
             ->shouldBeCalledTimes(1);
 
         $bundle = new XsolveModelFactoryBundle();
 
         $bundle->build($container->reveal());
     }
-}
+}

composer.json

@@ -15,14 +15,15 @@
     ],
     "require": {
         "php": "^5.6|^7.0|^8.0",
-        "symfony/framework-bundle": "^2.3|^3.0|^4.0|^5.0",
+        "symfony/framework-bundle": "^2.3|^3.0|^4.0|^5.0|^6.0",
         "xsolve-pl/model-factory": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.5",
+        "phpunit/phpunit": "^5.5|^6.0|^7.0|^8.0|^9.0",
         "symfony/phpunit-bridge": "^3.0|^4.0|^5.0",
         "sebastian/phpcpd": "^2.0",
-        "phpmd/phpmd": "^2.4"
+        "phpmd/phpmd": "^2.4",
+        "phpspec/prophecy": "^1.16"
     },
     "autoload":{
         "psr-4":{