Skip to content

Commit a795388

Browse files
Merge branch '2.3' into 2.7
* 2.3: use stable 1.0.x Composer versions
2 parents 4d8b4bf + 1d43d9c commit a795388

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ before_install:
5151
- if [[ ! $skip && $PHP = 5.* ]]; then pecl install -f memcached-2.1.0; fi
5252
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi
5353
- if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi
54-
- if [[ ! $skip ]]; then composer self-update; fi
54+
- if [[ ! $skip ]]; then composer self-update --stable; fi
5555
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi
5656
- if [[ ! $skip ]]; then ./phpunit install; fi
5757
- if [[ ! $skip && $deps ]]; then composer global remove hirak/prestissimo; fi

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ install:
4949
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
5050
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
5151
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
52-
- appveyor DownloadFile https://getcomposer.org/composer.phar
52+
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar
5353
- copy /Y php.ini-max php.ini
5454
- cd c:\projects\symfony
5555
- mkdir %APPDATA%\Composer

0 commit comments

Comments
 (0)