Skip to content

Commit

Permalink
Merge pull request #10 from benrowe/releases/build-2
Browse files Browse the repository at this point in the history
Releases/build 2
  • Loading branch information
benrowe committed Dec 19, 2016
2 parents 42d4c78 + c7b490d commit bdc2d8d
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: vendor/bin/heroku-php-nginx public/
web: vendor/bin/heroku-php-nginx -C rewrite.conf public/
23 changes: 12 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@
"email": "[email protected]"
}
],
"require": {
"vlucas/phpdotenv": "^2.4",
"mrjgreen/config": "^2.0",
"league/container": "^2.2",
"league/route": "^2.0",
"symfony/http-foundation": "^3.2",
"symfony/psr-http-message-bridge": "^1.0",
"zendframework/zend-diactoros": "^1.3",
"guzzlehttp/guzzle": "^6.2"
},
"require-dev": {
"phpunit/phpunit": "^5.7"
"phpunit/phpunit": "^5.7",
"heroku/heroku-buildpack-php": "^117.0"
},
"autoload": {
"psr-4": {
Expand All @@ -24,15 +35,5 @@
"psr-4": {
"Tests\\": "tests/"
}
},
"require": {
"vlucas/phpdotenv": "^2.4",
"mrjgreen/config": "^2.0",
"league/container": "^2.2",
"league/route": "^2.0",
"symfony/http-foundation": "^3.2",
"symfony/psr-http-message-bridge": "^1.0",
"zendframework/zend-diactoros": "^1.3",
"guzzlehttp/guzzle": "^6.2"
}
}
48 changes: 46 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions rewrite.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
location / {
# try to serve file directly, fallback to rewrite
try_files $uri @rewriteapp;
}

location @rewriteapp {
# rewrite all to app.php
rewrite ^(.*)$ /index.php/$1 last;
}

0 comments on commit bdc2d8d

Please sign in to comment.