From f03da0d0c70f585e4acfb4fe83d76debfce243be Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 11:59:06 +0200 Subject: [PATCH 1/8] remove dependency to symfony/symfony Libraries should not depend on metapackage symfony/symfony, but on the Symfony components they use. See https://symfony.com/doc/current/setup/flex.html#upgrading-existing-applications-to-flex --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1ed2811..e3a93f5 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,11 @@ ], "require": { "php": ">=5.5.0", - "symfony/symfony": "~2.6|~3.0", + "symfony/dependency-injection": "~2.6|~3.0", + "symfony/config": "~2.6|~3.0", + "symfony/http-kernel": "~2.6|~3.0", + "symfony/form": "~2.6|~3.0", + "symfony/validator": "~2.6|~3.0", "doctrine/orm": "~2.3" }, "require-dev": { From f760196807ad563ba2d6c36dd84b3e06a15e28b0 Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 12:27:44 +0200 Subject: [PATCH 2/8] add yaml as a dependency --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index e3a93f5..3c2c360 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "symfony/http-kernel": "~2.6|~3.0", "symfony/form": "~2.6|~3.0", "symfony/validator": "~2.6|~3.0", + "symfony/yaml": "~2.6|~3.0", "doctrine/orm": "~2.3" }, "require-dev": { From 2349e68f526d8bac7dfb6ee3a41f4b6fc298ab2e Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 12:42:46 +0200 Subject: [PATCH 3/8] fix Yaml problem by using own PHPUnit --- .travis.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b78da67..31759d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_install: install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS script: - - phpunit --coverage-clover=coverage.clover + - ./vendor/bin/phpunit --coverage-clover=coverage.clover after_script: - wget https://scrutinizer-ci.com/ocular.phar diff --git a/composer.json b/composer.json index 3c2c360..1e9fe8b 100644 --- a/composer.json +++ b/composer.json @@ -18,10 +18,10 @@ "symfony/http-kernel": "~2.6|~3.0", "symfony/form": "~2.6|~3.0", "symfony/validator": "~2.6|~3.0", - "symfony/yaml": "~2.6|~3.0", "doctrine/orm": "~2.3" }, "require-dev": { + "phpunit/phpunit": ">=4.5.0", "phake/phake": ">=2.0.0@dev" }, "autoload": { From 242707004f0ccb55f86448f2d478aae2d14caf98 Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 13:59:59 +0200 Subject: [PATCH 4/8] add Doctrine Bridge to requirements --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 1e9fe8b..dc950be 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "symfony/http-kernel": "~2.6|~3.0", "symfony/form": "~2.6|~3.0", "symfony/validator": "~2.6|~3.0", + "symfony/doctrine-bridge": "~2.6|~3.0", "doctrine/orm": "~2.3" }, "require-dev": { From a3ff5affb9499e4585e94a6ead04f7354386bb1c Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 14:11:06 +0200 Subject: [PATCH 5/8] do not use PHP Unit 6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dc950be..dbf8f48 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/orm": "~2.3" }, "require-dev": { - "phpunit/phpunit": ">=4.5.0", + "phpunit/phpunit": ">=4.5.0,<=6", "phake/phake": ">=2.0.0@dev" }, "autoload": { From dd1bb0d8153c1a6c96df38f6e277c859511e1db7 Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 14:15:29 +0200 Subject: [PATCH 6/8] do not use PHP Unit 6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index dbf8f48..3b43be2 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "doctrine/orm": "~2.3" }, "require-dev": { - "phpunit/phpunit": ">=4.5.0,<=6", + "phpunit/phpunit": ">=4.5.0,<6", "phake/phake": ">=2.0.0@dev" }, "autoload": { From 862e6dd282b951c334de456fb96cabc5a13c5fff Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 14:21:16 +0200 Subject: [PATCH 7/8] add yaml as a dependency --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 3b43be2..8c59d3c 100644 --- a/composer.json +++ b/composer.json @@ -18,6 +18,7 @@ "symfony/http-kernel": "~2.6|~3.0", "symfony/form": "~2.6|~3.0", "symfony/validator": "~2.6|~3.0", + "symfony/yaml": "~2.6|~3.0", "symfony/doctrine-bridge": "~2.6|~3.0", "doctrine/orm": "~2.3" }, From 11d87ba4676a1ac97184ccc209d68459273206c0 Mon Sep 17 00:00:00 2001 From: Oliver Tischlinger Date: Thu, 17 May 2018 14:25:20 +0200 Subject: [PATCH 8/8] add symfony translation as dependency --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 8c59d3c..493700e 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "symfony/validator": "~2.6|~3.0", "symfony/yaml": "~2.6|~3.0", "symfony/doctrine-bridge": "~2.6|~3.0", + "symfony/translation": "~2.6|~3.0", "doctrine/orm": "~2.3" }, "require-dev": {