summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json64
-rw-r--r--php-laminas-servicemanager-di.spec135
2 files changed, 112 insertions, 87 deletions
diff --git a/composer.json b/composer.json
index 5aa97c2..4123d3c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,54 +1,55 @@
{
- "name": "zendframework/zend-servicemanager-di",
- "description": "zend-di integration for zend-servicemanager",
+ "name": "laminas/laminas-servicemanager-di",
+ "description": "laminas-di integration for laminas-servicemanager",
"license": "BSD-3-Clause",
"keywords": [
- "zf",
- "zendframework",
+ "laminas",
"di"
],
+ "homepage": "https://laminas.dev",
"support": {
- "docs": "https://docs.zendframework.com/zend-servicemanager-di/",
- "issues": "https://github.com/zendframework/zend-servicemanager-di/issues",
- "source": "https://github.com/zendframework/zend-servicemanager-di",
- "rss": "https://github.com/zendframework/zend-servicemanager-di/releases.atom",
- "chat": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
+ "docs": "https://docs.laminas.dev/laminas-servicemanager-di/",
+ "issues": "https://github.com/laminas/laminas-servicemanager-di/issues",
+ "source": "https://github.com/laminas/laminas-servicemanager-di",
+ "rss": "https://github.com/laminas/laminas-servicemanager-di/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev",
+ "dev-develop": "1.3.x-dev"
+ },
+ "laminas": {
+ "component": "Laminas\\ServiceManager\\Di",
+ "config-provider": "Laminas\\ServiceManager\\Di\\ConfigProvider"
+ }
},
"require": {
"php": "^5.6 || ^7.0",
"container-interop/container-interop": "^1.1",
- "zendframework/zend-di": "^2.6",
- "zendframework/zend-servicemanager": "^3.0.3"
+ "laminas/laminas-di": "^2.6",
+ "laminas/laminas-servicemanager": "^3.0.3",
+ "laminas/laminas-zendframework-bridge": "^1.0"
},
"require-dev": {
- "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
- "zendframework/zend-coding-standard": "~1.0.0"
+ "laminas/laminas-coding-standard": "~1.0.0",
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
},
"conflict": {
- "zendframework/zend-servicemanager": "<3.0"
+ "laminas/laminas-servicemanager": "<3.0"
},
"autoload": {
"psr-4": {
- "Zend\\ServiceManager\\Di\\": "src/"
+ "Laminas\\ServiceManager\\Di\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "ZendTest\\ServiceManager\\Di\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "1.2.x-dev",
- "dev-develop": "1.3.x-dev"
- },
- "zf": {
- "component": "Zend\\ServiceManager\\Di",
- "config-provider": "Zend\\ServiceManager\\Di\\ConfigProvider"
+ "LaminasTest\\ServiceManager\\Di\\": "test/"
}
},
"scripts": {
@@ -60,5 +61,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-servicemanager-di": "self.version"
}
}
diff --git a/php-laminas-servicemanager-di.spec b/php-laminas-servicemanager-di.spec
index 4e6541a..6a868e7 100644
--- a/php-laminas-servicemanager-di.spec
+++ b/php-laminas-servicemanager-di.spec
@@ -1,31 +1,34 @@
-# remirepo/Fedora spec file for php-zendframework-zend-servicemanager-di
+# remirepo/Fedora spec file for php-laminas-servicemanager-di
#
-# Copyright (c) 2016-2018 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 aaf6fb59fccd32ffdf5ac8ffbd54f99e8e359d5b
+%global gh_commit abb2409f9dbf1b7c88f5dbe06bac726daa7c0325
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner zendframework
-%global gh_project zend-servicemanager-di
+%global gh_owner laminas
+%global gh_project laminas-servicemanager-di
+%global zf_name zend-servicemanager-di
%global php_home %{_datadir}/php
-%global library Di
+%global namespace Laminas
+%global library ServiceManager
+%global subproj Di
%if %{bootstrap}
%global with_tests 0%{?_with_tests:1}
%else
%global with_tests 0%{!?_without_tests:1}
%endif
-Name: php-%{gh_owner}-%{gh_project}
+Name: php-%{gh_project}
Version: 1.2.1
Release: 1%{?dist}
-Summary: Zend Framework ServiceManager-%{library} component
+Summary: %{namespace} Framework %{library}-%{subproj} 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
@@ -35,26 +38,23 @@ BuildArch: noarch
BuildRequires: php(language) >= 5.6
BuildRequires: php-spl
# From composer, "require-dev": {
-# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-# "zendframework/zend-coding-standard": "~1.0.0"
+# "laminas/laminas-coding-standard": "~1.0.0",
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
# 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-di) >= 2.6 with php-autoloader(%{gh_owner}/zend-di) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/zend-servicemanager) < 4)
-%global phpunit %{_bindir}/phpunit7
-BuildRequires: phpunit7 >= 7.1.4
+BuildRequires: (php-composer(container-interop/container-interop) >= 1.1 with php-composer(container-interop/container-interop) < 2)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-di) >= 2.6 with php-autoloader(%{gh_owner}/laminas-di) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# remirepo:10
%else
-BuildRequires: php-composer(container-interop/container-interop) < 2
-BuildRequires: php-composer(container-interop/container-interop) >= 1.1
-BuildRequires: php-autoloader(%{gh_owner}/zend-di) < 3
-BuildRequires: php-autoloader(%{gh_owner}/zend-di) >= 2.6
-BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4
-BuildRequires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 3.0.3
-%global phpunit %{_bindir}/phpunit6
-BuildRequires: phpunit6 >= 6.5.8
+BuildRequires: php-container-interop >= 1.1
+BuildRequires: php-laminas-di
+BuildRequires: php-laminas-servicemanager
+BuildRequires: php-laminas-zendframework-bridge
%endif
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.4
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
@@ -62,36 +62,41 @@ BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^5.6 || ^7.0",
# "container-interop/container-interop": "^1.1",
-# "zendframework/zend-di": "^2.6",
-# "zendframework/zend-servicemanager": "^3.0.3"
+# "laminas/laminas-di": "^2.6",
+# "laminas/laminas-servicemanager": "^3.0.3",
+# "laminas/laminas-zendframework-bridge": "^1.0"
Requires: php(language) >= 5.6
# 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-di) >= 2.6 with php-autoloader(%{gh_owner}/zend-di) < 3)
-Requires: (php-autoloader(%{gh_owner}/zend-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/zend-servicemanager) < 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-di) >= 2.6 with php-autoloader(%{gh_owner}/laminas-di) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# remirepo:6
%else
-Requires: php-composer(container-interop/container-interop) < 2
-Requires: php-composer(container-interop/container-interop) >= 1.1
-Requires: php-autoloader(%{gh_owner}/zend-di) < 3
-Requires: php-autoloader(%{gh_owner}/zend-di) >= 2.6
-Requires: php-autoloader(%{gh_owner}/zend-servicemanager) < 4
-Requires: php-autoloader(%{gh_owner}/zend-servicemanager) >= 3.0.3
+Requires: php-container-interop >= 1.1
+Requires: php-laminas-di
+Requires: php-laminas-servicemanager
+Requires: php-laminas-zendframework-bridge
%endif
-# From phpcompatinfo report for version 1.1.0
+# From phpcompatinfo report for version 1.2.1
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
-Provides: php-composer(%{gh_owner}/%{gh_project}) = %{version}
+# Compatibily ensure by the bridge
+Obsoletes: php-zendframework-%{zf_name} < 1.2.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
-Provides integration for zend-di within zend-servicemanager.
+Provides integration for laminas-di within laminas-servicemanager.
-Documentation: https://zendframework.github.io/%{gh_project}/
+Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
@@ -100,28 +105,34 @@ Documentation: https://zendframework.github.io/%{gh_project}/
mv LICENSE.md LICENSE
%build
-: Create dependency autoloader - deprecated
-cat << 'EOF' | tee autoload.php
-<?php
-require_once '%{php_home}/Interop/Container/autoload.php';
-EOF
-
: Create autoloader
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/Di/autoload.php',
- '%{php_home}/Zend/ServiceManager/autoload.php',
+ '%{php_home}/%{namespace}/Di/autoload.php',
+ '%{php_home}/%{namespace}/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(dirname(__DIR__))) . '/%{namespace}/%{library}/%{subproj}/autoload.php',
+]);
+EOF
-%install
-mkdir -p %{buildroot}%{php_home}/Zend/ServiceManager
-cp -pr src %{buildroot}%{php_home}/Zend/ServiceManager/%{library}
-install -m644 autoload.php %{buildroot}%{php_home}/Zend/ServiceManager-%{library}-autoload.php
+%install
+: Laminas library
+mkdir -p %{buildroot}%{php_home}/%{namespace}/%{library}
+cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}
+
+: Zend equiv
+mkdir -p %{buildroot}%{php_home}/Zend/%{library}/%{subproj}
+cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/%{subproj}/autoload.php
%check
@@ -129,12 +140,19 @@ install -m644 autoload.php %{buildroot}%{php_home}/Zend/ServiceManager-%{library
mkdir vendor
cat << 'EOF' | tee vendor/autoload.php
<?php
-require_once '%{buildroot}%{php_home}/Zend/ServiceManager/%{library}/autoload.php';
-\Fedora\Autoloader\Autoload::addPsr4('ZendTest\\ServiceManager\\%{library}\\', dirname(__DIR__) . '/test');
+require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/%{subproj}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\%{subproj}\\', dirname(__DIR__) . '/test');
EOF
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend/%{library}/%{subproj}/autoload.php";
+return (class_exists("\\Zend\\%{library}\\%{subproj}/DiFactory") ? 0 : 1);
+'
+
+: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
@@ -151,11 +169,14 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%{php_home}/Zend/ServiceManager/%{library}
-%{php_home}/Zend/ServiceManager-%{library}-autoload.php
+%{php_home}/Zend/%{library}/%{subproj}
+%{php_home}/%{namespace}/%{library}/%{subproj}
%changelog
+* Thu Jan 9 2020 Remi Collet <remi@remirepo.net> - 1.2.1-1
+- switch to Laminas
+
* Mon Oct 21 2019 Remi Collet <remi@remirepo.net> - 1.2.1-1
- update to 1.2.1