Merge branch 'PHP-7.4'

diff --cc azure/file_cache_job.yml
index a52b56a2163c9cf5e11941c0cbf3b61cbd2c0202,0000000000000000000000000000000000000000..614bd8d1a5e99586bd885e3ea73c94005264608e
mode 100644,000000..100644
--- 1/azure/file_cache_job.yml
--- /dev/null
+++ b/azure/file_cache_job.yml
@@@ -1,60 -1,0 +1,54 @@@
-     - script: |
-         set -e
-         sudo service mysql start
-         mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
-         sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
-         sudo -u postgres psql -c "CREATE DATABASE test;"
-       displayName: 'Setup'
 +parameters:
 +  configurationName: ''
 +  configurationParameters: ''
 +  runTestsParameters: ''
 +  timeoutInMinutes: 60
 +
 +jobs:
 +  - job: ${{ parameters.configurationName }}
 +    timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
 +    pool:
 +      vmImage: 'ubuntu-18.04'
 +    steps:
 +    - template: apt.yml
 +    - template: configure.yml
 +      parameters:
 +        configurationParameters: ${{ parameters.configurationParameters }}
 +    - script: make -j$(/usr/bin/nproc) >/dev/null
 +      displayName: 'Make Build'
 +    - template: install.yml
++    - template: script.yml
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache (prime)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-prime
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache (use)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-use
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache Only (prime)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-prime
 +          -d opcache.file_cache_only=1
 +    - template: test.yml
 +      parameters:
 +        configurationName: ${{ parameters.configurationName }}
 +        runTestsName: 'File Cache Only (use)'
 +        runTestsParameters: >-
 +          ${{ parameters.runTestsParameters }}
 +          -d zend_extension=opcache.so
 +          --file-cache-use
 +          -d opcache.file_cache_only=1

diff --cc azure/i386/job.yml
Simple merge

diff --cc azure/job.yml
Simple merge