Skip to content

Commit 1f585b2

Browse files
TimWollaarnaud-lb
TimWolla
authored and
arnaud-lb
committed
Remove zend_extension=opcache 
1 parent 3ba008d commit 1f585b2

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
@@ -101,4 +101,3 @@ runs:
101101
--show-diff \
102102
--show-slow 1000 \
103103
--set-timeout 120 \
104-
-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
@@ -126,7 +126,6 @@ jobs:
126126
jitType: tracing
127127
runTestsParameters: >-
128128
--asan -x
129-
-d zend_extension=opcache.so
130129
-d opcache.enable_cli=1
131130
- name: Notify Slack
132131
if: failure()
@@ -240,14 +239,12 @@ jobs:
240239
jitType: tracing
241240
runTestsParameters: >-
242241
${{ matrix.run_tests_parameters }}
243-
-d zend_extension=opcache.so
244242
-d opcache.enable_cli=1
245243
- name: Test OpCache
246244
uses: ./.github/actions/test-linux
247245
with:
248246
runTestsParameters: >-
249247
${{ matrix.run_tests_parameters }}
250-
-d zend_extension=opcache.so
251248
-d opcache.enable_cli=1
252249
- name: Test Function JIT
253250
# ASAN frequently timeouts. Each test run takes ~90 minutes, we can
@@ -258,7 +255,6 @@ jobs:
258255
jitType: function
259256
runTestsParameters: >-
260257
${{ matrix.run_tests_parameters }}
261-
-d zend_extension=opcache.so
262258
-d opcache.enable_cli=1
263259
- name: Verify generated files are up to date
264260
uses: ./.github/actions/verify-generated-files
@@ -332,22 +328,19 @@ jobs:
332328
jitType: tracing
333329
runTestsParameters: >-
334330
${{ matrix.run_tests_parameters }}
335-
-d zend_extension=opcache.so
336331
-d opcache.enable_cli=1
337332
- name: Test OpCache
338333
uses: ./.github/actions/test-linux
339334
with:
340335
runTestsParameters: >-
341336
${{ matrix.run_tests_parameters }}
342-
-d zend_extension=opcache.so
343337
-d opcache.enable_cli=1
344338
- name: Test Function JIT
345339
uses: ./.github/actions/test-linux
346340
with:
347341
jitType: function
348342
runTestsParameters: >-
349343
${{ matrix.run_tests_parameters }}
350-
-d zend_extension=opcache.so
351344
-d opcache.enable_cli=1
352345
- name: Notify Slack
353346
if: failure()
@@ -392,21 +385,18 @@ jobs:
392385
with:
393386
jitType: tracing
394387
runTestsParameters: >-
395-
-d zend_extension=opcache.so
396388
-d opcache.enable_cli=1
397389
- name: Test OpCache
398390
uses: ./.github/actions/test-macos
399391
with:
400392
runTestsParameters: >-
401-
-d zend_extension=opcache.so
402393
-d opcache.enable_cli=1
403394
- name: Test Function JIT
404395
if: matrix.os != '14' || !matrix.zts
405396
uses: ./.github/actions/test-macos
406397
with:
407398
jitType: function
408399
runTestsParameters: >-
409-
-d zend_extension=opcache.so
410400
-d opcache.enable_cli=1
411401
- name: Verify generated files are up to date
412402
uses: ./.github/actions/verify-generated-files
@@ -468,7 +458,6 @@ jobs:
468458
with:
469459
jitType: tracing
470460
runTestsParameters: >-
471-
-d zend_extension=opcache.so
472461
-d opcache.enable_cli=1
473462
- uses: codecov/codecov-action@v4
474463
if: ${{ !cancelled() }}
@@ -522,7 +511,6 @@ jobs:
522511
- name: Enable Opcache
523512
run: |
524513
echo memory_limit=-1 >> /etc/php.d/opcache.ini
525-
echo zend_extension=opcache.so > /etc/php.d/opcache.ini
526514
echo opcache.enable_cli=1 >> /etc/php.d/opcache.ini
527515
echo opcache.enable=1 >> /etc/php.d/opcache.ini
528516
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
@@ -713,37 +701,32 @@ jobs:
713701
uses: ./.github/actions/test-linux
714702
with:
715703
runTestsParameters: >-
716-
-d zend_extension=opcache.so
717704
-d opcache.enable_cli=1
718705
--file-cache-prime
719706
- name: Test File Cache (prime shm, use shm)
720707
uses: ./.github/actions/test-linux
721708
with:
722709
runTestsParameters: >-
723-
-d zend_extension=opcache.so
724710
-d opcache.enable_cli=1
725711
--file-cache-use
726712
- name: Test File Cache (prime shm, use file)
727713
uses: ./.github/actions/test-linux
728714
with:
729715
runTestsParameters: >-
730-
-d zend_extension=opcache.so
731716
-d opcache.enable_cli=1
732717
--file-cache-use
733718
-d opcache.file_cache_only=1
734719
- name: Test File Cache Only (prime)
735720
uses: ./.github/actions/test-linux
736721
with:
737722
runTestsParameters: >-
738-
-d zend_extension=opcache.so
739723
-d opcache.enable_cli=1
740724
--file-cache-prime
741725
-d opcache.file_cache_only=1
742726
- name: Test File Cache Only (use)
743727
uses: ./.github/actions/test-linux
744728
with:
745729
runTestsParameters: >-
746-
-d zend_extension=opcache.so
747730
-d opcache.enable_cli=1
748731
--file-cache-use
749732
-d opcache.file_cache_only=1
@@ -837,7 +820,6 @@ jobs:
837820
with:
838821
runTestsParameters: >-
839822
--msan
840-
-d zend_extension=opcache.so
841823
-d opcache.enable_cli=1
842824
- name: Verify generated files are up to date
843825
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)