From 0f3fafe50fb690dedd15968f930017ac4b282025 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:10:38 +0000 Subject: [PATCH 01/10] Drop support for < php5.6 --- .travis.yml | 2 -- composer.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fe83b73..af481bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ sudo: false language: php php: - - 5.4 - - 5.5 - 5.6 env: diff --git a/composer.json b/composer.json index 01be29c..c794e11 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "antimattr/mongodb-migrations" : "*" }, "require": { - "php": ">=5.4.45", + "php": "^5.6|^7.1", "doctrine/mongodb": "1.*", "symfony/console": "^2.5|^3.0|^4", "symfony/yaml": "^2.5|^3.0|^4" From a43c7f0c12556e73d4a38e3a822df8b4c0da92da Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:12:52 +0000 Subject: [PATCH 02/10] Add doesntmattr keyword --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c794e11..d3e4263 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "doesntmattr/mongodb-migrations", "type": "library", "description": "Managed Database Migrations for MongoDB", - "keywords": ["antimattr", "database", "doctrine", "migration", "mongodb"], + "keywords": ["doesntmattr", "antimattr", "database", "doctrine", "migration", "mongodb"], "homepage": "http://github.com/doesntmattr/mongodb-migrations", "license": "MIT", "authors": [ From 53689fa44ef5b9ad63bad33570a33986adb7cae1 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:13:39 +0000 Subject: [PATCH 03/10] Drop support for symfony 2 and set minimum symfony to 3.3 --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index d3e4263..2c3f854 100644 --- a/composer.json +++ b/composer.json @@ -14,9 +14,9 @@ }, "require": { "php": "^5.6|^7.1", - "doctrine/mongodb": "1.*", - "symfony/console": "^2.5|^3.0|^4", - "symfony/yaml": "^2.5|^3.0|^4" + "doctrine/mongodb": "^1.0", + "symfony/console": "^3.3|^4", + "symfony/yaml": "^3.3|^4" }, "require-dev": { "antimattr/test-case": "~1.0@stable", From 46f43f9b212fe7577975e4f721adf17a84ac587b Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:14:37 +0000 Subject: [PATCH 04/10] Upgrade to phpunit 5 --- composer.json | 2 +- tests/AntiMattr/Tests/MongoDB/Migrations/OutputWriterTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2c3f854..cb4b5cf 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ }, "require-dev": { "antimattr/test-case": "~1.0@stable", - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "^5.0", "friendsofphp/php-cs-fixer": "^1.0", "mikey179/vfsStream": "1.*" }, diff --git a/tests/AntiMattr/Tests/MongoDB/Migrations/OutputWriterTest.php b/tests/AntiMattr/Tests/MongoDB/Migrations/OutputWriterTest.php index 5655eca..bf26509 100644 --- a/tests/AntiMattr/Tests/MongoDB/Migrations/OutputWriterTest.php +++ b/tests/AntiMattr/Tests/MongoDB/Migrations/OutputWriterTest.php @@ -11,7 +11,7 @@ class OutputWriterTest extends AntiMattrTestCase protected function setUp() { - $this->output = $this->getMock('Symfony\Component\Console\Output\OutputInterface'); + $this->output = $this->createMock('Symfony\Component\Console\Output\OutputInterface'); $output = $this->output; $this->outputWriter = new OutputWriter(function ($message) use ($output) { return $output->writeln($message); From 01e887ee5e0d6152fb22c6f6e37aef75264b9ad2 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:15:49 +0000 Subject: [PATCH 05/10] Update cs-fixer to maintained v2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cb4b5cf..feb39e9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "require-dev": { "antimattr/test-case": "~1.0@stable", "phpunit/phpunit": "^5.0", - "friendsofphp/php-cs-fixer": "^1.0", + "friendsofphp/php-cs-fixer": "^2.0", "mikey179/vfsStream": "1.*" }, "autoload": { From 7563300bd8c989936b988d185df74ed41c334dc0 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:17:29 +0000 Subject: [PATCH 06/10] Change composer autoloader to psr-4 syntax --- composer.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index feb39e9..934cbf3 100644 --- a/composer.json +++ b/composer.json @@ -25,12 +25,16 @@ "mikey179/vfsStream": "1.*" }, "autoload": { - "psr-0": { "AntiMattr\\MongoDB\\Migrations\\": "src/" } + "psr-4": { + "AntiMattr\\": "src/AntiMattr" + } }, "autoload-dev": { - "psr-0": { - "AntiMattr\\TestCase\\": "vendor/antimattr/test-case/src", - "AntiMattr\\Tests\\MongoDB\\Migrations\\": "tests/" + "psr-4": { + "AntiMattr\\": [ + "vendor/antimattr/test-case/src/AntiMattr", + "tests/AntiMattr" + ] } }, "extra": { From 5926eda301c3546204158dd7022438d86854f7c5 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:37:41 +0000 Subject: [PATCH 07/10] Branch alias master to 1.2 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 934cbf3..45b6518 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "archive": { From b446a5d212ab2a5046a76e12e8dbba8ac5fcf315 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:55:05 +0000 Subject: [PATCH 08/10] Try getting the travis php5.6 build back --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index af481bf..82e2337 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: php php: - 5.6 + - 7.1 env: - MONGO_VERSION=stable From 614c93a1a93d31f90b46665901b2e8beb4e6b914 Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Mon, 19 Feb 2018 11:58:15 +0000 Subject: [PATCH 09/10] Revert "Try getting the travis php5.6 build back" This reverts commit b446a5d212ab2a5046a76e12e8dbba8ac5fcf315. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 82e2337..af481bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ language: php php: - 5.6 - - 7.1 env: - MONGO_VERSION=stable From 115589fc82f841f8857e4491832628c4dda8daea Mon Sep 17 00:00:00 2001 From: Douglas Reith Date: Tue, 20 Feb 2018 22:24:31 +0000 Subject: [PATCH 10/10] Restore symfony 2 support --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 45b6518..4c24610 100644 --- a/composer.json +++ b/composer.json @@ -15,8 +15,8 @@ "require": { "php": "^5.6|^7.1", "doctrine/mongodb": "^1.0", - "symfony/console": "^3.3|^4", - "symfony/yaml": "^3.3|^4" + "symfony/console": "^2.7|^3.3|^4", + "symfony/yaml": "^2.7|^3.3|^4" }, "require-dev": { "antimattr/test-case": "~1.0@stable",