From 51ab3ff2bacd7b6f0ffe8c39156236829b92732a Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi <akagane99@gmail.com>
Date: Thu, 18 Oct 2018 21:45:35 +0900
Subject: [PATCH 01/23] =?UTF-8?q?fix:=20=E3=82=AB=E3=83=86=E3=82=B4?=
 =?UTF-8?q?=E3=83=AA=E7=99=BB=E9=8C=B2=E3=81=97=E3=81=9F=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E3=81=8C=E7=B7=A8=E9=9B=86=E7=94=BB=E9=9D=A2=E3=81=AB=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/NetCommons3?=
 =?UTF-8?q?/issues/1343?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Elements/edit_form_categories.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/View/Elements/edit_form_categories.ctp b/View/Elements/edit_form_categories.ctp
index 4a14502..ff5a82f 100644
--- a/View/Elements/edit_form_categories.ctp
+++ b/View/Elements/edit_form_categories.ctp
@@ -32,10 +32,10 @@
 				</button>
 			</div>
 
-			<input type="hidden" name="data[Categories][{{$index}}][Category][id]" ng-value="c.Category.id">
+			<input type="hidden" name="data[Categories][{{$index}}][Category][id]" ng-value="c.category.id">
 			<input type="hidden" name="data[Categories][{{$index}}][CategoryOrder][weight]" ng-value="{{$index + 1}}">
 			<input type="text" name="data[Categories][{{$index}}][CategoriesLanguage][name]"
-					ng-model="c.CategoriesLanguage.name" class="form-control" required autofocus>
+					ng-model="c.categoriesLanguage.name" class="form-control" required autofocus>
 
 			<div class="input-group-btn">
 				<button type="button" class="btn btn-default" tooltip="<?php echo __d('net_commons', 'Delete'); ?>"

From f503182453a4da739c217aa5b25454df545f2f47 Mon Sep 17 00:00:00 2001
From: Mitsuru Mutaguchi <akagane99@gmail.com>
Date: Wed, 12 Dec 2018 13:18:41 +0900
Subject: [PATCH 02/23] =?UTF-8?q?Revert=20"fix:=20=E3=82=AB=E3=83=86?=
 =?UTF-8?q?=E3=82=B4=E3=83=AA=E7=99=BB=E9=8C=B2=E3=81=97=E3=81=9F=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=81=8C=E7=B7=A8=E9=9B=86=E7=94=BB=E9=9D=A2=E3=81=AB?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90?=
 =?UTF-8?q?=E3=82=B0=E4=BF=AE=E6=AD=A3=20"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Elements/edit_form_categories.ctp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/View/Elements/edit_form_categories.ctp b/View/Elements/edit_form_categories.ctp
index ff5a82f..4a14502 100644
--- a/View/Elements/edit_form_categories.ctp
+++ b/View/Elements/edit_form_categories.ctp
@@ -32,10 +32,10 @@
 				</button>
 			</div>
 
-			<input type="hidden" name="data[Categories][{{$index}}][Category][id]" ng-value="c.category.id">
+			<input type="hidden" name="data[Categories][{{$index}}][Category][id]" ng-value="c.Category.id">
 			<input type="hidden" name="data[Categories][{{$index}}][CategoryOrder][weight]" ng-value="{{$index + 1}}">
 			<input type="text" name="data[Categories][{{$index}}][CategoriesLanguage][name]"
-					ng-model="c.categoriesLanguage.name" class="form-control" required autofocus>
+					ng-model="c.CategoriesLanguage.name" class="form-control" required autofocus>
 
 			<div class="input-group-btn">
 				<button type="button" class="btn btn-default" tooltip="<?php echo __d('net_commons', 'Delete'); ?>"

From f1f1f6265626c5277f096e56e6470de3371bb71a Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 5 Jan 2019 14:25:06 +0900
Subject: [PATCH 03/23] =?UTF-8?q?Language=E3=83=A2=E3=83=87=E3=83=AB?=
 =?UTF-8?q?=E3=81=AB=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0=E3=81=97=E3=81=9F=E3=81=93=E3=81=A8=E3=81=AB=E3=82=88?=
 =?UTF-8?q?=E3=82=8B=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/Ne?=
 =?UTF-8?q?tCommons3/issues/1337?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/Category.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Model/Category.php b/Model/Category.php
