From da90fc62423c72c6d6fa0058011c84204a838972 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Thu, 12 Jan 2023 11:01:48 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20test:=20WorkflowBehavior=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E3=81=AB=E3=81=A8=E3=82=82=E3=81=AA=E3=81=84=E3=82=A8?= =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=83=86?= =?UTF-8?q?=E3=82=B9=E3=83=88=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/QuestionnaireAnswersController/ViewTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Test/Case/Controller/QuestionnaireAnswersController/ViewTest.php b/Test/Case/Controller/QuestionnaireAnswersController/ViewTest.php index 5949eef..e8c3edb 100644 --- a/Test/Case/Controller/QuestionnaireAnswersController/ViewTest.php +++ b/Test/Case/Controller/QuestionnaireAnswersController/ViewTest.php @@ -325,7 +325,8 @@ public function testGetShuffle() { 'action' => 'view', 'frame_id' => 6, 'block_id' => 2, - 'key' => 'questionnaire_4' + 'key' => 'questionnaire_4', + '?' => ['lang' => 'ja'] ); $assert = array('method' => 'assertTextContains', 'expected' => __d('questionnaires', 'This questionnaire is being temporarily stored . You can questionnaire test before performed in this page . If you want to modify or change the questionnaire , you will be able to edit by pressing the [ Edit question ] button in the upper-right corner .')); From 144d978ee36c1dd95e174b47f0ae81e57da0d03d Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Thu, 12 Jan 2023 16:01:26 +0900 Subject: [PATCH 2/4] =?UTF-8?q?change:=20PHP7.1=E3=82=92=E8=87=AA=E5=8B=95?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E5=AF=BE=E8=B1=A1=E3=81=8B?= =?UTF-8?q?=E3=82=89=E5=A4=96=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当プラグインは、composer.lockファイルを参照する処理があるのだが、PHP7.1ではcomposer install時にjms/serializerのインストールに失敗しcomposer.lockファイルが参照できなくなる。それが原因でテストに失敗するため。 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9501566..8262600 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-18.04 strategy: matrix: - php: [ '7.1', '7.2', '7.3', '7.4' ] + php: [ '7.2', '7.3', '7.4' ] mysql: [ '5.7', '8.0' ] env: From e6f72e1ddc3ffaab197151995a2d149323337b5b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 16:09:30 +0900 Subject: [PATCH 3/4] =?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 | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8262600..3195c64 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,6 +44,7 @@ jobs: MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 From 7d9d29ed49314cfca0d6bc08bb1c8cc485669234 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 26 Feb 2023 04:15:54 +0900 Subject: [PATCH 4/4] 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