From 1daa2a976d6f116daf3d9a715968eb6b58535bfa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Nov 2017 06:25:37 +0100 Subject: clean --- composer-dev.json | 44 ------- composer.json | 48 ++------ php-zendframework-zend-servicemanager-dev.spec | 161 ------------------------- php-zendframework-zend-servicemanager.spec | 158 +++++++++--------------- 4 files changed, 68 insertions(+), 343 deletions(-) delete mode 100644 composer-dev.json delete mode 100644 php-zendframework-zend-servicemanager-dev.spec diff --git a/composer-dev.json b/composer-dev.json deleted file mode 100644 index 181a643..0000000 --- a/composer-dev.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "zendframework/zend-servicemanager", - "description": " ", - "license": "BSD-3-Clause", - "keywords": [ - "zf2", - "servicemanager" - ], - "homepage": "https://github.com/zendframework/zend-servicemanager", - "autoload": { - "psr-4": { - "Zend\\ServiceManager\\": "src/" - } - }, - "require": { - "php": "^5.5 || ^7.0", - "container-interop/container-interop": "~1.0" - }, - "require-dev": { - "zendframework/zend-di": "~2.5", - "zendframework/zend-mvc": "~2.5", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0", - "athletic/athletic": "dev-master" - }, - "suggest": { - "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", - "zendframework/zend-di": "Zend\\Di component" - }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "3.0-dev" - } - }, - "autoload-dev": { - "psr-4": { - "ZendTest\\ServiceManager\\": "test/", - "ZendBench\\ServiceManager\\": "benchmarks/" - } - } -} diff --git a/composer.json b/composer.json index 31ec699..181a643 100644 --- a/composer.json +++ b/composer.json @@ -3,9 +3,8 @@ "description": " ", "license": "BSD-3-Clause", "keywords": [ - "zf", - "servicemanager", - "service-manager" + "zf2", + "servicemanager" ], "homepage": "https://github.com/zendframework/zend-servicemanager", "autoload": { @@ -14,28 +13,26 @@ } }, "require": { - "php": "^5.6 || ^7.0", - "container-interop/container-interop": "^1.2", - "psr/container": "^1.0", - "zendframework/zend-stdlib": "^3.1" + "php": "^5.5 || ^7.0", + "container-interop/container-interop": "~1.0" }, "require-dev": { - "ocramius/proxy-manager": "^1.0 || ^2.0", - "phpbench/phpbench": "^0.10.0", - "phpunit/phpunit": "^5.7 || ^6.0.6", - "mikey179/vfsStream": "^1.6", - "zendframework/zend-coding-standard": "~1.0.0" + "zendframework/zend-di": "~2.5", + "zendframework/zend-mvc": "~2.5", + "fabpot/php-cs-fixer": "1.7.*", + "phpunit/PHPUnit": "~4.0", + "athletic/athletic": "dev-master" }, "suggest": { - "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", - "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" + "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", + "zendframework/zend-di": "Zend\\Di component" }, "minimum-stability": "dev", "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "3.3-dev", - "dev-develop": "3.4-dev" + "dev-master": "2.7-dev", + "dev-develop": "3.0-dev" } }, "autoload-dev": { @@ -43,24 +40,5 @@ "ZendTest\\ServiceManager\\": "test/", "ZendBench\\ServiceManager\\": "benchmarks/" } - }, - "provide": { - "container-interop/container-interop-implementation": "^1.2", - "psr/container-implementation": "^1.0" - }, - "bin": [ - "bin/generate-deps-for-config-factory", - "bin/generate-factory-for-class" - ], - "scripts": { - "check": [ - "@cs-check", - "@test" - ], - "cs-check": "phpcs", - "cs-fix": "phpcbf", - "test": "phpunit --colors=always", - "test-coverage": "phpunit --colors=always --coverage-clover clover.xml", - "upload-coverage": "coveralls -v" } } diff --git a/php-zendframework-zend-servicemanager-dev.spec b/php-zendframework-zend-servicemanager-dev.spec deleted file mode 100644 index 7bcbcce..0000000 --- a/php-zendframework-zend-servicemanager-dev.spec +++ /dev/null @@ -1,161 +0,0 @@ -# remirepo/Fedora spec file for php-zendframework-zend-servicemanager -# -# Copyright (c) 2015-2016 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 2ae3b6e4978ec2e9ff52352e661946714ed989f9 -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_owner zendframework -%global gh_project zend-servicemanager -%global php_home %{_datadir}/php -%global library ServiceManager -%if %{bootstrap} -%global with_tests 0%{?_with_tests:1} -%else -%global with_tests 0%{!?_without_tests:1} -%endif - -Name: php-%{gh_owner}-%{gh_project} -Version: 2.7.8 -Release: 1%{?dist} -Summary: Zend Framework %{library} component - -Group: Development/Libraries -License: BSD -URL: http://framework.zend.com/ -Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz -Source1: makesrc.sh - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildArch: noarch -# Tests -%if %{with_tests} -BuildRequires: php(language) >= 5.5 -BuildRequires: php-composer(container-interop/container-interop) >= 1.0 -BuildRequires: php-spl -# From composer, "require-dev": { -# "zendframework/zend-di": "~2.5", -# "zendframework/zend-mvc": "~2.5", -# "fabpot/php-cs-fixer": "1.7.*", -# "phpunit/PHPUnit": "~4.0", -# "athletic/athletic": "dev-master" -BuildRequires: php-composer(%{gh_owner}/zend-di) >= 2.5 -BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.5 -BuildRequires: php-composer(phpunit/phpunit) >= 4.0 -# Because of bootstrap -BuildRequires: php-composer(%{gh_owner}/zend-code) >= 2.5 -# Autoloader -BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -%endif - -# From composer, "require": { -# "php": "^5.5 || ^7.0" -# "container-interop/container-interop": "~1.0" -Requires: php(language) >= 5.5 -Requires: php-composer(container-interop/container-interop) >= 1.0 -Requires: php-composer(container-interop/container-interop) < 2 -# From phpcompatinfo report for version 2.7.4 -Requires: php-spl -%if ! %{bootstrap} -# From composer, "suggest": { -# "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", -# "zendframework/zend-di": "Zend\\Di component" -%if 0%{?fedora} >= 21 -Suggests: php-composer(ocramius/proxy-manager) -Suggests: php-composer(%{gh_owner}/zend-di) -%endif -# Autoloader -Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5 -%endif - -Obsoletes: php-ZendFramework2-%{library} < 2.5 -Provides: php-ZendFramework2-%{library} = %{version} -Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version} - - -%description -The Service Locator design pattern is implemented by the Zend\ServiceManager -component. The Service Locator is a service/object locator, tasked with -retrieving other objects. - - -%prep -%setup -q -n %{gh_project}-%{gh_commit} - -# NOTICE container-interop/container-interop is PSR-0 -# so will be managed by the fallback_autoloader option - - -%build -# Empty build section, nothing required - - -%install -rm -rf %{buildroot} - -mkdir -p %{buildroot}%{php_home}/Zend/ -cp -pr src %{buildroot}%{php_home}/Zend/%{library} - - -%check -%if %{with_tests} -mkdir vendor -cat << 'EOF' | tee vendor/autoload.php - array( - 'namespaces' => array( - 'ZendTest\\%{library}' => dirname(__DIR__).'/test/', - 'Zend\\%{library}' => '%{buildroot}%{php_home}/Zend/%{library}' -)))); -require_once '%{php_home}/Zend/autoload.php'; -EOF - -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -if which php70; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} -fi -%else -: Test suite disabled -%endif - - -%clean -rm -rf %{buildroot} - - -%files -%defattr(-,root,root,-) -%{!?_licensedir:%global license %%doc} -%license LICENSE.md -%doc CONTRIBUTING.md README.md -%doc composer.json -%{php_home}/Zend/%{library} - - -%changelog -* Fri Mar 3 2017 Remi Collet - 2.7.8-1 -- Update to 2.7.8 - -* Thu Apr 28 2016 Remi Collet - 2.7.6-1 -- update to 2.7.6 - -* Tue Feb 2 2016 Remi Collet - 2.7.5-1 -- update to 2.7.5 - -* Thu Jan 28 2016 Remi Collet - 2.7.4-2 -- update to 2.7.4 -- raise minimal php version to 5.5 -- add dependency on container-interop/container-interop ~1.0 - -* Thu Aug 6 2015 Remi Collet - 2.5.1-2 -- fix description - -* Tue Aug 4 2015 Remi Collet - 2.5.1-1 -- initial package diff --git a/php-zendframework-zend-servicemanager.spec b/php-zendframework-zend-servicemanager.spec index 1d951e6..7bcbcce 100644 --- a/php-zendframework-zend-servicemanager.spec +++ b/php-zendframework-zend-servicemanager.spec @@ -1,13 +1,13 @@ # remirepo/Fedora spec file for php-zendframework-zend-servicemanager # -# Copyright (c) 2015-2017 Remi Collet +# Copyright (c) 2015-2016 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 c3036efb81f71bfa36cc9962ee5d4474f36581d0 +%global gh_commit 2ae3b6e4978ec2e9ff52352e661946714ed989f9 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-servicemanager @@ -20,74 +20,61 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 3.3.0 -Release: 3%{?dist} +Version: 2.7.8 +Release: 1%{?dist} Summary: Zend Framework %{library} component Group: Development/Libraries License: BSD -URL: https://zendframework.github.io/%{gh_project}/ +URL: http://framework.zend.com/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 5.6 -BuildRequires: php-composer(container-interop/container-interop) >= 1.2 -BuildRequires: php-composer(psr/container) >= 1.0 -BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 -BuildRequires: php-reflection -BuildRequires: php-date -BuildRequires: php-json +BuildRequires: php(language) >= 5.5 +BuildRequires: php-composer(container-interop/container-interop) >= 1.0 BuildRequires: php-spl # From composer, "require-dev": { -# "ocramius/proxy-manager": "^1.0 || ^2.0", -# "phpbench/phpbench": "^0.10.0", -# "phpunit/phpunit": "^5.7 || ^6.0.6" -# "mikey179/vfsStream": "^1.6", -# "zendframework/zend-coding-standard": "~1.0.0" -BuildRequires: php-composer(phpunit/phpunit) >= 5.7 -BuildRequires: php-composer(ocramius/proxy-manager) >= 1.0 -BuildRequires: php-composer(mikey179/vfsStream) >= 1.6 +# "zendframework/zend-di": "~2.5", +# "zendframework/zend-mvc": "~2.5", +# "fabpot/php-cs-fixer": "1.7.*", +# "phpunit/PHPUnit": "~4.0", +# "athletic/athletic": "dev-master" +BuildRequires: php-composer(%{gh_owner}/zend-di) >= 2.5 +BuildRequires: php-composer(%{gh_owner}/zend-mvc) >= 2.5 +BuildRequires: php-composer(phpunit/phpunit) >= 4.0 +# Because of bootstrap +BuildRequires: php-composer(%{gh_owner}/zend-code) >= 2.5 # Autoloader -BuildRequires: php-fedora-autoloader-devel +BuildRequires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %endif # From composer, "require": { -# "php": "^5.6 || ^7.0", -# "container-interop/container-interop": "^1.2", -# "psr/container": "^1.0", -# "zendframework/zend-stdlib": "^3.1" -Requires: php(language) >= 5.6 -Requires: php-composer(container-interop/container-interop) >= 1.2 +# "php": "^5.5 || ^7.0" +# "container-interop/container-interop": "~1.0" +Requires: php(language) >= 5.5 +Requires: php-composer(container-interop/container-interop) >= 1.0 Requires: php-composer(container-interop/container-interop) < 2 -Requires: php-composer(psr/container) >= 1.0 -Requires: php-composer(psr/container) < 2 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) >= 3.1 -Requires: php-autoloader(%{gh_owner}/zend-stdlib) < 4 -# From phpcompatinfo report for version 3.2.0 -Requires: php-reflection -Requires: php-date -Requires: php-json +# From phpcompatinfo report for version 2.7.4 Requires: php-spl %if ! %{bootstrap} # From composer, "suggest": { -# "ocramius/proxy-manager": "ProxyManager 1.* to handle lazy initialization of services", -# "zendframework/zend-stdlib": "zend-stdlib ^2.5 if you wish to use the MergeReplaceKey or MergeRemoveKey features in Config instances" +# "ocramius/proxy-manager": "ProxyManager 0.5.* to handle lazy initialization of services", +# "zendframework/zend-di": "Zend\\Di component" %if 0%{?fedora} >= 21 Suggests: php-composer(ocramius/proxy-manager) +Suggests: php-composer(%{gh_owner}/zend-di) %endif # Autoloader -Requires: php-composer(fedora/autoloader) +Requires: php-composer(%{gh_owner}/zend-loader) >= 2.5 %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} -Provides: php-composer(container-interop/container-interop-implementation) = 1.2 -Provides: php-composer(psr/container-implementation) = 1.0 %description @@ -95,101 +82,66 @@ The Service Locator design pattern is implemented by the Zend\ServiceManager component. The Service Locator is a service/object locator, tasked with retrieving other objects. -Documentation: https://zendframework.github.io/%{gh_project}/ - %prep %setup -q -n %{gh_project}-%{gh_commit} -mv LICENSE.md LICENSE +# NOTICE container-interop/container-interop is PSR-0 +# so will be managed by the fallback_autoloader option %build -: Create dependency autoloader - deprecated -cat << 'EOF' | tee autoload.php - array( + 'namespaces' => array( + 'ZendTest\\%{library}' => dirname(__DIR__).'/test/', + 'Zend\\%{library}' => '%{buildroot}%{php_home}/Zend/%{library}' +)))); +require_once '%{php_home}/Zend/autoload.php'; EOF -ret=0 -for cmd in php php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit --verbose || ret=1 - fi -done -exit $ret +%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} + +if which php70; then + php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} +fi %else : Test suite disabled %endif +%clean +rm -rf %{buildroot} + + %files +%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} -%license LICENSE -%doc *.md +%license LICENSE.md +%doc CONTRIBUTING.md README.md %doc composer.json %{php_home}/Zend/%{library} -%{php_home}/Zend/%{library}-autoload.php %changelog -* Thu Nov 23 2017 Remi Collet - 3.3.0-3 -- switch from zend-loader to fedora/autoloader - -* Thu Mar 2 2017 Remi Collet - 3.3.0-1 -- update to 3.3.0 -- raise dependency on container-interop/container-interop 1.2 -- add dependency on psr/container 1.0 - -* Wed Feb 15 2017 Remi Collet - 3.2.1-1 -- update to 3.2.1 - -* Tue Dec 20 2016 Remi Collet - 3.2.0-1 -- update to 3.2.0 -- raise dependency on PHP 5.6 -- add dependency on zendframework/zend-stdlib - -* Sun Jul 17 2016 Remi Collet - 3.1.1-1 -- update to 3.1.1 - -* Wed Jun 29 2016 Remi Collet - 3.1.0-1 -- update to 3.1.0 for ZendFramework 3 -- add dependencies autoloader +* Fri Mar 3 2017 Remi Collet - 2.7.8-1 +- Update to 2.7.8 * Thu Apr 28 2016 Remi Collet - 2.7.6-1 - update to 2.7.6 -- cgit