From f57f6a10b7d98d835edc0676b9d04312b75821cb Mon Sep 17 00:00:00 2001
From: Ryan Mahoney <ryan.mahoney@betterlesson.com>
Date: Mon, 31 Oct 2016 10:00:16 -0400
Subject: [PATCH] update router

---
 .travis.yml                             | 10 ++--------
 composer.json                           | 16 ++++++++--------
 config/containers/package-container.yml |  8 ++++----
 config/containers/test-container.yml    |  2 +-
 docker/compose.sh                       |  1 +
 docker/pull.sh                          |  2 ++
 docker/test.sh                          |  5 +++++
 docker/test/Dockerfile                  |  3 +++
 docker/test/make.sh                     |  1 +
 var/cache/config.json                   |  6 ------
 10 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100755 docker/compose.sh
 create mode 100755 docker/pull.sh
 create mode 100755 docker/test.sh
 create mode 100644 docker/test/Dockerfile
 create mode 100755 docker/test/make.sh

diff --git a/.travis.yml b/.travis.yml
index 8101b37..00c3299 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,13 @@
 language: php
 php:
-  - 5.5
+  - 7
 
 install:
   - composer self-update
   - composer install --dev
 
-services:
-  - memcached
-
-before_script:
-  - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-
 script: vendor/bin/phpunit --coverage-clover=coverage.clover
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
\ No newline at end of file
+  - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
diff --git a/composer.json b/composer.json
index 5b340c6..7547b71 100644
--- a/composer.json
+++ b/composer.json
@@ -17,20 +17,20 @@
         }
     ],
     "require": {
-        "php"             : ">=5.5.0",
-        "nikic/fast-route": "0.3.0",
+        "php"             : ">=7.0.0",
+        "nikic/fast-route": "1.0.1",
         "opine/interfaces": "~1.0",
-        "opine/config"    : "~3.0",
-        "opine/container" : "~2.0",
-        "opine/bundle"    : "~2.0"
+        "opine/config"    : "3.0.12",
+        "opine/container" : "2.0.11",
+        "opine/bundle"    : "2.0.14"
     },
     "require-dev": {
-        "phpunit/phpunit": "3.7.32"
+        "phpunit/phpunit": "5.5"
     },
     "autoload": {
         "psr-4": {
             "Opine\\Route\\": "src/"
         }
     },
-    "version": "3.0.10"
-}
\ No newline at end of file
+    "version": "3.0.11"
+}
diff --git a/config/containers/package-container.yml b/config/containers/package-container.yml
index 736fc54..04f895b 100644
--- a/config/containers/package-container.yml
+++ b/config/containers/package-container.yml
@@ -3,15 +3,15 @@ services:
         class: Opine\Route\Service
         arguments:
             - %root%
-            - @container
+            - "@container"
     routeModel:
         class: Opine\Route\Model
         arguments:
             - %root%
-            - @route
-            - @bundleModel
+            - "@route"
+            - "@bundleModel"
     redirect:
         class: Opine\Route\Redirect
         scope: prototype
         arguments:
-            - @route
+            - "@route"
diff --git a/config/containers/test-container.yml b/config/containers/test-container.yml
index 6bca3d8..fd537d5 100644
--- a/config/containers/test-container.yml
+++ b/config/containers/test-container.yml
@@ -6,4 +6,4 @@ services:
     controller:
         class: Controller
         arguments:
-            - @redirect
+            - "@redirect"
diff --git a/docker/compose.sh b/docker/compose.sh
new file mode 100755
index 0000000..bec91df
--- /dev/null
+++ b/docker/compose.sh
@@ -0,0 +1 @@
+docker run --rm -v "$(pwd)/../":/app composer/composer install
\ No newline at end of file
diff --git a/docker/pull.sh b/docker/pull.sh
new file mode 100755
index 0000000..5ad9cd4
--- /dev/null
+++ b/docker/pull.sh
@@ -0,0 +1,2 @@
+docker pull composer/composer
+docker pull phpunit:5.5.0
diff --git a/docker/test.sh b/docker/test.sh
new file mode 100755
index 0000000..1d73468
--- /dev/null
+++ b/docker/test.sh
@@ -0,0 +1,5 @@
+docker run \
+    -e "OPINE_ENV=docker" \
+    --rm \
+    -v "$(pwd)/../":/app opine:phpunit-route \
+    --bootstrap /app/tests/bootstrap.php
diff --git a/docker/test/Dockerfile b/docker/test/Dockerfile
new file mode 100644
index 0000000..949cbf0
--- /dev/null
+++ b/docker/test/Dockerfile
@@ -0,0 +1,3 @@
+FROM phpunit/phpunit:5.5.0
+
+RUN apk --no-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing add php7-ctype
diff --git a/docker/test/make.sh b/docker/test/make.sh
new file mode 100755
index 0000000..593af27
--- /dev/null
+++ b/docker/test/make.sh
@@ -0,0 +1 @@
+docker build -t="opine:phpunit-route" .
diff --git a/var/cache/config.json b/var/cache/config.json
index 3fc37d2..14e00a3 100644
--- a/var/cache/config.json
+++ b/var/cache/config.json
@@ -4,11 +4,5 @@
             "name": "phpunit",
             "conn": "mongodb:\/\/unit:test@localhost\/phpunit"
         }
-    },
-    "routes": {
-        "db": {
-            "name": "phpunit",
-            "conn": "mongodb:\/\/unit:test@localhost\/phpunit"
-        }
     }
 }
\ No newline at end of file