From 1d7336fdb44f9ac2a6df2fcdc59a35bb7b40026a Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 13 Mar 2020 23:45:13 +0900 Subject: [PATCH 1/4] =?UTF-8?q?change:=20test:=20travis.yml=E3=81=8B?= =?UTF-8?q?=E3=82=89php5.4,5.5=E3=82=92=E5=89=8A=E9=99=A4=E3=80=82php7.3,7?= =?UTF-8?q?.4=E3=82=92=E8=BF=BD=E5=8A=A0=20https://github.com/NetCommons3/?= =?UTF-8?q?NetCommons3/issues/1560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1420f4b..65d7f59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,12 @@ language: php php: - - 5.4 - - 5.5 - 5.6 - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4 sudo: false dist: trusty From 0f40c0abaded102ecd8d12d819099ec94cec56be Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 14 Mar 2020 10:50:59 +0900 Subject: [PATCH 2/4] =?UTF-8?q?change:=20php7.4=E3=81=A7Notice=E3=81=8C?= =?UTF-8?q?=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20=E2=80=BBPHP7.4=E3=81=8B=E3=82=89=E3=82=B9=E3=82=AB?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E5=9E=8B=E5=A4=89=E6=95=B0=E3=81=AB=E9=85=8D?= =?UTF-8?q?=E5=88=97=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=81=A8E=5FNOTICE=E3=81=8C=E5=87=BA=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AA=E3=81=A3=E3=81=9F=E3=80=82=20https://github.?= =?UTF-8?q?com/NetCommons3/NetCommons3/issues/1560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/QuizExport.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Model/QuizExport.php b/Model/QuizExport.php index ebe9568..cca33b3 100644 --- a/Model/QuizExport.php +++ b/Model/QuizExport.php @@ -73,7 +73,11 @@ public function getExportData($quizKey) { $Plugin = ClassRegistry::init('PluginManager.Plugin'); $composer = $Plugin->getComposer('netcommons/quizzes'); // 最初のデータは小テストプラグインのバージョン - $zipData['version'] = $composer['version']; + if (isset($composer['version'])) { + $zipData['version'] = $composer['version']; + } else { + $zipData['version'] = null; + } // 言語数分 $Language = ClassRegistry::init('M17n.Language'); From b4d571254d9838cb9848e9e9466146253a4ecd8c Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 14 Mar 2020 14:42:07 +0900 Subject: [PATCH 3/4] =?UTF-8?q?change:=20test:=20TravisCI=E3=81=8Cphp74?= =?UTF-8?q?=E3=81=A7ZipArchive=E3=81=A8imagecreatefromgif=E3=82=92?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=82=81php73=E3=81=BE=E3=81=A7=E3=81=A8=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=80=82=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/1560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 65d7f59..b897ab1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ php: - 7.1 - 7.2 - 7.3 - - 7.4 sudo: false dist: trusty From 571f94ba33d82f1cd4e71b7b5168c5be5b22309a Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 14 Mar 2020 19:26:21 +0900 Subject: [PATCH 4/4] =?UTF-8?q?change:=20test:=20TravisCI=E3=81=8Cphp74?= =?UTF-8?q?=E3=81=A7ZipArchive=E3=81=A8imagecreatefromgif=E3=82=92?= =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=A8=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=8Ctravis.yml=E3=81=AB=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8A=E3=81=8F=20https://github.com/NetCo?= =?UTF-8?q?mmons3/NetCommons3/issues/1560?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b897ab1..65d7f59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4 sudo: false dist: trusty