Merge branch 'PHP-7.4'

* PHP-7.4:
  Use nproc instead of hardcoded number

diff --cc .travis.yml
index 20c5e704ba35cb95e5117f628050718a1cfc63cc,d78b14e93dca4b803497d243b323978cf6bf594f..af2b7afb17877e6d391486eacfd3132cc20a6812
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -73,7 -73,7 +73,7 @@@ before_script
  
  # Run PHPs run-tests.php
  script:
-     - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j2
 -    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$(nproc)
++    - ./sapi/cli/php run-tests.php -P -d extension=`pwd`/modules/zend_test.so $(if [ $ENABLE_DEBUG == 0 ]; then echo "-d opcache.enable_cli=1 -d opcache.protect_memory=1 -d opcache.jit_buffer_size=16M -d zend_extension=`pwd`/modules/opcache.so"; fi) -g "FAIL,XFAIL,BORK,WARN,LEAK,SKIP" --offline --show-diff --show-slow 1000 --set-timeout 120 -j$(nproc)
      - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");'
  
  after_success:

diff --cc travis/compile.sh
Simple merge