From 7e7891464c7f9ff92b1553c77494dbdadff071b4 Mon Sep 17 00:00:00 2001
From: "Sakamoto, Kazunori" <exkazuu@gmail.com>
Date: Thu, 20 Feb 2020 14:35:38 +0900
Subject: [PATCH 1/3] feat: don't make CDN cache in quiz pages

---
 Controller/QuizAnswersController.php | 3 +++
 Controller/QuizResultController.php  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Controller/QuizAnswersController.php b/Controller/QuizAnswersController.php
index dc2826c..e360d10 100644
--- a/Controller/QuizAnswersController.php
+++ b/Controller/QuizAnswersController.php
@@ -95,6 +95,9 @@ public function beforeFilter() {
 		// 親クラスのbeforeFilterを済ませる
 		parent::beforeFilter();
 
+		// CDNキャッシュを作成しない
+		$this->response->header('Pragma', 'no-cache');
+
 		// 現在の表示形態を調べておく
 		list($this->__displayType) = $this->QuizFrameSetting->getQuizFrameSetting(
 			Current::read('Frame.key')
diff --git a/Controller/QuizResultController.php b/Controller/QuizResultController.php
index bb449f0..a555f28 100644
--- a/Controller/QuizResultController.php
+++ b/Controller/QuizResultController.php
@@ -83,6 +83,9 @@ public function beforeFilter() {
 		// まずは、そのキーを取り出す
 		$quizKey = $this->_getQuizKeyFromPass();
 
+		// CDNキャッシュを作成しない
+		$this->response->header('Pragma', 'no-cache');
+
 		// キーで指定されたデータを取り出しておく
 		$conditions = $this->Quiz->getResultViewCondition(
 			array('Quiz.key' => $quizKey)

From 345b84aafb74c721d1afcbd61be1bbf331952d73 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 1 Aug 2020 03:30:23 +0900
Subject: [PATCH 2/3] =?UTF-8?q?change:=20test:=20Travis=E3=81=8B=E3=82=89P?=
 =?UTF-8?q?HP5.6=E3=82=92=E5=89=8A=E9=99=A4,php72=E4=BB=A5=E9=99=8D?=
 =?UTF-8?q?=E3=81=A7UnitTest=E3=81=A7Warning=E3=81=8C=E5=87=BA=E3=82=8B?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3=20https://github.com/NetCo?=
 =?UTF-8?q?mmons3/NetCommons3/issues/1588?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a049e43..f091a05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,12 @@ dist: trusty
 env:
   - NETCOMMONS_VERSION=master DB=mysql
 
+matrix:
+  allow_failures:
+    # PHP 7.4 testing is allowed to fail because the GD extension and ZipArchive is not packaged on Travis CI yet.
+    # See https://travis-ci.community/t/some-extensions-are-missing-in-php-7-4-0-zip-gmp-sodium/6320/9
+    - php: 7.4
+
 before_script:
   - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3
   - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR

From 6a194ecbcabbf33a24636df4af49e42cb1d3e5c3 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 8 Aug 2020 16:43:54 +0900
Subject: [PATCH 3/3] =?UTF-8?q?change:=20test:=20Travis=E3=81=8B=E3=82=89P?=
 =?UTF-8?q?HP5.6=E3=82=92=E5=89=8A=E9=99=A4,php72=E4=BB=A5=E9=99=8D?=
 =?UTF-8?q?=E3=81=A7UnitTest=E3=81=A7Warning=E3=81=8C=E5=87=BA=E3=82=8B?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3=20https://github.com/NetCo?=
 =?UTF-8?q?mmons3/NetCommons3/issues/1588?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f091a05..c3460f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ sudo: false
 dist: trusty
 
 env:
-  - NETCOMMONS_VERSION=master DB=mysql
+  - NETCOMMONS_VERSION=availability DB=mysql
 
 matrix:
   allow_failures: