Skip to content

Commit

Permalink
update router
Browse files Browse the repository at this point in the history
  • Loading branch information
rmahoney-bl committed Oct 31, 2016
1 parent fb06224 commit f57f6a1
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 27 deletions.
10 changes: 2 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
- php ocular.phar code-coverage:upload --format=php-clover coverage.clover
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
"version": "3.0.11"
}
8 changes: 4 additions & 4 deletions config/containers/package-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion config/containers/test-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ services:
controller:
class: Controller
arguments:
- @redirect
- "@redirect"
1 change: 1 addition & 0 deletions docker/compose.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker run --rm -v "$(pwd)/../":/app composer/composer install
2 changes: 2 additions & 0 deletions docker/pull.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
docker pull composer/composer
docker pull phpunit:5.5.0
5 changes: 5 additions & 0 deletions docker/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
docker run \
-e "OPINE_ENV=docker" \
--rm \
-v "$(pwd)/../":/app opine:phpunit-route \
--bootstrap /app/tests/bootstrap.php
3 changes: 3 additions & 0 deletions docker/test/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions docker/test/make.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
docker build -t="opine:phpunit-route" .
6 changes: 0 additions & 6 deletions var/cache/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,5 @@
"name": "phpunit",
"conn": "mongodb:\/\/unit:test@localhost\/phpunit"
}
},
"routes": {
"db": {
"name": "phpunit",
"conn": "mongodb:\/\/unit:test@localhost\/phpunit"
}
}
}

0 comments on commit f57f6a1

Please sign in to comment.