diff options
| -rw-r--r-- | composer.json | 11 | ||||
| -rw-r--r-- | composer.spec | 28 |
2 files changed, 25 insertions, 14 deletions
diff --git a/composer.json b/composer.json index f61d0db..b772f95 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "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" + "react/promise": "^1.2 || ^2.7", + "composer/pcre": "^1.0" }, "require-dev": { "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0", @@ -55,7 +56,7 @@ }, "extra": { "branch-alias": { - "dev-main": "2.1-dev" + "dev-main": "2.2-dev" } }, "autoload": { @@ -78,11 +79,11 @@ ], "scripts": { "compile": "@php -dphar.readonly=0 bin/compile", - "test": "simple-phpunit", + "test": "@php simple-phpunit", "phpstan-setup": [ "@composer config platform --unset", - "@php composer.phar update", - "@composer require --dev phpstan/phpstan:^0.12.93 phpstan/phpstan-phpunit:^0.12.17 phpunit/phpunit:^7.5.20 --with-all-dependencies", + "@composer update", + "@composer require --dev phpstan/phpstan:^1.0 phpstan/phpstan-phpunit:^1.0 phpstan/phpstan-deprecation-rules:^1 phpstan/phpstan-strict-rules:^1 phpunit/phpunit:^7.5.20 --with-all-dependencies", "git checkout composer.json composer.lock" ], "phpstan": "@php vendor/bin/phpstan analyse --configuration=phpstan/config.neon" diff --git a/composer.spec b/composer.spec index 4615c59..0f291fa 100644 --- a/composer.spec +++ b/composer.spec @@ -12,17 +12,17 @@ %bcond_without tests -%global gh_commit cd28fc05b0c9d3beaf58b57018725c4dc15a6446 +%global gh_commit 35bba53ebb8c3f3915f149f0befe283151779e4e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_branch 2.0-dev %global gh_owner composer %global gh_project composer -%global api_version 2.1.0 -%global run_version 2.1.0 +%global api_version 2.2.0 +%global run_version 2.2.0 -%global upstream_version 2.1.14 -#global upstream_prever RC1 -#global upstream_lower rc1 +%global upstream_version 2.2.0 +%global upstream_prever RC1 +%global upstream_lower rc1 %global symfony_prefix php-symfony4 %global symfony_path %{_datadir}/php/Symfony4 @@ -64,7 +64,8 @@ BuildRequires: (php-composer(seld/phar-utils) >= 1.0 with php-com BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) BuildRequires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) BuildRequires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -# remirepo:12 +BuildRequires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +# remirepo:13 %else BuildRequires: php-composer-ca-bundle BuildRequires: php-composer-metadata-minifier @@ -76,6 +77,7 @@ BuildRequires: php-seld-phar-utils BuildRequires: php-PsrLog BuildRequires: php-justinrainbow-json-schema5 >= 5.2.11 BuildRequires: php-react-promise >= 2.7 +BuildRequires: php-composer-pcre %endif BuildRequires: %{symfony_prefix}-console >= %{symfony_min} BuildRequires: %{symfony_prefix}-finder >= %{symfony_min} @@ -107,7 +109,8 @@ BuildRequires: php-PsrLog >= 1.1 # "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" +# "react/promise": "^1.2 || ^2.7", +# "composer/pcre": "^1.0" Requires: php(language) >= 5.3.2 Requires: php-cli # remirepo:1 @@ -122,7 +125,8 @@ Requires: (php-composer(seld/phar-utils) >= 1.0 with php-com Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 3) Requires: (php-composer(justinrainbow/json-schema) >= 5.2.11 with php-composer(justinrainbow/json-schema) < 6) Requires: (php-composer(react/promise) >= 2.7 with php-composer(react/promise) < 3) -# remirepo:12 +Requires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) +# remirepo:13 %else Requires: php-composer-ca-bundle Requires: php-composer-metadata-minifier @@ -134,6 +138,7 @@ Requires: php-seld-phar-utils Requires: php-PsrLog Requires: php-justinrainbow-json-schema5 >= 5.2.11 Requires: php-react-promise >= 2.7 +Requires: php-composer-pcre %endif Requires: %{symfony_prefix}-console >= %{symfony_min} Requires: %{symfony_prefix}-finder >= %{symfony_min} @@ -212,6 +217,7 @@ 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/Pcre/autoload.php', [ '%{_datadir}/php/Psr/Log2/autoload.php', '%{_datadir}/php/Psr/Log/autoload.php', @@ -330,6 +336,10 @@ exit $ret %changelog +* Wed Dec 8 2021 Remi Collet <remi@remirepo.net> - 2.2.0-RC1-1 +- update to 2.2.0-RC1 +- add dependency on composer/pcre + * Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 2.1.14-1 - update to 2.1.14 |