From d04ab109e609538d8b82a23787bd971143a6bb22 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 20:43:18 +0100 Subject: [PATCH 01/14] Test on symfony 4 --- .travis.yml | 89 +++++++++++++++++++++++++++++++++------------------ composer.json | 10 ++++-- 2 files changed, 66 insertions(+), 33 deletions(-) diff --git a/.travis.yml b/.travis.yml index dfa28c1..2136092 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,49 +1,76 @@ language: php + sudo: false -dist: trusty -php: - - 7.1 - - 7.0 - - 5.6 - - hhvm +cache: + directories: + - $HOME/.composer/cache/files + - $HOME/symfony-bridge/.phpunit env: - global: - - COMPOSER_COMMAND="composer install --prefer-dist" - - TEST_COMMAND="php vendor/bin/phpunit" - - COVERAGE=false - matrix: - - SYMFONY_VERSION=2.7.* - - SYMFONY_VERSION=2.8.* - - SYMFONY_VERSION=3.1.* - - SYMFONY_VERSION=3.2.* + global: + - TEST_COMMAND="composer test" + - SYMFONY_PHPUNIT_VERSION="6.3" + - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit" branches: - except: - - /^analysis-.*$/ - - /^patch-.*$/ + except: + - /^analysis-.*$/ matrix: - fast_finish: true - include: - - php: 5.6 - env: COMPOSER_COMMAND="composer update --prefer-lowest --prefer-stable" COVERAGE=true TEST_COMMAND="php -dzend_extension=xdebug.so vendor/bin/phpunit --coverage-clover=coverage.xml" SYMFONY_VERSION=2.7.* + fast_finish: true + include: + # Minimum supported Symfony version and latest PHP version + - php: 7.2 + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" + - php: 5.6 + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" -cache: - directories: - - $HOME/.composer/cache + # Test the latest stable release + - php: 5.6 + env: SYMFONY_PHPUNIT_VERSION="5.7" + - php: 7.0 + - php: 7.1 + - php: 7.2 + env: COVERAGE=true TEST_COMMAND="composer test-ci" + + # Test LTS versions + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^2" + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^3" + - php: 7.2 + env: DEPENDENCIES="dunglas/symfony-lock:^4" + + # Latest commit to master + - php: 7.2 + env: STABILITY="dev" + + allow_failures: + # dev stability is allowed to fail. + - env: STABILITY="dev" before_install: - - if [[ $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi; - - pip install --user codecov - - composer require symfony/symfony:${SYMFONY_VERSION} --no-update + - if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi + - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi; + - if ! [ -v "$DEPENDENCIES" ]; then composer require --no-update ${DEPENDENCIES}; fi; + - pip install --user codecov install: - - travis_retry ${COMPOSER_COMMAND} --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: - - $TEST_COMMAND + - composer validate --strict --no-check-lock + - $TEST_COMMAND after_success: - - if [[ "$COVERAGE" = true ]]; then codecov; fi + - if [[ $COVERAGE = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [[ $COVERAGE = true ]]; then php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml; fi + - if [[ "$COVERAGE" = true ]]; then codecov; fi + +after_script: + - wget http://tnyholm.se/reporter.phar + - php reporter.phar build:upload diff --git a/composer.json b/composer.json index 4c23021..70f9e9f 100644 --- a/composer.json +++ b/composer.json @@ -32,10 +32,9 @@ "nyholm/nsa": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^5.7.17", - "symfony/symfony": "^2.7 || ^3.0", "cache/psr-6-doctrine-bridge": "^3.0", "cache/array-adapter": "^1.0", + "symfony/phpunit-bridge": "^3.3 || ^4.0", "nyholm/symfony-bundle-test": "^1.2", "matthiasnoback/symfony-dependency-injection-test": "^1.0" }, @@ -52,5 +51,12 @@ "psr-4": { "Cache\\CacheBundle\\Tests\\": "tests/" } + }, + "scripts": { + "test": "vendor/bin/simple-phpunit", + "test-ci": "vendor/bin/simple-phpunit --coverage-text --coverage-clover=build/coverage.xml" + }, + "config": { + "sort-packages": true } } From cb3217b2571bf6a4c40e2b90333b3d8cbe288523 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 20:49:39 +0100 Subject: [PATCH 02/14] sort packages --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 70f9e9f..897dc9c 100644 --- a/composer.json +++ b/composer.json @@ -32,11 +32,11 @@ "nyholm/nsa": "^1.1" }, "require-dev": { - "cache/psr-6-doctrine-bridge": "^3.0", "cache/array-adapter": "^1.0", - "symfony/phpunit-bridge": "^3.3 || ^4.0", + "cache/psr-6-doctrine-bridge": "^3.0", + "matthiasnoback/symfony-dependency-injection-test": "^1.0", "nyholm/symfony-bundle-test": "^1.2", - "matthiasnoback/symfony-dependency-injection-test": "^1.0" + "symfony/phpunit-bridge": "^3.3 || ^4.0" }, "suggest": { "cache/adapter-bundle": "To register PSR-6 compliant cache implementations as services.", From d3e710757fc89dfbfb11fbd14134f685fe056d1b Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:05:06 +0100 Subject: [PATCH 03/14] Fixed tests --- .travis.yml | 1 + composer.json | 18 +++++++++++++----- tests/Functional/BundleInitializationTest.php | 19 ++++++++++++++----- tests/Functional/config.yml | 7 ------- tests/Functional/sf2_and_3.yml | 7 +++++++ 5 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 tests/Functional/sf2_and_3.yml diff --git a/.travis.yml b/.travis.yml index 2136092..396fccb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,7 @@ env: - TEST_COMMAND="composer test" - SYMFONY_PHPUNIT_VERSION="6.3" - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit" + - SYMFONY_DEPRECATIONS_HELPER="weak" branches: except: diff --git a/composer.json b/composer.json index 897dc9c..47d9c5d 100644 --- a/composer.json +++ b/composer.json @@ -25,18 +25,26 @@ ], "require": { "php": "^5.6 || ^7.0", - "symfony/framework-bundle": "^2.7 || ^3.0", - "symfony/var-dumper": "^3.3", - "cache/taggable-cache": "^1.0", "cache/session-handler": "^1.0", - "nyholm/nsa": "^1.1" + "cache/taggable-cache": "^1.0", + "dunglas/symfony-lock": "^3", + "nyholm/nsa": "^1.1", + "symfony/config": "^2.7 || ^3.0 || ^4.0", + "symfony/console": "^2.7 || ^3.0 || ^4.0", + "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", + "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0", + "symfony/http-foundation": "^2.7 || ^3.0 || ^4.0", + "symfony/http-kernel": "^2.7 || ^3.0 || ^4.0", + "symfony/var-dumper": "^2.7 || ^3.3 || ^4.0" }, "require-dev": { "cache/array-adapter": "^1.0", "cache/psr-6-doctrine-bridge": "^3.0", "matthiasnoback/symfony-dependency-injection-test": "^1.0", "nyholm/symfony-bundle-test": "^1.2", - "symfony/phpunit-bridge": "^3.3 || ^4.0" + "symfony/phpunit-bridge": "^3.3 || ^4.0", + "symfony/validator": "^2.7 || ^3.0 || ^4.0", + "symfony/routing": "^2.7 || ^3.0 || ^4.0" }, "suggest": { "cache/adapter-bundle": "To register PSR-6 compliant cache implementations as services.", diff --git a/tests/Functional/BundleInitializationTest.php b/tests/Functional/BundleInitializationTest.php index a0a935e..109d4a7 100644 --- a/tests/Functional/BundleInitializationTest.php +++ b/tests/Functional/BundleInitializationTest.php @@ -17,6 +17,8 @@ use Cache\CacheBundle\Routing\CachingRouter; use Cache\SessionHandler\Psr6SessionHandler; use Nyholm\BundleTest\BaseBundleTestCase; +use Symfony\Component\HttpKernel\HttpKernel; +use Symfony\Component\HttpKernel\Kernel; /** * @author Tobias Nyholm @@ -33,6 +35,10 @@ protected function setUp() parent::setUp(); $kernel = $this->createKernel(); $kernel->addConfigFile(__DIR__.'/config.yml'); + + if (Kernel::MAJOR_VERSION < 4) { + $kernel->addConfigFile(__DIR__.'/sf2_and_3.yml'); + } } public function testInitBundle() @@ -41,10 +47,13 @@ public function testInitBundle() $container = $this->getContainer(); $this->assertTrue($container->hasParameter('cache.provider_service_ids')); - $this->assertInstanceOf(DoctrineCacheBridge::class, $container->get('cache.service.annotation')); - $this->assertInstanceOf(DoctrineCacheBridge::class, $container->get('cache.service.serializer')); - $this->assertInstanceOf(SymfonyValidatorBridge::class, $container->get('cache.service.validation')); - $this->assertInstanceOf(Psr6SessionHandler::class, $container->get('cache.service.session')); - $this->assertInstanceOf(CachingRouter::class, $container->get('cache.service.router')); + + if (Kernel::MAJOR_VERSION < 4) { + $this->assertInstanceOf(DoctrineCacheBridge::class, $container->get('cache.service.annotation')); + $this->assertInstanceOf(DoctrineCacheBridge::class, $container->get('cache.service.serializer')); + $this->assertInstanceOf(SymfonyValidatorBridge::class, $container->get('cache.service.validation')); + $this->assertInstanceOf(Psr6SessionHandler::class, $container->get('cache.service.session')); + $this->assertInstanceOf(CachingRouter::class, $container->get('cache.service.router')); + } } } diff --git a/tests/Functional/config.yml b/tests/Functional/config.yml index 75d87b9..e4446c9 100644 --- a/tests/Functional/config.yml +++ b/tests/Functional/config.yml @@ -29,10 +29,3 @@ cache: service_id: 'array_cache' use_tagging: true -framework: - annotations: - cache: 'cache.service.annotation' - serializer: - cache: 'cache.service.serializer' - validation: - cache: 'cache.service.validation' diff --git a/tests/Functional/sf2_and_3.yml b/tests/Functional/sf2_and_3.yml new file mode 100644 index 0000000..df18346 --- /dev/null +++ b/tests/Functional/sf2_and_3.yml @@ -0,0 +1,7 @@ +framework: + annotations: + cache: 'cache.service.annotation' + serializer: + cache: 'cache.service.serializer' + validation: + cache: 'cache.service.validation' From 84397f92bb62f22c58a5c89af237adcc0ef2ca5b Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:05:20 +0100 Subject: [PATCH 04/14] Removed debug code --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 47d9c5d..45b2047 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,6 @@ "php": "^5.6 || ^7.0", "cache/session-handler": "^1.0", "cache/taggable-cache": "^1.0", - "dunglas/symfony-lock": "^3", "nyholm/nsa": "^1.1", "symfony/config": "^2.7 || ^3.0 || ^4.0", "symfony/console": "^2.7 || ^3.0 || ^4.0", From c717257b6a56410e701a8ef98ffc74a7a8ab4086 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:19:38 +0100 Subject: [PATCH 05/14] Adding doctrine annotations and force new versions of PHPUnut --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 396fccb..45e3513 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,23 +23,23 @@ matrix: include: # Minimum supported Symfony version and latest PHP version - php: 7.2 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" - php: 5.6 - env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" SYMFONY_PHPUNIT_VERSION="5.7" + env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" SYMFONY_DEPRECATIONS_HELPER="weak" # Test the latest stable release - php: 5.6 - env: SYMFONY_PHPUNIT_VERSION="5.7" - php: 7.0 + DEPENDENCIES="doctrine/annotations" - php: 7.1 - php: 7.2 env: COVERAGE=true TEST_COMMAND="composer test-ci" # Test LTS versions - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2" + env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations " - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^3" + env: DEPENDENCIES="dunglas/symfony-lock:^3 doctrine/annotations" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" From e4dda000da073e17e8cfade4fa8a8a2a9806595c Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:20:03 +0100 Subject: [PATCH 06/14] typo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 45e3513..2e23df3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ matrix: # Test the latest stable release - php: 5.6 - php: 7.0 - DEPENDENCIES="doctrine/annotations" + env: DEPENDENCIES="doctrine/annotations" - php: 7.1 - php: 7.2 env: COVERAGE=true TEST_COMMAND="composer test-ci" From 1d487c167f82eca4de4ca898f19010d9556f3ac3 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:29:18 +0100 Subject: [PATCH 07/14] Better deps --- .travis.yml | 1 - composer.json | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2e23df3..9782766 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,6 @@ cache: env: global: - TEST_COMMAND="composer test" - - SYMFONY_PHPUNIT_VERSION="6.3" - SYMFONY_PHPUNIT_DIR="$HOME/symfony-bridge/.phpunit" - SYMFONY_DEPRECATIONS_HELPER="weak" diff --git a/composer.json b/composer.json index 45b2047..bb1aa8f 100644 --- a/composer.json +++ b/composer.json @@ -39,11 +39,13 @@ "require-dev": { "cache/array-adapter": "^1.0", "cache/psr-6-doctrine-bridge": "^3.0", + "doctrine/annotations": "^1.0", "matthiasnoback/symfony-dependency-injection-test": "^1.0", "nyholm/symfony-bundle-test": "^1.2", "symfony/phpunit-bridge": "^3.3 || ^4.0", - "symfony/validator": "^2.7 || ^3.0 || ^4.0", - "symfony/routing": "^2.7 || ^3.0 || ^4.0" + "symfony/routing": "^2.7 || ^3.0 || ^4.0", + "symfony/serializer": "^2.7 || ^3.0 || ^4.0", + "symfony/validator": "^2.7 || ^3.0 || ^4.0" }, "suggest": { "cache/adapter-bundle": "To register PSR-6 compliant cache implementations as services.", From 84cf6dc38159a15e61ac141b60d411bf687caf2f Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:52:20 +0100 Subject: [PATCH 08/14] Bugfix --- .travis.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9782766..b9dbc8b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: # Test LTS versions - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations " + env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/serializer-bundle" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3 doctrine/annotations" - php: 7.2 diff --git a/composer.json b/composer.json index bb1aa8f..a9ac720 100644 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ "cache/array-adapter": "^1.0", "cache/psr-6-doctrine-bridge": "^3.0", "doctrine/annotations": "^1.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.0", + "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.3", "nyholm/symfony-bundle-test": "^1.2", "symfony/phpunit-bridge": "^3.3 || ^4.0", "symfony/routing": "^2.7 || ^3.0 || ^4.0", From a70fcd2a7dff0fcee338441d2438051338612c3c Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 21:59:45 +0100 Subject: [PATCH 09/14] serializer-bundle does not exists =) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b9dbc8b..a956e3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: # Test LTS versions - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/serializer-bundle" + env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/framework-bundle" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3 doctrine/annotations" - php: 7.2 From dc98a0a261d179abcca4a392c0ef519a74ff214a Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 22:04:36 +0100 Subject: [PATCH 10/14] cs --- tests/Functional/BundleInitializationTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Functional/BundleInitializationTest.php b/tests/Functional/BundleInitializationTest.php index 109d4a7..5f24762 100644 --- a/tests/Functional/BundleInitializationTest.php +++ b/tests/Functional/BundleInitializationTest.php @@ -17,7 +17,6 @@ use Cache\CacheBundle\Routing\CachingRouter; use Cache\SessionHandler\Psr6SessionHandler; use Nyholm\BundleTest\BaseBundleTestCase; -use Symfony\Component\HttpKernel\HttpKernel; use Symfony\Component\HttpKernel\Kernel; /** From 9982f3bada438daa4e99c42a4fab8760e9a2cc88 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 22:06:14 +0100 Subject: [PATCH 11/14] Better specify versions --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a956e3c..01adc0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: # Test LTS versions - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/framework-bundle" + env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/framework-bundle:^2.8" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3 doctrine/annotations" - php: 7.2 From ee69667ea70d67f1dbcb7c9cdba414ccddc66b77 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 22:21:21 +0100 Subject: [PATCH 12/14] Test fix on sf2.7 --- .travis.yml | 2 +- composer.json | 1 - tests/Functional/DummyNormalizer.php | 18 ++++++++++++++++++ tests/Functional/config.yml | 5 +++++ 4 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 tests/Functional/DummyNormalizer.php diff --git a/.travis.yml b/.travis.yml index 01adc0f..b3ca1e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ matrix: # Test LTS versions - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/framework-bundle:^2.8" + env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/property-access" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3 doctrine/annotations" - php: 7.2 diff --git a/composer.json b/composer.json index a9ac720..a6c9ebf 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,6 @@ "require-dev": { "cache/array-adapter": "^1.0", "cache/psr-6-doctrine-bridge": "^3.0", - "doctrine/annotations": "^1.0", "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.3", "nyholm/symfony-bundle-test": "^1.2", "symfony/phpunit-bridge": "^3.3 || ^4.0", diff --git a/tests/Functional/DummyNormalizer.php b/tests/Functional/DummyNormalizer.php new file mode 100644 index 0000000..bf0f51e --- /dev/null +++ b/tests/Functional/DummyNormalizer.php @@ -0,0 +1,18 @@ + Date: Sat, 13 Jan 2018 22:24:29 +0100 Subject: [PATCH 13/14] minor --- .travis.yml | 5 ++--- composer.json | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b3ca1e5..4bc508e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,16 +29,15 @@ matrix: # Test the latest stable release - php: 5.6 - php: 7.0 - env: DEPENDENCIES="doctrine/annotations" - php: 7.1 - php: 7.2 env: COVERAGE=true TEST_COMMAND="composer test-ci" # Test LTS versions - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2 doctrine/annotations symfony/property-access" + env: DEPENDENCIES="dunglas/symfony-lock:^2 symfony/property-access:^2.8" - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^3 doctrine/annotations" + env: DEPENDENCIES="dunglas/symfony-lock:^3" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" diff --git a/composer.json b/composer.json index a6c9ebf..a9ac720 100644 --- a/composer.json +++ b/composer.json @@ -39,6 +39,7 @@ "require-dev": { "cache/array-adapter": "^1.0", "cache/psr-6-doctrine-bridge": "^3.0", + "doctrine/annotations": "^1.0", "matthiasnoback/symfony-dependency-injection-test": "^1.1 || ^2.3", "nyholm/symfony-bundle-test": "^1.2", "symfony/phpunit-bridge": "^3.3 || ^4.0", From 54a3bbde27b745ef2b3124d6e5b2785fc01a579c Mon Sep 17 00:00:00 2001 From: Nyholm Date: Sat, 13 Jan 2018 22:35:16 +0100 Subject: [PATCH 14/14] cs --- tests/Functional/DummyNormalizer.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/Functional/DummyNormalizer.php b/tests/Functional/DummyNormalizer.php index bf0f51e..eba0227 100644 --- a/tests/Functional/DummyNormalizer.php +++ b/tests/Functional/DummyNormalizer.php @@ -1,12 +1,21 @@ , Tobias Nyholm + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + namespace Cache\CacheBundle\Tests\Functional; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; class DummyNormalizer implements NormalizerInterface { - public function normalize($object, $format = null, array $context = array()) + public function normalize($object, $format = null, array $context = []) { return []; }