index 3754263..81dd727 100644
--- a/Model/Category.php
+++ b/Model/Category.php
@@ -210,8 +210,7 @@ public function bindModelCategoryLang($joinKey = 'Category.id') {
 			'Language' => 'M17n.Language',
 		]);
 
-		$langs = $this->Language->getLanguage();
-		if (count($langs) > 1) {
+		if ($this->Language->isMultipleLang()) {
 			$conditions = [
 				'CategoriesLanguage.category_id = ' . $joinKey,
 				'OR' => array(

From 5444f32baeaf596ead48def121d2296fc35f8a8e Mon Sep 17 00:00:00 2001
From: Ryuji AMANO <ryuji@ryus.co.jp>
Date: Thu, 9 May 2019 11:22:51 +0900
Subject: [PATCH 04/23] =?UTF-8?q?change:=20beforeValidate()=E3=82=92?=
 =?UTF-8?q?=E5=91=BC=E3=81=B3=E5=87=BA=E3=81=99=E3=81=9F=E3=81=B3=E3=81=AB?=
 =?UTF-8?q?Hash::merge=E3=81=A7=E3=83=90=E3=83=AA=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=AB=E3=83=BC=E3=83=AB=E3=81=8C?=
 =?UTF-8?q?=E5=A2=97=E3=81=88=E3=82=8B=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82?=
 =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=E3=80=82ValidateM?=
 =?UTF-8?q?erge::merge=E3=81=B8=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?=
 =?UTF-8?q?=E3=81=9F=20Refs=20https://github.com/NetCommons3/NetCommons3/i?=
 =?UTF-8?q?ssues/1486?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/CategoryOrder.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Model/CategoryOrder.php b/Model/CategoryOrder.php
index 9d457a8..7c8dee3 100644
--- a/Model/CategoryOrder.php
+++ b/Model/CategoryOrder.php
@@ -36,7 +36,7 @@ class CategoryOrder extends CategoriesAppModel {
  * @see Model::save()
  */
 	public function beforeValidate($options = array()) {
-		$this->validate = Hash::merge($this->validate, array(
+		$this->validate = ValidateMerge::merge($this->validate, array(
 			'block_key' => array(
 				'notBlank' => array(
 					'rule' => array('notBlank'),

From ea563974b35ba465ca040941142b70b8399ac483 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 6 Jul 2019 14:54:40 +0900
Subject: [PATCH 05/23] =?UTF-8?q?fix:=20=E9=80=9F=E5=BA=A6=E6=94=B9?=
 =?UTF-8?q?=E5=96=84=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E3=80=81Model?=
 =?UTF-8?q?=E3=81=AEbelongTo=E3=81=8B=E3=82=89CategoriesLanguage=E3=82=92?=
 =?UTF-8?q?=E5=A4=96=E3=81=97=E3=81=9F=E3=81=93=E3=81=A8=E3=81=AB=E3=82=88?=
 =?UTF-8?q?=E3=82=8A=E6=AD=A3=E3=81=97=E3=81=8Flanguage=5Fid=E3=81=8C?=
 =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=E3=81=95=E3=82=8C=E3=81=AA=E3=81=8F?=
 =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F=20https://github.com/NetCommons3/Ne?=
 =?UTF-8?q?tCommons3/issues/1468?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/Component/CategoryEditComponent.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Controller/Component/CategoryEditComponent.php b/Controller/Component/CategoryEditComponent.php
index 5fb8579..899a21d 100644
--- a/Controller/Component/CategoryEditComponent.php
+++ b/Controller/Component/CategoryEditComponent.php
@@ -66,6 +66,7 @@ public function startup(Controller $controller) {
 						'CategoriesLanguage' => array(
 							'id' => null,
 							'name' => $post['CategoriesLanguage']['name'],
+							'language_id' => Current::read('Language.id'),
 						),
 						'CategoryOrder' => array(
 							'id' => null,

From 9272279909eeac654a22a5d97dd036b49b4f5de9 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 10 Aug 2019 19:31:53 +0900
Subject: [PATCH 06/23] =?UTF-8?q?fix:=20test:=20travis=20php7.2=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20https://github.com/NetCommons3/NetCommons3/issues/1?=
 =?UTF-8?q?451?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml      | 3 ++-
 phpunit.xml.dist | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1d005ee..21a91ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - 7.1
+  - 7.2
 
 sudo: false
+dist: trusty
 
 env:
   matrix:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4af2b4c..d74a248 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -14,6 +14,5 @@
     </filter>
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="coverage-html" target="build/logs/clover"/>
     </logging>
 </phpunit>

From 4f34aa55bbda2c4d28bc7c9351f9ea559f33e65a Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sun, 11 Aug 2019 00:04:10 +0900
Subject: [PATCH 07/23] =?UTF-8?q?fix:=20test:=20travis=20php7.2=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20https://github.com/NetCommons3/NetCommons3/issues/1?=
 =?UTF-8?q?451?=
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 21a91ae..7bf65b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - 7.2
 
 sudo: false

From c9dd3ef8635609bb6593ef74ce760643112d432d Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 9 Mar 2020 08:15:27 +0900
Subject: [PATCH 08/23] =?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 7bf65b7..be6a96f 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 2525ef7f7aefa56725f16dd60a7f1cf314f83218 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 1 Aug 2020 06:09:47 +0900
Subject: [PATCH 09/23] =?UTF-8?q?change:=20test:=20Travis=E3=81=8B?=
 =?UTF-8?q?=E3=82=89PHP5.6=E3=82=92=E5=89=8A=E9=99=A4,php72=E4=BB=A5?=
 =?UTF-8?q?=E9=99=8D=E3=81=A7UnitTest=E3=81=A7Warning=E3=81=8C=E5=87=BA?=
 =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E4=BF=AE=E6=AD=A3=20https://github.?=
 =?UTF-8?q?com/NetCommons3/NetCommons3/issues/1588?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .travis.yml      | 1 -
 phpunit.xml.dist | 6 ++++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index be6a96f..512f80f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d74a248..0ca8f78 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit bootstrap="vendors/autoload.php">
+    <php>
+        <ini name="memory_limit" value="-1"/>
+    </php>
+    <php>
+        <ini name="error_reporting" value="0"/>
+    </php>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".ctp">app/Plugin/Categories</directory>

From 107e1681f21588044468d3429011b2298f7e9a81 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Wed, 26 Aug 2020 20:17:00 +0900
Subject: [PATCH 10/23] change: Version number to 3.3.2

---
 VERSION.txt | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 VERSION.txt

diff --git a/VERSION.txt b/VERSION.txt
new file mode 100644
index 0000000..4772543
--- /dev/null
+++ b/VERSION.txt
@@ -0,0 +1 @@
+3.3.2

From 9ff037bf479a1f74ff9a9dfe5a0a7688f7b67ea6 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sun, 13 Dec 2020 16:51:42 +0900
Subject: [PATCH 11/23] =?UTF-8?q?fix:=20test:=20TravisCI=E3=81=AEphp7.3?=
 =?UTF-8?q?=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=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/1618?=
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 512f80f..981be3f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  - 7.3
+  - 7.3.24
   - 7.4
 
 sudo: false

From 9e177929d6d20084cb1a4a1521f855f114350eec Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 23 Jan 2021 13:53:18 +0900
Subject: [PATCH 12/23] =?UTF-8?q?add:=20release=E3=82=BF=E3=82=B0=E4=BB=98?=
 =?UTF-8?q?=E3=81=91=E3=81=AEgithub=20action=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/NetCommons3/NetCommons3/issues/1619
---
 .github/workflows/release.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 .github/workflows/release.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..a3225bc
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,28 @@
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '3*'
+
+name: Create Release
+
+jobs:
+  build:
+    name: Create Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+        with:
+          tag_name: ${{ github.ref }}
+          release_name: ${{ github.ref }}
+          body: |
+            NetCommons ${{ github.ref }} released.
+          draft: false
+          prerelease: false

From 37e1c058ac3868458a6c3a8c9ebece427bb0094f Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 23 Jan 2021 13:53:23 +0900
Subject: [PATCH 13/23] change: Version number to 3.3.3

---
 VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index 4772543..619b537 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-3.3.2
+3.3.3

From e2d1fb8de4421b0fe1f287a0dbbcd8170df6ccbe Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 30 Jul 2021 16:55:13 +0900
Subject: [PATCH 14/23] =?UTF-8?q?change:=20test:=20TravisCI=E3=81=8B?=
 =?UTF-8?q?=E3=82=89GithubAction=E3=81=AB=E5=A4=89=E6=9B=B4=20https://gith?=
 =?UTF-8?q?ub.com/NetCommons3/NetCommons3/issues/1650?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/tests.yml | 137 ++++++++++++++++++++++++++++++++++++
 .travis.yml                 |  42 -----------
 README.md                   |  11 +--
 phpunit.xml.dist            |   4 +-
 4 files changed, 141 insertions(+), 53 deletions(-)
 create mode 100644 .github/workflows/tests.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
new file mode 100644
index 0000000..d6bd01e
--- /dev/null
+++ b/.github/workflows/tests.yml
@@ -0,0 +1,137 @@
+on:
+  push:
+    branches:
+      - main
+      - master
+      - availability
+  pull_request:
+    branches:
+      - main
+      - master
+      - availability
+
+name: tests
+
+jobs:
+  tests:
+    name: tests
+    runs-on: ubuntu-18.04
+    strategy:
+      matrix:
+        php: [ '7.1', '7.2', '7.3', '7.4' ]
+
+    env:
+        NC3_BUILD_DIR: "/opt/nc3"
+        NC3_DOCKER_DIR: "/opt/docker"
+        NC3_GIT_URL: "git://github.com/NetCommons3/NetCommons3.git"
+        NC3_GIT_BRANCH: "master"
+        PLUGIN_BUILD_DIR: ${{ github.workspace }}
+        PHP_VERSION: ${{ matrix.php }}
+        MYSQL_ROOT_PASSWORD: root
+        MYSQL_DATABASE: cakephp_test
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: environment
+        run: |
+          echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
+          echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}"
+          echo "PHP_VERSION=${PHP_VERSION}"
+          ls -al ${PLUGIN_BUILD_DIR}
+
+      - name: docker-compose install
+        run: |
+          curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+          chmod +x ~/docker-compose
+          sudo mv ~/docker-compose /usr/local/bin/docker-compose
+          docker-compose --version
+
+      - name: git clone nc3
+        run: git clone -b ${NC3_GIT_BRANCH} ${NC3_GIT_URL} ${NC3_BUILD_DIR}
+
+      - name: git clone nc3_docker
+        run: git clone https://github.com/NetCommons3/nc3app-docker.git ${NC3_DOCKER_DIR}
+
+      - name: docker-compose start
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose up -d
+          docker-compose start
+
+      - run: docker ps
+
+      - name: check libraries
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/start-on-docker.sh
+
+      - name: nc3 build
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/app-build.sh
+
+      - name: phpcs (PHP CodeSniffer)
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh
+
+      - name: phpmd (PHP Mess Detector)
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh
+
+      - name: phpcpd (PHP Copy/Paste Detector)
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh
+
+      - name: gjslint (JavaScript Style Check)
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh
+
+      - name: phpdoc (PHP Documentor)
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh
+
+      - name: phpunit (PHP UnitTest)
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh
+          sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build
+
+      - name: push coveralls
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          COVERALLS_FLAG_NAME: ${{ matrix.php }}
+        run: |
+          cd ${NC3_BUILD_DIR}
+          ls -la ${NC3_BUILD_DIR}
+          vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+
+      - name: docker-compose remove
+        run: |
+          cd ${NC3_DOCKER_DIR}
+          docker-compose rm -f
+
+      # テスト成功時はこちらのステップが実行される
+      - name: Slack Notification on Success
+        if: success()
+        uses: rtCamp/action-slack-notify@v2.2.0
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: notify-netcommons3
+          SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})"
+          SLACK_COLOR: good
+
+      # テスト失敗時はこちらのステップが実行される
+      - name: Slack Notification on Failure
+        uses: rtCamp/action-slack-notify@v2.2.0
+        if: failure()
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: notify-netcommons3
+          SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})"
+          SLACK_COLOR: danger
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 981be3f..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-language: php
-
-php:
-  - 7.0
-  - 7.1
-  - 7.2
-  - 7.3.24
-  - 7.4
-
-sudo: false
-dist: trusty
-
-env:
-  matrix:
-    - NETCOMMONS_VERSION=master DB=mysql
-  global:
-    - secure: "e/M4FTA0VmiNuSJbKZLEacPHLoSCCmurcs2U8IbSWgbfZju2bFO03szIcq4pUKE7cfuIzWLl23ZIn0Psn1Q//7gQagEpVFUHFE46W/QrIXYv/so7JTCAdj+E4zmZZ4ZP269kdmCUPWDyBHm9XQr7vZtC1GCi8TrsVgm6/E8EHeQ="
-    - GIT_COMMITTER_NAME=s-nakajima
-    - GIT_COMMITTER_EMAIL=nakajimashouhei@gmail.com
-    - GIT_AUTHOR_NAME=s-nakajima
-    - GIT_AUTHOR_EMAIL=nakajimashouhei@gmail.com
-
-before_script:
-  - export NETCOMMONS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/NetCommons3
-  - git clone git://github.com/NetCommons3/NetCommons3 $NETCOMMONS_BUILD_DIR
-  - cd $NETCOMMONS_BUILD_DIR
-  - git checkout $NETCOMMONS_VERSION
-  - travis_wait . tools/build/plugins/cakephp/travis/pre.sh
-  - . tools/build/plugins/cakephp/travis/environment.sh
-
-script:
-  - . tools/build/plugins/cakephp/travis/main.sh
-
-after_script:
-  - . tools/build/plugins/cakephp/travis/post.sh
-
-notifications:
-  email:
-    recipients:
-      - netcommons3@googlegroups.com
-    on_success: never  # default: change
-    on_failure: always # default: always
diff --git a/README.md b/README.md
index ad1a5e6..ddbf417 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,9 @@
 Categories
 ==============
 
-Categories for NetComomns3
-
-[![Build Status](https://api.travis-ci.org/NetCommons3/Categories.png?branch=master)](https://travis-ci.org/NetCommons3/Categories)
-[![Coverage Status](https://coveralls.io/repos/NetCommons3/Categories/badge.png?branch=master)](https://coveralls.io/r/NetCommons3/Categories?branch=master)
-
-| dependencies  | status |
-| ------------- | ------ |
-| composer.json | [![Dependency Status](https://www.versioneye.com/user/projects/54fd286dfcd47ac3bb0000d2/badge.png)](https://www.versioneye.com/user/projects/54fd286dfcd47ac3bb0000d2) |
+[![Tests Status](https://github.com/NetCommons3/Categories/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/NetCommons3/Categories/actions/workflows/tests.yml)
+[![Coverage Status](https://coveralls.io/repos/NetCommons3/Categories/badge.svg?branch=master)](https://coveralls.io/r/NetCommons3/Categories?branch=master)
+[![Stable Version](https://img.shields.io/packagist/v/netcommons/categories.svg?label=stable)](https://packagist.org/packages/netcommons/categories)
 
 ### 概要
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0ca8f78..901f324 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -3,9 +3,6 @@
     <php>
         <ini name="memory_limit" value="-1"/>
     </php>
-    <php>
-        <ini name="error_reporting" value="0"/>
-    </php>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
             <directory suffix=".ctp">app/Plugin/Categories</directory>
@@ -20,5 +17,6 @@
     </filter>
     <logging>
         <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-text" target="build/logs/covarage.txt"/>
     </logging>
 </phpunit>

From d2b7058519e16c4747209d162a1b1f503d49b999 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 10 Aug 2021 23:03:15 +0900
Subject: [PATCH 15/23] =?UTF-8?q?change:=20test:=20Slack=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3,=20mysql8.0=E3=83=86=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20https://github.com/NetCommons3/NetCommons3?=
 =?UTF-8?q?/issues/1650?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/release.yml | 35 ++++++++++++++++++++++++--
 .github/workflows/tests.yml   | 47 +++++++++++++++++++++++++----------
 2 files changed, 67 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a3225bc..592d72f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,16 +4,25 @@ on:
     tags:
       - '3*'
 
-name: Create Release
+name: create_release
 
 jobs:
   build:
-    name: Create Release
+    name: create_release
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Slack Notification on Start
+        uses: rtCamp/action-slack-notify@v2.2.0
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }}
+          SLACK_CHANNEL: notify-nc3-release
+          SLACK_TITLE: "${{ github.repository }}"
+          SLACK_COLOR: "#f0ad4e"
+          SLACK_MESSAGE: "Start Job"
+
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -26,3 +35,25 @@ jobs:
             NetCommons ${{ github.ref }} released.
           draft: false
           prerelease: false
+
+      # テスト成功時はこちらのステップが実行される
+      - name: Slack Notification on Finish
+        uses: rtCamp/action-slack-notify@v2.2.0
+        if: success()
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }}
+          SLACK_CHANNEL: notify-nc3-release
+          SLACK_TITLE: "${{ github.repository }}"
+          SLACK_COLOR: good
+          SLACK_MESSAGE: "Job Success"
+
+      # テスト失敗時はこちらのステップが実行される
+      - name: Slack Notification on Failure
+        uses: rtCamp/action-slack-notify@v2.2.0
+        if: failure()
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_RELEASE }}
+          SLACK_CHANNEL: notify-nc3-tests
+          SLACK_TITLE: "${{ github.repository }}"
+          SLACK_COLOR: danger
+          SLACK_MESSAGE: "Job Failure"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d6bd01e..1477ea2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,12 +13,26 @@ on:
 name: tests
 
 jobs:
+  setup:
+    name: setup
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Slack Notification on Start
+        uses: rtCamp/action-slack-notify@v2.2.0
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
+          SLACK_CHANNEL: notify-nc3-tests
+          SLACK_TITLE: "${{ github.repository }}"
+          SLACK_COLOR: "#f0ad4e"
+
   tests:
     name: tests
+    needs: setup
     runs-on: ubuntu-18.04
     strategy:
       matrix:
         php: [ '7.1', '7.2', '7.3', '7.4' ]
+        mysql: [ '5.7', '8.0' ]
 
     env:
         NC3_BUILD_DIR: "/opt/nc3"
@@ -27,6 +41,7 @@ jobs:
         NC3_GIT_BRANCH: "master"
         PLUGIN_BUILD_DIR: ${{ github.workspace }}
         PHP_VERSION: ${{ matrix.php }}
+        MYSQL_VERSION: ${{ matrix.mysql }}
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: cakephp_test
 
@@ -38,6 +53,7 @@ jobs:
           echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
           echo "PLUGIN_BUILD_DIR=${PLUGIN_BUILD_DIR}"
           echo "PHP_VERSION=${PHP_VERSION}"
+          echo "MYSQL_VERSION=${MYSQL_VERSION}"
           ls -al ${PLUGIN_BUILD_DIR}
 
       - name: docker-compose install
@@ -116,22 +132,27 @@ jobs:
           cd ${NC3_DOCKER_DIR}
           docker-compose rm -f
 
-      # テスト成功時はこちらのステップが実行される
-      - name: Slack Notification on Success
-        if: success()
-        uses: rtCamp/action-slack-notify@v2.2.0
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: notify-netcommons3
-          SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})"
-          SLACK_COLOR: good
-
       # テスト失敗時はこちらのステップが実行される
       - name: Slack Notification on Failure
         uses: rtCamp/action-slack-notify@v2.2.0
         if: failure()
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_CHANNEL: notify-netcommons3
-          SLACK_TITLE: "${{ github.repository }}(${{ matrix.php }})"
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
+          SLACK_CHANNEL: notify-nc3-tests
+          SLACK_TITLE: "${{ github.repository }}(php${{ matrix.php }}, mysql${{ matrix.mysql }})"
           SLACK_COLOR: danger
+
+  teardown:
+    name: teardown
+    runs-on: ubuntu-18.04
+    needs: tests
+    steps:
+      # テスト成功時はこちらのステップが実行される
+      - name: Slack Notification on Success
+        if: success()
+        uses: rtCamp/action-slack-notify@v2.2.0
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
+          SLACK_CHANNEL: notify-nc3-tests
+          SLACK_TITLE: "${{ github.repository }}"
+          SLACK_COLOR: good

From 6082b71052859cb50b77f19a5dd6f68240867913 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 13 Aug 2021 14:56:14 +0900
Subject: [PATCH 16/23] change: Version number to 3.3.4

---
 VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index 619b537..a0891f5 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-3.3.3
+3.3.4

From 26db8fa0afe35c0dd927fffc6ccc3a6cbb533d55 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Tue, 25 Jan 2022 17:19:59 +0900
Subject: [PATCH 17/23] =?UTF-8?q?fix:=20=E3=82=AB=E3=83=86=E3=82=B4?=
 =?UTF-8?q?=E3=83=AA=E3=83=BC=E3=81=AE=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AB?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E3=81=AAID=E3=82=92=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB?=
 =?UTF-8?q?=E3=81=AF=E3=81=AA=E3=82=8B=E3=81=9F=E3=82=81=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=8CNotice=E3=81=8C=E7=99=BA=E7=94=9F?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=80=82BadRequest=E3=81=AB=E5=A4=89?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Controller/Component/CategoryEditComponent.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Controller/Component/CategoryEditComponent.php b/Controller/Component/CategoryEditComponent.php
index 899a21d..d620a09 100644
--- a/Controller/Component/CategoryEditComponent.php
+++ b/Controller/Component/CategoryEditComponent.php
@@ -73,11 +73,15 @@ public function startup(Controller $controller) {
 							'weight' => $post['CategoryOrder']['weight'],
 						),
 					));
-				}
-				if (isset($controller->request->data['CategoryMap'][$post['Category']['id']])) {
-					$category = Hash::merge(
-						$post, $controller->request->data['CategoryMap'][$post['Category']['id']]
-					);
+				} else {
+					if (isset($controller->request->data['CategoryMap'][$post['Category']['id']])) {
+						$category = Hash::merge(
+							$post, $controller->request->data['CategoryMap'][$post['Category']['id']]
+						);
+					} else {
+						$controller->request->data['Categories'] = [];
+						return $controller->throwBadRequest();
+					}
 				}
 				$category['Category']['block_id'] = $controller->request->data['Block']['id'];
 				$category['CategoryOrder']['block_key'] = $controller->request->data['Block']['key'];

From a1121ac5ab9393ea0c5c62895c16a0fbb697e299 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 11 Feb 2022 18:28:18 +0900
Subject: [PATCH 18/23] change: Version number to 3.3.5

---
 VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index a0891f5..fa7adc7 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-3.3.4
+3.3.5

From 85be047eeb112e93b765f3afb1812ccd8e9d7216 Mon Sep 17 00:00:00 2001
From: Ryuji AMANO <ryuji@ryus.co.jp>
Date: Fri, 18 Feb 2022 16:51:23 +0900
Subject: [PATCH 19/23] =?UTF-8?q?fix:=20=E3=82=AB=E3=83=86=E3=82=B4?=
 =?UTF-8?q?=E3=83=AA=E3=83=89=E3=83=AD=E3=83=83=E3=83=97=E3=83=80=E3=82=A6?=
 =?UTF-8?q?=E3=83=B3=E3=81=A7$options['categories']=E3=81=AB=E3=81=AA?=
 =?UTF-8?q?=E3=81=84$currentCategoryId=E3=81=8C=E6=8C=87=E5=AE=9A=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=81=A8Notice=E3=81=AB=E3=81=AA=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20Refs=20https://github.co?=
 =?UTF-8?q?m/researchmap/RmNetCommons3/issues/2667?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 View/Elements/dropdown_toggle_category.ctp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/View/Elements/dropdown_toggle_category.ctp b/View/Elements/dropdown_toggle_category.ctp
index 529737f..3157860 100644
--- a/View/Elements/dropdown_toggle_category.ctp
+++ b/View/Elements/dropdown_toggle_category.ctp
@@ -16,7 +16,7 @@
 			<div class="clearfix">
 				<div class="pull-left nc-category-ellipsis">
 					<?php if (isset($currentCategoryId)) : ?>
-						<?php echo h($options['categories'][$currentCategoryId]['name']); ?>
+						<?php echo h($options['categories'][$currentCategoryId]['name'] ?? ''); ?>
 					<?php else : ?>
 						<?php echo h($options['categories']['0']['name']); ?>
 					<?php endif; ?>

From 93c584cf21281f2ff52460f3281dac4dbc889b02 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Fri, 24 Feb 2023 13:34:09 +0900
Subject: [PATCH 20/23] =?UTF-8?q?test:=20Github=20Action=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/tests.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 1477ea2..7cfa881 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -44,10 +44,14 @@ jobs:
         MYSQL_VERSION: ${{ matrix.mysql }}
         MYSQL_ROOT_PASSWORD: root
         MYSQL_DATABASE: cakephp_test
+        COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - uses: actions/checkout@v2
 
+      - name: Fix up git URLs
+        run: echo -e '[url "https://github.com/"]\n  insteadOf = "git://github.com/"' >> ~/.gitconfig
+
       - name: environment
         run: |
           echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}"
@@ -58,7 +62,7 @@ jobs:
 
       - name: docker-compose install
         run: |
-          curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
+          curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose
           chmod +x ~/docker-compose
           sudo mv ~/docker-compose /usr/local/bin/docker-compose
           docker-compose --version

From 956068c54d2d144e1d5ed33d752cbb7472eba4ad Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Sat, 25 Feb 2023 21:32:25 +0900
Subject: [PATCH 21/23] change: Version number to 3.3.6

---
 VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index fa7adc7..9c25013 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-3.3.5
+3.3.6

From 996cc6e6afb93582327c6e5ad69f088d213342a9 Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Thu, 5 Oct 2023 17:16:46 +0900
Subject: [PATCH 22/23] =?UTF-8?q?test:=20github=20action=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/tests.yml | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7cfa881..eb2068b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,10 +15,11 @@ name: tests
 jobs:
   setup:
     name: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Slack Notification on Start
         uses: rtCamp/action-slack-notify@v2.2.0
+        if: env.SLACK_WEBHOOK != ''
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
           SLACK_CHANNEL: notify-nc3-tests
@@ -28,7 +29,7 @@ jobs:
   tests:
     name: tests
     needs: setup
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         php: [ '7.1', '7.2', '7.3', '7.4' ]
@@ -92,46 +93,53 @@ jobs:
           docker-compose exec -T nc3app bash /opt/scripts/app-build.sh
 
       - name: phpcs (PHP CodeSniffer)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh
 
       - name: phpmd (PHP Mess Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh
 
       - name: phpcpd (PHP Copy/Paste Detector)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh
 
       - name: gjslint (JavaScript Style Check)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh
 
       - name: phpdoc (PHP Documentor)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh
 
       - name: phpunit (PHP UnitTest)
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh
           sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build
 
-      - name: push coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          COVERALLS_FLAG_NAME: ${{ matrix.php }}
-        run: |
-          cd ${NC3_BUILD_DIR}
-          ls -la ${NC3_BUILD_DIR}
-          vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+#       - name: push coveralls
+#         env:
+#           COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+#           COVERALLS_FLAG_NAME: ${{ matrix.php }}
+#         run: |
+#           cd ${NC3_BUILD_DIR}
+#           ls -la ${NC3_BUILD_DIR}
+#           vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
 
       - name: docker-compose remove
+        if: always()
         run: |
           cd ${NC3_DOCKER_DIR}
           docker-compose rm -f
@@ -139,7 +147,7 @@ jobs:
       # テスト失敗時はこちらのステップが実行される
       - name: Slack Notification on Failure
         uses: rtCamp/action-slack-notify@v2.2.0
-        if: failure()
+        if: env.SLACK_WEBHOOK != '' && failure()
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
           SLACK_CHANNEL: notify-nc3-tests
@@ -148,13 +156,13 @@ jobs:
 
   teardown:
     name: teardown
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     needs: tests
     steps:
       # テスト成功時はこちらのステップが実行される
       - name: Slack Notification on Success
-        if: success()
         uses: rtCamp/action-slack-notify@v2.2.0
+        if: env.SLACK_WEBHOOK != '' && success()
         env:
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }}
           SLACK_CHANNEL: notify-nc3-tests

From ca4643247e5ac81e39aa47c51feab8e8dc0efdfc Mon Sep 17 00:00:00 2001
From: s-nakajima <nakajimashouhei@gmail.com>
Date: Mon, 9 Oct 2023 15:48:50 +0900
Subject: [PATCH 23/23] change: Version number to 3.3.7

---
 VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION.txt b/VERSION.txt
index 9c25013..86fb650 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-3.3.6
+3.3.7