Migrating to service-providers 0.4

Author: moufmouf

README.md

@@ -8,7 +8,7 @@ This package integrates the franzliedke/whoops-middleware in any [container-inte
 composer require thecodingmachine/whoops-middleware-universal-module
 ```
 
-If your container supports autodiscovery by Puli or Discovery, there is nothing more to do.
+If your container supports autodiscovery by Discovery, there is nothing more to do.
 Otherwise, you need to register the [`TheCodingMachine\WhoopsMiddlewareServiceProvider`](src/WhoopsMiddlewareServiceProvider.php) into your container.
 
 Refer to your framework or container's documentation to learn how to register *service providers*.

composer.json

@@ -10,15 +10,11 @@
     },
     "require": {
         "php": ">=7.0",
-        "container-interop/service-provider": "~0.3.0",
-        "franzl/whoops-middleware": "~0.5.0",
+        "container-interop/service-provider": "^0.4",
+        "franzl/whoops-middleware": "^0.5.0",
         "http-interop/http-middleware": "^0.4.1",
         "thecodingmachine/middleware-list-universal-module": "^1.0"
     },
-    "require-dev": {
-        "puli/cli": "^1.0",
-        "puli/composer-plugin": "^1.0"
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

discovery.json

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

puli.json

@@ -5,22 +5,28 @@
 use Franzl\Middleware\Whoops\ErrorMiddleware;
 use Franzl\Middleware\Whoops\Middleware;
 use Franzl\Middleware\Whoops\PSR15Middleware;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Interop\Container\ServiceProvider;
-use JsonSchema\Exception\InvalidArgumentException;
+use Interop\Container\ServiceProviderInterface;
 
-class WhoopsMiddlewareServiceProvider implements ServiceProvider
+class WhoopsMiddlewareServiceProvider implements ServiceProviderInterface
 {
 
-    public function getServices()
+    public function getFactories()
     {
         return [
             ErrorMiddleware::class => [self::class,'createErrorMiddleware'],
             Middleware::class => [self::class,'createMiddleware'],
-            MiddlewareListServiceProvider::MIDDLEWARES_QUEUE => [self::class,'updatePriorityQueue']
         ];
     }
 
+    public function getExtensions()
+    {
+        return [
+            MiddlewareListServiceProvider::MIDDLEWARES_QUEUE => [self::class,'updatePriorityQueue']
+        ]
+    }
+
     public static function createErrorMiddleware() : ErrorMiddleware
     {
         return new ErrorMiddleware();
@@ -31,14 +37,9 @@ public static function createMiddleware() : Middleware
         return new PSR15Middleware();
     }
 
-    public static function updatePriorityQueue(ContainerInterface $container, callable $previous = null) : \SplPriorityQueue
+    public static function updatePriorityQueue(ContainerInterface $container, \SplPriorityQueue $queue) : \SplPriorityQueue
     {
-        if ($previous) {
-            $priorityQueue = $previous();
-            $priorityQueue->insert($container->get(Middleware::class), MiddlewareOrder::EXCEPTION_EARLY);
-            return $priorityQueue;
-        } else {
-            throw new InvalidArgumentException("Could not find declaration for service '".MiddlewareListServiceProvider::MIDDLEWARES_QUEUE."'.");
-        }
+        $queue->insert($container->get(Middleware::class), MiddlewareOrder::EXCEPTION_EARLY);
+        return $queue;
     }
 }