Skip to content

Commit 10bf33c

Browse files
TimWollaarnaud-lb
TimWolla
authored and
arnaud-lb
committed
Remove zend_extension=opcache 
1 parent cde504c commit 10bf33c

File tree

9 files changed

+0
-31
lines changed

9 files changed

+0
-31
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,6 @@ jobs:
168168
no_output_timeout: 30m
169169
command: |
170170
sapi/cli/php run-tests.php \
171-
-d zend_extension=opcache.so \
172171
-d opcache.enable_cli=1 \
173172
-d opcache.jit_buffer_size=64M \
174173
-d opcache.jit=tracing \

‎.github/actions/freebsd/action.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,3 @@ runs:
107107
--show-diff \
108108
--show-slow 1000 \
109109
--set-timeout 120 \
110-
-d zend_extension=opcache.so

‎.github/scripts/windows/test_task.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ mkdir %PHP_BUILD_DIR%\test_file_cache
128128
rem generate php.ini
129129
echo extension_dir=%PHP_BUILD_DIR% > %PHP_BUILD_DIR%\php.ini
130130
echo opcache.file_cache=%PHP_BUILD_DIR%\test_file_cache >> %PHP_BUILD_DIR%\php.ini
131-
if "%OPCACHE%" equ "1" echo zend_extension=php_opcache.dll >> %PHP_BUILD_DIR%\php.ini
132131
rem work-around for some spawned PHP processes requiring OpenSSL and sockets
133132
echo extension=php_openssl.dll >> %PHP_BUILD_DIR%\php.ini
134133
echo extension=php_sockets.dll >> %PHP_BUILD_DIR%\php.ini

‎.github/workflows/nightly.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ jobs:
132132
jitType: tracing
133133
runTestsParameters: >-
134134
--asan -x
135-
-d zend_extension=opcache.so
136135
-d opcache.enable_cli=1
137136
- name: Notify Slack
138137
if: failure()
@@ -246,14 +245,12 @@ jobs:
246245
jitType: tracing
247246
runTestsParameters: >-
248247
${{ matrix.run_tests_parameters }}
249-
-d zend_extension=opcache.so
250248
-d opcache.enable_cli=1
251249
- name: Test OpCache
252250
uses: ./.github/actions/test-linux
253251
with:
254252
runTestsParameters: >-
255253
${{ matrix.run_tests_parameters }}
256-
-d zend_extension=opcache.so
257254
-d opcache.enable_cli=1
258255
- name: Test Function JIT
259256
# ASAN frequently timeouts. Each test run takes ~90 minutes, we can
@@ -264,7 +261,6 @@ jobs:
264261
jitType: function
265262
runTestsParameters: >-
266263
${{ matrix.run_tests_parameters }}
267-
-d zend_extension=opcache.so
268264
-d opcache.enable_cli=1
269265
- name: Verify generated files are up to date
270266
uses: ./.github/actions/verify-generated-files
@@ -338,22 +334,19 @@ jobs:
338334
jitType: tracing
339335
runTestsParameters: >-
340336
${{ matrix.run_tests_parameters }}
341-
-d zend_extension=opcache.so
342337
-d opcache.enable_cli=1
343338
- name: Test OpCache
344339
uses: ./.github/actions/test-linux
345340
with:
346341
runTestsParameters: >-
347342
${{ matrix.run_tests_parameters }}
348-
-d zend_extension=opcache.so
349343
-d opcache.enable_cli=1
350344
- name: Test Function JIT
351345
uses: ./.github/actions/test-linux
352346
with:
353347
jitType: function
354348
runTestsParameters: >-
355349
${{ matrix.run_tests_parameters }}
356-
-d zend_extension=opcache.so
357350
-d opcache.enable_cli=1
358351
- name: Notify Slack
359352
if: failure()
@@ -398,21 +391,18 @@ jobs:
398391
with:
399392
jitType: tracing
400393
runTestsParameters: >-
401-
-d zend_extension=opcache.so
402394
-d opcache.enable_cli=1
403395
- name: Test OpCache
404396
uses: ./.github/actions/test-macos
405397
with:
406398
runTestsParameters: >-
407-
-d zend_extension=opcache.so
408399
-d opcache.enable_cli=1
409400
- name: Test Function JIT
410401
if: matrix.os != '14' || !matrix.zts
411402
uses: ./.github/actions/test-macos
412403
with:
413404
jitType: function
414405
runTestsParameters: >-
415-
-d zend_extension=opcache.so
416406
-d opcache.enable_cli=1
417407
- name: Verify generated files are up to date
418408
uses: ./.github/actions/verify-generated-files
@@ -474,7 +464,6 @@ jobs:
474464
with:
475465
jitType: tracing
476466
runTestsParameters: >-
477-
-d zend_extension=opcache.so
478467
-d opcache.enable_cli=1
479468
- uses: codecov/codecov-action@v4
480469
if: ${{ !cancelled() }}
@@ -528,7 +517,6 @@ jobs:
528517
- name: Enable Opcache
529518
run: |
530519
echo memory_limit=-1 >> /etc/php.d/opcache.ini
531-
echo zend_extension=opcache.so > /etc/php.d/opcache.ini
532520
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
533521
echo opcache.enable=1 >> /etc/php.d/opcache.ini
534522
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
@@ -719,37 +707,32 @@ jobs:
719707
uses: ./.github/actions/test-linux
720708
with:
721709
runTestsParameters: >-
722-
-d zend_extension=opcache.so
723710
-d opcache.enable_cli=1
724711
--file-cache-prime
725712
- name: Test File Cache (prime shm, use shm)
726713
uses: ./.github/actions/test-linux
727714
with:
728715
runTestsParameters: >-
729-
-d zend_extension=opcache.so
730716
-d opcache.enable_cli=1
731717
--file-cache-use
732718
- name: Test File Cache (prime shm, use file)
733719
uses: ./.github/actions/test-linux
734720
with:
735721
runTestsParameters: >-
736-
-d zend_extension=opcache.so
737722
-d opcache.enable_cli=1
738723
--file-cache-use
739724
-d opcache.file_cache_only=1
740725
- name: Test File Cache Only (prime)
741726
uses: ./.github/actions/test-linux
742727
with:
743728
runTestsParameters: >-
744-
-d zend_extension=opcache.so
745729
-d opcache.enable_cli=1
746730
--file-cache-prime
747731
-d opcache.file_cache_only=1
748732
- name: Test File Cache Only (use)
749733
uses: ./.github/actions/test-linux
750734
with:
751735
runTestsParameters: >-
752-
-d zend_extension=opcache.so
753736
-d opcache.enable_cli=1
754737
--file-cache-use
755738
-d opcache.file_cache_only=1
@@ -843,7 +826,6 @@ jobs:
843826
with:
844827
runTestsParameters: >-
845828
--msan
846-
-d zend_extension=opcache.so
847829
-d opcache.enable_cli=1
848830
- name: Verify generated files are up to date
849831
uses: ./.github/actions/verify-generated-files

