From ac51e36546a920faa93de2b65d27303d1c72805e Mon Sep 17 00:00:00 2001
From: arp <a.poly@thecodingmachine.com>
Date: Tue, 27 Feb 2018 17:43:15 +0100
Subject: [PATCH] used tcm funky

---
 composer.json                                 |  4 +--
 ...rfHeaderCheckMiddlewareServiceProvider.php | 29 +++++--------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index c12204f..79e3e03 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
   },
   "require": {
     "php": ">=7.0",
-    "container-interop/service-provider": "^0.3",
+    "thecodingmachine/funky": "^1.0",
     "thecodingmachine/csrf-header-check-middleware": "^1.0",
     "thecodingmachine/middleware-list-universal-module": "^1.0"
   },
@@ -18,7 +18,7 @@
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-      "dev-master": "1.0.x-dev"
+      "dev-master": "1.1.x-dev"
     }
   }
 }
\ No newline at end of file
diff --git a/src/CsrfHeaderCheckMiddlewareServiceProvider.php b/src/CsrfHeaderCheckMiddlewareServiceProvider.php
index 9d05ef5..8fe5991 100644
--- a/src/CsrfHeaderCheckMiddlewareServiceProvider.php
+++ b/src/CsrfHeaderCheckMiddlewareServiceProvider.php
@@ -2,34 +2,19 @@
 
 namespace TheCodingMachine\Middlewares;
 
-use Interop\Container\ServiceProvider;
-use Psr\Container\ContainerInterface;
+use TheCodingMachine\Funky\Annotations\Tag;
+use TheCodingMachine\Funky\Annotations\Factory;
+use TheCodingMachine\Funky\ServiceProvider;
 use TheCodingMachine\MiddlewareListServiceProvider;
 use TheCodingMachine\MiddlewareOrder;
 
-class CsrfHeaderCheckMiddlewareServiceProvider implements ServiceProvider
+class CsrfHeaderCheckMiddlewareServiceProvider extends ServiceProvider
 {
-    public function getServices()
-    {
-        return [
-            CsrfHeaderCheckMiddleware::class => [self::class, 'createMiddleware'],
-            MiddlewareListServiceProvider::MIDDLEWARES_QUEUE => [self::class, 'updatePriorityQueue'],
-        ];
-    }
-
+    /**
+     * @Factory(tags={@Tag(name=MiddlewareListServiceProvider::MIDDLEWARES_QUEUE, priority=MiddlewareOrder::UTILITY)})
+     */
     public static function createMiddleware(): CsrfHeaderCheckMiddleware
     {
         return CsrfHeaderCheckMiddlewareFactory::createDefault();
     }
-
-    public static function updatePriorityQueue(ContainerInterface $container, callable $previous = null) : \SplPriorityQueue
-    {
-        if ($previous) {
-            $priorityQueue = $previous();
-            $priorityQueue->insert($container->get(CsrfHeaderCheckMiddleware::class), MiddlewareOrder::UTILITY);
-            return $priorityQueue;
-        } else {
-            throw new \InvalidArgumentException("Could not find declaration for service '".MiddlewareListServiceProvider::MIDDLEWARES_QUEUE."'.");
-        }
-    }
 }