From adf1ca8e90059a10bc4e0ddf5f4443ccc2bb41b1 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 10 Mar 2016 16:05:56 +0100 Subject: [PATCH] [ci] use hirak/prestissimo --- .composer-auth.json => .composer/auth.json | 0 .composer/composer.json | 6 ++ .composer/composer.lock | 72 +++++++++++++++++++ .travis.yml | 2 +- appveyor.yml | 6 +- .../Filesystem/Tests/FilesystemTest.php | 2 +- 6 files changed, 85 insertions(+), 3 deletions(-) rename .composer-auth.json => .composer/auth.json (100%) create mode 100644 .composer/composer.json create mode 100644 .composer/composer.lock diff --git a/.composer-auth.json b/.composer/auth.json similarity index 100% rename from .composer-auth.json rename to .composer/auth.json diff --git a/.composer/composer.json b/.composer/composer.json new file mode 100644 index 0000000000..655ee13805 --- /dev/null +++ b/.composer/composer.json @@ -0,0 +1,6 @@ +{ + "require": { + "php": ">=5.3.7", + "hirak/prestissimo": "^0.1.15" + } +} diff --git a/.composer/composer.lock b/.composer/composer.lock new file mode 100644 index 0000000000..5b0ec6605b --- /dev/null +++ b/.composer/composer.lock @@ -0,0 +1,72 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "This file is @generated automatically" + ], + "hash": "aa7aa2d143fd85800595242996021ada", + "content-hash": "51e9161b78dda1fe149a9e9c106be90b", + "packages": [ + { + "name": "hirak/prestissimo", + "version": "0.1.15", + "source": { + "type": "git", + "url": "https://github.com/hirak/prestissimo.git", + "reference": "f735c4f92061dae7829a6797d74bd543501d7d05" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/hirak/prestissimo/zipball/f735c4f92061dae7829a6797d74bd543501d7d05", + "reference": "f735c4f92061dae7829a6797d74bd543501d7d05", + "shasum": "" + }, + "require": { + "composer-plugin-api": "~1.0.0-alpha10", + "ext-curl": "*", + "php": ">=5.3.2" + }, + "require-dev": { + "composer/composer": "1.0.0-alpha10", + "phpunit/phpunit": "^4.8", + "squizlabs/php_codesniffer": "^2.5" + }, + "type": "composer-plugin", + "extra": { + "class": "Hirak\\Prestissimo\\Plugin" + }, + "autoload": { + "psr-4": { + "Hirak\\Prestissimo\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Hiraku NAKANO", + "email": "hiraku@tojiru.net" + } + ], + "description": "composer parallel install plugin", + "keywords": [ + "install", + "parallel", + "speedup" + ], + "time": "2016-03-07 10:12:34" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "php": ">=5.3.7" + }, + "platform-dev": [] +} diff --git a/.travis.yml b/.travis.yml index 46572d8dd8..23fe0109ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,8 +48,8 @@ before_install: - if [[ $TRAVIS_PHP_VERSION = 5.* ]]; then pecl install -f memcached-2.1.0; fi; - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi; - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; - - if [[ $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; - if [[ $deps != skip ]]; then composer self-update; fi; + - if [[ $deps != skip && $TRAVIS_REPO_SLUG = symfony/symfony ]]; then cp .composer/* ~/.composer/; composer global install --prefer-dist; fi; - if [[ $deps != skip ]]; then ./phpunit install; fi; - export PHPUNIT=$(readlink -f ./phpunit) diff --git a/appveyor.yml b/appveyor.yml index 857ba04284..d498927fa6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,6 +18,7 @@ init: install: - IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php) - cd c:\php + - IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem - IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.3.3-nts-Win32-VC9-x86.zip - IF %PHP%==1 7z x php-5.3.3-nts-Win32-VC9-x86.zip -y >nul - IF %PHP%==1 appveyor DownloadFile http://nebm.ist.utl.pt/~glopes/misc/intl_win/ICU-51.2-dlls.zip @@ -38,6 +39,8 @@ install: - 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_apcu.dll >> php.ini-max - IF %PHP%==1 echo apc.enable_cli=1 >> php.ini-max @@ -50,7 +53,8 @@ install: - copy /Y php.ini-max php.ini - cd c:\projects\symfony - mkdir %APPDATA%\Composer - - IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer-auth.json %APPDATA%\Composer\auth.json + - IF %APPVEYOR_REPO_NAME%==symfony/symfony copy /Y .composer\* %APPDATA%\Composer\ + - IF %APPVEYOR_REPO_NAME%==symfony/symfony composer global install --prefer-dist --no-progress --ansi || echo curl.cainfo needs PHP 5.3.7 - php phpunit install - IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev) - composer update --prefer-dist --no-progress --ansi diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php index d4129dce3a..6707c9b5fe 100644 --- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php +++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php @@ -962,7 +962,7 @@ class FilesystemTest extends \PHPUnit_Framework_TestCase $this->assertTrue(is_dir($targetPath)); $this->assertFileEquals($sourcePath.'/nested/file1.txt', $targetPath.'link1/file1.txt'); $this->assertTrue(is_link($targetPath.DIRECTORY_SEPARATOR.'link1')); - $this->assertEquals('nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1')); + $this->assertEquals('\\' === DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1')); } /**