Merge pull request #1 from moufmouf/service-providers-0.4

Migrating to service-providers 0.4.

Author: moufmouf

.gitignore

@@ -1,5 +1,4 @@
 .idea
 vendor
-.puli
 composer.lock
 build

README.md

@@ -14,7 +14,7 @@ composer require thecodingmachine/stash-universal-module
 
 Once installed, you need to register the [`TheCodingMachine\StashServiceProvider`](src/StashServiceProvider.php) into your container.
 
-If your container supports Puli integration, you have nothing to do. Otherwise, refer to your framework or container's documentation to learn how to register *service providers*.
+If your container supports thecodingmachine/discovery integration, you have nothing to do. Otherwise, refer to your framework or container's documentation to learn how to register *service providers*.
 
 ## Introduction
 

composer.json

@@ -10,14 +10,12 @@
   },
   "require": {
     "php": ">=7.0",
-    "container-interop/service-provider": "~0.3.0",
-    "thecodingmachine/common-factories": "^0.3",
+    "container-interop/service-provider": "^0.4",
+    "thecodingmachine/common-factories": "^0.4",
     "tedivm/stash": "~0.14.0"
   },
   "require-dev": {
-    "puli/cli":"^1.0",
-    "puli/composer-plugin": "^1.0",
-    "mnapoli/simplex": "~0.2.0",
+    "mnapoli/simplex": "~0.3.0",
     "phpunit/phpunit": "^5.0",
     "satooshi/php-coveralls": "^1.0"
   },

discovery.json

@@ -1,3 +1,3 @@
 {
-  "Interop\\Container\\ServiceProvider": "TheCodingMachine\\StashServiceProvider"
+  "Interop\\Container\\ServiceProviderInterface": "TheCodingMachine\\StashServiceProvider"
 }

puli.json

@@ -2,10 +2,10 @@
 
 namespace TheCodingMachine;
 
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Interop\Container\Factories\Alias;
 use Interop\Container\Factories\Parameter;
-use Interop\Container\ServiceProvider;
+use Interop\Container\ServiceProviderInterface;
 use Psr\Cache\CacheItemPoolInterface;
 use Stash\Driver\Apc;
 use Stash\Driver\BlackHole;
@@ -24,7 +24,7 @@
 use Twig_Loader_Chain;
 use Twig_Loader_Filesystem;
 
-class StashServiceProvider implements ServiceProvider
+class StashServiceProvider implements ServiceProviderInterface
 {
     const PACKAGE = 'thecodingmachine.stash-universal-module';
 
@@ -38,7 +38,7 @@ public function __construct(string $suffix = null)
         $this->suffix = $suffix ? '.'.$suffix : '';
     }
 
-    public function getServices()
+    public function getFactories()
     {
         return [
             'stash'.$this->suffix.'.composite.options' => function(ContainerInterface $container) : array
@@ -105,6 +105,11 @@ public function getServices()
         ];
     }
 
+    public function getExtensions()
+    {
+        return [];
+    }
+
     /**
      * Returns the entry named PACKAGE.$name, of simply $name if PACKAGE.$name is not found.
      *
@@ -129,6 +134,4 @@ public static function createBlackHoleDriver() : BlackHole
     {
         return new BlackHole();
     }
-
-
 }