Merge branch 'master' into fixed_webpack

EC-CUBE · Oct 29, 2024 · 358faed · 358faed
2 parents 1399f72 + a895209
commit 358faed
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -123,7 +127,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'
@@ -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
@@ -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
@@ -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:
@@ -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

diff --git a/html/install/templates/step4.tpl b/html/install/templates/step4.tpl
@@ -30,7 +30,7 @@
     <input type="hidden" name="senddata_cube_ver" value="<!--{$tpl_cube_ver}-->" />
     <input type="hidden" name="senddata_php_ver" value="<!--{$tpl_php_ver}-->" />
     <input type="hidden" name="senddata_db_ver" value="<!--{$tpl_db_ver}-->" />
-    <input type="hidden" name="senddata_os_type" value="<!--{""|php_uname|h}--> <!--{$smarty.server.SERVER_SOFTWARE|h}-->" />
+    <input type="hidden" name="senddata_os_type" value="<!--{php_uname()|h}--> <!--{$smarty.server.SERVER_SOFTWARE|h}-->" />
     <!--{foreach key=key item=item from=$arrHidden}-->
         <input type="hidden" name="<!--{$key}-->" value="<!--{$item|h}-->" />
     <!--{/foreach}-->
@@ -48,7 +48,7 @@
                 <li><span class="bold">EC-CUBEバージョン：</span><!--{$tpl_cube_ver}--></li>
                 <li><span class="bold">PHP情報：</span><!--{$tpl_php_ver}--></li>
                 <li><span class="bold">DB情報：</span><!--{$tpl_db_ver}--></li>
-                <li><span class="bold">OS情報：</span><!--{""|php_uname|h}--> <!--{$smarty.server.SERVER_SOFTWARE|h}--></li>
+                <li><span class="bold">OS情報：</span><!--{php_uname()|h}--> <!--{$smarty.server.SERVER_SOFTWARE|h}--></li>
             </ul>
         </div>
         <div class="result-info02">

diff --git 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');