Make CI green for regular jobs

nicolas-grekas · nicolas-grekas · commit ea4121ae5518 · 2018-05-25T13:34:02.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -36,6 +36,7 @@ cache:
     directories:
         - .phpunit
         - php-$MIN_PHP
+        - ~/php-ext
 
 services:
     - memcached
@@ -108,10 +109,26 @@ before_install:
       [[ $PHP = 5.* ]] && echo extension = memcache.so >> $INI
       if [[ $PHP = 5.* ]]; then
           echo extension = mongo.so >> $INI
-      elif [[ $PHP = 7.* ]]; then
-          echo extension = mongodb.so >> $INI
       fi
 
+      # tpecl is a helper to compile and cache php extensions
+      tpecl () {
+          local ext_name=$1
+          local ext_so=$2
+          local INI=$3
+          local ext_dir=$(php -r "echo ini_get('extension_dir');")
+          local ext_cache=~/php-ext/$(basename $ext_dir)/$ext_name
+
+          if [[ -e $ext_cache/$ext_so ]]; then
+              echo extension = $ext_cache/$ext_so >> $INI
+          else
+              mkdir -p $ext_cache
+              echo yes | pecl install -f $ext_name &&
+              cp $ext_dir/$ext_so $ext_cache
+          fi
+      }
+      export -f tpecl
+
       # Matrix lines for intermediate PHP versions are skipped for pull requests
       if [[ ! $deps && ! $PHP = ${MIN_PHP%.*} && ! $PHP = hhvm* && $TRAVIS_PULL_REQUEST != false ]]; then
           deps=skip
@@ -130,10 +147,17 @@ before_install:
     - |
       # Install extra PHP extensions
       if [[ ! $skip && $PHP = 5.* ]]; then
