diff options
| -rw-r--r-- | composer.json | 45 | ||||
| -rw-r--r-- | php-laminas-di.spec | 117 |
2 files changed, 100 insertions, 62 deletions
diff --git a/composer.json b/composer.json index 9f15661..559de5c 100644 --- a/composer.json +++ b/composer.json @@ -1,38 +1,51 @@ { - "name": "zendframework/zend-di", + "name": "laminas/laminas-di", "description": " ", "license": "BSD-3-Clause", "keywords": [ - "zf2", + "laminas", "di" ], - "homepage": "https://github.com/zendframework/zend-di", - "autoload": { - "psr-4": { - "Zend\\Di\\": "src/" + "homepage": "https://laminas.dev", + "support": { + "docs": "https://docs.laminas.dev/laminas-di/", + "issues": "https://github.com/laminas/laminas-di/issues", + "source": "https://github.com/laminas/laminas-di", + "rss": "https://github.com/laminas/laminas-di/releases.atom", + "chat": "https://laminas.dev/chat", + "forum": "https://discourse.laminas.dev" + }, + "config": { + "sort-packages": true + }, + "extra": { + "branch-alias": { + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "require": { "php": "^5.5 || ^7.0", "container-interop/container-interop": "^1.1", - "zendframework/zend-code": "^2.6 || ^3.0", - "zendframework/zend-stdlib": "^2.7 || ^3.0" + "laminas/laminas-code": "^2.6 || ^3.0", + "laminas/laminas-stdlib": "^2.7 || ^3.0", + "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0" }, "require-dev": { "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "phpunit/phpunit": "~4.0" }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "autoload": { + "psr-4": { + "Laminas\\Di\\": "src/" } }, "autoload-dev": { "psr-4": { - "ZendTest\\Di\\": "test/" + "LaminasTest\\Di\\": "test/" } + }, + "replace": { + "zendframework/zend-di": "self.version" } } diff --git a/php-laminas-di.spec b/php-laminas-di.spec index 86a6739..cedf78e 100644 --- a/php-laminas-di.spec +++ b/php-laminas-di.spec @@ -1,4 +1,4 @@ -# remirepo/Fedora spec file for php-zendframework-zend-di +# remirepo/Fedora spec file for php-laminas-di # # Copyright (c) 2015-2020 Remi Collet # License: CC-BY-SA @@ -7,11 +7,13 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 1fd1ba85660b5a2718741b38639dc7c4c3194b37 +%global gh_commit 239b22408a1f8eacda6fc2b838b5065c4cf1d88e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-di +%global gh_owner laminas +%global gh_project laminas-di +%global zf_name zend-di %global php_home %{_datadir}/php +%global namespace Laminas %global library Di %if %{bootstrap} %global with_tests 0%{?_with_tests:1} @@ -19,38 +21,40 @@ %global with_tests 0%{!?_without_tests:1} %endif -Name: php-%{gh_owner}-%{gh_project} +Name: php-%{gh_project} Version: 2.6.1 -Release: 8%{?dist} -Summary: Zend Framework %{library} component +Release: 1%{?dist} +Summary: Laminas Framework %{library} component License: BSD -URL: https://zendframework.github.io/%{gh_project}/ +URL: https://github.com/%{gh_owner}/%{gh_project} Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.3.23 +BuildRequires: php(language) >= 5.5 BuildRequires: php-reflection BuildRequires: php-pcre BuildRequires: php-spl # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) -BuildRequires: (php-autoloader(%{gh_owner}/zend-code) >= 2.6 with php-autoloader(%{gh_owner}/zend-code) < 4) -BuildRequires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -# remirepo:6 +BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.0 with php-autoloader(%{gh_owner}/laminas-code) < 4) +BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +BuildRequires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:7 %else BuildRequires: php-composer(container-interop/container-interop) < 2 BuildRequires: php-composer(container-interop/container-interop) >= 1.1 -BuildRequires: php-autoloader(%{gh_owner}/zend-code) >= 2.6 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 +BuildRequires: php-laminas-code +BuildRequires: php-laminas-stdlib +BuildRequires: php-laminas-zendframework-bridge %endif # From composer, "require-dev": { # "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0" +# "phpunit/phpunit": "~4.0" BuildRequires: php-composer(phpunit/phpunit) >= 4.0 %endif # Autoloader @@ -59,50 +63,49 @@ BuildRequires: php-fedora-autoloader-devel # From composer, "require": { # "php": "^5.5 || ^7.0", # "container-interop/container-interop": "^1.1", -# "zendframework/zend-code": "^2.6 || ^3.0", -# "zendframework/zend-stdlib": "^2.7 || ^3.0" -Requires: php(language) >= 5.3.23 +# "laminas/laminas-code": "^2.6 || ^3.0", +# "laminas/laminas-stdlib": "^2.7 || ^3.0", +# "laminas/laminas-zendframework-bridge": "^0.4.5 || ^1.0" +Requires: php(language) >= 5.7 %if ! %{bootstrap} # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) -Requires: (php-autoloader(%{gh_owner}/zend-code) >= 2.6 with php-autoloader(%{gh_owner}/zend-code) < 4) -Requires: (php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 with php-autoloader(%{gh_owner}/zend-stdlib) < 4) -# remirepo:8 +Requires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2) +Requires: (php-autoloader(%{gh_owner}/laminas-code) >= 3.0 with php-autoloader(%{gh_owner}/laminas-code) < 4) +Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.0 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4) +Requires: (php-composer(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-composer(%{gh_owner}/laminas-zendframework-bridge) < 2) +# remirepo:7 %else Requires: php-composer(container-interop/container-interop) >= 1.1 Requires: php-composer(container-interop/container-interop) < 2 -Requires: php-autoloader(%{gh_owner}/zend-code) >= 2.6 -Requires: php-autoloader(%{gh_owner}/zend-code) < 4 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -%endif -# From composer, "suggest": { -# "zendframework/zend-servicemanager": "Zend\\ServiceManager component" -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -Suggests: php-autoloader(%{gh_owner}/zend-servicemanager) +Requires: php-laminas-code +Requires: php-laminas-stdlib +Requires: php-laminas-zendframework-bridge %endif %endif # Autoloader Requires: php-composer(fedora/autoloader) -# From phpcompatinfo report for version 2.5.2 +# From phpcompatinfo report for version 2.6.1 Requires: php-reflection Requires: php-pcre Requires: php-spl -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +# Compatibily ensure by the bridge +Obsoletes: php-zendframework-%{zf_name} < 2.6.1-99 +Provides: php-zendframework-%{zf_name} = %{version}-99 +Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} +Provides: php-composer(zendframework/%{zf_name}) = %{version} Provides: php-autoloader(%{gh_owner}/%{gh_project}) = %{version} +Provides: php-autoloader(zendframework/%{zf_name}) = %{version} %description -Zend\Di is an example of an Inversion of Control (IoC) container. +%{gh_project} is an example of an Inversion of Control (IoC) container. IoC containers are widely used to create object instances that have all dependencies resolved and injected. Dependency Injection containers are one form of IoC – but not the only form. -Documentation: https://zendframework.github.io/%{gh_project}/ +Documentation: https://docs.laminas.dev/%{gh_project}/ %prep @@ -117,18 +120,29 @@ phpab --template fedora --output src/autoload.php src cat << 'EOF' | tee -a src/autoload.php \Fedora\Autoloader\Dependencies::required([ '%{php_home}/Interop/Container/autoload.php', - '%{php_home}/Zend/Code/autoload.php', - '%{php_home}/Zend/Stdlib/autoload.php', + '%{php_home}/%{namespace}/Code/autoload.php', + '%{php_home}/%{namespace}/Stdlib/autoload.php', ]); -\Fedora\Autoloader\Dependencies::optional([ - '%{php_home}/Zend/ServiceManager/autoload.php', +EOF + +cat << 'EOF' | tee zf.php +<?php +require_once '%{php_home}/Fedora/Autoloader/autoload.php'; +\Fedora\Autoloader\Dependencies::required([ + '%{php_home}/%{namespace}/ZendFrameworkBridge/autoload.php', + dirname(dirname(__DIR__)) . '/%{namespace}/%{library}/autoload.php', ]); EOF %install -mkdir -p %{buildroot}%{php_home}/Zend/ -cp -pr src %{buildroot}%{php_home}/Zend/%{library} +: Laminas library +mkdir -p %{buildroot}%{php_home}/%{namespace}/ +cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library} + +: Zend equiv +mkdir -p %{buildroot}%{php_home}/Zend/%{library} +cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php %check @@ -136,8 +150,8 @@ cp -pr src %{buildroot}%{php_home}/Zend/%{library} mkdir vendor cat << 'EOF' | tee vendor/autoload.php <?php -require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; -\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); +require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php'; +\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test'); EOF ret=0 @@ -146,6 +160,13 @@ for cmd in php php71 php72 php73 php74; do $cmd %{_bindir}/phpunit --verbose || ret=1 fi done + +: check compat autoloader +php -r ' +require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php"; +return (class_exists("\\Zend\\%{library}\\%{library}") ? 0 : 1); +' + exit $ret %else : Test suite disabled @@ -159,9 +180,13 @@ exit $ret %doc *.md %doc composer.json %{php_home}/Zend/%{library} +%{php_home}/%{namespace}/%{library} %changelog +* Tue Jan 7 2020 Remi Collet <remi@remirepo.net> - 2.6.1-1 +- switch to Laminas + * Thu Feb 28 2019 Remi Collet <remi@remirepo.net> - 2.6.1-8 - use range dependencies |