Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Remi Collet
9c7b486340 v2.0.5
(cherry picked from commit 4d5ddada4a)
(cherry picked from commit 71bd62fe32)
2022-02-25 08:08:34 +01:00
Remi Collet
524d65db8e v2.0.4
(cherry picked from commit befc5ea586)
2022-01-05 13:50:45 +01:00
Remi Collet
73208ba29e update to 2.0.3
add dependency on composer/pcre
allow composer/log v2 and v3

(cherry picked from commit 7c40d97da2)
2021-12-13 08:50:10 +01:00
Remi Collet
7e69e13140 v2.0.2
(cherry picked from commit 4d24b6bf85)
2021-08-02 07:26:28 +02:00
3 changed files with 48 additions and 25 deletions

4
.gitignore vendored
View file

@ -1,2 +1,6 @@
/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
/php-composer-xdebug-handler2-2.0.4-0c1a392.tgz
/php-composer-xdebug-handler2-2.0.5-9e36aee.tgz

View file

@ -1,6 +1,6 @@
# remirepo/fedora spec file for php-composer-xdebug-handler2
#
# Copyright (c) 2018-2021 Remi Collet
# Copyright (c) 2018-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@ -9,7 +9,7 @@
%bcond_without tests
%global gh_commit 964adcdd3a28bf9ed5d9ac6450064e0d71ed7496
%global gh_commit 9e36aeed4616366d2b690bdce11f71e9178c579a
%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.1
Version: 2.0.5
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: Restarts a process without Xdebug, version %{major}
@ -37,41 +37,42 @@ 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)
# From composer.json, "require": {
# "php": "^5.3.2 || ^7.0 || ^8.0",
# "psr/log": "^1.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,15 +122,15 @@ 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}
ret=0
for cmdarg in "php %{phpunit}" php73 php74 php80; do
for cmdarg in "php %{phpunit}" php74 php80 php81; 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,20 @@ exit $ret
%changelog
* Fri Feb 25 2022 Remi Collet <remi@remirepo.net> - 2.0.5-1
- update to 2.0.5
* Wed Jan 5 2022 Remi Collet <remi@remirepo.net> - 2.0.4-1
- update to 2.0.4
* 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
* Thu May 6 2021 Remi Collet <remi@remirepo.net> - 2.0.1-1
- update to 2.0.1

View file

@ -1 +1 @@
SHA512 (php-composer-xdebug-handler2-2.0.1-964adcd.tgz) = fa5da59344edb08418567ef17427f5a8d18e5169cc207bcfea21f359cbf3ed739e0c86258e662b5a8d3be60452efa9f63bf08f96cb370180e707efffda57cc06
SHA512 (php-composer-xdebug-handler2-2.0.5-9e36aee.tgz) = 51b1678422ab8d09a51660846f567f8d7b426487f84e667c5ce5913fbaefd8ea315834490883a808870449e3aadbd5dcf1eea054d1d2138b1030dc1ef558e216