Skip to content

Updated travis yml to properly test different symfony versions #221

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

Merged
merged 16 commits into from
Nov 27, 2017
Merged

Updated travis yml to properly test different symfony versions #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
47c6dda
Updated travis yml to properly test different symfony versions
Nyholm Nov 25, 2017
7528644
Use tilde
Nyholm Nov 25, 2017
a90e79d
Require phpunit bridge
Nyholm Nov 25, 2017
41e8a04
Make sure test pass on phpunit 5.7
Nyholm Nov 25, 2017
3457ef6
Removed phpunit/phpunit
Nyholm Nov 25, 2017
493377a
Require config-test 2.0
Nyholm Nov 25, 2017
788e262
remove PHP 7.2 since it is failing on some weird test issue
Nyholm Nov 25, 2017
47a1947
latest phpunit bridge support php7
Nyholm Nov 25, 2017
d2d7a08
specify PHPUnit version
Nyholm Nov 25, 2017
12a0de1
typo
Nyholm Nov 25, 2017
f9d6078
specify different phpunit versions
Nyholm Nov 25, 2017
c7ade50
Removed phpunit
Nyholm Nov 25, 2017
3d4a53e
Updated comment
Nyholm Nov 26, 2017
1d2cb65
Run simple-phpunit install
Nyholm Nov 26, 2017
64ed481
Using phpunit-bridge 3.3
Nyholm Nov 26, 2017
cfe423b
updated comment
Nyholm Nov 26, 2017
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
54 changes: 35 additions & 19 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,10 @@ cache:
directories:
- $HOME/.composer/cache/files

php:
- 5.5
- 5.6
- 7.0
- 7.1
- 7.2

env:
global:
- TEST_COMMAND="composer test"
- SYMFONY_PHPUNIT_VERSION="6.3"
Copy link
Member

Choose a reason for hiding this comment

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

Did tests fail without exposing this environment variable? The bridge should pick the best PHPUnit version automatically if you don't do it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, it did. It was some issues with mattiasnoback/config-test.

Copy link
Contributor

Choose a reason for hiding this comment

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

Have you more details on those issues? I could look at it and maybe fix those in the library and so remove those variables from our travis file.


branches:
except:
Expand All @@ -24,26 +18,48 @@ branches:
matrix:
fast_finish: true
include:
# Minimum supported Symfony version and latest PHP version
- php: 7.1
env: DEPENDENCIES="minimum" COVERAGE=true TEST_COMMAND="composer test-ci" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7"

# Test the latest stable release
- php: 5.5
Copy link
Member

Choose a reason for hiding this comment

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

Not sure you need this job. There are two other jobs making use of PHP 5.5.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, maybe you are correct.

env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
- php: 7.2
env: DEPENDENCIES=dev
- php: hhvm
dist: trusty
# Test against LTS versions
env: SYMFONY_PHPUNIT_VERSION="5.7"
- php: 5.6
env: SYMFONY_PHPUNIT_VERSION="5.7"
- php: 7.0
env: SYMFONY_VERSION=2.8.*
- php: 7.1
- php: 7.2

# Test LTS versions
- php: 5.5
env: DEPENDENCIES="symfony/lts:^2"
- php: 5.5
env: DEPENDENCIES="symfony/lts:^3"
Copy link
Contributor

Choose a reason for hiding this comment

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

This allows some dependencies to be installed in their 2.x version. Is that wanted?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, That is fine.


# Latest commit to master
- php: 7.1
env: DEPENDENCIES="dev"

allow_failures:
# dev-master is allowed to fail.
- php: 7.1
env: DEPENDENCIES="dev"

before_install:
- if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
- if [ "$DEPENDENCIES" = "dev" ]; then sed -i '/prefer-stable/d' composer.json; fi;
- if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
- if [ $COVERAGE != true ]; then phpenv config-rm xdebug.ini; fi;
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
- if [ "$DEPENDENCIES" = "minimum" ]; then COMPOSER_FLAGS="--prefer-stable --prefer-lowest"; fi;
- if [ "$DEPENDENCIES" = "dev" ]; then composer config minimum-stability dev; fi;
- if [[ $DEPENDENCIES == *"/"* ]]; then composer require --no-update $DEPENDENCIES; fi;

install:
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355
- if [[ "$COMPOSER_FLAGS" == *"--prefer-lowest"* ]]; then composer update --prefer-dist --no-interaction --prefer-stable --quiet; fi
- composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction
- vendor/bin/simple-phpunit install

script:
- composer validate --strict --no-check-lock
- $TEST_COMMAND

after_success:
Expand Down
14 changes: 11 additions & 3 deletions Tests/Unit/Collector/StackPluginTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
use Http\HttplugBundle\Collector\StackPlugin;
use Http\Promise\FulfilledPromise;
use Http\Promise\RejectedPromise;
use PHPUnit\Framework\Error\Warning;
use PHPUnit\Framework\TestCase;
use Psr\Http\Message\RequestInterface;
use Psr\Http\Message\ResponseInterface;
Expand Down Expand Up @@ -188,8 +187,17 @@ public function testOnError()
$this->markTestSkipped();
}

//PHPUnit wrap any \Error into a \PHPUnit\Framework\Error\Warning.
$this->expectException(Warning::class);
/*
* Use the correct PHPUnit version
* PHPUnit wrap any \Error into a \PHPUnit\Framework\Error\Warning.
*/
if (class_exists('PHPUnit_Framework_Error')) {
// PHPUnit 5.7
$this->setExpectedException(\PHPUnit_Framework_Error::class);
} else {
// PHPUnit 6.0 and above
$this->expectException(\PHPUnit\Framework\Error\Warning::class);
}

$this->collector
->expects($this->once())
Expand Down
9 changes: 4 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,14 @@
"symfony/dependency-injection": "^2.8.3 || ^3.0.3"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.1",
"phpunit/php-token-stream": "^1.1.8",
"php-http/curl-client": "^1.0",
"php-http/socket-client": "^1.0",
"php-http/guzzle6-adapter": "^1.1.1",
"php-http/react-adapter": "^0.2.1",
"php-http/buzz-adapter": "^0.3",
"php-http/mock-client": "^1.0",
"symfony/phpunit-bridge": "^3.2",
"symfony/phpunit-bridge": "^3.3 || ^4.0",
"symfony/twig-bundle": "^2.8 || ^3.0",
"symfony/twig-bridge": "^2.8 || ^3.0",
"symfony/web-profiler-bundle": "^2.8 || ^3.0",
Expand All @@ -50,7 +49,7 @@
"symfony/browser-kit": "^2.8 || ^3.0",
"symfony/dom-crawler": "^2.8 || ^3.0",
"polishsymfonycommunity/symfony-mocker-container": "^1.0",
"matthiasnoback/symfony-dependency-injection-test": "^1.0 || ^2.0",
"matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.0",
"nyholm/nsa": "^1.1"
},
"conflict": {
Expand All @@ -69,8 +68,8 @@
]
},
"scripts": {
"test": "vendor/bin/phpunit",
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
"test": "vendor/bin/simple-phpunit",
"test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml"
},
"extra": {
"branch-alias": {
Expand Down