From 35a17cc9c02fa50f6b3796f06e0fdc2cbb3215a1 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 25 Oct 2017 11:14:32 +1300 Subject: [PATCH 1/4] Update recipe-plugin to 1.0 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c288d0d..ec67bb1 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "The SilverStripe Framework Installer", "require": { "php": ">=5.6.0", - "silverstripe/recipe-plugin": ">=0.1@dev <1.0", + "silverstripe/recipe-plugin": "^1", "silverstripe/recipe-cms": "1.0.x-dev", "silverstripe-themes/simple": "~3.2.0" }, @@ -24,4 +24,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +} From d6c528b8bc433914cadb60ce4435c011c861fa59 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 25 Oct 2017 16:20:00 +1300 Subject: [PATCH 2/4] Fix test paths --- .cow.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cow.json b/.cow.json index a19992b..adcbc69 100644 --- a/.cow.json +++ b/.cow.json @@ -8,8 +8,8 @@ "silverstripe" ], "tests": [ - "vendor/bin/phpunit framework/tests/php", - "vendor/bin/phpunit cms/tests" + "vendor/bin/phpunit vendor/silverstripe/framework/tests/php", + "vendor/bin/phpunit vendor/silverstripe/cms/tests" ], "exclude": [ "silverstripe/recipe-plugin" From ee92941f87b673231e53e22172f912eccf77ac27 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Tue, 7 Nov 2017 12:58:43 +0000 Subject: [PATCH 3/4] DOCS update comments for supported versions --- composer.json | 2 +- phpcs.xml.dist | 2 +- phpunit.xml.dist | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index ec67bb1..3edefbc 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "silverstripe-themes/simple": "~3.2.0" }, "require-dev": { - "phpunit/PHPUnit": "^5.7" + "phpunit/phpunit": "^5.7" }, "extra": { "project-files": [ diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 38151e4..9924cfd 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -1,6 +1,6 @@ - Coding standard for SilverStripe 3.x + Coding standard for SilverStripe 4.x */vendor/* diff --git a/phpunit.xml.dist b/phpunit.xml.dist index b97f70b..a629724 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,7 +1,7 @@