From 8516f58e513bbb68d202f2f05e0bcd1a4e73c97c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 13 Sep 2019 08:46:52 +0200 Subject: - update to 1.0.1 - rename to php-phpdocumentor-type-resolver1 - move to /usr/share/php/phpDocumentor/Reflection2 - raise dependency on PHP 7.1 - raise dependency on reflection-common 2.0 - use phpunit7 --- composer.json | 33 ++++++---- php-phpdocumentor-type-resolver1.spec | 118 ++++++++++++++++++---------------- 2 files changed, 85 insertions(+), 66 deletions(-) diff --git a/composer.json b/composer.json index 82ead15..f784935 100644 --- a/composer.json +++ b/composer.json @@ -1,27 +1,36 @@ { - "name": "phpdocumentor/type-resolver", - "type": "library", + "name": "phpdocumentor/type-resolver", + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "type": "library", "license": "MIT", "authors": [ - {"name": "Mike van Riel", "email": "me@mikevanriel.com"} + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } ], "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" + "php": "^7.1", + "phpdocumentor/reflection-common": "^2.0" + }, + "require-dev": { + "mockery/mockery": "~1", + "ext-tokenizer": "^7.1", + "phpunit/phpunit": "^7.0" }, "autoload": { - "psr-4": {"phpDocumentor\\Reflection\\": ["src/"]} + "psr-4": { + "phpDocumentor\\Reflection\\": "src" + } }, "autoload-dev": { - "psr-4": {"phpDocumentor\\Reflection\\": ["tests/unit"]} - }, - "require-dev": { - "phpunit/phpunit": "^5.2||^4.8.24", - "mockery/mockery": "^0.9.4" + "psr-4": { + "phpDocumentor\\Reflection\\": "tests/unit" + } }, "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.x-dev" } } } diff --git a/php-phpdocumentor-type-resolver1.spec b/php-phpdocumentor-type-resolver1.spec index 9f66a77..a667a6b 100644 --- a/php-phpdocumentor-type-resolver1.spec +++ b/php-phpdocumentor-type-resolver1.spec @@ -1,8 +1,6 @@ -# remirepo spec file for php-phpdocumentor-type-resolver, from +# remirepo/fedora spec file for php-phpdocumentor-type-resolver # -# Fedora spec file for php-phpdocumentor-type-resolver -# -# Copyright (c) 2017 Shawn Iwinski +# Copyright (c) 2017-2019 Remi Collet, Shawn Iwinski # # License: MIT # http://opensource.org/licenses/MIT @@ -12,29 +10,33 @@ %global github_owner phpDocumentor %global github_name TypeResolver -%global github_version 0.4.0 -%global github_commit 9c977708995954784726e25d0cd1dddf4e65b0f7 +%global github_version 1.0.1 +%global github_commit 2e32a6d48972b2c1976ed5d8967145b6cec4a4a9 %global composer_vendor phpdocumentor %global composer_project type-resolver -# "php": "^5.5 || ^7.0" -%global php_min_ver 5.5 -# "mockery/mockery": "^0.9.4" -%global mockery_min_ver 0.9.4 -%global mockery_max_ver 1.0 -# "phpdocumentor/reflection-common": "^1.0" -%global reflection_common_min_ver 1.0 -%global reflection_common_max_ver 2.0 +%global major 1 +# Install in reflection-common tree +%global ns_major 2 + +# "php": "^7.1" +%global php_min_ver 7.1 +# "mockery/mockery": "^1" +%global mockery_min_ver 1 +%global mockery_max_ver 2 +# "phpdocumentor/reflection-common": "^2.0" +%global reflection_common_min_ver 2.0 +%global reflection_common_max_ver 3 # Build using "--without tests" to disable tests %global with_tests 0%{!?_without_tests:1} %{!?phpdir: %global phpdir %{_datadir}/php} -Name: php-%{composer_vendor}-%{composer_project} +Name: php-%{composer_vendor}-%{composer_project}%{major} Version: %{github_version} -Release: 5%{?github_release}%{?dist} +Release: 1%{?github_release}%{?dist} Summary: A PSR-5 based resolver of Class names, Types and Structural Element Names Group: Development/Libraries @@ -42,50 +44,49 @@ License: MIT URL: https://github.com/%{github_owner}/%{github_name} # GitHub export does not include tests. -# Run php-phpdocumentor-type-resolver-get-source.sh to create full source. +# Run makesrc.sh to create full source. Source0: %{name}-%{github_version}-%{github_commit}.tar.gz -Source1: %{name}-get-source.sh +Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} ## composer.json -BuildRequires: php(language) >= %{php_min_ver} -BuildRequires: php-composer(phpunit/phpunit) +BuildRequires: php(language) >= %{php_min_ver} +BuildRequires: phpunit7 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 BuildRequires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) -BuildRequires: (php-composer(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver}) -# remirepo:6 +BuildRequires: (php-composer(mockery/mockery) >= %{mockery_min_ver} with php-composer(mockery/mockery) < %{mockery_max_ver}) +# remirepo:4 %else -BuildRequires: php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver} -BuildRequires: php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} -BuildRequires: php-composer(mockery/mockery) < %{mockery_max_ver} -BuildRequires: php-composer(mockery/mockery) >= %{mockery_min_ver} +BuildRequires: php-phpdocumentor-reflection-common2 >= %{reflection_common_min_ver} +BuildRequires: php-mockery >= %{mockery_min_ver} %endif -## phpcompatinfo (computed from version 0.4.0) -BuildRequires: php-reflection -BuildRequires: php-spl -BuildRequires: php-tokenizer +## phpcompatinfo (computed from version 1.0.0) +BuildRequires: php-reflection +BuildRequires: php-pcre +BuildRequires: php-spl +BuildRequires: php-tokenizer ## Autoloader -BuildRequires: php-fedora-autoloader-devel +BuildRequires: php-fedora-autoloader-devel %endif # composer.json -Requires: php(language) >= %{php_min_ver} +Requires: php(language) >= %{php_min_ver} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) -# remirepo:4 +Requires: (php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} with php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver}) +# remirepo:3 %else -Requires: php-composer(phpdocumentor/reflection-common) >= %{reflection_common_min_ver} -Requires: php-composer(phpdocumentor/reflection-common) < %{reflection_common_max_ver} +Requires: php-phpdocumentor-reflection-common2 >= %{reflection_common_min_ver} %endif -# phpcompatinfo (computed from version 0.4.0) -Requires: php-spl -Requires: php-tokenizer +# phpcompatinfo (computed from version 1.0.0) +Requires: php-pcre +Requires: php-spl +Requires: php-tokenizer # Autoloader -Requires: php-composer(fedora/autoloader) +Requires: php-composer(fedora/autoloader) # Composer Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version} @@ -106,14 +107,14 @@ This package provides two Resolvers that are capable of: 2. Returning an FQSEN object after resolving any partial Structural Element Names into Fully Qualified Structural Element names. -Autoloader: %{phpdir}/phpDocumentor/Reflection/autoload-type-resolver.php +Autoloader: %{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php %prep %setup -qn %{github_name}-%{github_commit} : Update examples autoload require -sed "s#.*require.*vendor.*/autoload.php.*#require_once '%{phpdir}/phpDocumentor/Reflection/autoload-type-resolver.php';#" \ +sed "s#.*require.*vendor.*/autoload.php.*#require_once '%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php';#" \ -i examples/* @@ -129,8 +130,8 @@ AUTOLOAD %install -mkdir -p %{buildroot}%{phpdir}/phpDocumentor/Reflection -cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection/ +mkdir -p %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major} +cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection%{ns_major}/ %check @@ -138,22 +139,22 @@ cp -rp src/* %{buildroot}%{phpdir}/phpDocumentor/Reflection/ : Create tests bootstrap cat <<'BOOTSTRAP' | tee bootstrap.php phpunit.xml +sed 's#vendor/mockery/mockery/library/Mockery#%{phpdir}/Mockery1#' phpunit.xml.dist > phpunit.xml : Upstream tests RETURN_CODE=0 -PHPUNIT=$(which phpunit) -for PHP_EXEC in php php56 php70 php71 php72 php73; do +PHPUNIT=$(which phpunit7) +for PHP_EXEC in php php71 php72 php73 php74; do if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC -d auto_prepend_file=$PWD/bootstrap.php \ $PHPUNIT --verbose --bootstrap bootstrap.php \ @@ -167,19 +168,28 @@ exit $RETURN_CODE %files +# remirepo:1 %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md %doc composer.json %doc examples -%{phpdir}/phpDocumentor/Reflection/autoload-type-resolver.php -%{phpdir}/phpDocumentor/Reflection/FqsenResolver.php -%{phpdir}/phpDocumentor/Reflection/Type.php -%{phpdir}/phpDocumentor/Reflection/TypeResolver.php -%{phpdir}/phpDocumentor/Reflection/Types +%{phpdir}/phpDocumentor/Reflection%{ns_major}/autoload-type-resolver.php +%{phpdir}/phpDocumentor/Reflection%{ns_major}/FqsenResolver.php +%{phpdir}/phpDocumentor/Reflection%{ns_major}/Type.php +%{phpdir}/phpDocumentor/Reflection%{ns_major}/TypeResolver.php +%{phpdir}/phpDocumentor/Reflection%{ns_major}/Types %changelog +* Fri Sep 13 2019 Remi Collet - 1.0.1-1 +- update to 1.0.1 +- rename to php-phpdocumentor-type-resolver1 +- move to /usr/share/php/phpDocumentor/Reflection2 +- raise dependency on PHP 7.1 +- raise dependency on reflection-common 2.0 +- use phpunit7 + * Fri Dec 7 2018 Remi Collet - 0.4.0-5 - use range dependencies -- cgit