From 990182edb7311af363ee31d773ecdc4278783077 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 8 Nov 2018 07:41:57 +0100 Subject: [PATCH 1/5] Update branch-alias to 1.4.x-dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2b9696c..08ac5a0 100644 --- a/composer.json +++ b/composer.json @@ -67,7 +67,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } } } From 4a9070e81a869328538c9aa1429165e5ab0e78d4 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 8 Nov 2018 07:44:49 +0100 Subject: [PATCH 2/5] Drop support for PHP < 7.1 --- .travis.yml | 13 ++----------- composer.json | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb86826..8079f42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,21 +26,12 @@ after_script: - php ./vendor/bin/coveralls -v matrix: - exclude: - - php: 5.3 - dist: trusty allow_failures: - php: nightly include: - - php: 5.3 - dist: precise - env: COMPOSER_MEMORY_LIMIT=-1 - - php: 5.4 - - php: 5.5 - - php: 5.6 - env: DEPS="dev" COMPOSER_MEMORY_LIMIT=-1 - - php: 7.0 - php: 7.1 + - php: 7.1 + env: DEPS="dev" - php: 7.2 - php: 7.3 - php: nightly diff --git a/composer.json b/composer.json index 08ac5a0..c57c974 100644 --- a/composer.json +++ b/composer.json @@ -32,20 +32,20 @@ } ], "require": { - "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.7|~3.3|~4.0", - "doctrine/inflector": "~1.0", + "php": "^7.1", + "symfony/doctrine-bridge": "^3.4|^4.0", + "doctrine/inflector": "^1.0", "doctrine/cache": "^1.4.2" }, "require-dev": { - "phpunit/phpunit": "~4.8.36|~5.6|~6.5|~7.0", - "symfony/phpunit-bridge": "~2.7|~3.3|~4.0", - "symfony/yaml": "~2.7|~3.3|~4.0", - "symfony/validator": "~2.7|~3.3|~4.0", - "symfony/console": "~2.7|~3.3|~4.0", - "symfony/finder": "~2.7|~3.3|~4.0", - "symfony/framework-bundle": "~2.7|~3.3|~4.0", - "symfony/security-acl": "~2.7|~3.3", + "phpunit/phpunit": "^7.0", + "symfony/phpunit-bridge": "^3.4|^4.0", + "symfony/yaml": "^3.4|^4.0", + "symfony/validator": "^3.4|^4.0", + "symfony/console": "^3.4|^4.0", + "symfony/finder": "^3.4|^4.0", + "symfony/framework-bundle": "^3.4|^4.0", + "symfony/security-acl": "^2.8", "instaclick/coding-standard": "~1.1", "satooshi/php-coveralls": "^1.0", "squizlabs/php_codesniffer": "~1.5", From ef0a634781ba1afa607e52beb4dab358feeeb2b6 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Thu, 8 Nov 2018 07:54:11 +0100 Subject: [PATCH 3/5] Remove invalid code from phpunit configuration --- phpunit.xml.dist | 1 - 1 file changed, 1 deletion(-) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 2157842..62c9b11 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -7,7 +7,6 @@ processIsolation="false" backupGlobals="false" stopOnFailure="false" - syntaxCheck="false" colors="true"> From 6e1f23efa3819371a97478526093e524b1e07570 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 9 Nov 2018 16:40:02 +0100 Subject: [PATCH 4/5] Drop alignment in composer.json --- composer.json | 64 +++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/composer.json b/composer.json index c57c974..720fe3b 100644 --- a/composer.json +++ b/composer.json @@ -1,57 +1,57 @@ { - "name": "doctrine/doctrine-cache-bundle", - "homepage": "https://www.doctrine-project.org", - "description": "Symfony Bundle for Doctrine Cache", - "keywords": ["cache", "caching"], - "type": "symfony-bundle", - "license": "MIT", + "name": "doctrine/doctrine-cache-bundle", + "homepage": "https://www.doctrine-project.org", + "description": "Symfony Bundle for Doctrine Cache", + "keywords": ["cache", "caching"], + "type": "symfony-bundle", + "license": "MIT", "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" }, { - "name": "Fabio B. Silva", - "email": "fabio.bat.silva@gmail.com" + "name": "Fabio B. Silva", + "email": "fabio.bat.silva@gmail.com" }, { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@hotmail.com" + "name": "Guilherme Blanco", + "email": "guilhermeblanco@hotmail.com" }, { - "name": "Symfony Community", + "name": "Symfony Community", "homepage": "http://symfony.com/contributors" }, { - "name": "Doctrine Project", + "name": "Doctrine Project", "homepage": "http://www.doctrine-project.org/" } ], "require": { - "php": "^7.1", + "php": "^7.1", "symfony/doctrine-bridge": "^3.4|^4.0", - "doctrine/inflector": "^1.0", - "doctrine/cache": "^1.4.2" + "doctrine/inflector": "^1.0", + "doctrine/cache": "^1.4.2" }, "require-dev": { - "phpunit/phpunit": "^7.0", - "symfony/phpunit-bridge": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0", - "symfony/validator": "^3.4|^4.0", - "symfony/console": "^3.4|^4.0", - "symfony/finder": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/security-acl": "^2.8", - "instaclick/coding-standard": "~1.1", - "satooshi/php-coveralls": "^1.0", - "squizlabs/php_codesniffer": "~1.5", + "phpunit/phpunit": "^7.0", + "symfony/phpunit-bridge": "^3.4|^4.0", + "symfony/yaml": "^3.4|^4.0", + "symfony/validator": "^3.4|^4.0", + "symfony/console": "^3.4|^4.0", + "symfony/finder": "^3.4|^4.0", + "symfony/framework-bundle": "^3.4|^4.0", + "symfony/security-acl": "^2.8", + "instaclick/coding-standard": "~1.1", + "satooshi/php-coveralls": "^1.0", + "squizlabs/php_codesniffer": "~1.5", "instaclick/object-calisthenics-sniffs": "dev-master", - "instaclick/symfony2-coding-standard": "dev-remaster", - "predis/predis": "~0.8" + "instaclick/symfony2-coding-standard": "dev-remaster", + "predis/predis": "~0.8" }, "suggest": { "symfony/security-acl": "For using this bundle to cache ACLs" From 17072b1f1d2c0973f2b040d8cdb63492dae6d634 Mon Sep 17 00:00:00 2001 From: Andreas Braun Date: Fri, 9 Nov 2018 16:37:01 +0100 Subject: [PATCH 5/5] Use build stages for travis-ci --- .coveralls.yml | 2 +- .travis.yml | 67 ++++++++++++++++++++++-------------- Tests/travis/install-deps.sh | 17 --------- Tests/travis/php.ini | 4 --- 4 files changed, 43 insertions(+), 47 deletions(-) delete mode 100755 Tests/travis/install-deps.sh delete mode 100644 Tests/travis/php.ini diff --git a/.coveralls.yml b/.coveralls.yml index 67bd5dd..522a746 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,4 +1,4 @@ # for php-coveralls service_name: travis-ci src_dir: ./ -coverage_clover: build/logs/clover.xml +coverage_clover: clover.xml diff --git a/.travis.yml b/.travis.yml index 8079f42..f5e7199 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,36 +2,53 @@ language: php sudo: false dist: trusty +php: + - 7.1 + - 7.2 + - 7.3 + - nightly + +matrix: + allow_failures: + - php: nightly + cache: - directories: - - $HOME/.composer/cache + directories: + - $HOME/.composer/cache services: - - riak - - mongodb - - memcached - - redis-server + - mongodb + - memcached + - redis-server + +jobs: + include: + # Test against lowest dependencies + - stage: Test + php: 7.1 + env: COMPOSER_FLAGS="--prefer-lowest" + + # Test against dev dependencies on the newest version + - stage: Test + php: 7.3 + env: DEPS="dev" -before_script: - - ./Tests/travis/install-deps.sh - - composer self-update - - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi; - - composer update --prefer-dist + - stage: Code Quality + php: 7.1 + script: + - ./vendor/bin/phpcs -np --extensions=php --ignore=vendor/*,Tests/* --standard=ruleset.xml . + after_script: + +before_install: + - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + +install: + - if [ "$DEPS" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi; + - composer update --prefer-dist $COMPOSER_FLAGS script: - - ./vendor/bin/phpunit -v --coverage-clover ./build/logs/clover.xml - - ./vendor/bin/phpcs -np --extensions=php --ignore=vendor/*,Tests/* --standard=ruleset.xml . + - ./vendor/bin/phpunit -v --coverage-clover clover.xml after_script: - - php ./vendor/bin/coveralls -v - -matrix: - allow_failures: - - php: nightly - include: - - php: 7.1 - - php: 7.1 - env: DEPS="dev" - - php: 7.2 - - php: 7.3 - - php: nightly + - php ./vendor/bin/coveralls -v diff --git a/Tests/travis/install-deps.sh b/Tests/travis/install-deps.sh deleted file mode 100755 index a04d84a..0000000 --- a/Tests/travis/install-deps.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -BASEDIR=$(dirname $0); - -if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then - exit 0; -fi - -VERSION_NAME=$(phpenv version-name) - -if [ $VERSION_NAME = "5.3" ] || [ $VERSION_NAME = "5.4" ] || [ $VERSION_NAME = "5.5" ] || [ $VERSION_NAME = "5.6" ]; then - echo "extension = mongo.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini - echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini -fi - -pecl install riak -phpenv config-add $BASEDIR/php.ini diff --git a/Tests/travis/php.ini b/Tests/travis/php.ini deleted file mode 100644 index ec6e621..0000000 --- a/Tests/travis/php.ini +++ /dev/null @@ -1,4 +0,0 @@ -extension="memcached.so" - -apc.enabled=1 -apc.enable_cli=1