-          ([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI") &&
-          tfold ext.apcu4 'echo yes | pecl install -f apcu-4.0.11'
+          ([[ $deps ]] || tfold ext.symfony_debug 'cd src/Symfony/Component/Debug/Resources/ext && phpize && ./configure && make && echo extension = $(pwd)/modules/symfony_debug.so >> '"$INI")
+          tfold ext.apcu tpecl apcu-4.0.11 apcu.so $INI
       elif [[ ! $skip && $PHP = 7.* ]]; then
-          tfold ext.apcu5 'echo yes | pecl install -f apcu-5.1.6'
+          # install libsodium
+          sudo add-apt-repository ppa:ondrej/php -y
+          sudo apt-get update -q
+          sudo apt-get install libsodium-dev -y
+
+          tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
+          tfold ext.libsodium tpecl libsodium sodium.so $INI
+          tfold ext.mongodb tpecl mongodb-1.4.0RC1 mongodb.so $INI
       fi
 
     - |
diff --git a/appveyor.yml b/appveyor.yml
@@ -18,8 +18,8 @@ install:
     - mkdir c:\php && cd c:\php
     - appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
     - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-5.5.9-nts-Win32-VC11-x86.zip
-    - 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
     - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php-7.1.3-Win32-VC14-x86.zip
+    - 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul
     - cd ext
     - appveyor DownloadFile https://github.com/symfony/binary-utils/releases/download/v0.1/php_apcu-4.0.10-5.5-nts-vc11-x86.zip
     - 7z x php_apcu-4.0.10-5.5-nts-vc11-x86.zip -y >nul
@@ -45,19 +45,21 @@ install:
     - echo extension=php_pdo_sqlite.dll >> php.ini-max
     - echo extension=php_curl.dll >> php.ini-max
     - echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
-    - copy /Y php.ini-max php.ini
+    - copy /Y php.ini-min php.ini
+    - echo extension=php_openssl.dll >> php.ini
     - cd c:\projects\symfony
     - IF NOT EXIST composer.phar (appveyor DownloadFile https://getcomposer.org/download/1.3.0/composer.phar)
     - php composer.phar self-update
     - copy /Y .composer\* %APPDATA%\Composer\
     - php .github/build-packages.php "HEAD^" src\Symfony\Bridge\PhpUnit
     - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
-    - php -dmemory_limit=-1 composer.phar update --no-progress --no-suggest --ansi
+    - php composer.phar config platform.php 5.5.9
+    - php composer.phar update --no-progress --no-suggest --ansi
     - php phpunit install
 
 test_script:
     - SET X=0
-    - cd c:\php && 7z x php-7.1.3-Win32-VC14-x86.zip -y >nul && copy /Y php.ini-min php.ini
+    - cd c:\php && copy /Y php.ini-min php.ini
     - cd c:\projects\symfony
     - php phpunit src\Symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
     - cd c:\php && 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul && copy /Y php.ini-min php.ini
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/default.phpt
@@ -59,6 +59,10 @@ $foo = new FooTestCase();
 $foo->testLegacyFoo();
 $foo->testNonLegacyBar();
 
+register_shutdown_function(function () {
+    exit('I get precedence over any exit statements inside the deprecation error handler.');
+});
+
 ?>
 --EXPECTF--
 Unsilenced deprecation notices (3)
@@ -80,3 +84,4 @@ Other deprecation notices (1)
 
   1x: root deprecation
 
+I get precedence over any exit statements inside the deprecation error handler.
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/fake_vendor/acme/lib/deprecation_riddled.php
@@ -21,6 +21,8 @@ public function testLegacyFoo()
     {
         @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
         trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
+        @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);
+        trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);
     }
 
     public function testNonLegacyBar()
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak.phpt
@@ -37,4 +37,3 @@ Unsilenced deprecation notices (1)
 Legacy deprecation notices (1)
 
 Other deprecation notices (1)
-
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_eval_d_deprecation.phpt
@@ -15,9 +15,11 @@ while (!file_exists($vendor.'/vendor')) {
 define('PHPUNIT_COMPOSER_INSTALL', $vendor.'/vendor/autoload.php');
 require PHPUNIT_COMPOSER_INSTALL;
 require_once __DIR__.'/../../bootstrap.php';
-eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);")
+eval("@trigger_error('who knows where I come from?', E_USER_DEPRECATED);");
 
 ?>
 --EXPECTF--
 
 Other deprecation notices (1)
+
+  1x: who knows where I come from?
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_phar_deprecation.phpt
@@ -23,3 +23,5 @@ include 'phar://deprecation.phar/deprecation.php';
 --EXPECTF--
 
 Other deprecation notices (1)
+
+  1x: I come from… afar! :D
diff --git a/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt b/src/Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/weak_vendors_on_vendor.phpt
@@ -20,10 +20,21 @@ require __DIR__.'/fake_vendor/acme/lib/deprecation_riddled.php';
 
 ?>
 --EXPECTF--
-Unsilenced deprecation notices (2)
+Unsilenced deprecation notices (3)
+
+  2x: unsilenced foo deprecation
+    2x in FooTestCase::testLegacyFoo
+
+  1x: unsilenced bar deprecation
+    1x in FooTestCase::testNonLegacyBar
 
 Remaining vendor deprecation notices (1)
 
-Legacy deprecation notices (1)
+  1x: silenced bar deprecation
+    1x in FooTestCase::testNonLegacyBar
+
+Legacy deprecation notices (2)
 
 Other deprecation notices (1)
+
+  1x: root deprecation

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ public function testLegacyFoo()`
`21`	`21`	`{`
`22`	`22`	`@trigger_error('silenced foo deprecation', E_USER_DEPRECATED);`
`23`	`23`	`trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
	`24`	`+ @trigger_error('silenced foo deprecation', E_USER_DEPRECATED);`
	`25`	`+ trigger_error('unsilenced foo deprecation', E_USER_DEPRECATED);`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`public function testNonLegacyBar()`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,3 @@ Unsilenced deprecation notices (1)`
`37`	`37`	`Legacy deprecation notices (1)`
`38`	`38`
`39`	`39`	`Other deprecation notices (1)`
`40`		`-`