update deps

diff --git a/app/bootstrap/router.php b/app/bootstrap/router.php
index 50f2a3c830825223629373561e566a27924fdbd3..f587ece854574942a8a47b06b44ef7c42bde4840 100644 (file)
--- a/app/bootstrap/router.php
+++ b/app/bootstrap/router.php
@@ -49,7 +49,9 @@ $injector->share(RouteCollector::class)
 
 $injector->share(Dispatcher::class)
        ->alias(Dispatcher::class, Dispatcher\GroupCountBased::class)
-       ->delegate(Dispatcher\GroupCountBased::class, function($class, Injector $injector) {
-               return new $class($injector->make(RouteCollector::class)->getData());
-       });
+       ->define(Dispatcher\GroupCountBased::class, [
+               "+data" => function($name, Injector $injector) {
+                       return $injector->make(RouteCollector::class)->getData();
+               }
+       ]);
 

diff --git a/composer.json b/composer.json
index 3bd139da54c87595bf93e17ed6a4a63e979cf257..f59742cdabb9f607424d0dd33e83fc7bc6958d06 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
                }
        },
        "require": {
-               "m6w6/pharext": "dev-master",
+               "m6w6/pharext": "~4.0",
                "m6w6/merry": "~1.1",
                "nikic/fast-route": "0.4.*",
                "league/plates": "~3.1",

diff --git a/composer.lock b/composer.lock
index e458cd3ed6aa61b61739cb283aa39362f9bf48c1..77016ed60fb17484172696d0a40fcca6ef83aca1 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "910f08879af0e54cb4aaa21d1ca5eef2",
+    "hash": "3c2c0d61af5e4ef2dd29dff656ba1236",
     "packages": [
         {
             "name": "league/plates",
@@ -100,16 +100,16 @@
         },
         {
             "name": "m6w6/pharext",
-            "version": "dev-master",
+            "version": "v4.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/m6w6/pharext.git",
-                "reference": "c99dfed4c3056e0a8ed1351adb79dd4f16324965"
+                "reference": "d017df1dcb270773804bbed4628397a9c7df30c4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/m6w6/pharext/zipball/c99dfed4c3056e0a8ed1351adb79dd4f16324965",
-                "reference": "c99dfed4c3056e0a8ed1351adb79dd4f16324965",
+                "url": "https://api.github.com/repos/m6w6/pharext/zipball/d017df1dcb270773804bbed4628397a9c7df30c4",
+                "reference": "d017df1dcb270773804bbed4628397a9c7df30c4",
                 "shasum": ""
             },
             "bin": [
@@ -129,7 +129,7 @@
                 "package",
                 "phar"
             ],
-            "time": "2015-05-18 15:11:04"
+            "time": "2015-05-20 06:39:24"
         },
         {
             "name": "m6w6/pharext.wiki",
@@ -347,17 +347,21 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/rdlowrey/Auryn.git",
-                "reference": "2e03bf93ddcd855e962d314cce74ce2a01a49228"
+                "reference": "d0d875868e1d7d241983c88252c07965a65224c1"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/rdlowrey/Auryn/zipball/d0d875868e1d7d241983c88252c07965a65224c1",
-                "reference": "2e03bf93ddcd855e962d314cce74ce2a01a49228",
+                "reference": "d0d875868e1d7d241983c88252c07965a65224c1",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
+            "require-dev": {
+                "athletic/athletic": "~0.1",
+                "phpunit/phpunit": "~4.5"
+            },
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -394,14 +398,13 @@
                 "dic",
                 "ioc"
             ],
-            "time": "2015-05-01 14:20:14"
+            "time": "2015-05-17 18:29:19"
         }
     ],
     "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": {
-        "m6w6/pharext": 20,
         "rdlowrey/auryn": 20,
         "m6w6/pharext.wiki": 20,
         "m6w6/pq-gateway": 20