From 29b164b9f5f1767c3add57b452432f59e1059608 Mon Sep 17 00:00:00 2001 From: Shohei Nakajima Date: Fri, 31 Jul 2020 13:42:03 +0900 Subject: [PATCH 1/4] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index a5693c41..daf5dc60 100644 --- a/composer.json +++ b/composer.json @@ -28,6 +28,7 @@ "jms/serializer": "1.1.0@stable" }, "require-dev": { + "netcommons/net-commons": "dev-availability", "cakephp/cakephp-codesniffer": "~1.0@stable", "doctrine/annotations": "1.2.*@stable", "dompdf/dompdf": "~0.6@stable", From 429ca5a924027ecf2beece1a8458ac079106aa5d Mon Sep 17 00:00:00 2001 From: Shohei Nakajima Date: Fri, 31 Jul 2020 14:26:09 +0900 Subject: [PATCH 2/4] Update pre.sh --- tools/build/plugins/cakephp/travis/pre.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/build/plugins/cakephp/travis/pre.sh b/tools/build/plugins/cakephp/travis/pre.sh index 1f2ccf75..28ca1b94 100644 --- a/tools/build/plugins/cakephp/travis/pre.sh +++ b/tools/build/plugins/cakephp/travis/pre.sh @@ -30,6 +30,9 @@ php -q << _EOF_ > packages.txt \$ret = ''; if (isset(\$composer['require'])) { foreach (\$composer['require'] as \$package => \$version) { + if (\$package !== 'netcommons/net-commons') { + continue; + } \$ret .= ' ' . \$package . ':' . \$version; } } From 4fec11f15c758e9f7362d07a8b994d3b794145e3 Mon Sep 17 00:00:00 2001 From: Shohei Nakajima Date: Fri, 31 Jul 2020 15:00:57 +0900 Subject: [PATCH 3/4] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index daf5dc60..154509c0 100644 --- a/composer.json +++ b/composer.json @@ -24,11 +24,11 @@ "require": { "cakephp/cakephp": "~2.10@stable", "netcommons/install": "@stable", + "netcommons/net-commons": "dev-availability", "josegonzalez/cakephp-upload": "~2.0@stable", "jms/serializer": "1.1.0@stable" }, "require-dev": { - "netcommons/net-commons": "dev-availability", "cakephp/cakephp-codesniffer": "~1.0@stable", "doctrine/annotations": "1.2.*@stable", "dompdf/dompdf": "~0.6@stable", From 6781799bb03cc606090c66f1e3909289ab4fecd9 Mon Sep 17 00:00:00 2001 From: Shohei Nakajima Date: Fri, 31 Jul 2020 15:01:46 +0900 Subject: [PATCH 4/4] Update pre.sh --- tools/build/plugins/cakephp/travis/pre.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/plugins/cakephp/travis/pre.sh b/tools/build/plugins/cakephp/travis/pre.sh index 28ca1b94..78f74e61 100644 --- a/tools/build/plugins/cakephp/travis/pre.sh +++ b/tools/build/plugins/cakephp/travis/pre.sh @@ -30,7 +30,7 @@ php -q << _EOF_ > packages.txt \$ret = ''; if (isset(\$composer['require'])) { foreach (\$composer['require'] as \$package => \$version) { - if (\$package !== 'netcommons/net-commons') { + if (\$package === 'netcommons/net-commons') { continue; } \$ret .= ' ' . \$package . ':' . \$version;