From 58a4e04e8828faf5f8f319f650a7b72ac82f41e0 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 14 Nov 2019 01:24:52 +0000 Subject: [PATCH 1/7] Remove obsolete branch-alias --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index f563167..9c65bba 100644 --- a/composer.json +++ b/composer.json @@ -25,9 +25,6 @@ "project-files": [ "app/src/*" ], - "branch-alias": { - "4.x-dev": "4.5.x-dev" - }, "resources-dir": "_resources" }, "config": { @@ -35,4 +32,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file From f5aa73baaebdd3124558a2c5bcab7689889c319f Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Mon, 18 Nov 2019 14:44:03 +1300 Subject: [PATCH 2/7] Update Travis config to Xenial --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 04ea3b0..b4ede93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ language: php +dist: xenial + +services: + - mysql + - postgresql + env: global: - COMPOSER_ROOT_VERSION=4.5.x-dev From ebebe164f2b017d19f0ca1a3c6e4fcf63aa74a8a Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 21 Nov 2019 14:03:39 +1300 Subject: [PATCH 3/7] Update branch alias and travis --- .travis.yml | 4 ++-- composer.json | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4ede93..fd0107d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: env: global: - - COMPOSER_ROOT_VERSION=4.5.x-dev + - COMPOSER_ROOT_VERSION=4.6.x-dev matrix: include: @@ -27,7 +27,7 @@ before_script: - composer validate - composer require --no-update silverstripe-themes/simple:~3.2.0 - - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi + - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Validate cow schema diff --git a/composer.json b/composer.json index 9c65bba..60f2fbf 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,9 @@ "phpunit/phpunit": "^5.7" }, "extra": { + "branch-alias": { + "4.x-dev": "4.6.x-dev" + }, "project-files": [ "app/src/*" ], From ba2034c28265759cfdff0ad6043f7e56a8b52066 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 21 Nov 2019 14:30:04 +1300 Subject: [PATCH 4/7] Update composer requirements --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 60f2fbf..8e36f0f 100644 --- a/composer.json +++ b/composer.json @@ -6,17 +6,17 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.5.x-dev", - "silverstripe/admin": "1.5.x-dev", - "silverstripe/asset-admin": "1.5.x-dev", - "silverstripe/campaign-admin": "1.5.x-dev", - "silverstripe/versioned-admin": "1.3.x-dev", - "silverstripe/cms": "4.5.x-dev", - "silverstripe/errorpage": "1.5.x-dev", - "silverstripe/graphql": "3.2.x-dev", - "silverstripe/reports": "4.5.x-dev", - "silverstripe/siteconfig": "4.5.x-dev", - "silverstripe/versioned": "1.5.x-dev" + "silverstripe/recipe-core": "4.6.x-dev", + "silverstripe/admin": "1.6.x-dev", + "silverstripe/asset-admin": "1.6.x-dev", + "silverstripe/campaign-admin": "1.6.x-dev", + "silverstripe/versioned-admin": "1.4.x-dev", + "silverstripe/cms": "4.6.x-dev", + "silverstripe/errorpage": "1.6.x-dev", + "silverstripe/graphql": "3.3.x-dev", + "silverstripe/reports": "4.6.x-dev", + "silverstripe/siteconfig": "4.6.x-dev", + "silverstripe/versioned": "1.6.x-dev" }, "require-dev": { "phpunit/phpunit": "^5.7" From a781315718662d057c4a7c1d488ad6e9996faf6e Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Mon, 9 Dec 2019 11:09:42 +1300 Subject: [PATCH 5/7] RFC-9344 Remove branch aliases --- .travis.yml | 4 ++-- composer.json | 25 +++++++++++-------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd0107d..c05bbc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: env: global: - - COMPOSER_ROOT_VERSION=4.6.x-dev + - COMPOSER_ROOT_VERSION=4.x-dev matrix: include: @@ -27,7 +27,7 @@ before_script: - composer validate - composer require --no-update silverstripe-themes/simple:~3.2.0 - - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi + - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.x-dev --no-update; fi - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile # Validate cow schema diff --git a/composer.json b/composer.json index 8e36f0f..8a7898e 100644 --- a/composer.json +++ b/composer.json @@ -6,25 +6,22 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.6.x-dev", - "silverstripe/admin": "1.6.x-dev", - "silverstripe/asset-admin": "1.6.x-dev", - "silverstripe/campaign-admin": "1.6.x-dev", - "silverstripe/versioned-admin": "1.4.x-dev", - "silverstripe/cms": "4.6.x-dev", - "silverstripe/errorpage": "1.6.x-dev", - "silverstripe/graphql": "3.3.x-dev", - "silverstripe/reports": "4.6.x-dev", - "silverstripe/siteconfig": "4.6.x-dev", - "silverstripe/versioned": "1.6.x-dev" + "silverstripe/recipe-core": "4.x-dev", + "silverstripe/admin": "1.x-dev", + "silverstripe/asset-admin": "1.x-dev", + "silverstripe/campaign-admin": "1.x-dev", + "silverstripe/versioned-admin": "1.x-dev", + "silverstripe/cms": "4.x-dev", + "silverstripe/errorpage": "1.x-dev", + "silverstripe/graphql": "3.x-dev", + "silverstripe/reports": "4.x-dev", + "silverstripe/siteconfig": "4.x-dev", + "silverstripe/versioned": "1.x-dev" }, "require-dev": { "phpunit/phpunit": "^5.7" }, "extra": { - "branch-alias": { - "4.x-dev": "4.6.x-dev" - }, "project-files": [ "app/src/*" ], From 0c1280b6b0101d1d044a57486e575c7f030ab427 Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 26 Feb 2020 14:53:42 +1300 Subject: [PATCH 6/7] Update Travis config to include PHP 7.4 build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4ede93..92a98b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: env: DB=PGSQL - php: 7.3 env: DB=MYSQL - - php: 7.3 + - php: 7.4 env: DB=MYSQL before_script: From 101c69a27ed52545d20e51be98f4672d309fc7be Mon Sep 17 00:00:00 2001 From: Garion Herman Date: Wed, 26 Feb 2020 16:47:49 +1300 Subject: [PATCH 7/7] Add sminnee/phpunit-mock-objects to fix PHP 7.4 compat --- composer.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9c65bba..399e73a 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,8 @@ "silverstripe/versioned": "1.5.x-dev" }, "require-dev": { - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^5.7", + "sminnee/phpunit-mock-objects": "^3.4.5" }, "extra": { "project-files": [ @@ -32,4 +33,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +}