From 2a03ff39a2964108a333f7d2a59fde485d685d28 Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Thu, 28 Dec 2017 13:31:12 +0100 Subject: [PATCH 1/9] Update composer.json allowing symfony 4 usage --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 4becb48..4facd2d 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.5.9", - "symfony/framework-bundle": "~2.8|~3.0" + "symfony/framework-bundle": "~2.8|~3.0|4.0" }, "autoload": { "psr-4": { "Lexik\\Bundle\\CurrencyBundle\\": "" } From d1a0a20bf216ba5f7a88f1816753ef19f98a4bb9 Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Fri, 29 Dec 2017 23:43:17 +0100 Subject: [PATCH 2/9] Update adapters.xml lexik_currency.adapter_collector should be public for this bundle to work but sf4 changes every service to private by default --- Resources/config/adapters.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/config/adapters.xml b/Resources/config/adapters.xml index 44446a4..5e58ac5 100644 --- a/Resources/config/adapters.xml +++ b/Resources/config/adapters.xml @@ -17,7 +17,7 @@ - + From 7c52882d3c45ec4a43f81b2f33c420da2d4c0d0b Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 13:37:08 +0100 Subject: [PATCH 3/9] Update .travis.yml Added modern versions of php - 7.1 + 7.2 Added new symfony versions 3.4 and 4.0 --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8ae9a95..5d9444b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ php: - 5.5 - 5.6 - 7.0 + - 7.1 + - 7.2 matrix: fast_finish: true @@ -20,6 +22,8 @@ env: - SYMFONY_VERSION=3.1.* - SYMFONY_VERSION=3.2.* - SYMFONY_VERSION=3.3.* + - SYMFONY_VERSION=3.4.* + - SYMFONY_VERSION=4.0.* before_install: - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update From c543174dfca440b0ccce86a82c3f348507bd11ed Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 14:34:01 +0100 Subject: [PATCH 4/9] Update .travis.yml enforcing phpunit 5.7 (default verstion for php 7 is phpunit 6 and it is not compatible with old tests) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5d9444b..3db146c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ env: - SYMFONY_VERSION=4.0.* before_install: + - curl -sSf -o ~/.phpenv/versions/hhvm/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update - composer require doctrine/doctrine-bundle:~1.5 --no-update - composer require doctrine/orm:~2.4 --no-update From 7a4845b187eb8031b7ab45d187cd8994d3c5a230 Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 14:44:54 +0100 Subject: [PATCH 5/9] Update composer.json Adding phpunit to requirement to safely running test and avoiding phpunit 6 problems --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index 4facd2d..be92f8f 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,9 @@ "php": ">=5.5.9", "symfony/framework-bundle": "~2.8|~3.0|4.0" }, + "require-dev": { + "phpunit/phpunit": "^5.7" + } "autoload": { "psr-4": { "Lexik\\Bundle\\CurrencyBundle\\": "" } } From c9f9576bcccc67a764e210d0f938152bc4b01f43 Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 14:45:52 +0100 Subject: [PATCH 6/9] Update .travis.yml Removed custom phpunit install --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3db146c..5d9444b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,6 @@ env: - SYMFONY_VERSION=4.0.* before_install: - - curl -sSf -o ~/.phpenv/versions/hhvm/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar - composer require symfony/framework-bundle:${SYMFONY_VERSION} --no-update - composer require doctrine/doctrine-bundle:~1.5 --no-update - composer require doctrine/orm:~2.4 --no-update From 1ea69c7790bc04bcaa34e086d6aa8f56c720c26b Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 15:06:49 +0100 Subject: [PATCH 7/9] Update composer.json fixed syntax error in json file --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index be92f8f..f674227 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ }, "require-dev": { "phpunit/phpunit": "^5.7" - } + }, "autoload": { "psr-4": { "Lexik\\Bundle\\CurrencyBundle\\": "" } } From 3e335f9436e699d9006eea50aa88ebb14a5cd19e Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 15:21:02 +0100 Subject: [PATCH 8/9] Update composer.json less strict phpunit version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f674227..07fc6a9 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ "symfony/framework-bundle": "~2.8|~3.0|4.0" }, "require-dev": { - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^4.5|^5.7" }, "autoload": { "psr-4": { "Lexik\\Bundle\\CurrencyBundle\\": "" } From 724cce2f905fd49fb0ee1bd23bfcad341bd0312e Mon Sep 17 00:00:00 2001 From: lukaszwit Date: Sat, 30 Dec 2017 15:28:23 +0100 Subject: [PATCH 9/9] Update composer.json improved version requirements --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 07fc6a9..5940a38 100644 --- a/composer.json +++ b/composer.json @@ -16,8 +16,8 @@ } ], "require": { - "php": ">=5.5.9", - "symfony/framework-bundle": "~2.8|~3.0|4.0" + "php": ">=5.5.9|^7.0", + "symfony/framework-bundle": "~2.8|~3.0|~4.0" }, "require-dev": { "phpunit/phpunit": "^4.5|^5.7"