From a8ad65eb0e32f98e1e74e80873a998af9ab2ab57 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 9 Mar 2020 07:15:53 +0900
Subject: [PATCH 1/3] =?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 848b3ce..263ee76 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: required
 dist: trusty

From f1e02b7e7ef87eeecad9496a0e3d374e591f0fc9 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 14 Mar 2020 10:48:12 +0900
Subject: [PATCH 2/3] =?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/Behavior/AuthorizationKeyBehavior.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Model/Behavior/AuthorizationKeyBehavior.php b/Model/Behavior/AuthorizationKeyBehavior.php
index 638149a..6ddd1b8 100644
--- a/Model/Behavior/AuthorizationKeyBehavior.php
+++ b/Model/Behavior/AuthorizationKeyBehavior.php
@@ -136,7 +136,11 @@ public function beforeDelete(Model $Model, $cascade = true) {
  * @return void
  */
 	public function afterDelete(Model $Model) {
-		$contentId = $this->_deleteTargetData[$Model->alias]['id'];
+		if (isset($this->_deleteTargetData[$Model->alias]['id'])) {
+			$contentId = $this->_deleteTargetData[$Model->alias]['id'];
+		} else {
+			$contentId = null;
+		}
 		$AuthorizationKey = $this->_getModel();
 		$AuthorizationKey->cleanup($Model, $contentId);
 	}

From 71a8eef9e3a503919ef59d0944b17f8d3f6f6f30 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sun, 12 Apr 2020 03:25:23 +0900
Subject: [PATCH 3/3] =?UTF-8?q?fix:=20url=E3=82=A8=E3=83=B3=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=8C=E3=81=95=E3=82=8C=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E3=81=9F=E3=82=81=E3=80=81?=
 =?UTF-8?q?=E5=B7=A6(=E5=8F=B3)=E3=82=AB=E3=83=A9=E3=83=A0=E3=81=AB?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=81=97=E3=81=9F=E3=82=A2=E3=83=B3=E3=82=B1?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=8B=E3=82=89=E5=9B=9E=E7=AD=94=E3=82=92?=
 =?UTF-8?q?=E3=83=80=E3=82=A6=E3=83=B3=E3=83=AD=E3=83=BC=E3=83=89=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=20https://github.com/NetCommons3/Ne?=
 =?UTF-8?q?tCommons3/issues/1567?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Helper/AuthKeyPopupButtonHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/View/Helper/AuthKeyPopupButtonHelper.php b/View/Helper/AuthKeyPopupButtonHelper.php
index 2784a22..5ae675d 100644
--- a/View/Helper/AuthKeyPopupButtonHelper.php
+++ b/View/Helper/AuthKeyPopupButtonHelper.php
@@ -98,7 +98,7 @@ public function popupButton($options) {
 		}
 		$html = '<a  authorization-keys-popup-link frame-id="' . Current::read('Frame.id') . '" ' .
 			'class="' . $options['class'] . '" ' .
-			'url="' . $options['url'] . '" ' .
+			'url="' . rawurlencode($options['url']) . '" ' .
 			'popup-title="' . $options['popup-title'] . '" ' .
 			'popup-label="' . $options['popup-label'] . '" ' .
 			'popup-placeholder="' . $options['popup-placeholder'] . '">' .