From 33e040624b5f182b8e514e0efec2ba10370b537a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Dec 2017 13:55:11 +0100 Subject: switch from zend-loader to fedora/autoloader --- php-zendframework-zend-config.spec | 57 +++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/php-zendframework-zend-config.spec b/php-zendframework-zend-config.spec index e4963bd..c997044 100644 --- a/php-zendframework-zend-config.spec +++ b/php-zendframework-zend-config.spec @@ -21,7 +21,7 @@ Name: php-%{gh_owner}-%{gh_project} Version: 2.6.0 -Release: 1%{?dist} +Release: 4%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries @@ -39,8 +39,7 @@ BuildRequires: php-pcre BuildRequires: php-spl BuildRequires: php-xmlreader BuildRequires: php-xmlwriter -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 # From composer, "require-dev": { # "zendframework/zend-filter": "^2.6", # "zendframework/zend-i18n": "^2.5", @@ -48,20 +47,23 @@ BuildRequires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 # "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", # "fabpot/php-cs-fixer": "1.7.*", # "phpunit/PHPUnit": "~4.0" -BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-i18n) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-json) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-servicemanager) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-filter) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-filter) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-i18n) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.5 +BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 2.5 BuildRequires: php-composer(phpunit/phpunit) >= 4.0 %endif +# Autoloader +BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.5 || ^7.0", # "zendframework/zend-stdlib": "^2.7 || ^3.0" Requires: php(language) >= 5.5 -Requires: php-composer(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-composer(%{gh_owner}/zend-stdlib) < 4 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 +# Autoloader +Requires: php-composer(fedora/autoloader) # From phpcompatinfo report for version 2.5.2 Requires: php-libxml Requires: php-pcre @@ -75,16 +77,17 @@ Requires: php-xmlwriter # "zendframework/zend-json": "Zend\\Json to use the Json reader or writer classes", # "zendframework/zend-servicemanager": "Zend\\ServiceManager for use with the Config Factory to retrieve reader and writer instances" %if 0%{?fedora} >= 21 -Suggests: php-composer(%{gh_owner}/zend-filter) -Suggests: php-composer(%{gh_owner}/zend-i18n) -Suggests: php-composer(%{gh_owner}/zend-json) -Suggests: php-composer(%{gh_owner}/zend-servicemanager) +Suggests: php-autoloader(%{gh_owner}/zend-filter) +Suggests: php-autoloader(%{gh_owner}/zend-i18n) +Suggests: php-autoloader(%{gh_owner}/zend-json) +Suggests: php-autoloader(%{gh_owner}/zend-servicemanager) %endif %endif Obsoletes: php-ZendFramework2-%{library} < 2.5 Provides: php-ZendFramework2-%{library} = %{version} Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} %description @@ -104,7 +107,18 @@ mv LICENSE.md LICENSE %build -# Empty build section, nothing required +phpab --template fedora --output src/autoload.php src +cat << 'EOF' | tee -a src/autoload.php +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/Zend/Stdlib/autoload.php', +]); +\Fedora\Autoloader\Dependencies::optional([ + '%{php_home}/Zend/Filter/autoload.php', + '%{php_home}/Zend/I18n/autoload.php', + '%{php_home}/Zend/Json/autoload.php', + '%{php_home}/Zend/ServiceManager/autoload.php', +]); +EOF %install @@ -117,14 +131,8 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} mkdir vendor cat << 'EOF' | tee vendor/autoload.php array( - 'namespaces' => array( - 'ZendTest\\Config' => dirname(__DIR__).'/test/', - 'Zend\\Config' => '%{buildroot}%{php_home}/Zend/%{library}' -)))); -require_once '%{php_home}/Zend/autoload.php'; +require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); EOF ret=0 @@ -148,6 +156,9 @@ exit $ret %changelog +* Thu Dec 7 2017 Remi Collet - 2.6.0-4 +- switch from zend-loader to fedora/autoloader + * Fri Feb 5 2016 Remi Collet - 2.6.0-1 - update to 2.6.0 - raise dependency on PHP >= 5.5 -- cgit