8000 [ci] use hirak/prestissimo · symfony/symfony@adf1ca8 · GitHub
[go: up one dir, main page]
Skip to content

Commit adf1ca8

Browse files
nicolas-grekasnicolas-grekas
committed
[ci] use hirak/prestissimo
1 parent 6a99db4 commit adf1ca8

File tree

6 files changed

+85
-3
lines changed

6 files changed

+85
-3
lines changed

‎.composer-auth.json renamed to ‎.composer/auth.json

File renamed without changes.

‎.composer/composer.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"require": {
3+
"php": ">=5.3.7",
4+
"hirak/prestissimo": "^0.1.15"
5+
}
6+
}

‎.composer/composer.lock

Lines changed: 72 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ before_install:
4848
- if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0; fi;
4949
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi;
5050
- if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
51-
- if [[ $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
5251
- if [[ $deps != skip ]]; then composer self-update; fi;
52+
- if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install --prefer-dist; fi;
5353
- if [[ $deps != skip ]]; then ./phpunit install; fi;
5454
- export PHPUNIT=$(readlink -f ./phpunit)
5555

‎appveyor.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ init:
1818
install:
1919
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
2020
- cd c:\php
21+
- IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem
2122
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.3.3-nts-Win32-VC9-x86.zip
2223
- IF %PHP%==1 7z x php-5.3.3-nts-Win32-VC9-x86.zip -y >nul
2324
- IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/ICU-51.2-dlls.zip
@@ -38,6 +39,8 @@ install:
3839
- IF %PHP%==1 echo date.timezone="UTC" >> php.ini-min
3940
- IF %PHP%==1 echo extension_dir=ext >> php.ini-min
4041
- IF %PHP%==1 echo extension=php_openssl.dll >> php.ini-min
42+
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-min
43+
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-min
4144
- IF %PHP%==1 copy /Y php.ini-min php.ini-max
4245
- IF %PHP%==1 echo extension=php_apcu.dll >> php.ini-max
4346
- IF %PHP%==1 echo apc.enable_cli=1 >> php.ini-max
@@ -50,7 +53,8 @@ install:
5053
- copy /Y php.ini-max php.ini
5154
- cd c:\projects\symfony
5255
- mkdir %APPDATA%\Composer
53-
- IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer-auth.json %APPDATA%\Composer\auth.json
56+
- IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer\* %APPDATA%\Composer\
57+
- IF %APPVEYOR_REPO_NAME%==symfony/symfony composer global install --prefer-dist --no-progress --ansi || echo curl.cainfo needs PHP 5.3.7
5458
- php phpunit install
5559
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5660
- composer update --prefer-dist --no-progress --ansi

‎src/Symfony/Component/Filesystem/Tests/FilesystemTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ public function testMirrorCopiesRelativeLinkedContents()
962962
$this->assertTrue(is_dir($targetPath));
963963
$this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt');
964964
$this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1'));
965-
$this->assertEquals('nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
965+
$this->assertEquals('\\' === DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
966966
}
967967

968968
/**

0 commit comments

Comments
 (0)
0