summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json12
-rw-r--r--composer.spec30
2 files changed, 23 insertions, 19 deletions
diff --git a/composer.json b/composer.json
index 0ee8df4..2734e96 100644
--- a/composer.json
+++ b/composer.json
@@ -27,19 +27,19 @@
"composer/metadata-minifier": "^1.0",
"composer/semver": "^3.0",
"composer/spdx-licenses": "^1.2",
- "composer/xdebug-handler": "^1.1",
+ "composer/xdebug-handler": "^2.0",
"justinrainbow/json-schema": "^5.2.10",
"psr/log": "^1.0",
"seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0",
- "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
- "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
- "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
- "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
+ "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+ "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
"react/promise": "^1.2 || ^2.7"
},
"require-dev": {
- "symfony/phpunit-bridge": "^4.2 || ^5.0",
+ "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0",
"phpspec/prophecy": "^1.10"
},
"suggest": {
diff --git a/composer.spec b/composer.spec
index c5b70ed..0dc3545 100644
--- a/composer.spec
+++ b/composer.spec
@@ -10,7 +10,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 986e8b86b7b570632ad0a905c3726c33dd4c0efb
+%global gh_commit 92b2ccbef65292ba9f2004271ef47c7231e2eed5
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 2.0-dev
%global gh_owner composer
@@ -19,7 +19,7 @@
%global api_version 2.0.0
%global run_version 2.0.0
-%global upstream_version 2.0.13
+%global upstream_version 2.0.14
#global upstream_prever RC2
#global upstream_lower rc2
@@ -62,7 +62,7 @@ BuildRequires: (php-composer(composer/ca-bundle) >= 1.0 with php-com
BuildRequires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2)
BuildRequires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4)
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(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3)
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(psr/log) >= 1.0 with php-composer(psr/log) < 2)
@@ -73,7 +73,7 @@ BuildRequires: php-composer-ca-bundle
BuildRequires: php-composer-metadata-minifier
BuildRequires: php-composer-semver3
BuildRequires: php-composer-spdx-licenses >= 1.2
-BuildRequires: php-composer-xdebug-handler >= 1.1
+BuildRequires: php-composer-xdebug-handler2
BuildRequires: php-jsonlint >= 1.4
BuildRequires: php-seld-phar-utils
BuildRequires: php-PsrLog
@@ -86,7 +86,7 @@ BuildRequires: %{symfony_prefix}-filesystem >= %{symfony_min}
BuildRequires: %{symfony_prefix}-process >= %{symfony_min}
BuildRequires: php-zip
# From composer.json, "require-dev": {
-# "symfony/phpunit-bridge": "^4.2 || ^5.0",
+# "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0",
# "phpspec/prophecy": "^1.10"
BuildRequires: %{_phpunit}
# For autoloader
@@ -101,15 +101,15 @@ BuildRequires: php-PsrLog >= 1.1
# "composer/metadata-minifier": "^1.0",
# "composer/semver": "^3.0",
# "composer/spdx-licenses": "^1.2",
-# "composer/xdebug-handler": "^1.1",
+# "composer/xdebug-handler": "^2.0",
# "justinrainbow/json-schema": "^5.2.10",
# "psr/log": "^1.0"
# "seld/jsonlint": "~1.4",
# "seld/phar-utils": "^1.0",
-# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
-# "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
-# "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
-# "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
+# "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
+# "symfony/process": "^^2.8.52 || ^3.4.35 || ^4.4 || ^5.0 || ^6.0",
# "react/promise": "^1.2 || ^2.7"
Requires: php(language) >= 5.3.2
Requires: php-cli
@@ -118,7 +118,7 @@ Requires: (php-composer(composer/ca-bundle) >= 1.0 with php-com
Requires: (php-composer(composer/metadata-minifier) >= 1.0 with php-composer(composer/metadata-minifier) < 2)
Requires: (php-composer(composer/semver) >= 3.0 with php-composer(composer/semver) < 4)
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(composer/xdebug-handler) >= 2.0 with php-composer(composer/xdebug-handler) < 3)
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(psr/log) >= 1.0 with php-composer(psr/log) < 2)
@@ -129,7 +129,7 @@ Requires: php-composer-ca-bundle
Requires: php-composer-metadata-minifier
Requires: php-composer-semver3
Requires: php-composer-spdx-licenses >= 1.2
-Requires: php-composer-xdebug-handler >= 1.1
+Requires: php-composer-xdebug-handler2
Requires: php-jsonlint >= 1.4
Requires: php-seld-phar-utils
Requires: php-PsrLog
@@ -201,6 +201,7 @@ phpab --template fedora --output src/Composer/autoload.php src/Composer
cat << 'EOF' | tee -a src/Composer/autoload.php
\Fedora\Autoloader\Dependencies::required([
+ '%{_datadir}/php/Composer/XdebugHandler2/autoload.php', /* before symfony which load composer */
'%{symfony_path}/Component/Console/autoload.php',
'%{symfony_path}/Component/Finder/autoload.php',
'%{symfony_path}/Component/Process/autoload.php',
@@ -211,7 +212,6 @@ cat << 'EOF' | tee -a src/Composer/autoload.php
'%{_datadir}/php/Composer/Spdx/autoload.php',
'%{_datadir}/php/Composer/MetadataMinifier/autoload.php',
'%{_datadir}/php/Composer/Semver3/autoload.php',
- '%{_datadir}/php/Composer/XdebugHandler/autoload.php',
'%{_datadir}/php/Psr/Log/autoload.php',
'%{_datadir}/php/JsonSchema5/autoload.php',
'%{_datadir}/php/React/Promise/autoload.php',
@@ -327,6 +327,10 @@ exit $ret
%changelog
+* Sat May 22 2021 Remi Collet <remi@remirepo.net> - 2.0.14-1
+- update to 2.0.14
+- switch to composer/xdebug-handler v2
+
* Tue Apr 27 2021 Remi Collet <remi@remirepo.net> - 2.0.13-1
- update to 2.0.13
- add dependency on composer/metadata-minifier
generated by cgit (git 2.34.1) at 2024-11-18 04:09:47 +0000