Update to Symfony 3

Author: enumag

composer.json

@@ -12,12 +12,11 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.5.0",
         "nette/di": "^2.3.0",
-        "symfony/dependency-injection": "^2.8.0"
+        "symfony/dependency-injection": "^3.0.0"
     },
     "require-dev": {
-        "php": ">=5.5.0",
         "arachne/bootstrap": "~0.2.1",
         "codeception/codeception": "~2.2.0@rc"
     },

src/ContainerAdapter.php

@@ -15,13 +15,12 @@
 use Nette\DI\MissingServiceException;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-use Symfony\Component\DependencyInjection\IntrospectableContainerInterface;
-use Symfony\Component\DependencyInjection\ScopeInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
  * @author Jáchym Toušek <enumag@gmail.com>
  */
-class ContainerAdapter implements IntrospectableContainerInterface
+class ContainerAdapter implements ContainerInterface
 {
     /**
      * @var Container
@@ -36,11 +35,8 @@ public function __construct(Container $container)
     /**
      * {@inheritdoc}
      */
-    public function set($id, $service, $scope = self::SCOPE_CONTAINER)
+    public function set($id, $service)
     {
-        if (func_num_args() >= 3) {
-            throw new NotSupportedException();
-        }
         $this->container->removeService($id);
         $this->container->addService($id, $service);
     }
@@ -101,29 +97,4 @@ public function setParameter($name, $value)
     {
         $this->container->parameters[$name] = $value;
     }
-
-    public function enterScope($name)
-    {
-        throw new NotSupportedException();
-    }
-
-    public function leaveScope($name)
-    {
-        throw new NotSupportedException();
-    }
-
-    public function addScope(ScopeInterface $scope)
-    {
-        throw new NotSupportedException();
-    }
-
-    public function hasScope($name)
-    {
-        throw new NotSupportedException();
-    }
-
-    public function isScopeActive($name)
-    {
-        throw new NotSupportedException();
-    }
 }

src/DI/ContainerAdapterExtension.php

@@ -10,6 +10,7 @@
 
 namespace Arachne\ContainerAdapter\DI;
 
+use Arachne\ContainerAdapter\ContainerAdapter;
 use Nette\DI\CompilerExtension;
 
 /**
@@ -22,6 +23,6 @@ public function loadConfiguration()
         $builder = $this->getContainerBuilder();
 
         $builder->addDefinition($this->prefix('containerAdapter'))
-            ->setClass('Arachne\ContainerAdapter\ContainerAdapter');
+            ->setClass(ContainerAdapter::class);
     }
 }

src/Exception/NotSupportedException.php

@@ -4,15 +4,12 @@
 
 use Arachne\Bootstrap\Configurator;
 use Arachne\ContainerAdapter\ContainerAdapter;
-use Arachne\ContainerAdapter\Exception\NotSupportedException;
 use Codeception\Test\Unit;
-use Codeception\Util\Stub;
 use DateTime;
 use IntegrationSuiteGuy;
 use Nette\DI\Container;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
-use Symfony\Component\DependencyInjection\ScopeInterface;
 
 /**
  * @author Jáchym Toušek <enumag@gmail.com>
@@ -60,10 +57,6 @@ public function testSet()
         $service2 = new DateTime();
         $this->containerAdapter->set('date', $service2);
         $this->assertSame($service2, $this->containerAdapter->get('date'));
-
-        $this->tester->expectException(NotSupportedException::class, function () {
-            $this->containerAdapter->set('date', new DateTime(), 'scope');
-        });
     }
 
     public function testHas()
@@ -103,41 +96,6 @@ public function testSetParameter()
         $this->assertSame('value', $this->containerAdapter->getParameter('nonexistent'));
     }
 
-    public function testEnterScope()
-    {
-        $this->tester->expectException(NotSupportedException::class, function () {
-            $this->containerAdapter->enterScope('scope');
-        });
-    }
-
-    public function testLeaveScope()
-    {
-        $this->tester->expectException(NotSupportedException::class, function () {
-            $this->containerAdapter->leaveScope('scope');
-        }, NotSupportedException::class);
-    }
-
-    public function testAddScope()
-    {
-        $this->tester->expectException(NotSupportedException::class, function () {
-            $this->containerAdapter->addScope(Stub::makeEmpty(ScopeInterface::class));
-        });
-    }
-
-    public function testHasScope()
-    {
-        $this->tester->expectException(NotSupportedException::class, function () {
-            $this->containerAdapter->hasScope('scope');
-        });
-    }
-
-    public function testIsScopeActive()
-    {
-        $this->tester->expectException(NotSupportedException::class, function () {
-            $this->containerAdapter->isScopeActive('scope');
-        });
-    }
-
     private function createContainer($file)
     {
         $config = new Configurator();