From 2fe8dda5708966085c272fbd57079532afc3792a Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Fri, 24 Feb 2023 17:13:46 +0900
Subject: [PATCH 01/11] =?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 e0223bc252299ca090422fdc213e09155ad3e2eb Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Sun, 26 Feb 2023 07:33:34 +0900
Subject: [PATCH 02/11] 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 88f5dd03b9d9e6716f9e01d5df5dcd94e2704dd4 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 19 Sep 2023 09:20:47 +0900
Subject: [PATCH 03/11] =?UTF-8?q?refactor:=20=E8=A9=B3=E7=B4=B0=E3=83=BB?=
=?UTF-8?q?=E3=82=B5=E3=83=A0=E3=83=8D=E3=82=A4=E3=83=AB=E3=82=92=E9=9D=9E?=
=?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=99=E3=82=8B=E3=81=A8=E4=B8=8D?=
=?UTF-8?q?=E8=A6=81=E3=81=AB=E3=81=AA=E3=82=8B=E3=82=BF=E3=82=B0=E3=82=92?=
=?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
=?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3=20https://github.com/NetCommons3/Ne?=
=?UTF-8?q?tCommons3/issues/1708?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
View/Elements/Topics/item.ctp | 2 ++
View/Elements/Topics/item_angularjs.ctp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/View/Elements/Topics/item.ctp b/View/Elements/Topics/item.ctp
index e64e76c..ff1b9ca 100644
--- a/View/Elements/Topics/item.ctp
+++ b/View/Elements/Topics/item.ctp
@@ -57,6 +57,7 @@
+
+
diff --git a/View/Elements/Topics/item_angularjs.ctp b/View/Elements/Topics/item_angularjs.ctp
index 4598e33..bfab703 100644
--- a/View/Elements/Topics/item_angularjs.ctp
+++ b/View/Elements/Topics/item_angularjs.ctp
@@ -58,6 +58,7 @@
+
+
From 6bb356ae7b7428ade98376c84b4dcf39e5453162 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 19 Sep 2023 09:23:34 +0900
Subject: [PATCH 04/11] =?UTF-8?q?fix:=20=E3=82=82=E3=81=A3=E3=81=A8?=
=?UTF-8?q?=E3=81=BF=E3=82=8B=E3=81=A7=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?=
=?UTF-8?q?=E3=81=9F=E6=96=B0=E7=9D=80=E3=81=AB=E5=AF=BE=E3=81=97=E3=81=A6?=
=?UTF-8?q?=E3=80=81=E6=9C=AA=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=AE?=
=?UTF-8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AB?=
=?UTF-8?q?=E3=82=92=E3=82=AF=E3=83=AA=E3=83=83=E3=82=AF=E3=81=97=E3=81=A6?=
=?UTF-8?q?=E3=82=82=E3=83=9D=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97?=
=?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
=?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=80=82=20https:?=
=?UTF-8?q?//github.com/NetCommons3/NetCommons3/issues/1674?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
View/Elements/Topics/item_angularjs.ctp | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/View/Elements/Topics/item_angularjs.ctp b/View/Elements/Topics/item_angularjs.ctp
index bfab703..d2a621d 100644
--- a/View/Elements/Topics/item_angularjs.ctp
+++ b/View/Elements/Topics/item_angularjs.ctp
@@ -51,9 +51,15 @@
From bc0e0a5942797bf7b946436440bf5ee0096905f6 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 19 Sep 2023 09:32:28 +0900
Subject: [PATCH 05/11] =?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 | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 7cfa881..a4ab928 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -15,7 +15,7 @@ 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
@@ -28,7 +28,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 +92,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
@@ -148,7 +155,7 @@ jobs:
teardown:
name: teardown
- runs-on: ubuntu-18.04
+ runs-on: ubuntu-latest
needs: tests
steps:
# テスト成功時はこちらのステップが実行される
From d8bd6614da73ccafd79a02e98104673acb309d1e Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Fri, 6 Oct 2023 10:03:23 +0900
Subject: [PATCH 06/11] =?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 | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index a4ab928..6da4321 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -3,12 +3,10 @@ on:
branches:
- main
- master
- - availability
pull_request:
branches:
- main
- master
- - availability
name: tests
@@ -19,6 +17,7 @@ jobs:
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
@@ -146,7 +145,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
@@ -160,8 +159,8 @@ jobs:
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 471d6bcac8354b2fd67d6bfc3e2b9b8de5bfd364 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Tue, 10 Oct 2023 00:30:45 +0900
Subject: [PATCH 07/11] 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
From 8170a0738ac161b37d9e8c07d4e03a10234bc3a1 Mon Sep 17 00:00:00 2001
From: tmx-researchmap-team
Date: Fri, 6 Feb 2026 14:39:12 +0900
Subject: [PATCH 08/11] =?UTF-8?q?add:=20=E3=83=91=E3=83=95=E3=82=A9?=
=?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=B3=E3=82=B9=E6=94=B9=E5=96=84=E3=81=AB?=
=?UTF-8?q?=E4=BC=B4=E3=81=86=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83=E3=82=AF?=
=?UTF-8?q?=E3=82=B9=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Migration/1769652195_add_index.php | 60 +++++++++++++++++++++++
1 file changed, 60 insertions(+)
create mode 100644 Config/Migration/1769652195_add_index.php
diff --git a/Config/Migration/1769652195_add_index.php b/Config/Migration/1769652195_add_index.php
new file mode 100644
index 0000000..c325b88
--- /dev/null
+++ b/Config/Migration/1769652195_add_index.php
@@ -0,0 +1,60 @@
+ array(
+ 'create_field' => array(
+ 'topics' => array(
+ 'indexes' => array(
+ 'idx1_p_topics' => array('column' => array('category_id'), 'unique' => 0),
+ 'idx2_p_topics' => array('column' => array('frame_id'), 'unique' => 0),
+ 'idx3_p_topics' => array('column' => array('language_id', 'room_id','is_latest','is_active','is_in_room','created_user','public_type','publish_start','publish_end'), 'unique' => 0),
+ 'idx4_p_topics' => array('column' => array('is_active', 'room_id','public_type','publish_start','publish_end','created_user','id','`plugin_key`(191)'), 'unique' => 0),
+ ),
+ ),
+ ),
+ ),
+ 'down' => array(
+ 'drop_field' => array(
+ 'topics' => array('indexes' => array('idx1_p_topics', 'idx2_p_topics', 'idx3_p_topics', 'idx4_p_topics')),
+ ),
+ ),
+ );
+
+/**
+ * Before migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+ public function before($direction) {
+ return true;
+ }
+
+/**
+ * After migration callback
+ *
+ * @param string $direction Direction of migration process (up or down)
+ * @return bool Should process continue
+ */
+ public function after($direction) {
+ return true;
+ }
+}
From eea6cb25c48c1e291a5f59bba665e5d9142d600f Mon Sep 17 00:00:00 2001
From: "TMX\\kazuno"
Date: Mon, 16 Feb 2026 17:41:35 +0900
Subject: [PATCH 09/11] =?UTF-8?q?change:=20=E3=83=91=E3=83=95=E3=82=A9?=
=?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=B3=E3=82=B9=E6=94=B9=E5=96=84=E3=81=AB?=
=?UTF-8?q?=E4=BC=B4=E3=81=86=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83=E3=82=AF?=
=?UTF-8?q?=E3=82=B9=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Config/Schema/schema.php | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Config/Schema/schema.php b/Config/Schema/schema.php
index 7fd308f..76a052e 100644
--- a/Config/Schema/schema.php
+++ b/Config/Schema/schema.php
@@ -237,6 +237,10 @@ public function after($event = array()) {
'plugin_key2' => array('column' => array('plugin_key', 'language_id', 'block_id', 'content_id'), 'unique' => 0),
'room_id' => array('column' => 'room_id', 'unique' => 0),
'search' => array('column' => array('search_contents'), 'type' => 'fulltext'),
+ 'idx1_p_topics' => array('column' => array('category_id'), 'unique' => 0),
+ 'idx2_p_topics' => array('column' => array('frame_id'), 'unique' => 0),
+ 'idx3_p_topics' => array('column' => array('language_id', 'room_id','is_latest','is_active','is_in_room','created_user','public_type','publish_start','publish_end'), 'unique' => 0),
+ 'idx4_p_topics' => array('column' => array('is_active', 'room_id','public_type','publish_start','publish_end','created_user','id','`plugin_key`(191)'), 'unique' => 0),
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'Mroonga', 'comment' => 'engine "InnoDB"')
);
From 9991325300d21c903d07f848816b8beecc09b047 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Wed, 18 Feb 2026 19:25:42 +0900
Subject: [PATCH 10/11] =?UTF-8?q?ci:=20php7.4=E3=81=AE=E3=81=BF=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/tests.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6da4321..f46fc05 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -30,8 +30,8 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- php: [ '7.1', '7.2', '7.3', '7.4' ]
- mysql: [ '5.7', '8.0' ]
+ php: [ '7.4' ]
+ mysql: [ '8.0' ]
env:
NC3_BUILD_DIR: "/opt/nc3"
From d71d32102d57ada79abecf8296480f8831fe53b8 Mon Sep 17 00:00:00 2001
From: s-nakajima
Date: Wed, 18 Feb 2026 19:26:13 +0900
Subject: [PATCH 11/11] =?UTF-8?q?ci:=20phpdoc,phpcs=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
---
Config/Migration/1769652195_add_index.php | 10 +++++++---
Config/Schema/schema.php | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Config/Migration/1769652195_add_index.php b/Config/Migration/1769652195_add_index.php
index c325b88..96398c9 100644
--- a/Config/Migration/1769652195_add_index.php
+++ b/Config/Migration/1769652195_add_index.php
@@ -1,8 +1,12 @@
array(
'idx1_p_topics' => array('column' => array('category_id'), 'unique' => 0),
'idx2_p_topics' => array('column' => array('frame_id'), 'unique' => 0),
- 'idx3_p_topics' => array('column' => array('language_id', 'room_id','is_latest','is_active','is_in_room','created_user','public_type','publish_start','publish_end'), 'unique' => 0),
- 'idx4_p_topics' => array('column' => array('is_active', 'room_id','public_type','publish_start','publish_end','created_user','id','`plugin_key`(191)'), 'unique' => 0),
+ 'idx3_p_topics' => array('column' => array('language_id', 'room_id', 'is_latest', 'is_active', 'is_in_room', 'created_user', 'public_type', 'publish_start', 'publish_end'), 'unique' => 0),
+ 'idx4_p_topics' => array('column' => array('is_active', 'room_id', 'public_type', 'publish_start', 'publish_end', 'created_user', 'id', '`plugin_key`(191)'), 'unique' => 0),
),
),
),
diff --git a/Config/Schema/schema.php b/Config/Schema/schema.php
index 76a052e..2a2b4b2 100644
--- a/Config/Schema/schema.php
+++ b/Config/Schema/schema.php
@@ -239,8 +239,8 @@ public function after($event = array()) {
'search' => array('column' => array('search_contents'), 'type' => 'fulltext'),
'idx1_p_topics' => array('column' => array('category_id'), 'unique' => 0),
'idx2_p_topics' => array('column' => array('frame_id'), 'unique' => 0),
- 'idx3_p_topics' => array('column' => array('language_id', 'room_id','is_latest','is_active','is_in_room','created_user','public_type','publish_start','publish_end'), 'unique' => 0),
- 'idx4_p_topics' => array('column' => array('is_active', 'room_id','public_type','publish_start','publish_end','created_user','id','`plugin_key`(191)'), 'unique' => 0),
+ 'idx3_p_topics' => array('column' => array('language_id', 'room_id', 'is_latest', 'is_active', 'is_in_room', 'created_user', 'public_type', 'publish_start', 'publish_end'), 'unique' => 0),
+ 'idx4_p_topics' => array('column' => array('is_active', 'room_id', 'public_type', 'publish_start', 'publish_end', 'created_user', 'id', '`plugin_key`(191)'), 'unique' => 0),
),
'tableParameters' => array('charset' => 'utf8', 'collate' => 'utf8_general_ci', 'engine' => 'Mroonga', 'comment' => 'engine "InnoDB"')
);