Merge pull request #9 from filakhtov/PEN-1562

PEN-1562: Replace outdated, deprecated and abandoned dependencies

Author: Garry Filakhtov

.gitignore

@@ -1,2 +1,2 @@
-.idea/
-vendor/
+/.phpunit.result.cache
+/vendor/

.travis.yml

@@ -1,6 +1,6 @@
 language: php
 php:
-  - 7.1
+  - 7.3
 
 install:
  - composer install

composer.json

@@ -16,13 +16,13 @@
   ],
   "minimum-stability": "dev",
   "require": {
-    "php": ">=5.6",
+    "php": "^7.3",
     "pimple/pimple": "*",
     "ocramius/proxy-manager": "^1.0 || ^2.0",
-    "container-interop/container-interop": "^1.1"
+    "psr/container": "^1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^6.0 || ^5.6"
+    "phpunit/phpunit": "^5.6 || ^6.0 || ^7.0 || ^8.0"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -2,9 +2,9 @@
 namespace Bigcommerce\Injector\Adapter;
 
 use Bigcommerce\Injector\Adapter\Exception\ServiceNotFoundException;
-use Interop\Container\ContainerInterface;
-use Interop\Container\Exception\ContainerException;
-use Interop\Container\Exception\NotFoundException;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 
 /**
  * Adapt a simple array container (i.e Pimple) to ContainerInterop Interface
@@ -31,8 +31,8 @@ public function __construct($arrayContainer)
      *
      * @param string $id Identifier of the entry to look for.
      *
-     * @throws NotFoundException  No entry was found for this identifier.
-     * @throws ContainerException Error while retrieving the entry.
+     * @throws NotFoundExceptionInterface  No entry was found for this identifier.
+     * @throws ContainerExceptionInterface Error while retrieving the entry.
      *
      * @return mixed Entry.
      */

src/Adapter/ArrayContainerAdapter.php

@@ -1,9 +1,9 @@
 <?php
 namespace Bigcommerce\Injector\Adapter\Exception;
 
-use Interop\Container\Exception\NotFoundException;
+use Psr\Container\NotFoundExceptionInterface;
 
-class ServiceNotFoundException extends \Exception implements NotFoundException
+class ServiceNotFoundException extends \Exception implements NotFoundExceptionInterface
 {
 
-}
+}

src/Adapter/Exception/ServiceNotFoundException.php

@@ -23,7 +23,7 @@ class InjectorServiceProviderTest extends TestCase
     /** @var BindingClosureFactory|ObjectProphecy */
     private $closureFactory;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->injector = $this->prophesize(Injector::class);

tests/InjectorServiceProviderTest.php

@@ -5,9 +5,9 @@
 use Bigcommerce\Injector\Exception\InjectorInvocationException;
 use Bigcommerce\Injector\Injector;
 use Bigcommerce\Injector\Reflection\ParameterInspector;
-use Interop\Container\ContainerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
+use Psr\Container\ContainerInterface;
 use Tests\Dummy\DummyDependency;
 use Tests\Dummy\DummyNoConstructor;
 use Tests\Dummy\DummyPrivateConstructor;
@@ -33,7 +33,7 @@ class InjectorTest extends TestCase
      */
     private $inspector;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->container = $this->prophesize(ContainerInterface::class);

tests/InjectorTest.php

@@ -17,7 +17,7 @@ class ParameterInspectorTest extends TestCase
     /** @var ObjectProphecy|ServiceCacheInterface */
     private $cache;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->cache = $this->prophesize(ArrayServiceCache::class);

tests/Reflection/ParameterInspectorTest.php

@@ -24,7 +24,7 @@ class BindingClosureFactoryTest extends TestCase
     /** @var LazyLoadingValueHolderFactory|ObjectProphecy */
     private $proxyFactory;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->injector = $this->prophesize(Injector::class);