Fix OPcache loading on 8.5

Author: dktapps

.github/workflows/main-php-matrix-windows.yml

@@ -7,6 +7,10 @@ on:
         description: 'PHP version'
         type: string
         required: true
+      opcache-shared:
+        description: 'Whether OPcache needs a zend_extension option (not needed in 8.5+)'
+        type: boolean
+        default: false
       vs-arch:
         description: 'CPU arch to build for (x86 or x64)'
         type: string
@@ -204,7 +208,11 @@ jobs:
           $opcache = "${{ matrix.opcache }}"
           if ($opcache -ne "off") {
             echo "Enabling OPcache"
-            echo "zend_extension=php_opcache.dll" >> php.ini
+            $opcache_shared = "${{ inputs.opcache-shared }}"
+            if ($opcache_shared -eq "true") {
+              echo "OPcache is a shared extension in this version"
+              echo "zend_extension=php_opcache.dll" >> php.ini
+            }
             echo "opcache.enable=1" >> php.ini
             echo "opcache.enable_cli=1" >> php.ini
             echo "opcache.protect_memory=1" >> php.ini

.github/workflows/main-php-matrix.yml

@@ -7,6 +7,10 @@ on:
         description: 'PHP version'
         required: true
         type: string
+      opcache-shared:
+        description: 'Whether opcache needs a zend_extension option (not needed in 8.5+)'
+        type: boolean
+        default: false
       runs-on:
         description: 'GitHub runner'
         default: 'ubuntu-22.04'
@@ -122,7 +126,10 @@ jobs:
           echo "extension=pmmpthread.so" > $GITHUB_WORKSPACE/php.ini
           if [[ "${{ matrix.opcache }}" != "off" ]]; then
             echo "Enabling OPcache"
-            echo "zend_extension=opcache.so" >> $GITHUB_WORKSPACE/php.ini
+            if [[ "${{ inputs.opcache-shared }}" == "true" ]]; then
+              echo "OPcache is a shared extension in this version"
+              echo "zend_extension=opcache.so" >> $GITHUB_WORKSPACE/php.ini
+            fi
             echo "opcache.enable=1" >> $GITHUB_WORKSPACE/php.ini
             echo "opcache.enable_cli=1" >> $GITHUB_WORKSPACE/php.ini
             echo "opcache.protect_memory=1" >> $GITHUB_WORKSPACE/php.ini

.github/workflows/main.yml

@@ -11,12 +11,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: 
-          - 8.1.33
-          - 8.2.29
-          - 8.3.25
-          - 8.4.12
-          - 8.5.0beta3
+        include:
+          - php: 8.1.33
+            opcache-shared: true
+          - php: 8.2.29
+            opcache-shared: true
+          - php: 8.3.25
+            opcache-shared: true
+          - php: 8.4.12
+            opcache-shared: true
+          - php: 8.5.0beta3
+            opcache-shared: false
 
     uses: ./.github/workflows/main-php-matrix.yml
     with:
@@ -31,14 +36,19 @@ jobs:
         include:
           - php: 8.1.33
             vs-crt: vs16
+            opcache-shared: true
           - php: 8.2.29
             vs-crt: vs16
+            opcache-shared: true
           - php: 8.3.25
             vs-crt: vs16
+            opcache-shared: true
           - php: 8.4.12
             vs-crt: vs17
+            opcache-shared: true
           - php: 8.5.0beta3
             vs-crt: vs17
+            opcache-shared: false
 
     uses: ./.github/workflows/main-php-matrix-windows.yml
     with: