From 9603021679e8509c5ddc3a1ac2020da9f9d7bcb0 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Thu, 17 Oct 2024 22:38:06 +0900 Subject: [PATCH 1/4] Add php:8.4-rc --- .github/actions/dockerbuild/action.yml | 3 +-- .github/workflows/dockerbuild-and-push.yml | 5 ++--- .github/workflows/dockerbuild.yml | 2 +- .github/workflows/e2e-tests.yml | 4 ++-- .github/workflows/unit-tests.yml | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/actions/dockerbuild/action.yml b/.github/actions/dockerbuild/action.yml index 8bec828e97..e24efe6863 100644 --- a/.github/actions/dockerbuild/action.yml +++ b/.github/actions/dockerbuild/action.yml @@ -22,8 +22,7 @@ runs: run: | echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} - - if: ${{ inputs.php-version >= 7.4 }} - shell: 'bash' + - shell: 'bash' run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} diff --git a/.github/workflows/dockerbuild-and-push.yml b/.github/workflows/dockerbuild-and-push.yml index d7e293aaac..125683f27b 100644 --- a/.github/workflows/dockerbuild-and-push.yml +++ b/.github/workflows/dockerbuild-and-push.yml @@ -21,15 +21,14 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] steps: - name: downcase REPO run: | echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}-php" >> ${GITHUB_ENV} - - if: ${{ matrix.php >= 7.4 }} - run: | + - run: | echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV} echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV} echo "APCU=apcu" >> ${GITHUB_ENV} diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 26c6b554c5..d2d4ec2a42 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] steps: - name: Checkout diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 5e5dcd305c..3c9cb1f6fe 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -30,7 +30,7 @@ jobs: - 'test/front_login' - 'test/front_guest' - 'test/admin' - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] db: [ mysql, pgsql ] steps: - name: Checkout @@ -123,7 +123,7 @@ jobs: fail-fast: false matrix: db: [ 'pgsql', 'mysql' ] - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] include: - db: mysql dbport: '3306' diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 14ef5dfc4f..e41c0520e9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -24,7 +24,7 @@ jobs: fail-fast: false matrix: operating-system: [ ubuntu-22.04 ] - php: [ '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '7.4', '8.0', '8.1', '8.2', '8.3', '8.4-rc' ] db: [ mysql, pgsql ] steps: From 7bb29419052466da56d430d38e07ad9fd1c611be Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Thu, 17 Oct 2024 23:44:48 +0900 Subject: [PATCH 2/4] =?UTF-8?q?PHP8.4=E3=81=A7=20`Argument=20#1=20($mode)?= =?UTF-8?q?=20must=20be=20a=20single=20character`=20=E3=81=A8=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/install/templates/step4.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl index 53e2c6c624..933b39ccef 100644 --- a/html/install/templates/step4.tpl +++ b/html/install/templates/step4.tpl @@ -30,7 +30,7 @@ - " /> + @@ -48,7 +48,7 @@
  • EC-CUBEバージョン：
  • PHP情報：
  • DB情報：
    • -
  • OS情報：
    • +
  • OS情報：
    • From 3900242e7f7629b4b02cd56b7a373aad32f1840a Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Thu, 17 Oct 2024 23:46:36 +0900 Subject: [PATCH 3/4] =?UTF-8?q?PHP8.4.0+=E3=81=A7=20MobileDetect=203.74.x?= =?UTF-8?q?=20=E3=81=8C=20E=5FDEPRECATED=20=E3=82=92=E7=99=BA=E7=94=9F?= =?UTF-8?q?=E3=81=95=E3=81=9B=E3=82=8B=E3=81=9F=E3=82=81=E5=88=86=E5=B2=90?= =?UTF-8?q?=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MobileDetect 4.8.x は PHP7.4.x に対応していないため、3.74.x を利用する --- tests/class/fixtures/server/common.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/class/fixtures/server/common.php b/tests/class/fixtures/server/common.php index ca9ccba031..db9a949582 100644 --- a/tests/class/fixtures/server/common.php +++ b/tests/class/fixtures/server/common.php @@ -4,7 +4,12 @@ require __DIR__.'/../../../require.php'; -error_reporting(-1); +if (PHP_VERSION_ID >= 80400) { + // XXX PHP8.4.0+で MobileDetect 3.74.x が E_DEPRECATED を発生させるため + error_reporting(E_ALL & ~E_DEPRECATED); +} else { + error_reporting(E_ALL); +} ini_set('display_errors', '1'); header_remove('X-Powered-By'); From e511f15a489ba5109c82e68f8031fa6e338d81f7 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Fri, 18 Oct 2024 00:24:46 +0900 Subject: [PATCH 4/4] =?UTF-8?q?Fixes=20#1019=20PR=20=E3=81=AE=E5=A0=B4?= =?UTF-8?q?=E5=90=88=E3=81=AF=20`TAG=3D${DOCKER=5FMETADATA=5FOUTPUT=5FVERS?= =?UTF-8?q?ION}`=20=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/e2e-tests.yml | 12 ++++++++++-- .github/workflows/phpstan.yml | 6 +++++- .github/workflows/unit-tests.yml | 6 +++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 3c9cb1f6fe..1a114efb30 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -60,7 +60,11 @@ jobs: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml" >> $GITHUB_ENV echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV if [ $EVENT_NAME = "pull_request" ]; then - echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + if [ -n $DOCKER_METADATA_OUTPUT_VERSION ]; then + echo "TAG=${DOCKER_METADATA_OUTPUT_VERSION}" >> $GITHUB_ENV + else + echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + fi else echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV fi @@ -158,7 +162,11 @@ jobs: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml" >> $GITHUB_ENV echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV if [ $EVENT_NAME = "pull_request" ]; then - echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + if [ -n $DOCKER_METADATA_OUTPUT_VERSION ]; then + echo "TAG=${DOCKER_METADATA_OUTPUT_VERSION}" >> $GITHUB_ENV + else + echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + fi else echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV fi diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml index 96d47fdb71..0858b04b40 100644 --- a/.github/workflows/phpstan.yml +++ b/.github/workflows/phpstan.yml @@ -39,7 +39,11 @@ jobs: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.dev.yml" >> $GITHUB_ENV echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV if [ $EVENT_NAME = "pull_request" ]; then - echo "TAG=8.3-apache-${BASE_REF}" >> $GITHUB_ENV + if [ -n $DOCKER_METADATA_OUTPUT_VERSION ]; then + echo "TAG=${DOCKER_METADATA_OUTPUT_VERSION}" >> $GITHUB_ENV + else + echo "TAG=8.3-apache-${BASE_REF}" >> $GITHUB_ENV + fi else echo "TAG=8.3-apache-${REF_NAME}" >> $GITHUB_ENV fi diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index e41c0520e9..89b0a2a465 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -53,7 +53,11 @@ jobs: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.${DB}.yml:docker-compose.dev.yml" >> $GITHUB_ENV echo "IMAGE_NAME=${OWNER,,}/ec-cube2-php" >> $GITHUB_ENV if [ $EVENT_NAME = "pull_request" ]; then - echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + if [ -n $DOCKER_METADATA_OUTPUT_VERSION ]; then + echo "TAG=${DOCKER_METADATA_OUTPUT_VERSION}" >> $GITHUB_ENV + else + echo "TAG=${PHP}-apache-${BASE_REF}" >> $GITHUB_ENV + fi else echo "TAG=${PHP}-apache-${REF_NAME}" >> $GITHUB_ENV fi