Skip to content

Commit

Permalink
Merge pull request #4 from BenoitLeveque/add-php7-symfony-28
Browse files Browse the repository at this point in the history
 Allow usage with PHP 7.0
  • Loading branch information
J-Ben87 authored Nov 2, 2016
2 parents 6b2ca60 + 1a90a5f commit 39014c6
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1,586 deletions.
44 changes: 1 addition & 43 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,44 +1,2 @@
# Cache and logs (Symfony2)
/app/cache/*
/app/logs/*
!app/cache/.gitkeep
!app/logs/.gitkeep

# Cache and logs (Symfony3)
/var/cache/*
/var/logs/*
!var/cache/.gitkeep
!var/logs/.gitkeep

# Parameters
/app/config/parameters.yml
/app/config/parameters.ini

# Managed by Composer
/app/bootstrap.php.cache
/var/bootstrap.php.cache
/bin/*
!bin/console
!bin/symfony_requirements
/vendor/

# Assets and user uploads
/web/bundles/
/web/uploads/

# PHPUnit
/app/phpunit.xml
/phpunit.xml

# Build data
/build/

# Composer PHAR
/composer.phar

# Sublime-text files
*.sublime-project
*.sublime-workspace

# PHPStorm files
/.idea
composer.lock
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ php:
- 5.4
- 5.5
- 5.6
- 7.0

env:
- SYMFONY_VERSION=2.3.*
- SYMFONY_VERSION=2.4.*
- SYMFONY_VERSION=2.5.*
- SYMFONY_VERSION=2.6.*
- SYMFONY_VERSION=2.7.*
- SYMFONY_VERSION=2.8.*

before_install:
- pear install pear/PHP_CodeSniffer
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": "^5.4",
"php": ">=5.4",
"symfony/symfony": "^2.3"
},
"require-dev": {
Expand Down
Loading

0 comments on commit 39014c6

Please sign in to comment.