From 82c6bed6b0f7f3f66ad0f98ae40c35dcad328575 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Wed, 23 Mar 2016 15:51:24 +0100
Subject: [PATCH] [ci] Tweak scripts

---
 appveyor.yml | 6 +++---
 phpunit      | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 308b765884..35d4ba0e81 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -38,10 +38,8 @@ install:
     - IF %PHP%==1 echo max_execution_time=1200 >> php.ini-min
     - IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min
     - IF %PHP%==1 echo extension_dir=ext >> php.ini-min
-    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min
-    - IF %PHP%==1 echo extension=php_curl.dll >> php.ini-min
-    - IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-min
     - IF %PHP%==1 copy /Y php.ini-min php.ini-max
+    - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-max
     - IF %PHP%==1 echo extension=php_apcu.dll >> php.ini-max
     - IF %PHP%==1 echo apc.enable_cli=1 >> php.ini-max
     - IF %PHP%==1 echo extension=php_memcache.dll >> php.ini-max
@@ -49,6 +47,8 @@ install:
     - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini-max
     - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini-max
     - IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
+    - IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
+    - IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
     - appveyor DownloadFile https://getcomposer.org/composer.phar
     - copy /Y php.ini-max php.ini
     - cd c:\projects\symfony
diff --git a/phpunit b/phpunit
index b05ac28199..413e7d0ba4 100755
--- a/phpunit
+++ b/phpunit
@@ -11,7 +11,7 @@
  */
 
 // Please update when phpunit needs to be reinstalled with fresh deps:
-// Cache-Id-Version: 2016-03-22 17:23 UTC
+// Cache-Id-Version: 2016-03-23 14:50 UTC
 
 use Symfony\Component\Process\ProcessUtils;
 
@@ -53,7 +53,10 @@ if (!file_exists("$PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit") || md5_file(__
     chdir("phpunit-$PHPUNIT_VERSION");
     passthru("$COMPOSER remove --no-update symfony/yaml");
     passthru("$COMPOSER require --dev --no-update symfony/phpunit-bridge \">=3.1@dev\"");
-    passthru("$COMPOSER install --prefer-dist --no-progress --ansi");
+    passthru("$COMPOSER install --prefer-dist --no-progress --ansi", $exit);
+    if ($exit) {
+        exit($exit);
+    }
     file_put_contents('phpunit', <<<'EOPHP'
 <?php