Skip to content

Commit

Permalink
Merge pull request #3 from j0k3r/sf3.0-deprecation
Browse files Browse the repository at this point in the history
Remove Symfony 3.0 deprecation
  • Loading branch information
K-Phoen committed Jan 11, 2016
2 parents dcaaed6 + 5bef0c8 commit 57416b7
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 9 deletions.
24 changes: 21 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,36 @@ cache:
- vendor
- $HOME/.composer/cache

matrix:
fast_finish: true
include:
- php: 5.6
env: SYMFONY_VERSION=2.5.*
- php: 5.6
env: SYMFONY_VERSION=2.6.*
- php: 5.6
env: SYMFONY_VERSION=2.7.*
- php: 5.6
env: SYMFONY_VERSION=2.8.*
- php: 5.6
env: SYMFONY_VERSION=3.0.*

php:
- 5.4
- 5.5
- 5.6
- 7.0
- hhvm

before_script:
before_install:
- composer self-update
- if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
# disable xdebug since we don't use code-coverage for now
- if [[ $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;

install: composer install --prefer-source
install:
- composer update --prefer-dist --no-interaction $COMPOSER_FLAGS

script: ./vendor/bin/phpunit
script:
- ./vendor/bin/phpunit
2 changes: 1 addition & 1 deletion Resources/config/debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ services:

rulerz.compiler.eval:
class: RulerZ\Compiler\EvalCompiler
arguments: [ @rulerz.parser ]
arguments: [ "@rulerz.parser" ]
public: false
4 changes: 2 additions & 2 deletions Resources/config/rulerz.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
services:
rulerz:
class: RulerZ\RulerZ
arguments: [ @rulerz.compiler ]
arguments: [ "@rulerz.compiler" ]

rulerz.compiler:
alias: rulerz.compiler.file
Expand All @@ -10,7 +10,7 @@ services:
rulerz.compiler.file:
class: RulerZ\Compiler\FileCompiler
public: false
arguments: [ @rulerz.parser, %rulerz.cache_directory% ]
arguments: [ "@rulerz.parser", %rulerz.cache_directory% ]

rulerz.parser:
class: RulerZ\Parser\HoaParser
Expand Down
2 changes: 1 addition & 1 deletion Resources/config/validators.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
rulerz.validator.unique.rule_validator:
class: KPhoen\RulerZBundle\Validator\Constraints\RuleValidator
arguments: [ @rulerz.parser ]
arguments: [ "@rulerz.parser" ]
tags:
- { name: validator.constraint_validator, alias: rulerz_rule_validator }
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
},
"require": {
"kphoen/rulerz": "~0.1, >=0.13.0",
"symfony/validator": "~2.3|~3.0",
"symfony/framework-bundle": "~2.3|~3.0"
"symfony/validator": "~2.5|~3.0",
"symfony/framework-bundle": "~2.5|~3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8",
"symfony/phpunit-bridge": "~2.7|~3.0",
"mikey179/vfsStream": "~1.0",
"matthiasnoback/symfony-dependency-injection-test": "~0.7"
}
Expand Down

0 comments on commit 57416b7

Please sign in to comment.