Skip to content

Commit

Permalink
feature #438 Require only needed dependencies (xabbuh, javiereguiluz)
Browse files Browse the repository at this point in the history
This PR was merged into the master branch.

Discussion
----------

Require only needed dependencies

Commits
-------

47e3ee7 Removed an unneded job
fda0e3a Tweaked the Travis CI configuration
7e4fd0d Required an specific version of doctrine/common
0624f6c Added "symfony/twig-bridge" and reordered some dependencies
ddaadb4 Added CssSelector component
79c49d2 Added BrowserKit component to the list of dev dependencies
7e2a632 require only needed dependencies
  • Loading branch information
javiereguiluz committed Sep 15, 2015
2 parents 0bff199 + 47e3ee7 commit 5fc1a7d
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 24 deletions.
39 changes: 20 additions & 19 deletions .travis.yml
@@ -1,5 +1,13 @@
language: php

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

sudo: false

cache:
Expand All @@ -15,37 +23,30 @@ matrix:
fast_finish: true
include:
- php: 5.3
- php: 5.3
env: deps="low"
- php: 5.4
- php: 5.5
env: COMPOSER_FLAGS="--prefer-lowest"
- php: 5.6
env: SYMFONY_VERSION=2.3.*
- php: 5.6
env: SYMFONY_VERSION="2.3.x"
env: SYMFONY_VERSION=2.7.*
- php: 5.6
env: SYMFONY_VERSION="2.6.x"
env: SYMFONY_VERSION=2.8.*@dev
- php: 5.6
env: SYMFONY_VERSION="2.7.x"
- 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;
28 changes: 23 additions & 5 deletions composer.json
Expand Up @@ -17,18 +17,36 @@
],
"require": {
"php" : ">=5.3.0",
"pagerfanta/pagerfanta" : "~1.0,>=1.0.1",
"symfony/symfony" : "~2.3",
"doctrine/orm" : "~2.3",
"doctrine/common" : "^2.4.0",
"doctrine/doctrine-bundle" : "~1.2",
"twig/extensions" : "~1.0",
"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",
"symfony/event-dispatcher" : "~2.3",
"symfony/form" : "~2.3",
"symfony/framework-bundle" : "~2.3",
"symfony/http-foundation" : "~2.3",
"symfony/http-kernel" : "~2.3",
"symfony/twig-bridge" : "^2.3.4",
"twig/extensions" : "~1.0",
"twig/twig" : "~1.12,>=1.12.2"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle" : "~2.2",
"phpunit/phpunit" : "~4.4",
"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",
"symfony/twig-bundle" : "~2.3",
"symfony/validator" : "~2.3",
"symfony/yaml" : "~2.3"
},
"autoload": {
"psr-4": { "JavierEguiluz\\Bundle\\EasyAdminBundle\\": "" }
Expand Down

0 comments on commit 5fc1a7d

Please sign in to comment.