Skip to content

Commit

Permalink
Merge pull request #1 from siwapp/master
Browse files Browse the repository at this point in the history
Update from official repo
  • Loading branch information
JMCA2 authored Dec 8, 2016
2 parents e75387c + 2065677 commit 9d94e26
Show file tree
Hide file tree
Showing 20 changed files with 1,346 additions and 55 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cache:
php:
- '5.6'
- '7.0'
- '7.1'

before_install:
- phpenv config-rm xdebug.ini
Expand All @@ -17,3 +18,6 @@ before_install:
install:
- composer install
- php bin/console doctrine:schema:create

script:
- vendor/bin/phpunit --colors
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"require": {
"php": ">=5.6",
"symfony/symfony": "3.1.*",
"symfony/symfony": "3.2.*",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^1.6",
"doctrine/doctrine-cache-bundle": "^1.2",
Expand All @@ -38,6 +38,7 @@
"knplabs/knp-snappy-bundle": "^1.4"
},
"require-dev": {
"phpunit/phpunit": "^5.4",
"sensio/generator-bundle": "^3.0",
"symfony/phpunit-bridge": "^3.0"
},
Expand Down
Loading

0 comments on commit 9d94e26

Please sign in to comment.