Merge pull request #19 from frenchcomp/master

To use PHP-DI 6.0 with the Symfony Bridge, with Symfony 3.3, 3.4 et 4+

.gitignore

@@ -2,3 +2,4 @@ composer.lock
 composer.phar
 vendor/*
 .idea/*
+/phpunit.xml

.travis.yml

@@ -1,17 +1,18 @@
 language: php
 
 php:
-  - 5.5
-  - 5.6
   - 7.0
   - 7.1
-  - hhvm
+  - 7.2
 
 matrix:
   include:
-    - php: 5.5
+    - php: 7.0
       env: dependencies=lowest
 
 before_script:
   - composer install -n
   - if [ "$dependencies" = "lowest" ]; then composer update --prefer-lowest --prefer-stable -n; fi;
+
+script:
+  - vendor/bin/phpunit

composer.json

@@ -15,12 +15,12 @@
         }
     },
     "require": {
-        "php": "~5.5|~7.0",
-        "php-di/php-di": "^5.0",
-        "symfony/dependency-injection": "^3.0",
-        "symfony/http-kernel": "^3.0",
-        "symfony/proxy-manager-bridge": "^3.0",
-        "symfony/config": "^3.0"
+        "php": "~7.0",
+        "php-di/php-di": "~6.0",
+        "symfony/dependency-injection": "~3.3||~4.0",
+        "symfony/http-kernel": "~3.3||~4.0",
+        "symfony/proxy-manager-bridge": "~3.3||~4.0",
+        "symfony/config": "~3.3||~4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8",

src/Kernel.php

@@ -9,7 +9,7 @@
 
 namespace DI\Bridge\Symfony;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\Debug\DebugClassLoader;
 use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -92,7 +92,7 @@ private function removeInvalidReferenceBehaviorPass(ContainerBuilder $container)
 
     private function disableDebugClassLoader()
     {
-        if (!class_exists('Symfony\Component\Debug\DebugClassLoader')) {
+        if (!class_exists(DebugClassLoader::class)) {
             return;
         }
 

src/SymfonyContainerBridge.php

@@ -10,7 +10,7 @@
 namespace DI\Bridge\Symfony;
 
 use DI\NotFoundException;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Container as SymfonyContainer;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface as SymfonyContainerInterface;
@@ -87,7 +87,7 @@ public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE
             return $entry;
         } catch (NotFoundException $e) {
             if ($invalidBehavior === self::EXCEPTION_ON_INVALID_REFERENCE) {
-                throw new ServiceNotFoundException($id);
+                throw new ServiceNotFoundException($id, null, $e);
             }
         }
 

tests/FunctionalTest/ContainerInteractionTest.php

@@ -36,7 +36,7 @@ public function phpdi_should_get_entries_from_symfony()
 
         $phpdiContainer->set(
             'foo',
-            \DI\object(Class1::class)
+            \DI\create(Class1::class)
                 ->constructor(\DI\get('class2'))
         );
 
@@ -69,7 +69,9 @@ public function phpdi_aliases_can_reference_symfony_entries()
         /** @var Container $phpdiContainer */
         $phpdiContainer = $container->getFallbackContainer();
 
-        $phpdiContainer->set('foo', \DI\get('class2'));
+        $ref = \DI\get('class2');
+        $ref->setName('foo');
+        $phpdiContainer->set('foo', $ref);
 
         $class2 = $container->get('foo');
 

tests/FunctionalTest/Fixtures/config/class1.yml

@@ -1,4 +1,5 @@
 services:
     class1:
         class: DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class1
+        public: true
         arguments: [ '@DI\\Bridge\\Symfony\\Test\\FunctionalTest\\Fixtures\\Class2' ]

tests/FunctionalTest/Fixtures/config/class2.yml

@@ -1,3 +1,4 @@
 services:
     class2:
         class: DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\Class2
+        public: true

tests/UnitTest/SymfonyContainerBridgeTest.php

@@ -11,15 +11,16 @@
 
 use DI\Bridge\Symfony\SymfonyContainerBridge;
 use DI\ContainerBuilder;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Psr\Container\ContainerInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface as SfContainerInterface;
 
 class SymfonyContainerBridgeTest extends \PHPUnit_Framework_TestCase
 {
     public function testHasFallback()
     {
         $wrapper = new SymfonyContainerBridge();
 
-        $fallback = $this->getMockForAbstractClass('Interop\Container\ContainerInterface');
+        $fallback = $this->getMockForAbstractClass(ContainerInterface::class);
         $fallback->expects($this->once())
             ->method('has')
             ->with('foo')
@@ -34,7 +35,7 @@ public function testGetFallback()
     {
         $wrapper = new SymfonyContainerBridge();
 
-        $fallback = $this->getMockForAbstractClass('Interop\Container\ContainerInterface');
+        $fallback = $this->getMockForAbstractClass(ContainerInterface::class);
         $fallback->expects($this->once())
             ->method('get')
             ->with('foo')
@@ -51,7 +52,7 @@ public function testGetNotFoundReturnNull()
 
         $wrapper->setFallbackContainer(ContainerBuilder::buildDevContainer());
 
-        $this->assertNull($wrapper->get('foo', ContainerInterface::NULL_ON_INVALID_REFERENCE));
+        $this->assertNull($wrapper->get('foo', SfContainerInterface::NULL_ON_INVALID_REFERENCE));
     }
 
     /**