From 62ef1053907960b10d6388656456bdea93478b36 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 27 Dec 2018 08:30:27 +0100 Subject: [PATCH 1/4] Use phpunit 6.5 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 066a8cd9..d7f2f764 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ branches: env: global: - TEST_COMMAND="composer test" - - SYMFONY_PHPUNIT_VERSION="6.3" + - SYMFONY_PHPUNIT_VERSION="6.5" - COMPOSER_MEMORY_LIMIT=-1 matrix: From d69ebc49799ce91218e5b47d8372e43aadaaa7ec Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 27 Dec 2018 08:39:30 +0100 Subject: [PATCH 2/4] Bump to sf 3.4 and php 7.1 --- .travis.yml | 12 +----------- composer.json | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7f2f764..ae3b24be 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,28 +25,18 @@ matrix: # Test with lowest dependencies - php: 7.1 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" # Test the latest stable release - - php: 5.6 - env: SYMFONY_PHPUNIT_VERSION="5.7" - - php: 5.6 - env: SYMFONY_PHPUNIT_VERSION="5.7" - - php: 7.0 - php: 7.1 - php: 7.3 - php: 7.4snapshot # Force some major versions of Symfony - - php: 7.2 - env: DEPENDENCIES="dunglas/symfony-lock:^2 symfony/property-access:^2.8" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^3" - php: 7.2 env: DEPENDENCIES="dunglas/symfony-lock:^4" - - php: 7.0 - env: DEPENDENCIES="dunglas/symfony-lock:^2 twig/twig:^1.34,<1.39 symfony/property-access:^2.8" + # Latest commit to master - php: 7.2 diff --git a/composer.json b/composer.json index d8919f10..c2f946a7 100644 --- a/composer.json +++ b/composer.json @@ -10,13 +10,13 @@ } ], "require": { - "php": "^5.5 || ^7.0", - "symfony/framework-bundle": "^2.7 || ^3.0 || ^4.0", - "symfony/validator": "^2.7 || ^3.0 || ^4.0", - "symfony/translation": "^2.7 || ^3.0 || ^4.0,<4.2", - "symfony/twig-bundle": "^2.7 || ^3.0 || ^4.0", - "symfony/finder": "^2.7 || ^3.0 || ^4.0", - "symfony/intl": "^2.7 || ^3.0 || ^4.0", + "php": "^7.1", + "symfony/framework-bundle": "^3.4 || ^4.0", + "symfony/validator": "^3.4 || ^4.0", + "symfony/translation": "^3.4 || ^4.0,<4.2", + "symfony/twig-bundle": "^3.4 || ^4.0", + "symfony/finder": "^3.4 || ^4.0", + "symfony/intl": "^3.4 || ^4.0", "php-translation/common": "^1.0", "php-translation/symfony-storage": "^1.0", @@ -25,21 +25,21 @@ "twig/twig": "<1.39 || ^2.0,<2.8" }, "require-dev": { - "symfony/phpunit-bridge": "^3.4.19 || ^4.0", + "symfony/phpunit-bridge": "^4.2", "php-translation/translator": "^1.0", "php-http/curl-client": "^1.7", "php-http/message": "^1.6", "php-http/message-factory": "^1.0.2", - "symfony/console": "^2.7 || ^3.0 || ^4.0", - "symfony/twig-bridge": "^2.7 || ^3.0 || ^4.0", - "symfony/asset": "^2.7 || ^3.0 || ^4.0", - "symfony/templating": "^2.7 || ^3.0 || ^4.0", - "symfony/dependency-injection": "^2.7 || ^3.0 || ^4.0", - "symfony/web-profiler-bundle": "^2.7 || ^3.0 || ^4.0", - "matthiasnoback/symfony-dependency-injection-test": "^1.2 || ^2.3 || ^3.0", - "matthiasnoback/symfony-config-test": "^2.2 || ^3.1 || ^4.0", - "guzzlehttp/psr7": "^1.4", - "nyholm/symfony-bundle-test": "^1.2.3" + "symfony/console": "^3.4 || ^4.0", + "symfony/twig-bridge": "^3.4 || ^4.0", + "symfony/asset": "^3.4 || ^4.0", + "symfony/templating": "^3.4 || ^4.0", + "symfony/dependency-injection": "^3.4 || ^4.0", + "symfony/web-profiler-bundle": "^3.4 || ^4.0", + "matthiasnoback/symfony-dependency-injection-test": "^3.1", + "matthiasnoback/symfony-config-test": "^4.0", + "guzzlehttp/psr7": "^1.5", + "nyholm/symfony-bundle-test": "^1.4" }, "suggest": { "php-http/httplug-bundle": "To easier configure your httplug clients." From f86029372bbdc811f3a8d976e346878b3732b310 Mon Sep 17 00:00:00 2001 From: Nyholm Date: Fri, 19 Jul 2019 16:25:27 -0700 Subject: [PATCH 3/4] Added changelog --- Changelog.md | 7 +++++++ composer.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 24c8c9f3..bef98ee0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,13 @@ The change log describes what is "Added", "Removed", "Changed" or "Fixed" between each release. +## 0.9.0 + +### Removed + +- Support for PHP < 7.1 +- Support for Symfony < 3.4 + ## 0.8.2 ### Added diff --git a/composer.json b/composer.json index c2f946a7..b539b67c 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "symfony/web-profiler-bundle": "^3.4 || ^4.0", "matthiasnoback/symfony-dependency-injection-test": "^3.1", "matthiasnoback/symfony-config-test": "^4.0", - "guzzlehttp/psr7": "^1.5", + "nyholm/psr7": "^1.1", "nyholm/symfony-bundle-test": "^1.4" }, "suggest": { From 7ae150afca39bda69e51c5bf08e6f189fa57af0d Mon Sep 17 00:00:00 2001 From: Nyholm Date: Fri, 19 Jul 2019 16:29:59 -0700 Subject: [PATCH 4/4] PHPUnit fixes --- .travis.yml | 2 +- phpunit.xml.dist | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index ae3b24be..b2deffa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ matrix: # Test with lowest dependencies - php: 7.1 - 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: 7.1 diff --git a/phpunit.xml.dist b/phpunit.xml.dist index baabcc35..99da1a15 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -8,17 +8,13 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="false" - codecoverage="true" bootstrap="./vendor/autoload.php" > - - ./Tests