From 7e2a6328c010966b9300bee627dbe9bdeb23421c Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Sat, 5 Sep 2015 13:47:36 +0200 Subject: [PATCH 1/7] require only needed dependencies --- composer.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7debf734d4..12358841ce 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,14 @@ "require": { "php" : ">=5.3.0", "pagerfanta/pagerfanta" : "~1.0,>=1.0.1", - "symfony/symfony" : "~2.3", + "symfony/config" : "~2.3", + "symfony/dependency-injection" : "~2.3", + "symfony/doctrine-bridge" : "~2.3", + "symfony/event-dispatcher" : "~2.3", + "symfony/form" : "~2.3", + "symfony/framework-bundle" : "~2.3", + "symfony/http-foundation" : "~2.3", + "symfony/http-kernel" : "~2.3", "doctrine/orm" : "~2.3", "doctrine/doctrine-bundle" : "~1.2", "twig/extensions" : "~1.0", @@ -28,7 +35,14 @@ }, "require-dev": { "phpunit/phpunit" : "~4.4", - "doctrine/doctrine-fixtures-bundle" : "~2.2" + "doctrine/doctrine-fixtures-bundle" : "~2.2", + "symfony/console" : "~2.3", + "symfony/dom-crawler" : "~2.3", + "symfony/finder" : "~2.3", + "symfony/security-bundle" : "~2.3", + "symfony/twig-bundle" : "~2.3", + "symfony/validator" : "~2.3", + "symfony/yaml" : "~2.3" }, "autoload": { "psr-4": { "JavierEguiluz\\Bundle\\EasyAdminBundle\\": "" } From 79c49d23e01b1b329f53d19f3e3e695fc3915ef1 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 7 Sep 2015 20:46:43 +0200 Subject: [PATCH 2/7] Added BrowserKit component to the list of dev dependencies --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 12358841ce..51a1887af7 100644 --- a/composer.json +++ b/composer.json @@ -36,6 +36,7 @@ "require-dev": { "phpunit/phpunit" : "~4.4", "doctrine/doctrine-fixtures-bundle" : "~2.2", + "symfony/browser-kit" : "~2.3", "symfony/console" : "~2.3", "symfony/dom-crawler" : "~2.3", "symfony/finder" : "~2.3", From ddaadb4d18979c473aad6d377618a9b689b4c183 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 7 Sep 2015 21:47:06 +0200 Subject: [PATCH 3/7] Added CssSelector component --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 51a1887af7..e499310ada 100644 --- a/composer.json +++ b/composer.json @@ -38,6 +38,7 @@ "doctrine/doctrine-fixtures-bundle" : "~2.2", "symfony/browser-kit" : "~2.3", "symfony/console" : "~2.3", + "symfony/css-selector" : "~2.3", "symfony/dom-crawler" : "~2.3", "symfony/finder" : "~2.3", "symfony/security-bundle" : "~2.3", From 0624f6cd5fbfe78cfd58e43d65f123902a26d5e8 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Sun, 13 Sep 2015 19:39:51 +0200 Subject: [PATCH 4/7] Added "symfony/twig-bridge" and reordered some dependencies --- composer.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index e499310ada..af8eb3d384 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,11 @@ ], "require": { "php" : ">=5.3.0", + "doctrine/doctrine-bundle" : "~1.2", + "doctrine/orm" : "~2.3", "pagerfanta/pagerfanta" : "~1.0,>=1.0.1", + "sensio/distribution-bundle" : "~2.3|~3.0|~4.0", + "sensio/framework-extra-bundle" : "~3.0,>=3.0.2", "symfony/config" : "~2.3", "symfony/dependency-injection" : "~2.3", "symfony/doctrine-bridge" : "~2.3", @@ -26,16 +30,13 @@ "symfony/framework-bundle" : "~2.3", "symfony/http-foundation" : "~2.3", "symfony/http-kernel" : "~2.3", - "doctrine/orm" : "~2.3", - "doctrine/doctrine-bundle" : "~1.2", + "symfony/twig-bridge" : "^2.3.4", "twig/extensions" : "~1.0", - "sensio/distribution-bundle" : "~2.3|~3.0|~4.0", - "sensio/framework-extra-bundle" : "~3.0,>=3.0.2", "twig/twig" : "~1.12,>=1.12.2" }, "require-dev": { - "phpunit/phpunit" : "~4.4", "doctrine/doctrine-fixtures-bundle" : "~2.2", + "phpunit/phpunit" : "~4.4", "symfony/browser-kit" : "~2.3", "symfony/console" : "~2.3", "symfony/css-selector" : "~2.3", From 7e4fd0dfe6e1c95cff38c77078b8734e7e6f7ce3 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 Sep 2015 08:17:42 +0200 Subject: [PATCH 5/7] Required an specific version of doctrine/common --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index af8eb3d384..ca691bedbe 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ ], "require": { "php" : ">=5.3.0", + "doctrine/common" : "^2.4.0", "doctrine/doctrine-bundle" : "~1.2", "doctrine/orm" : "~2.3", "pagerfanta/pagerfanta" : "~1.0,>=1.0.1", From fda0e3a7d207487ef5fbdd373623a61a6f7094a5 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 Sep 2015 08:46:26 +0200 Subject: [PATCH 6/7] Tweaked the Travis CI configuration --- .travis.yml | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index fec6dc74d9..b1a98bed7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,13 @@ language: php +php: + - 5.3 + - 5.4 + - 5.5 + - 5.6 + - 7.0 + - hhvm + sudo: false cache: @@ -16,36 +24,30 @@ matrix: include: - php: 5.3 - php: 5.3 - env: deps="low" - - php: 5.4 - - php: 5.5 - - php: 5.6 + env: COMPOSER_FLAGS="--prefer-lowest" - php: 5.6 - env: SYMFONY_VERSION="2.3.x" + env: SYMFONY_VERSION=2.3.* - php: 5.6 - env: SYMFONY_VERSION="2.6.x" + env: SYMFONY_VERSION=2.7.* - php: 5.6 - env: SYMFONY_VERSION="2.7.x" + env: SYMFONY_VERSION=2.8.*@dev - php: 5.6 - env: SYMFONY_VERSION="2.8.x-dev" - - php: hhvm - - php: nightly + env: SYMFONY_VERSION="3.0.x-dev as 2.8" allow_failures: - php: hhvm - - php: nightly - - env: SYMFONY_VERSION="2.7.x-dev" - - env: SYMFONY_VERSION="2.8.x-dev" + - env: SYMFONY_VERSION=2.8.*@dev + - env: SYMFONY_VERSION="3.0.x-dev as 2.8" before_install: - - if [ "$(phpenv version-name)" = "5.3" ]; then echo 'memory_limit = -1' >> ~/.phpenv/versions/5.3/etc/conf.d/travis.ini; fi - - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:$SYMFONY_VERSION; fi + - composer selfupdate + - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi; install: - - if [ "$deps" = "low" ]; then composer update --prefer-lowest; fi - - if [ "$deps" != "low" ]; then composer install; fi + - composer update --prefer-dist --no-interaction $COMPOSER_FLAGS - composer require --dev satooshi/php-coveralls:~0.6 -script: phpunit --coverage-text --coverage-clover build/logs/clover.xml +script: + - phpunit --coverage-text --coverage-clover build/logs/clover.xml after_success: | if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then php vendor/bin/coveralls -v --config .coveralls.yml; fi; From 47e3ee7fbca1c45022d6f74e9169db1b26d4076d Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Mon, 14 Sep 2015 08:53:33 +0200 Subject: [PATCH 7/7] Removed an unneded job --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b1a98bed7a..5a2d054e3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ env: matrix: fast_finish: true include: - - php: 5.3 - php: 5.3 env: COMPOSER_FLAGS="--prefer-lowest" - php: 5.6