From 966443e60dd306f2d0c104d774721b557cdbcc72 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 14 Sep 2018 17:31:43 +0900 Subject: [PATCH 01/25] =?UTF-8?q?=E8=A8=80=E8=AA=9E=E5=88=87=E3=82=8A?= =?UTF-8?q?=E6=9B=BF=E3=81=88=E3=81=A7=E6=97=A5=E6=9C=AC=E8=AA=9E=E3=81=8C?= =?UTF-8?q?=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=81=AB=E5=85=A5?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E3=81=A8Notice=E3=81=8C?= =?UTF-8?q?=E3=81=A7=E3=82=8B=20https://github.com/NetCommons3/NetCommons3?= =?UTF-8?q?/issues/1341?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Elements/switch_language_form.ctp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/View/Elements/switch_language_form.ctp b/View/Elements/switch_language_form.ctp index c4f9d04..26ea706 100644 --- a/View/Elements/switch_language_form.ctp +++ b/View/Elements/switch_language_form.ctp @@ -16,14 +16,7 @@ $enable = array_flip( Hash::extract($switchLanguages, '{n}.Language.code') ); $options = $this->M17n->getLanguagesOptions($enable); -$langQuery = parse_url($this->request->header('REQUEST_URI'), PHP_URL_QUERY); -if (preg_match('/lang=[^&]*/i', $langQuery)) { - $langQuery = preg_replace('/lang=[^&]*/i', 'lang=%s', $langQuery); -} elseif ($langQuery) { - $langQuery .= '&lang=%s'; -} else { - $langQuery = 'lang=%s'; -} +$langCommonQuery = parse_url($this->request->header('REQUEST_URI'), PHP_URL_QUERY); ?> @@ -32,7 +25,17 @@ if (preg_match('/lang=[^&]*/i', $langQuery)) {