‎.github/workflows/push.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@ jobs:
130130
with:
131131
jitType: tracing
132132
runTestsParameters: >-
133-
-d zend_extension=opcache.so
134133
-d opcache.enable_cli=1
135134
${{ matrix.asan && '--asan -x' || '' }}
136135
- name: Verify generated files are up to date
@@ -190,7 +189,6 @@ jobs:
190189
with:
191190
jitType: tracing
192191
runTestsParameters: >-
193-
-d zend_extension=opcache.so
194192
-d opcache.enable_cli=1
195193
MACOS_DEBUG_NTS:
196194
if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
@@ -229,7 +227,6 @@ jobs:
229227
with:
230228
jitType: tracing
231229
runTestsParameters: >-
232-
-d zend_extension=opcache.so
233230
-d opcache.enable_cli=1
234231
- name: Verify generated files are up to date
235232
uses: ./.github/actions/verify-generated-files
@@ -319,7 +316,6 @@ jobs:
319316
sudo mkdir -p /etc/php.d
320317
sudo chmod 777 /etc/php.d
321318
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
322-
echo zend_extension=opcache.so >> /etc/php.d/opcache.ini
323319
echo opcache.enable=1 >> /etc/php.d/opcache.ini
324320
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
325321
- name: Setup

‎ext/opcache/tests/gh18417.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ $proc = proc_open([
2323
PHP_BINARY,
2424
"-n",
2525
"-d", "extension_dir=$extension_dir",
26-
"-d", "zend_extension=opcache",
2726
"-d", "opcache.memory_consumption=$new_memory_consumption",
2827
"-d", "opcache.enable=1",
2928
"-d", "opcache.enable_cli=1",

‎php.ini-development

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,8 +959,6 @@ default_socket_timeout = 60
959959
;extension=xsl
960960
;extension=zip
961961

962-
;zend_extension=opcache
963-
964962
;;;;;;;;;;;;;;;;;;;
965963
; Module Settings ;
966964
;;;;;;;;;;;;;;;;;;;

‎php.ini-production

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -961,8 +961,6 @@ default_socket_timeout = 60
961961
;extension=xsl
962962
;extension=zip
963963

964-
;zend_extension=opcache
965-
966964
;;;;;;;;;;;;;;;;;;;
967965
; Module Settings ;
968966
;;;;;;;;;;;;;;;;;;;

‎sapi/cli/tests/bug80092.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ if (!file_exists($extDir . '/opcache.so')) {
1717
$cmd = [
1818
PHP_BINARY,
1919
'-dextension_dir=' . ini_get('extension_dir'),
20-
'-dzend_extension=opcache.so',
2120
'-dopcache.enable=1',
2221
'-dopcache.enable_cli=1',
2322
'-dopcache.preload=' . __DIR__ . '/preload.inc',

0 commit comments

Comments
 (0)