From a0933b56d53addc811b00483930e23eb7308fab3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Jul 2018 09:50:29 +0200 Subject: update to 1.7.0 drop dependency on seld/cli-prompt add dependncy on composer/xdebug-handler --- composer-autoload.php | 2 +- composer-rpm.patch | 24 ++++++++++----------- composer.json | 60 ++++++++++++++++++++++++++++++--------------------- composer.spec | 57 ++++++++++++++++++++++++++---------------------- 4 files changed, 79 insertions(+), 64 deletions(-) diff --git a/composer-autoload.php b/composer-autoload.php index 04b2616..15e9c21 100644 --- a/composer-autoload.php +++ b/composer-autoload.php @@ -14,10 +14,10 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php'; $vendorDir . '/Symfony/Component/Filesystem/autoload.php', $vendorDir . '/Seld/JsonLint/autoload.php', $vendorDir . '/Seld/PharUtils/autoload.php', - $vendorDir . '/Seld/CliPrompt/autoload.php', $vendorDir . '/Composer/CaBundle/autoload.php', $vendorDir . '/Composer/Spdx/autoload.php', $vendorDir . '/Composer/Semver/autoload.php', + $vendorDir . '/Composer/XdebugHandler/autoload.php', $vendorDir . '/Psr/Log/autoload.php', $vendorDir . '/JsonSchema5/autoload.php', ]); diff --git a/composer-rpm.patch b/composer-rpm.patch index 44eb5b1..3ed61f4 100644 --- a/composer-rpm.patch +++ b/composer-rpm.patch @@ -1,6 +1,6 @@ diff -up ./bin/composer.rpm ./bin/composer ---- ./bin/composer.rpm 2018-05-04 12:59:13.065292434 +0200 -+++ ./bin/composer 2018-05-04 13:00:23.293493373 +0200 +--- ./bin/composer.rpm 2018-07-26 09:44:36.765795459 +0200 ++++ ./bin/composer 2018-07-26 09:45:14.199012215 +0200 @@ -6,7 +6,7 @@ if (PHP_SAPI !== 'cli') { } @@ -8,11 +8,11 @@ diff -up ./bin/composer.rpm ./bin/composer -require __DIR__.'/../src/bootstrap.php'; +require '/usr/share/php/Composer/autoload.php'; - use Composer\Factory; - use Composer\XdebugHandler; + use Composer\Console\Application; + use Composer\XdebugHandler\XdebugHandler; diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php ---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2018-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Autoload/AutoloadGenerator.php 2018-05-04 12:59:13.066292451 +0200 +--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2018-07-26 09:36:57.000000000 +0200 ++++ ./src/Composer/Autoload/AutoloadGenerator.php 2018-07-26 09:44:36.765795459 +0200 @@ -305,7 +305,7 @@ EOF; file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion)); @@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo if ($this->runScripts) { $this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array( diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ---- ./src/Composer/Compiler.php.rpm 2018-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Compiler.php 2018-05-04 12:59:13.066292451 +0200 +--- ./src/Composer/Compiler.php.rpm 2018-07-26 09:36:57.000000000 +0200 ++++ ./src/Composer/Compiler.php 2018-07-26 09:44:36.765795459 +0200 @@ -97,7 +97,7 @@ class Compiler $finder = new Finder(); $finder->files() @@ -35,8 +35,8 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php ->sort($finderSort) ; diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php ---- ./src/Composer/Json/JsonFile.php.rpm 2018-05-04 12:57:41.000000000 +0200 -+++ ./src/Composer/Json/JsonFile.php 2018-05-04 12:59:13.066292451 +0200 +--- ./src/Composer/Json/JsonFile.php.rpm 2018-07-26 09:36:57.000000000 +0200 ++++ ./src/Composer/Json/JsonFile.php 2018-07-26 09:44:36.765795459 +0200 @@ -156,7 +156,7 @@ class JsonFile self::validateSyntax($content, $this->path); } @@ -47,8 +47,8 @@ diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php // Prepend with file:// only when not using a special schema already (e.g. in the phar) if (false === strpos($schemaFile, '://')) { diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php ---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2018-05-04 12:57:41.000000000 +0200 -+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2018-05-04 12:59:13.066292451 +0200 +--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2018-07-26 09:36:57.000000000 +0200 ++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2018-07-26 09:44:36.765795459 +0200 @@ -97,7 +97,8 @@ class ComposerSchemaTest extends TestCas private function check($json) { diff --git a/composer.json b/composer.json index 338a8b2..91da0ec 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,13 @@ { "name": "composer/composer", + "type": "library", "description": "Composer helps you declare, manage and install dependencies of PHP projects, ensuring you have the right stack everywhere.", - "keywords": ["package", "dependency", "autoload"], + "keywords": [ + "package", + "dependency", + "autoload" + ], "homepage": "https://getcomposer.org/", - "type": "library", "license": "MIT", "authors": [ { @@ -17,55 +21,61 @@ "homepage": "http://seld.be" } ], - "support": { - "irc": "irc://irc.freenode.org/composer", - "issues": "https://github.com/composer/composer/issues" - }, "require": { "php": "^5.3.2 || ^7.0", - "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", "composer/ca-bundle": "^1.0", "composer/semver": "^1.0", "composer/spdx-licenses": "^1.2", + "composer/xdebug-handler": "^1.1", + "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", + "psr/log": "^1.0", "seld/jsonlint": "^1.4", + "seld/phar-utils": "^1.0", "symfony/console": "^2.7 || ^3.0 || ^4.0", - "symfony/finder": "^2.7 || ^3.0 || ^4.0", - "symfony/process": "^2.7 || ^3.0 || ^4.0", "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", - "seld/phar-utils": "^1.0", - "seld/cli-prompt": "^1.0", - "psr/log": "^1.0" + "symfony/finder": "^2.7 || ^3.0 || ^4.0", + "symfony/process": "^2.7 || ^3.0 || ^4.0" + }, + "conflict": { + "symfony/console": "2.8.38" }, "require-dev": { "phpunit/phpunit": "^4.8.35 || ^5.7", "phpunit/phpunit-mock-objects": "^2.3 || ^3.0" }, - "conflict": { - "symfony/console": "2.8.38" + "suggest": { + "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", + "ext-zip": "Enabling the zip extension allows you to unzip archives", + "ext-zlib": "Allow gzip compression of HTTP requests" }, "config": { "platform": { "php": "5.3.9" } }, - "suggest": { - "ext-zip": "Enabling the zip extension allows you to unzip archives", - "ext-zlib": "Allow gzip compression of HTTP requests", - "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages" + "extra": { + "branch-alias": { + "dev-master": "1.7-dev" + } }, "autoload": { - "psr-4": { "Composer\\": "src/Composer" } + "psr-4": { + "Composer\\": "src/Composer" + } }, "autoload-dev": { - "psr-4": { "Composer\\Test\\": "tests/Composer/Test" } - }, - "bin": ["bin/composer"], - "extra": { - "branch-alias": { - "dev-master": "1.6-dev" + "psr-4": { + "Composer\\Test\\": "tests/Composer/Test" } }, + "bin": [ + "bin/composer" + ], "scripts": { "test": "phpunit" + }, + "support": { + "issues": "https://github.com/composer/composer/issues", + "irc": "irc://irc.freenode.org/composer" } } diff --git a/composer.spec b/composer.spec index 5c1611f..7ca69f6 100644 --- a/composer.spec +++ b/composer.spec @@ -10,7 +10,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit b184a92419cc9a9c4c6a09db555a94d441cb11c9 +%global gh_commit 3ac3cf82e4aaf6ef560d3faa2bf54e0ff92fb71a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 1.0-dev %global gh_owner composer @@ -18,8 +18,8 @@ %global with_tests %{?_without_tests:0}%{!?_without_tests:1} %global api_version 1.1.0 -%global upstream_version 1.6.5 -#global upstream_prever RC +%global upstream_version 1.7.0 +%global upstream_prever RC %if 0 # see https://forum.remirepo.net/viewtopic.php?id=3677 @@ -53,26 +53,26 @@ BuildRequires: php-cli %if %{with_tests} BuildRequires: php-justinrainbow-json-schema5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) BuildRequires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) +BuildRequires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) +BuildRequires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) BuildRequires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -BuildRequires: (php-composer(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2) BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) %else -BuildRequires: php-composer(composer/spdx-licenses) < 2 -BuildRequires: php-composer(composer/spdx-licenses) >= 1.2 BuildRequires: php-composer(composer/ca-bundle) < 2 BuildRequires: php-composer(composer/ca-bundle) >= 1.0 BuildRequires: php-composer(composer/semver) < 2 BuildRequires: php-composer(composer/semver) >= 1.0 +BuildRequires: php-composer(composer/spdx-licenses) < 2 +BuildRequires: php-composer(composer/spdx-licenses) >= 1.2 +BuildRequires: php-composer(composer/xdebug-handler) >= 1.1 +BuildRequires: php-composer(composer/xdebug-handler) < 2 BuildRequires: php-composer(seld/jsonlint) < 2 BuildRequires: php-composer(seld/jsonlint) >= 1.4 BuildRequires: php-composer(seld/phar-utils) < 2 BuildRequires: php-composer(seld/phar-utils) >= 1.0 -BuildRequires: php-composer(seld/cli-prompt) < 2 -BuildRequires: php-composer(seld/cli-prompt) >= 1.0 BuildRequires: php-composer(psr/log) < 2 BuildRequires: php-composer(psr/log) >= 1.0 %endif @@ -88,48 +88,47 @@ BuildRequires: php-composer(phpunit/phpunit) >= 4.8.35 # For autoloader BuildRequires: php-composer(fedora/autoloader) >= 0.1.2 BuildRequires: php-seld-phar-utils >= 1.0.1 -BuildRequires: php-seld-cli-prompt >= 1.0.0-3 BuildRequires: php-PsrLog >= 1.0.0-8 %endif # From composer.json, "require": { # "php": "^5.3.2 || ^7.0", -# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", # "composer/ca-bundle": "^1.0", # "composer/semver": "^1.0", # "composer/spdx-licenses": "^1.2", +# "composer/xdebug-handler": "^1.1", +# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0", +# "psr/log": "^1.0" # "seld/jsonlint": "~1.4", +# "seld/phar-utils": "^1.0", # "symfony/console": "^2.7 || ^3.0 || ^4.0", +# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", # "symfony/finder": "^2.7 || ^3.0 || ^4.0", # "symfony/process": "^2.7 || ^3.0 || ^4.0", -# "symfony/filesystem": "^2.7 || ^3.0 || ^4.0", -# "seld/phar-utils": "^1.0", -# "seld/cli-prompt": "^1.0", -# "psr/log": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli Requires: php-justinrainbow-json-schema5 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-composer(composer/ca-bundle) < 2) Requires: (php-composer(composer/semver) >= 1.0 with php-composer(composer/semver) < 2) +Requires: (php-composer(composer/spdx-licenses) >= 1.2 with php-composer(composer/spdx-licenses) < 2) +Requires: (php-composer(composer/xdebug-handler) >= 1.1 with php-composer(composer/xdebug-handler) < 2) Requires: (php-composer(seld/jsonlint) >= 1.4 with php-composer(seld/jsonlint) < 2) Requires: (php-composer(seld/phar-utils) >= 1.0 with php-composer(seld/phar-utils) < 2) -Requires: (php-composer(seld/cli-prompt) >= 1.0 with php-composer(seld/cli-prompt) < 2) Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) %else -Requires: php-composer(composer/spdx-licenses) >= 1.2 -Requires: php-composer(composer/spdx-licenses) < 2 Requires: php-composer(composer/ca-bundle) >= 1.0 Requires: php-composer(composer/ca-bundle) < 2 Requires: php-composer(composer/semver) >= 1.0 Requires: php-composer(composer/semver) < 2 +Requires: php-composer(composer/spdx-licenses) >= 1.2 +Requires: php-composer(composer/spdx-licenses) < 2 +Requires: php-composer(composer/xdebug-handler) >= 1.1 +Requires: php-composer(composer/xdebug-handler) < 2 Requires: php-composer(seld/jsonlint) >= 1.4 Requires: php-composer(seld/jsonlint) < 2 Requires: php-composer(seld/phar-utils) >= 1.0 Requires: php-composer(seld/phar-utils) < 2 -Requires: php-composer(seld/cli-prompt) >= 1.0 -Requires: php-composer(seld/cli-prompt) < 2 Requires: php-composer(psr/log) >= 1.0 Requires: php-composer(psr/log) < 2 %endif @@ -138,14 +137,15 @@ Requires: %{symfony_prefix}-finder Requires: %{symfony_prefix}-process Requires: %{symfony_prefix}-filesystem # From composer.json, suggest -# "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic", -# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages" -Requires: php-zip +# "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", +# "ext-zip": "Enabling the zip extension allows you to unzip archives", +# "ext-zlib": "Allow gzip compression of HTTP requests" Requires: php-openssl +Requires: php-zip +Requires: php-zlib # For our autoloader Requires: php-composer(fedora/autoloader) Requires: php-seld-phar-utils >= 1.0.1 -Requires: php-seld-cli-prompt >= 1.0.0-3 Requires: php-PsrLog >= 1.0.0-8 # From phpcompatinfo Requires: php-curl @@ -264,7 +264,7 @@ export BUILDROOT=%{buildroot} # testIntegration may hang on local build ret=0 -for cmd in php php70 php71 php72; do +for cmd in php php70 php71 php72 php73; do if which $cmd; then $cmd -d memory_limit=1G %{_bindir}/phpunit \ --filter '^((?!(testIntegration)).)*$' \ @@ -289,6 +289,11 @@ exit $ret %changelog +* Thu Jul 26 2018 Remi Collet - 1.7.0-1 +- update to 1.7.0 +- drop dependency on seld/cli-prompt +- add dependncy on composer/xdebug-handler + * Fri May 4 2018 Remi Collet - 1.6.5-1 - update to 1.6.5 -- cgit