Test

Author: iluuu1994

.github/actions/configure-macos/action.yml

@@ -23,50 +23,8 @@ runs:
         ./configure \
           --enable-option-checking=fatal \
           --prefix=/usr/local \
-          --enable-fpm \
-          --with-pdo-mysql=mysqlnd \
-          --with-mysqli=mysqlnd \
-          --with-pgsql="$BREW_OPT"/libpq \
-          --with-pdo-pgsql="$BREW_OPT"/libpq \
-          --with-pdo-sqlite \
           --without-pear \
-          --enable-gd \
-          --with-jpeg \
-          --with-webp \
-          --with-freetype \
-          --enable-exif \
-          --with-zip \
-          --with-zlib \
-          --enable-soap \
-          --enable-xmlreader \
-          --with-xsl \
-          --with-tidy="$BREW_OPT"/tidy-html5 \
-          --with-libxml \
-          --enable-sysvsem \
-          --enable-sysvshm \
-          --enable-shmop \
-          --enable-pcntl \
-          --with-readline="$BREW_OPT"/readline \
           --enable-mbstring \
-          --with-curl \
-          --with-gettext="$BREW_OPT"/gettext \
-          --enable-sockets \
-          --with-bz2="$BREW_OPT"/bzip2 \
-          --with-openssl \
-          --with-gmp="$BREW_OPT"/gmp \
-          --with-iconv="$BREW_OPT"/libiconv \
-          --enable-bcmath \
-          --enable-calendar \
-          --enable-ftp \
-          --enable-sysvmsg \
-          --with-ffi \
-          --enable-zend-test \
-          --enable-dl-test=shared \
-          --enable-intl \
-          --with-mhash \
-          --with-sodium \
-          --enable-dba \
-          --enable-werror \
           --with-config-file-path=/etc \
           --with-config-file-scan-dir=/etc/php.d \
           ${{ inputs.configurationParameters }}

.github/workflows/push.yml

@@ -33,7 +33,7 @@ env:
   CXX: ccache g++
 jobs:
   ALPINE:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
     runs-on: ubuntu-24.04
     container:
@@ -74,7 +74,7 @@ jobs:
             --asan -x
             -d opcache.enable_cli=1
   LINUX_X64:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     services:
       mysql:
         image: mysql:8.3
@@ -170,7 +170,7 @@ jobs:
         if: ${{ !matrix.asan }}
         uses: ./.github/actions/verify-generated-files
   LINUX_X32:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     name: LINUX_X32_DEBUG_ZTS
     runs-on: ubuntu-latest
     timeout-minutes: 50
@@ -252,7 +252,7 @@ jobs:
       - name: ./configure
         uses: ./.github/actions/configure-macos
         with:
-          configurationParameters: --enable-debug --disable-zts
+          configurationParameters: --disable-debug --disable-zts
       - name: make
         run: |-
           export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
@@ -264,11 +264,11 @@ jobs:
         with:
           jitType: tracing
           runTestsParameters: >-
-            -d opcache.enable_cli=1
+            -d opcache.enable_cli=1 ext/mbstring/tests/eucjp_2004_encoding.phpt
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
   WINDOWS:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     name: WINDOWS_X64_ZTS
     runs-on: windows-2022
     timeout-minutes: 50
@@ -296,7 +296,7 @@ jobs:
         run: .github/scripts/windows/test.bat
   BENCHMARKING:
     name: BENCHMARKING
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     runs-on: ubuntu-24.04
     timeout-minutes: 50
     steps:
@@ -400,7 +400,7 @@ jobs:
           path: ${{ github.workspace }}/benchmark/profiles
           retention-days: 30
   FREEBSD:
-    if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
+    if: false
     name: FREEBSD
     runs-on: ubuntu-latest
     timeout-minutes: 50

ext/mbstring/libmbfl/filters/mbfilter_cjk.c

@@ -2101,6 +2101,17 @@ static int mbfl_filt_conv_wchar_jis2004_flush(mbfl_convert_filter *filter)
 #define JISX0213_PLANE1 2
 #define JISX0213_PLANE2 3
 
+static zend_never_inline __attribute__((optnone)) void mbfl_test(uint32_t *w, unsigned int w1)
+{
+	/* Conversion for CJK Unified Ideographs ext.B (U+2XXXX) */
+	if (!*w) {
+		int k = mbfl_bisec_srch2(w1, jisx0213_jis_u5_key, jisx0213_u5_tbl_len);
+		if (k >= 0) {
+			*w = jisx0213_jis_u5_tbl[k] + 0x20000;
+		}
+	}
+}
+
 static size_t mb_iso2022jp2004_to_wchar(unsigned char **in, size_t *in_len, uint32_t *buf, size_t bufsize, unsigned int *state)
 {
 	unsigned char *p = *in, *e = p + *in_len;
@@ -2179,12 +2190,7 @@ static size_t mb_iso2022jp2004_to_wchar(unsigned char **in, size_t *in_len, uint
 					}
 
 					/* Conversion for CJK Unified Ideographs ext.B (U+2XXXX) */
-					if (!w) {
-						int k = mbfl_bisec_srch2(w1, jisx0213_jis_u5_key, jisx0213_u5_tbl_len);
-						if (k >= 0) {
-							w = jisx0213_jis_u5_tbl[k] + 0x20000;
-						}
-					}
+					mbfl_test(&w, w1);
 
 					*out++ = w ? w : MBFL_BAD_INPUT;
 				} else if (*state == JISX0213_PLANE2) {
@@ -9234,12 +9240,7 @@ static size_t mb_eucjp2004_to_wchar(unsigned char **in, size_t *in_len, uint32_t
 			}
 
 			/* Conversion for CJK Unified Ideographs ext.B (U+2XXXX) */
-			if (!w) {
-				int k = mbfl_bisec_srch2(w1, jisx0213_jis_u5_key, jisx0213_u5_tbl_len);
-				if (k >= 0) {
-					w = jisx0213_jis_u5_tbl[k] + 0x20000;
-				}
-			}
+			mbfl_test(&w, w1);
 
 			*out++ = w ? w : MBFL_BAD_INPUT;
 		} else if (c == 0x8E && p < e) {