Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix master branch and its travis tests #397

Merged
merged 3 commits into from
Jan 28, 2018
Merged

Fix master branch and its travis tests #397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f114149
fix master branch by updating sonata cache packages and bumping php v…
ElectricMaxxx Nov 26, 2017
40480da
Apply fixes from StyleCI
ElectricMaxxx Jan 28, 2018
f7b331e
Merge pull request #402 from symfony-cmf/analysis-qrl7Eg
ElectricMaxxx Jan 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
language: php

php:
- 5.6
- 7.0
# 7.1 is tested using composer install
- 7.1

sudo: false

Expand All @@ -18,24 +16,25 @@ matrix:
env: TRANSPORT=jackrabbit COMPOSER_INSTALL=1
- php: 7.1
env: TRANSPORT=doctrine_dbal COMPOSER_INSTALL=1
- php: hhvm
dist: trusty

env:
global:
- SYMFONY_PHPUNIT_DIR=.phpunit SYMFONY_PHPUNIT_REMOVE="symfony/yaml" SYMFONY_PHPUNIT_VERSION=5.7
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this allowed, all on one line?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

afaik that works, yes. probably because this is how environment variables are passed anyways to the scripts that are run - travis-ci likely just concats the rows with whitespace separator.

- SYMFONY_DEPRECATIONS_HELPER=weak
matrix:
- TRANSPORT=jackrabbit
- TRANSPORT=doctrine_dbal

before_install:
- if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
# hack to avoid segmentation fault because of https://bugs.php.net/bug.php?id=74843
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
- if [ "$TRAVIS_PHP_VERSION" == "7.0" ]; then echo "zend.enable_gc = 0" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi
- phpenv config-rm xdebug.ini || true
- composer self-update

install: if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi
install:
- phpenv config-add travis.php.ini
- php -ini | grep memory_limit
- if [ "$COMPOSER_INSTALL" != "1" ]; then composer update --no-scripts --prefer-dist; else composer install --no-scripts --prefer-dist; fi

before_script:
- cp app/config/phpcr_${TRANSPORT}.yml.dist app/config/phpcr.yml
Expand All @@ -44,7 +43,7 @@ before_script:
- bin/console doctrine:phpcr:workspace:create sandbox_test -e=test
- bin/console doctrine:phpcr:repository:init -e=test

script: vendor/bin/simple-phpunit
script: php vendor/bin/simple-phpunit --debug

notifications:
irc: "irc.freenode.org#symfony-cmf"
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ Functional tests are written with PHPUnit. Note that Bundles and Components are
php bin/console doctrine:phpcr:workspace:create sandbox_test
phpunit -c app


## Remove demo configuration

If you start a project from the sandbox, remove ```.sensiolabs.yml``` as its not a good example for production use.
2 changes: 1 addition & 1 deletion app/config/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ cmf_menu:

cmf_resource:
description:
enhancers: [sonata_phpcr_admin, cmf_tree_icons, doctrine_phpcr_position]
enhancers: [doctrine_phpcr_position]
repositories:
default:
type: doctrine/phpcr-odm
Expand Down
9 changes: 6 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"psr-4": { "Tests\\": "tests/" }
},
"require": {
"php": "^5.6|^7.0",
"php": "^7.1",
"symfony/symfony": "^3.3",
"symfony/assetic-bundle": "^2.8",
"symfony/swiftmailer-bundle": "^2.3.10",
Expand All @@ -40,7 +40,7 @@
"doctrine/doctrine-cache-bundle": "^1.2",
"doctrine/phpcr-odm": "^1.4",

"sonata-project/cache-bundle": "^2.1",
"sonata-project/cache-bundle": "^2.4",
"sonata-project/translation-bundle": "2.1.0",
"sonata-project/doctrine-phpcr-admin-bundle": "^2.0",

Expand All @@ -55,7 +55,7 @@
"sensio/generator-bundle": "^3.0",
"liip/functional-test-bundle": "^1.3",
"symfony-cmf/testing": "^2.0",
"symfony/phpunit-bridge": "^3.2"
"symfony/phpunit-bridge": "^3.3"
},
"scripts": {
"post-install-cmd": [
Expand Down Expand Up @@ -90,5 +90,8 @@
"branch-alias": {
"dev-master": "2.0-dev"
}
},
"conflict": {
"sonata-project/cache": "<1.1.1"
}
}
Loading