From 78011e6f59f182808bb44e29aff1bb9291f40e05 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 13 Mar 2020 23:47:31 +0900
Subject: [PATCH 1/2] =?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 e231d1c..10db2ef 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 72d56077393dab6412c729ee8e25e9ff0a4391fc Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 14 Mar 2020 14:51:50 +0900
Subject: [PATCH 2/2] =?UTF-8?q?change:=20test:=20php7.4=E3=81=A7Notice?=
 =?UTF-8?q?=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20=E2=80=BBPHP7.4=E3=81=8B=E3=82=89=E3=82=B9?=
 =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=BC=E5=9E=8B=E5=A4=89=E6=95=B0=E3=81=AB?=
 =?UTF-8?q?=E9=85=8D=E5=88=97=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=81=A8E=5FNOTICE=E3=81=8C=E5=87=BA=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AA=E3=81=A3=E3=81=9F=E3=80=82=20https:?=
 =?UTF-8?q?//github.com/NetCommons3/NetCommons3/issues/1560?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaveRoomAssociationsBehavior/SaveDefaultPageTest.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Test/Case/Model/Behavior/SaveRoomAssociationsBehavior/SaveDefaultPageTest.php b/Test/Case/Model/Behavior/SaveRoomAssociationsBehavior/SaveDefaultPageTest.php
index e2ccdad..1deac3d 100644
--- a/Test/Case/Model/Behavior/SaveRoomAssociationsBehavior/SaveDefaultPageTest.php
+++ b/Test/Case/Model/Behavior/SaveRoomAssociationsBehavior/SaveDefaultPageTest.php
@@ -113,7 +113,7 @@ public function testPageOnExceptionError($data) {
  * @return void
  */
 	public function testRoomOnExceptionError($data) {
-		$this->_mockForReturnTrue('TestModel', 'Pages.Page', 'savePage');
+		$this->_mockForReturn('TestModel', 'Pages.Page', 'savePage', ['Page' => ['id' => '5']]);
 		$this->_mockForReturnFalse('TestModel', 'Rooms.Room', 'updateAll');
 
 		//テスト実施