Remove deprecated warning on DebugClassLoader

.gitignore

@@ -3,3 +3,4 @@ composer.phar
 vendor/*
 .idea/*
 /phpunit.xml
+var/cache/*

.travis.yml

@@ -1,13 +1,13 @@
 language: php
 
 php:
-  - 7.0
-  - 7.1
   - 7.2
+  - 7.3
+  - 7.4
 
 matrix:
   include:
-    - php: 7.0
+    - php: 7.2
       env: dependencies=lowest
 
 before_script:

composer.json

@@ -15,17 +15,17 @@
         }
     },
     "require": {
-        "php": "~7.0",
+        "php": "~7.2",
         "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"
+        "symfony/dependency-injection": "~3.4||~4.4||~5.1",
+        "symfony/http-kernel": "~3.4||~4.4||~5.1",
+        "symfony/proxy-manager-bridge": "~3.4||~4.4||~5.1",
+        "symfony/config": "~3.4||~4.4||~5.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "symfony/filesystem": "^3.0",
-        "symfony/yaml": "^3.0",
-        "symfony/debug": "^3.0"
+        "phpunit/phpunit": "~8.0||~9.0",
+        "symfony/filesystem": "~3.4||~4.4||~5.1",
+        "symfony/yaml": "~3.4||~4.4||~5.1",
+        "symfony/error-handler": "~3.4||~4.4||~5.1"
     }
 }

src/Kernel.php

@@ -10,9 +10,10 @@
 namespace DI\Bridge\Symfony;
 
 use Psr\Container\ContainerInterface;
-use Symfony\Component\Debug\DebugClassLoader;
+use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
 use Symfony\Component\DependencyInjection\Compiler\CheckExceptionOnInvalidReferenceBehaviorPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\ErrorHandler\DebugClassLoader;
 
 /**
  * Customization of Symfony's kernel to setup PHP-DI.
@@ -78,25 +79,35 @@ protected function initializeContainer()
     private function removeInvalidReferenceBehaviorPass(ContainerBuilder $container)
     {
         $passConfig = $container->getCompilerPassConfig();
-        $compilationPasses = $passConfig->getRemovingPasses();
 
-        foreach ($compilationPasses as $i => $pass) {
-            if ($pass instanceof CheckExceptionOnInvalidReferenceBehaviorPass) {
-                unset($compilationPasses[$i]);
-                break;
+        $compilationPassRemover = static function (array $compilationPasses): array {
+            foreach ($compilationPasses as $i => $pass) {
+                if ($pass instanceof CheckExceptionOnInvalidReferenceBehaviorPass) {
+                    unset($compilationPasses[$i]);
+                    break;
+                }
             }
-        }
 
-        $passConfig->setRemovingPasses($compilationPasses);
+            return $compilationPasses;
+        };
+
+        $passConfig->setRemovingPasses($compilationPassRemover($passConfig->getRemovingPasses()));
+        $passConfig->setAfterRemovingPasses($compilationPassRemover($passConfig->getAfterRemovingPasses()));
     }
 
     private function disableDebugClassLoader()
     {
-        if (!class_exists(DebugClassLoader::class)) {
+        if (class_exists(DebugClassLoader::class)) {
+            DebugClassLoader::disable();
+
+            return;
+        }
+
+        if (!class_exists(LegacyDebugClassLoader::class)) {
             return;
         }
 
-        DebugClassLoader::disable();
+        LegacyDebugClassLoader::disable();
     }
 
     /**

tests/FunctionalTest/AbstractFunctionalTest.php

@@ -4,9 +4,10 @@
 namespace DI\Bridge\Symfony\Test\FunctionalTest;
 
 use DI\Bridge\Symfony\Test\FunctionalTest\Fixtures\AppKernel;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Filesystem\Filesystem;
 
-abstract class AbstractFunctionalTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractFunctionalTest extends TestCase
 {
     protected function createKernel($configFile = 'empty.yml')
     {

tests/FunctionalTest/ContainerAwareTest.php

@@ -14,7 +14,7 @@
 /**
  * @coversNothing
  */
-class ContainerAwareInterfaceTest extends AbstractFunctionalTest
+class ContainerAwareTest extends AbstractFunctionalTest
 {
     /**
      * @link https://github.com/PHP-DI/Symfony-Bridge/issues/2
@@ -27,6 +27,6 @@ public function testContainerAware()
         /** @var ContainerAwareController $class */
         $class = $container->get(ContainerAwareController::class);
 
-        $this->assertSame($container, $class->container);
+        $this::assertSame($container, $class->container);
     }
 }

tests/FunctionalTest/ContainerInteractionTest.php

@@ -25,7 +25,7 @@ class ContainerInteractionTest extends AbstractFunctionalTest
     /**
      * @test Get a Symfony entry from PHP-DI's container
      */
-    public function phpdi_should_get_entries_from_symfony()
+    public function phpdiShouldGetEntriesFromSymfony()
     {
         $kernel = $this->createKernel('class2.yml');
 
@@ -42,7 +42,7 @@ public function phpdi_should_get_entries_from_symfony()
 
         $class1 = $container->get('foo');
 
-        $this->assertTrue($class1 instanceof Class1);
+        $this::assertTrue($class1 instanceof Class1);
     }
 
     /**
@@ -54,13 +54,13 @@ public function symfonyGetInPHPDI()
 
         $class1 = $kernel->getContainer()->get('class1');
 
-        $this->assertTrue($class1 instanceof Class1);
+        $this::assertTrue($class1 instanceof Class1);
     }
 
     /**
      * @test Alias a Symfony entry from PHP-DI's container
      */
-    public function phpdi_aliases_can_reference_symfony_entries()
+    public function phpdiAliasesCanReferenceSymfonyEntries()
     {
         $kernel = $this->createKernel('class2.yml');
 
@@ -75,6 +75,6 @@ public function phpdi_aliases_can_reference_symfony_entries()
 
         $class2 = $container->get('foo');
 
-        $this->assertTrue($class2 instanceof Class2);
+        $this::assertTrue($class2 instanceof Class2);
     }
 }

tests/FunctionalTest/Fixtures/config/class1.yml

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

tests/FunctionalTest/KernelTest.php

@@ -18,35 +18,26 @@
  */
 class KernelTest extends AbstractFunctionalTest
 {
-    /**
-     * @test
-     */
-    public function kernel_should_boot()
+    public function testKernelShouldBoot()
     {
         $kernel = $this->createKernel();
 
-        $this->assertInstanceOf(SymfonyContainerBridge::class, $kernel->getContainer());
+        $this::assertInstanceOf(SymfonyContainerBridge::class, $kernel->getContainer());
     }
 
-    /**
-     * @test
-     */
-    public function phpdi_should_resolve_classes()
+    public function testPhpdiShouldResolveClasses()
     {
         $kernel = $this->createKernel();
 
         $object = $kernel->getContainer()->get(Class1::class);
-        $this->assertInstanceOf(Class1::class, $object);
+        $this::assertInstanceOf(Class1::class, $object);
     }
 
-    /**
-     * @test
-     */
-    public function symfony_should_resolve_classes()
+    public function testSymfonyShouldResolveClasses()
     {
         $kernel = $this->createKernel('class2.yml');
 
         $object = $kernel->getContainer()->get('class2');
-        $this->assertInstanceOf(Class2::class, $object);
+        $this::assertInstanceOf(Class2::class, $object);
     }
 }

tests/UnitTest/SymfonyContainerBridgeTest.php

@@ -11,39 +11,41 @@
 
 use DI\Bridge\Symfony\SymfonyContainerBridge;
 use DI\ContainerBuilder;
+use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface as SfContainerInterface;
+use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 
-class SymfonyContainerBridgeTest extends \PHPUnit_Framework_TestCase
+class SymfonyContainerBridgeTest extends TestCase
 {
     public function testHasFallback()
     {
         $wrapper = new SymfonyContainerBridge();
 
         $fallback = $this->getMockForAbstractClass(ContainerInterface::class);
-        $fallback->expects($this->once())
+        $fallback->expects(self::once())
             ->method('has')
             ->with('foo')
-            ->will($this->returnValue(false));
+            ->will(self::returnValue(false));
 
         $wrapper->setFallbackContainer($fallback);
 
-        $this->assertFalse($wrapper->has('foo'));
+        $this::assertFalse($wrapper->has('foo'));
     }
 
     public function testGetFallback()
     {
         $wrapper = new SymfonyContainerBridge();
 
         $fallback = $this->getMockForAbstractClass(ContainerInterface::class);
-        $fallback->expects($this->once())
+        $fallback->expects(self::once())
             ->method('get')
             ->with('foo')
-            ->will($this->returnValue('bar'));
+            ->will(self::returnValue('bar'));
 
         $wrapper->setFallbackContainer($fallback);
 
-        $this->assertEquals('bar', $wrapper->get('foo'));
+        $this::assertEquals('bar', $wrapper->get('foo'));
     }
 
     public function testGetNotFoundReturnNull()
@@ -52,18 +54,17 @@ public function testGetNotFoundReturnNull()
 
         $wrapper->setFallbackContainer(ContainerBuilder::buildDevContainer());
 
-        $this->assertNull($wrapper->get('foo', SfContainerInterface::NULL_ON_INVALID_REFERENCE));
+        $this::assertNull($wrapper->get('foo', SfContainerInterface::NULL_ON_INVALID_REFERENCE));
     }
 
-    /**
-     * @expectedException \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException
-     */
     public function testGetNotFoundException()
     {
+        $this->expectException(ServiceNotFoundException::class);
+
         $wrapper = new SymfonyContainerBridge();
 
         $wrapper->setFallbackContainer(ContainerBuilder::buildDevContainer());
 
-        $this->assertNull($wrapper->get('foo'));
+        $this::assertNull($wrapper->get('foo'));
     }
 }