$name) : ?>
• - + +
From d4f099f9e0ebdad51aa59bd10cddfe9f2628793b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 5 Jan 2019 13:52:59 +0900 Subject: [PATCH 02/25] =?UTF-8?q?=E3=82=AF=E3=82=A8=E3=83=AA=E3=81=AE?= =?UTF-8?q?=E7=B5=90=E6=9E=9C=E3=82=92=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E3=82=92=E3=81=A8=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=80=82=E3=81=9D=E3=81=AE=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=80=81static=E3=81=AB=E6=8C=81=E3=81=A3=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E5=A4=89=E6=95=B0=E3=81=8C=E4=B8=8D=E8=A6=81=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=82=8B=E3=81=9F=E3=82=81=E5=89=8A=E9=99=A4=20https:?= =?UTF-8?q?//github.com/NetCommons3/NetCommons3/issues/1337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Language.php | 69 +++++++++++-------- Test/Case/Model/Language/GetLanguagesTest.php | 19 ----- TestSuite/M17nGetTest.php | 22 ------ 3 files changed, 42 insertions(+), 68 deletions(-) diff --git a/Model/Language.php b/Model/Language.php index 5a3983a..6aedeb1 100644 --- a/Model/Language.php +++ b/Model/Language.php @@ -36,13 +36,6 @@ class Language extends M17nAppModel { */ public $validate = array(); -/** - * 言語データ - * - * @var array - */ - public static $languages = array(); - /** * use behaviors * @@ -50,6 +43,7 @@ class Language extends M17nAppModel { */ public $actsAs = array( 'M17n.SaveM17n', + 'NetCommons.NetCommonsCache', ); /** @@ -115,7 +109,7 @@ public function getLanguage($type = null, $options = array()) { ]; } - $languages = $this->find($type, Hash::merge(array( + $languages = $this->cacheFindQuery($type, Hash::merge(array( 'recursive' => -1, 'conditions' => array( 'is_active' => true @@ -130,11 +124,7 @@ public function getLanguage($type = null, $options = array()) { * @return array */ public function getLanguages() { - if (self::$languages) { - return self::$languages; - } - - self::$languages = $this->find('all', array( + $result = $this->cacheFindQuery('all', array( 'recursive' => -1, 'fields' => [ 'id', 'code', 'weight', 'is_active' @@ -144,8 +134,22 @@ public function getLanguages() { ), 'order' => array('weight' => 'asc') )); + return $result; + } - return self::$languages; +/** + * 複数言語か否か + * + * @return bool + */ + public function isMultipleLang() { + $result = $this->cacheFindQuery('count', array( + 'recursive' => -1, + 'conditions' => array( + 'is_active' => true + ), + )); + return $result; } /** @@ -154,22 +158,30 @@ public function getLanguages() { * @return array */ public function getLanguagesWithName() { - $languages = $this->find('all', array( + $languages = $this->cacheFindQuery('all', array( 'fields' => array('code', 'is_active'), 'recursive' => -1, )); - $activeLangs = []; - $enableLangs = []; - foreach ($languages as $lang) { - $code = $lang[$this->alias]['code']; - if (! isset($this->__labelLanguages[$code])) { - continue; - } - $enableLangs[$code] = __d('m17n', $this->__labelLanguages[$code]); - if ($lang[$this->alias]['is_active']) { - $activeLangs[] = $code; + $activeLangs = $this->cacheRead('activeLangs'); + $enableLangs = $this->cacheRead('enableLangs'); + if (! $activeLangs || ! $enableLangs) { + $activeLangs = []; + $enableLangs = []; + foreach ($languages as $lang) { + $code = $lang[$this->alias]['code']; + if (! isset($this->__labelLanguages[$code])) { + continue; + } + $enableLangs[$code] = __d('m17n', $this->__labelLanguages[$code]); + if ($lang[$this->alias]['is_active']) { + $activeLangs[] = $code; + } } + + //キャッシュの書き込み + $this->cacheWrite($activeLangs, 'activeLangs'); + $this->cacheWrite($enableLangs, 'enableLangs'); } return array($activeLangs, $enableLangs); @@ -209,7 +221,10 @@ public function saveActive($data) { throw new InternalErrorException(__d('net_commons', 'Internal Server Error')); } - $languages = $this->find('list', array( + //キャッシュのクリア + $this->cacheClear(); + + $languages = $this->cacheFindQuery('list', array( 'recursive' => -1, 'conditions' => array( 'is_active' => true, @@ -231,7 +246,7 @@ public function saveActive($data) { public function validateActive($data) { $fieldName = 'Language.code'; - $languages = $this->find('list', array( + $languages = $this->cacheFindQuery('list', array( 'fields' => array('code', 'is_active'), 'recursive' => -1, )); diff --git a/Test/Case/Model/Language/GetLanguagesTest.php b/Test/Case/Model/Language/GetLanguagesTest.php index 2baccea..4d399d4 100644 --- a/Test/Case/Model/Language/GetLanguagesTest.php +++ b/Test/Case/Model/Language/GetLanguagesTest.php @@ -84,23 +84,4 @@ public function testGetLanguages() { $this->assertEquals($expected, $result); } -/** - * getLanguages()の既に取得済みの場合のテスト - * - * @return void - */ - public function testGetLanguagesWithData() { - $model = $this->_modelName; - $methodName = $this->_methodName; - - Language::$languages = array('test dummy'); - - //テスト実施 - $result = $this->$model->$methodName(); - - //チェック - $expected = array('test dummy'); - $this->assertEquals($expected, $result); - } - } diff --git a/TestSuite/M17nGetTest.php b/TestSuite/M17nGetTest.php index 7e4acb3..1dc0b28 100644 --- a/TestSuite/M17nGetTest.php +++ b/TestSuite/M17nGetTest.php @@ -52,26 +52,4 @@ public function __construct($name = null, array $data = array(), $dataName = '') parent::__construct($name, $data, $dataName); } -/** - * setUp method - * - * @return void - */ - public function setUp() { - parent::setUp(); - - Language::$languages = array(); - } - -/** - * tearDown method - * - * @return void - */ - public function tearDown() { - Language::$languages = array(); - - parent::tearDown(); - } - } From e51517752357be108acf91cc210dce3be377dd0e Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 5 Jan 2019 14:09:23 +0900 Subject: [PATCH 03/25] =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AE=E3=83=9F?= =?UTF-8?q?=E3=82=B9=20https://github.com/NetCommons3/NetCommons3/issues/1?= =?UTF-8?q?337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Language.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Language.php b/Model/Language.php index 6aedeb1..6e59408 100644 --- a/Model/Language.php +++ b/Model/Language.php @@ -149,7 +149,7 @@ public function isMultipleLang() { 'is_active' => true ), )); - return $result; + return $result > 1; } /** From 9fba3761cdb462b65fe21c695e1f902f00d2a103 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 6 Jan 2019 10:17:16 +0900 Subject: [PATCH 04/25] =?UTF-8?q?Plugin=E3=83=A2=E3=83=87=E3=83=AB?= =?UTF-8?q?=E3=81=AE=E3=82=AF=E3=82=A8=E3=83=AA=E7=B5=90=E6=9E=9C=E3=82=92?= =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=AB=E3=82=88=E3=82=8B=E6=94=B9=E4=BF=AE?= =?UTF-8?q?=20https://github.com/NetCommons3/NetCommons3/issues/1337?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Behavior/SaveM17nBehavior.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Behavior/SaveM17nBehavior.php b/Model/Behavior/SaveM17nBehavior.php index 4e508a3..98c66ec 100644 --- a/Model/Behavior/SaveM17nBehavior.php +++ b/Model/Behavior/SaveM17nBehavior.php @@ -65,7 +65,7 @@ public function copyOrignalData(Model $model, $languageId) { continue; } - $plugin = $model->Plugin->find('first', array( + $plugin = $model->Plugin->cacheFindQuery('first', array( 'recursive' => -1, 'conditions' => array( 'key' => Inflector::underscore($pluginDir), From e072de4ae24ab5fec0f4ad31d6820ab657b7c537 Mon Sep 17 00:00:00 2001 From: RikaFujiwara Date: Mon, 11 Mar 2019 10:34:29 +0000 Subject: [PATCH 05/25] refs #1449 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit language_idを設定しなくていい、とfalseを返すのはRoom.idがない時と、Plugin自体がm17nに対応していない時だけにすべき Spaceの設定がどうであれ、プラグインとしてm17nが動作することを期待しているならば、language_idを設定してあげないと language_idが空欄になってしまって、現在のlanguage_idに対応するデータを取り出せなくなるのではないか --- Model/Behavior/M17nBehavior.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/Model/Behavior/M17nBehavior.php b/Model/Behavior/M17nBehavior.php index e92bd03..598ac1a 100644 --- a/Model/Behavior/M17nBehavior.php +++ b/Model/Behavior/M17nBehavior.php @@ -157,8 +157,7 @@ public function isM17nGeneralPlugin(Model $model) { if (Current::read('Plugin.type') !== Plugin::PLUGIN_TYPE_FOR_FRAME) { return true; } - if (! Current::read('Room.id') || ! Current::read('Plugin.is_m17n') || - ! Current::read('Space.is_m17n')) { + if (! Current::read('Room.id') || ! Current::read('Plugin.is_m17n')) { return false; } @@ -176,22 +175,30 @@ public function isM17nGeneralPlugin(Model $model) { * @SuppressWarnings(PHPMD.NPathComplexity) */ public function beforeSave(Model $model, $options = array()) { +$this->log($model->alias . ' ' . __LINE__, 'debug'); +if ($model->alias == 'CategoriesLanguage') { +$this->log($model->data, 'debug'); +} if (! $this->_hasM17nFields($model)) { return true; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); $keyField = $this->settings[$model->name]['keyField']; if (! $keyField) { return true; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); if (! $this->isM17nGeneralPlugin($model)) { return true; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); if ($model->hasField('is_original_copy')) { $model->data[$model->alias]['is_original_copy'] = false; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); //チェックするためのWHERE条件 if ($this->_hasWorkflowFields($model)) { @@ -205,6 +212,7 @@ public function beforeSave(Model $model, $options = array()) { 'language_id' => Current::read('Language.id'), 'is_latest' => true ); +$this->log($model->alias . ' ' . __LINE__, 'debug'); } else { $transConditions = array( $keyField => $model->data[$model->alias][$keyField], @@ -214,6 +222,7 @@ public function beforeSave(Model $model, $options = array()) { $keyField => $model->data[$model->alias][$keyField], 'language_id' => Current::read('Language.id') ); +$this->log($model->alias . ' ' . __LINE__, 'debug'); } //データが1件もないことを確認する @@ -224,6 +233,10 @@ public function beforeSave(Model $model, $options = array()) { $keyField => $model->data[$model->alias][$keyField] ), )); +$this->log($model->alias . ' ' . __LINE__, 'debug'); +if ($model->alias == 'CategoriesLanguage') { +$this->log($model->data, 'debug'); +} if ($count <= 0) { $model->data[$model->alias]['language_id'] = Current::read('Language.id'); $model->data[$model->alias]['is_origin'] = true; @@ -231,6 +244,7 @@ public function beforeSave(Model $model, $options = array()) { return true; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); $model->data[$model->alias]['language_id'] = Current::read('Language.id'); @@ -245,6 +259,7 @@ public function beforeSave(Model $model, $options = array()) { } else { $model->data[$model->alias]['is_translation'] = false; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); //当言語のデータのチェック $data = $model->find('first', array( @@ -260,6 +275,11 @@ public function beforeSave(Model $model, $options = array()) { $model->data[$model->alias] = Hash::remove($model->data[$model->alias], 'id'); $model->id = null; } +$this->log($model->alias . ' ' . __LINE__, 'debug'); +if ($model->alias == 'CategoriesLanguage') { +$this->log($model->data, 'debug'); +} + return parent::beforeSave($model, $options); } From 77552747c5c090d22745bcc7ac66d10739dadc85 Mon Sep 17 00:00:00 2001 From: RikaFujiwara Date: Mon, 11 Mar 2019 10:57:16 +0000 Subject: [PATCH 06/25] delete debug log ..... --- Model/Behavior/M17nBehavior.php | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Model/Behavior/M17nBehavior.php b/Model/Behavior/M17nBehavior.php index 598ac1a..5c50565 100644 --- a/Model/Behavior/M17nBehavior.php +++ b/Model/Behavior/M17nBehavior.php @@ -175,30 +175,22 @@ public function isM17nGeneralPlugin(Model $model) { * @SuppressWarnings(PHPMD.NPathComplexity) */ public function beforeSave(Model $model, $options = array()) { -$this->log($model->alias . ' ' . __LINE__, 'debug'); -if ($model->alias == 'CategoriesLanguage') { -$this->log($model->data, 'debug'); -} if (! $this->_hasM17nFields($model)) { return true; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); $keyField = $this->settings[$model->name]['keyField']; if (! $keyField) { return true; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); if (! $this->isM17nGeneralPlugin($model)) { return true; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); if ($model->hasField('is_original_copy')) { $model->data[$model->alias]['is_original_copy'] = false; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); //チェックするためのWHERE条件 if ($this->_hasWorkflowFields($model)) { @@ -212,7 +204,6 @@ public function beforeSave(Model $model, $options = array()) { 'language_id' => Current::read('Language.id'), 'is_latest' => true ); -$this->log($model->alias . ' ' . __LINE__, 'debug'); } else { $transConditions = array( $keyField => $model->data[$model->alias][$keyField], @@ -222,7 +213,6 @@ public function beforeSave(Model $model, $options = array()) { $keyField => $model->data[$model->alias][$keyField], 'language_id' => Current::read('Language.id') ); -$this->log($model->alias . ' ' . __LINE__, 'debug'); } //データが1件もないことを確認する @@ -233,10 +223,6 @@ public function beforeSave(Model $model, $options = array()) { $keyField => $model->data[$model->alias][$keyField] ), )); -$this->log($model->alias . ' ' . __LINE__, 'debug'); -if ($model->alias == 'CategoriesLanguage') { -$this->log($model->data, 'debug'); -} if ($count <= 0) { $model->data[$model->alias]['language_id'] = Current::read('Language.id'); $model->data[$model->alias]['is_origin'] = true; @@ -244,7 +230,6 @@ public function beforeSave(Model $model, $options = array()) { return true; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); $model->data[$model->alias]['language_id'] = Current::read('Language.id'); @@ -259,7 +244,6 @@ public function beforeSave(Model $model, $options = array()) { } else { $model->data[$model->alias]['is_translation'] = false; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); //当言語のデータのチェック $data = $model->find('first', array( @@ -275,12 +259,6 @@ public function beforeSave(Model $model, $options = array()) { $model->data[$model->alias] = Hash::remove($model->data[$model->alias], 'id'); $model->id = null; } -$this->log($model->alias . ' ' . __LINE__, 'debug'); -if ($model->alias == 'CategoriesLanguage') { -$this->log($model->data, 'debug'); -} - - return parent::beforeSave($model, $options); } From dfc43f3136ac7ce59a46e1f79e7bbc6d48be53cc Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Thu, 9 May 2019 11:22:53 +0900 Subject: [PATCH 07/25] =?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/Language.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Language.php b/Model/Language.php index 6e59408..6af17fe 100644 --- a/Model/Language.php +++ b/Model/Language.php @@ -56,7 +56,7 @@ class Language extends M17nAppModel { * @see Model::save() */ public function beforeValidate($options = array()) { - $this->validate = Hash::merge($this->validate, array( + $this->validate = ValidateMerge::merge($this->validate, array( 'code' => array( 'notBlank' => array( 'rule' => array('notBlank'), From e392f8a6972de6dae9fe9bf34595b5502ab21eca Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 12 Aug 2019 11:18:01 +0900 Subject: [PATCH 08/25] =?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 | 2 ++ phpunit.xml.dist | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9929d24..622ef1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,10 @@ php: - 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 e1824b4..5963493 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,6 +14,5 @@ - From 964b94e4b4bc49b0af8cfcc1b6486e1cdd4bac7a Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 27 Dec 2019 12:14:19 +0900 Subject: [PATCH 09/25] =?UTF-8?q?fix:=20=E3=83=AA=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E5=8F=96=E5=BE=97=E3=81=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20https://github.com/researchmap/RmNetCommon?= =?UTF-8?q?s3/issues/1567#issuecomment-569170804?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/M17nController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/M17nController.php b/Controller/M17nController.php index c2abbbb..f714f2c 100644 --- a/Controller/M17nController.php +++ b/Controller/M17nController.php @@ -24,7 +24,7 @@ class M17nController extends M17nAppController { * @return void */ public function index() { - $this->redirect($this->request->referer()); + $this->redirect($this->request->referer(true)); } } From 89457a5a1ff522eb3729ce9fc944f5fdd7c324aa Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 10 Mar 2020 09:44:15 +0900 Subject: [PATCH 10/25] =?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 622ef1c..18e8700 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 3bbf22038fc22830c614af60637546ae4592a6cf Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 7 Aug 2020 22:35:16 +0900 Subject: [PATCH 11/25] =?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 18e8700..a2b8807 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 5963493..039fd2b 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,5 +1,11 @@ + + + + + + app/Plugin/M17n From d96e5946cf4c58e694b29315447f96e1af896ce0 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 26 Aug 2020 20:19:29 +0900 Subject: [PATCH 12/25] 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 5c3e194fe6f5da9912c0c202ceaab146a152bae2 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 13 Dec 2020 17:05:18 +0900 Subject: [PATCH 13/25] =?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 a2b8807..dbdf136 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 6308d6e03d49010d72fe3f6c81742f4b62324beb Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 23 Jan 2021 13:58:43 +0900 Subject: [PATCH 14/25] =?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 09f61e87cc0c1a5388a226c43454a146b1c19268 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 23 Jan 2021 13:58:48 +0900 Subject: [PATCH 15/25] 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 cd04c202e48e3de2b2404f7ee99d81aa13449f4f Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sat, 31 Jul 2021 10:46:11 +0900 Subject: [PATCH 16/25] =?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 | 9 +-- phpunit.xml.dist | 4 +- 4 files changed, 141 insertions(+), 51 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 dbdf136..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: "h36o2iRlR3lPZEjWvpM7kyyIBFBWZap1SSGBVf2UcQzXq1EnxzrdKS6uGhGRrMNsaj+F/1DHUDBJraZRP/Gle64u/tkfJugSWZHAiQSDNQ/Q6J0Dnot1FGz467Apf+swGTsjoV0GPEIWCWiXsqgfqe3YQ6GtvWrZRft3OOOISUA=" - - 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 a0142ec..309583d 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,6 @@ M17n ==== -[](https://travis-ci.org/NetCommons3/M17n) -[](https://coveralls.io/r/NetCommons3/M17n?branch=master) - -| dependencies | status | -| ------------ | ------ | -| composer.json | [](https://www.versioneye.com/user/projects/5382a4cb14c1582c240000d0) | +[](https://github.com/NetCommons3/M17n/actions/workflows/tests.yml) +[](https://coveralls.io/r/NetCommons3/M17n?branch=master) +[](https://packagist.org/packages/netcommons/m17n) diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 039fd2b..ebd10b6 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -3,9 +3,6 @@ - - - app/Plugin/M17n @@ -20,5 +17,6 @@ + From 4778bb1e9ca053f9330e507d7b1abb139cdf9dc2 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Wed, 11 Aug 2021 10:33:12 +0900 Subject: [PATCH 17/25] =?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 b4d9d22ec5c8c9588a19e30767db46ce22505680 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 13 Aug 2021 16:19:54 +0900 Subject: [PATCH 18/25] 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 267c02f8a796a08d2fa6d61a7a03deff35336540 Mon Sep 17 00:00:00 2001 From: ryu818 Date: Tue, 21 Sep 2021 15:43:00 +0900 Subject: [PATCH 19/25] =?UTF-8?q?change:=20=E3=80=8C=E5=8F=B0=E6=B9=BE?= =?UTF-8?q?=E3=80=8D=E3=81=AE=E8=8B=B1=E8=AA=9E=E8=A1=A8=E8=A8=98=E3=82=92?= =?UTF-8?q?=E3=80=8CTaiwan,=20Province=20of=20China=E3=80=8D=E3=81=8B?= =?UTF-8?q?=E3=82=89=E3=80=8CTaiwan=E3=80=8D=E3=81=AB=E5=A4=89=E6=9B=B4=20?= =?UTF-8?q?https://github.com/researchmap/RmNetCommons3/issues/2604?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- View/Helper/M17nHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/View/Helper/M17nHelper.php b/View/Helper/M17nHelper.php index c29cd1f..30aa0c8 100644 --- a/View/Helper/M17nHelper.php +++ b/View/Helper/M17nHelper.php @@ -271,7 +271,7 @@ class M17nHelper extends FormHelper { 'se' => 'Sweden', 'ch' => 'Switzerland', 'sy' => 'Syrian Arab Republic', - 'tw' => 'Taiwan, Province of China', + 'tw' => 'Taiwan', 'tj' => 'Tajikistan', 'tz' => 'Tanzania, United Republic of', 'th' => 'Thailand', From 348c20e48c1c372a63e3659e85bb101b5f9cf4a4 Mon Sep 17 00:00:00 2001 From: Shohei Nakajima Date: Sat, 13 Nov 2021 14:53:07 +0900 Subject: [PATCH 20/25] comment: Modified release tags. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 592d72f..2542421 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: tag_name: ${{ github.ref }} release_name: ${{ github.ref }} body: | - NetCommons ${{ github.ref }} released. + ${{ github.repository }} ${{ github.ref }} released. draft: false prerelease: false From f7d602eb081cf4aa137fd696254c02acc7cc13d7 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 11 Feb 2022 19:55:07 +0900 Subject: [PATCH 21/25] 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 cbd5e57c5fc185bcf42edc47c6cea9f62efe8088 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 14:58:11 +0900 Subject: [PATCH 22/25] =?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 da05bdabc3eaa16c64addc4580d2607d546a6a6c Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 26 Feb 2023 01:07:28 +0900 Subject: [PATCH 23/25] 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 b0bb8aad47c6f5387cccceb77001af7df084a67e Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Thu, 5 Oct 2023 18:54:04 +0900 Subject: [PATCH 24/25] =?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 | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..6da4321 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,22 +3,21 @@ on: branches: - main - master - - availability pull_request: branches: - main - master - - availability 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 +27,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 +91,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 +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 @@ -148,13 +154,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 13a30e8740fb47049d29ef9032423a249a8425ef Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 9 Oct 2023 18:51:34 +0900 Subject: [PATCH 25/25] 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