update to 2.0.3
add dependency on composer/pcre allow composer/log v2 and v3
This commit is contained in:
Remi Collet
parent
4d24b6bf85
commit
7c40d97da2
3 changed files with 33 additions and 22 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,3 +1,4 @@
|
|||
/php-composer-xdebug-handler2-2.0.0-31d5769.tgz
|
||||
/php-composer-xdebug-handler2-2.0.1-964adcd.tgz
|
||||
/php-composer-xdebug-handler2-2.0.2-84674dd.tgz
|
||||
/php-composer-xdebug-handler2-2.0.3-6555461.tgz
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
%bcond_without tests
|
||||
|
||||
%global gh_commit 84674dd3a7575ba617f5a76d7e9e29a7d3891339
|
||||
%global gh_commit 6555461e76962fd0379c444c46fd558a0fcfb65e
|
||||
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
|
||||
#global gh_date 20150717
|
||||
%global gh_owner composer
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
%global php_home %{_datadir}/php
|
||||
|
||||
Name: php-%{gh_owner}-%{gh_project}%{major}
|
||||
Version: 2.0.2
|
||||
Version: 2.0.3
|
||||
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
|
||||
Summary: Restarts a process without Xdebug, version %{major}
|
||||
|
||||
|
|
@ -37,23 +37,23 @@ BuildArch: noarch
|
|||
%if %{with tests}
|
||||
# For tests
|
||||
BuildRequires: php(language) >= 5.3.2
|
||||
BuildRequires: php-reflection
|
||||
BuildRequires: php-ctype
|
||||
BuildRequires: php-pcntl
|
||||
BuildRequires: php-pcre
|
||||
BuildRequires: php-posix
|
||||
BuildRequires: php-reflection
|
||||
BuildRequires: php-spl
|
||||
# From composer.json, "require-dev": {
|
||||
# "symfony/phpunit-bridge": "^4.2 || ^5",
|
||||
# "phpstan/phpstan": "^0.12.55"
|
||||
# "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0",
|
||||
# "phpstan/phpstan": "^1.0",
|
||||
# "phpstan/phpstan-strict-rules": "^1.1"
|
||||
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
|
||||
BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2)
|
||||
BuildRequires: phpunit8
|
||||
%global phpunit %{_bindir}/phpunit8
|
||||
BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4)
|
||||
BuildRequires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2)
|
||||
%else
|
||||
BuildRequires: php-PsrLog
|
||||
BuildRequires: php-phpunit-PHPUnit >= 4.8.35
|
||||
%global phpunit %{_bindir}/phpunit
|
||||
BuildRequires: php-composer-pcre
|
||||
%endif
|
||||
BuildRequires: phpunit9
|
||||
%global phpunit %{_bindir}/phpunit9
|
||||
%endif
|
||||
# Autoloader
|
||||
BuildRequires: php-composer(fedora/autoloader)
|
||||
|
|
@ -61,17 +61,18 @@ BuildRequires: php-composer(fedora/autoloader)
|
|||
# From composer.json, "require": {
|
||||
# "php": "^5.3.2 || ^7.0 || ^8.0",
|
||||
# "psr/log": "^1 || ^2 || ^3"
|
||||
# "composer/pcre": "^1"
|
||||
Requires: php(language) >= 5.3.2
|
||||
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
|
||||
Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2)
|
||||
Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4)
|
||||
Requires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2)
|
||||
%else
|
||||
Requires: php-PsrLog
|
||||
Requires: php-composer-pcre
|
||||
%endif
|
||||
# From phpcompatinfo report for version 1.0.0
|
||||
Requires: php-reflection
|
||||
Requires: php-ctype
|
||||
# From phpcompatinfo report for version 2.0.3
|
||||
Requires: php-pcntl
|
||||
Requires: php-pcre
|
||||
Requires: php-posix
|
||||
Requires: php-spl
|
||||
# Autoloader
|
||||
Requires: php-composer(fedora/autoloader)
|
||||
|
|
@ -100,7 +101,12 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
|
|||
|
||||
\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
|
||||
\Fedora\Autoloader\Dependencies::required(array(
|
||||
'%{_datadir}/php/Psr/Log/autoload.php',
|
||||
array(
|
||||
'%{_datadir}/php/Psr/Log3/autoload.php',
|
||||
'%{_datadir}/php/Psr/Log2/autoload.php',
|
||||
'%{_datadir}/php/Psr/Log/autoload.php',
|
||||
),
|
||||
'%{_datadir}/php/Composer/Pcre/autoload.php',
|
||||
));
|
||||
EOF
|
||||
|
||||
|
|
@ -116,7 +122,7 @@ mkdir vendor
|
|||
cat << 'EOF' | tee vendor/autoload.php
|
||||
<?php
|
||||
require_once '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload.php';
|
||||
\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', dirname(__DIR__).'/tests');
|
||||
\Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\Tests\\', dirname(__DIR__).'/tests');
|
||||
EOF
|
||||
|
||||
%if %{with tests}
|
||||
|
|
@ -124,7 +130,7 @@ ret=0
|
|||
for cmdarg in "php %{phpunit}" php73 php74 php80; do
|
||||
if which $cmdarg; then
|
||||
set $cmdarg
|
||||
$1 ${2:-%{_bindir}/phpunit8} --verbose|| ret=1
|
||||
$1 ${2:-%{_bindir}/phpunit9} --verbose|| ret=1
|
||||
fi
|
||||
done
|
||||
exit $ret
|
||||
|
|
@ -134,7 +140,6 @@ exit $ret
|
|||
|
||||
|
||||
%files
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license LICENSE
|
||||
%doc composer.json
|
||||
%doc *.md
|
||||
|
|
@ -143,6 +148,11 @@ exit $ret
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Dec 8 2021 Remi Collet <remi@remirepo.net> - 2.0.3-1
|
||||
- update to 2.0.3
|
||||
- add dependency on composer/pcre
|
||||
- allow composer/log v2 and v3
|
||||
|
||||
* Mon Aug 2 2021 Remi Collet <remi@remirepo.net> - 2.0.2-1
|
||||
- update to 2.0.2
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (php-composer-xdebug-handler2-2.0.2-84674dd.tgz) = e457759e087d14cb0113a8662296407d5f6a3561c64834b5999a5b525ef6375e51ed1dabcd3e45368ccc13dfef270d7e9ccc4c387715f4bac3395e37d5dfe810
|
||||
SHA512 (php-composer-xdebug-handler2-2.0.3-6555461.tgz) = 1145a8f183387b9693c9da9f87dfcc5ba09b9faa09d287dc1fcad70292c1b1000d7a936bf5fd7072a385f481eb672e75033b398ef747a88d9be29e12975da516
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue