Skip to content

Commit

Permalink
Merge pull request #10 from janalis/develop
Browse files Browse the repository at this point in the history
Migrate to php 7.1
  • Loading branch information
phcorp authored Nov 30, 2017
2 parents 3bb6a1d + 5953613 commit 71ed41b
Show file tree
Hide file tree
Showing 41 changed files with 1,763 additions and 903 deletions.
1 change: 1 addition & 0 deletions .formatter.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
strict: true
header: |
/*
* This file is part of the doctrineviz package
Expand Down
4 changes: 1 addition & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@ language: php
services:
- mysql
php:
- '5.6'
- '7.0'
- '7.1'
before_install:
- sudo apt-get update
- sudo apt-get install graphviz
- mysql -e 'CREATE DATABASE doctrineviz;'
install:
- mv env/config/parameters.yml.dist env/config/parameters.yml
- cp env/config/parameters.yml.dist env/config/parameters.yml
- composer install
- php env/console doctrine:schema:create
script:
Expand Down
30 changes: 22 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,29 @@
}
},
"require": {
"php": ">=5.6"
"php": ">=7.1"
},
"require-dev": {
"symfony/symfony": "2.8.*",
"doctrine/orm": "^2.4.8",
"doctrine/doctrine-bundle": "~1.4",
"symfony/monolog-bundle": "~2.11.3",
"symfony/phpunit-bridge": "~2.7",
"phpunit/phpunit": "^5.6",
"satooshi/php-coveralls": "^1.0"
"symfony/symfony": "^3.4",
"doctrine/orm": "^2.5",
"doctrine/doctrine-bundle": "^1.6",
"symfony/monolog-bundle": "^3.1.0",
"symfony/phpunit-bridge": "^3.0",
"phpunit/phpunit": "^6.2",
"satooshi/php-coveralls": "^1.0",
"incenteev/composer-parameter-handler": "^2.1"
},
"scripts": {
"post-install-cmd": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
],
"post-update-cmd": [
"Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
]
},
"extra": {
"incenteev-parameters": {
"file": "env/config/parameters.yml"
}
}
}
Loading

0 comments on commit 71ed41b

Please sign in to comment.