From c6f027d6d55ecd5cf52f2744276f3781b70dfc96 Mon Sep 17 00:00:00 2001 From: Ener-Getick Date: Tue, 8 Dec 2015 19:05:05 +0100 Subject: [PATCH] Add symfony 3.0 support --- .gitignore | 2 ++ .travis.yml | 31 +++++++++++++++++++++++++++++++ composer.json | 11 +++++++---- phpunit.xml.dist | 2 +- 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 .gitignore create mode 100644 .travis.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7579f74 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +vendor +composer.lock diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..3b6cf8e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: php + +php: + - 5.3 + - 5.4 + - 5.5 + - 5.6 + +sudo: false + +cache: + directories: + - $HOME/.composer/cache/files + +matrix: + fast_finish: true + include: + - php: 5.3 + env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_DEPRECATIONS_HELPER=weak + - php: 5.6 + env: SYMFONY_VERSION='2.7.*' + - php: 5.6 + env: SYMFONY_VERSION='2.8.*' + +before_install: + - composer self-update + - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony=$SYMFONY_VERSION; fi + +install: composer update $COMPOSER_FLAGS + +script: phpunit diff --git a/composer.json b/composer.json index fd11189..d49ae3c 100644 --- a/composer.json +++ b/composer.json @@ -11,16 +11,19 @@ } ], "require": { - "symfony/framework-bundle": "2.*", + "php": ">=5.3.9", + "symfony/framework-bundle": "^2.3|^3.0", "jms/cg": "^1.1" }, + "require-dev": { + "symfony/phpunit-bridge": "^2.7" + }, "autoload": { - "psr-0": { "JMS\\AopBundle": "" } + "psr-4": { "JMS\\AopBundle\\": "" } }, "extra": { "branch-alias": { "dev-master": "1.1.x-dev" } - }, - "target-dir": "JMS/AopBundle" + } } diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a4d8a79..a4e718f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,7 +9,7 @@ processIsolation="false" stopOnFailure="false" syntaxCheck="false" - bootstrap="./../../../../../app/bootstrap.php.cache" + bootstrap="vendor/autoload.php" >