diff options
| -rw-r--r-- | composer.json | 14 | ||||
| -rw-r--r-- | php-sebastian-code-unit-reverse-lookup2.spec | 94 | 
2 files changed, 54 insertions, 54 deletions
| diff --git a/composer.json b/composer.json index b9a2419..4af833c 100644 --- a/composer.json +++ b/composer.json @@ -9,11 +9,19 @@              "email": "sebastian@phpunit.de"          }      ], +    "prefer-stable": true, +    "config": { +        "platform": { +            "php": "7.3.0" +        }, +        "optimize-autoloader": true, +        "sort-packages": true +    },      "require": { -        "php": "^5.6 || ^7.0" +        "php": "^7.3"      },      "require-dev": { -        "phpunit/phpunit": "^5.7 || ^6.0" +        "phpunit/phpunit": "^9.0"      },      "autoload": {          "classmap": [ @@ -22,7 +30,7 @@      },      "extra": {          "branch-alias": { -            "dev-master": "1.0.x-dev" +            "dev-master": "2.0-dev"          }      }  } diff --git a/php-sebastian-code-unit-reverse-lookup2.spec b/php-sebastian-code-unit-reverse-lookup2.spec index 1f11936..7cefb10 100644 --- a/php-sebastian-code-unit-reverse-lookup2.spec +++ b/php-sebastian-code-unit-reverse-lookup2.spec @@ -1,59 +1,64 @@ -# remirepo/fedora spec file for php-sebastian-code-unit-reverse-lookup +# remirepo/fedora spec file for php-sebastian-code-unit-reverse-lookup2  # -# Copyright (c) 2016-2017 Remi Collet +# Copyright (c) 2016-2020 Remi Collet  # License: CC-BY-SA  # http://creativecommons.org/licenses/by-sa/4.0/  #  # Please, preserve the changelog entries  #  %global bootstrap    0 -%global gh_commit    4419fcdb5eabb9caa61a27c7a1db532a6b55dd18 +%global gh_commit    5b5dbe0044085ac41df47e79d34911a15b96d82e  %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})  %global gh_owner     sebastianbergmann  %global gh_project   code-unit-reverse-lookup -%global php_home     %{_datadir}/php/SebastianBergmann -%global ns_name      CodeUnitReverseLookup +# Packagist +%global pk_vendor    sebastian +%global pk_project   %{gh_project} +# Namespace +%global ns_vendor    SebastianBergmann +%global ns_project   CodeUnitReverseLookup +%global major        2 +%global php_home     %{_datadir}/php  %if %{bootstrap} -%global with_tests   %{?_with_tests:1}%{!?_with_tests:0} +%global with_tests   0%{?_with_tests:1}  %else -%global with_tests   %{?_without_tests:0}%{!?_without_tests:1} +%global with_tests   0%{!?_without_tests:1}  %endif -Name:           php-sebastian-%{gh_project} -Version:        1.0.1 +Name:           php-%{pk_vendor}-%{pk_project}%{major} +Version:        2.0.0  Release:        1%{?dist}  Summary:        Looks up which function or method a line of code belongs to  License:        BSD  URL:            https://github.com/%{gh_owner}/%{gh_project} -Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz +Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz -BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)  BuildArch:      noarch -BuildRequires:  php(language) >= 5.6 +BuildRequires:  php(language) >= 7.3  BuildRequires:  php-fedora-autoloader-devel  %if %{with_tests}  # from composer.json, "require-dev": { -#        "phpunit/phpunit": "^5.7 || ^6.0" -# Ignore min version on purpose, avoid bootstrap (tested with 4.8) -BuildRequires:  php-composer(phpunit/phpunit) +#        "phpunit/phpunit": "^9.0" +# TODO test suite passes with v8, switch to v9 when available +BuildRequires:  phpunit8  %endif  # from composer.json, "require": { -#        "php": "^5.6 || ^7.0" -Requires:       php(language) >= 5.6 -# From phpcompatinfo report for version 1.0.0 +#        "php": "^7.3" +Requires:       php(language) >= 7.3 +# From phpcompatinfo report for version 2.0.0  Requires:       php-reflection  # Autoloader  Requires:       php-composer(fedora/autoloader) -Provides:       php-composer(sebastian/%{gh_project}) = %{version} +Provides:       php-composer(%{pk_vendor}/%{pk_project}) = %{version}  %description  Looks up which function or method a line of code belongs to. -Autoloader: %{php_home}/%{ns_name}/autoload.php +Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php  %prep @@ -66,59 +71,46 @@ phpab --template fedora --output src/autoload.php src  %install -rm -rf     %{buildroot} -mkdir -p   %{buildroot}%{php_home} -cp -pr src %{buildroot}%{php_home}/%{ns_name} +mkdir -p   %{buildroot}%{php_home}/%{ns_vendor} +cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}  %check  %if %{with_tests}  mkdir vendor -cat << 'EOF' | tee vendor/autoload.php -<?php -require 'SebastianBergmann/%{ns_name}/autoload.php'; -EOF +touch vendor/autoload.php  : Run upstream test suite -# remirepo:13 -run=0  ret=0 -if which php56; then -  php56 -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ -  %{_bindir}/phpunit --verbose || ret=1 -   run=1 -fi -if which php71; then -  php71 -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ -  %{_bindir}/phpunit6 --verbose || ret=1 -   run=1 -fi -if [ $run -eq 0 ]; then -%{_bindir}/php -d include_path=.:%{buildroot}%{_datadir}/php:%{_datadir}/php \ -%{_bindir}/phpunit --verbose -# remirepo:2 -fi +for cmd in php php73 php74; do +  if which $cmd; then +    $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \ +      %{_bindir}/phpunit8  --verbose || ret=1 +  fi +done  exit $ret  %else  : bootstrap build with test suite disabled  %endif -%clean -rm -rf %{buildroot} - -  %files -%defattr(-,root,root,-) +# remirepo:1  %{!?_licensedir:%global license %%doc}  %license LICENSE  %doc *.md  %doc composer.json -%dir %{php_home} -%{php_home}/%{ns_name} +%dir %{php_home}/%{ns_vendor} +     %{php_home}/%{ns_vendor}/%{ns_project}%{major}  %changelog +* Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 2.0.0-1 +- update to 2.0.0 +- raise dependency on PHP 7.3 +- rename to php-sebastian-code-unit-reverse-lookup2 +- move to /usr/share/php/SebastianBergmann/CodeUnitReverseLookup2 +  * Sat Mar  4 2017 Remi Collet <remi@remirepo.net> - 1.0.1-1  - Update to 1.0.1 (no change) | 
