From 8f136ab66585dc5ca933363a8f39c336a3878d9b Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 11 May 2016 17:02:33 -0500 Subject: [PATCH] Drop hirak/prestissimo --- .composer/composer.json | 5 --- .composer/composer.lock | 70 ----------------------------------------- .composer/config.json | 3 -- .travis.yml | 3 +- appveyor.yml | 5 ++- 5 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 .composer/composer.json delete mode 100644 .composer/composer.lock diff --git a/.composer/composer.json b/.composer/composer.json deleted file mode 100644 index d69e9f7626..0000000000 --- a/.composer/composer.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "require": { - "hirak/prestissimo": "^0.1.18" - } -} diff --git a/.composer/composer.lock b/.composer/composer.lock deleted file mode 100644 index 7027e21d9a..0000000000 --- a/.composer/composer.lock +++ /dev/null @@ -1,70 +0,0 @@ -{ - "_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": "e02685ff7d2409d34fa87e306fc86ec5", - "content-hash": "2854c05c76a78113c693dbbdd3f9c518", - "packages": [ - { - "name": "hirak/prestissimo", - "version": "0.1.18", - "source": { - "type": "git", - "url": "https://github.com/hirak/prestissimo.git", - "reference": "84e9fb79ec18a4428c5a0c032eacac640d89be5d" - }, - "dist": { - "type": "zip", - "url": "https://codeload.github.com/hirak/prestissimo/legacy.zip/84e9fb79ec18a4428c5a0c032eacac640d89be5d", - "reference": "84e9fb79ec18a4428c5a0c032eacac640d89be5d", - "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-17 13:53:53" - } - ], - "packages-dev": [], - "aliases": [], - "minimum-stability": "stable", - "stability-flags": [], - "prefer-stable": false, - "prefer-lowest": false, - "platform": [], - "platform-dev": [] -} diff --git a/.composer/config.json b/.composer/config.json index 436403f601..941bc3b56e 100644 --- a/.composer/config.json +++ b/.composer/config.json @@ -2,9 +2,6 @@ "config": { "preferred-install": { "*": "dist" - }, - "prestissimo": { - "insecure": true } } } diff --git a/.travis.yml b/.travis.yml index 94b7482bd3..59e065e48d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,9 +51,8 @@ before_install: - if [[ ! $skip && $PHP != hhvm ]]; then echo extension = ldap.so >> $INI_FILE; fi - if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi - if [[ ! $skip ]]; then composer self-update --stable; fi - - if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi + - if [[ ! $skip ]]; then cp .composer/* ~/.composer/; fi - if [[ ! $skip ]]; then ./phpunit install; fi - - if [[ ! $skip && $deps ]]; then composer global remove hirak/prestissimo; fi - if [[ ! $skip ]]; then export PHPUNIT=$(readlink -f ./phpunit); fi install: diff --git a/appveyor.yml b/appveyor.yml index 3151b22d9d..aa992d719e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,7 +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 https://raw.githubusercontent.com/symfony/binary-utils/master/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 https://raw.githubusercontent.com/symfony/binary-utils/master/ICU-51.2-dlls.zip @@ -49,12 +49,11 @@ install: - 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 - - IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar + - IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.3/composer.phar - copy /Y php.ini-max php.ini - cd c:\projects\symfony - mkdir %APPDATA%\Composer - copy /Y .composer\* %APPDATA%\Composer\ - - composer global install --no-progress --ansi - 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 --no-progress --ansi