summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json50
-rw-r--r--php-laminas-loader.spec115
2 files changed, 94 insertions, 71 deletions
diff --git a/composer.json b/composer.json
index 350f7c6..c9874b4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,44 +1,45 @@
{
- "name": "zendframework/zend-loader",
+ "name": "laminas/laminas-loader",
"description": "Autoloading and plugin loading strategies",
"license": "BSD-3-Clause",
"keywords": [
- "zf",
- "zendframework",
+ "laminas",
"loader"
],
+ "homepage": "https://laminas.dev",
"support": {
- "docs": "https://docs.zendframework.com/zend-loader/",
- "issues": "https://github.com/zendframework/zend-loader/issues",
- "source": "https://github.com/zendframework/zend-loader",
- "rss": "https://github.com/zendframework/zend-loader/releases.atom",
- "chat": "https://zendframework-slack.herokuapp.com",
- "forum": "https://discourse.zendframework.com/c/questions/components"
+ "docs": "https://docs.laminas.dev/laminas-loader/",
+ "issues": "https://github.com/laminas/laminas-loader/issues",
+ "source": "https://github.com/laminas/laminas-loader",
+ "rss": "https://github.com/laminas/laminas-loader/releases.atom",
+ "chat": "https://laminas.dev/chat",
+ "forum": "https://discourse.laminas.dev"
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
+ }
},
"require": {
- "php": "^5.6 || ^7.0"
+ "php": "^5.6 || ^7.0",
+ "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"
},
"autoload": {
"psr-4": {
- "Zend\\Loader\\": "src/"
+ "Laminas\\Loader\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
- "ZendTest\\Loader\\": "test/"
- }
- },
- "config": {
- "sort-packages": true
- },
- "extra": {
- "branch-alias": {
- "dev-master": "2.6.x-dev",
- "dev-develop": "2.7.x-dev"
+ "LaminasTest\\Loader\\": "test/"
}
},
"scripts": {
@@ -50,5 +51,8 @@
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
+ },
+ "replace": {
+ "zendframework/zend-loader": "self.version"
}
}
diff --git a/php-laminas-loader.spec b/php-laminas-loader.spec
index a6c87cc..e930948 100644
--- a/php-laminas-loader.spec
+++ b/php-laminas-loader.spec
@@ -1,4 +1,4 @@
-# remirepo/Fedora spec file for php-zendframework-zend-loader
+# remirepo/Fedora spec file for php-laminas-loader
#
# Copyright (c) 2015-2020 Remi Collet
# License: CC-BY-SA
@@ -6,68 +6,76 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 91da574d29b58547385b2298c020b257310898c6
+%global gh_commit 5d01c2c237ae9e68bec262f339947e2ea18979bc
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner zendframework
-%global gh_project zend-loader
+%global gh_owner laminas
+%global gh_project laminas-loader
+%global zf_name zend-loader
%global php_home %{_datadir}/php
+%global namespace Laminas
%global library Loader
%global with_tests 0%{!?_without_tests:1}
-Name: php-%{gh_owner}-%{gh_project}
+Name: php-%{gh_project}
Version: 2.6.1
Release: 1%{?dist}
-Summary: Zend Framework %{library} component
+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: %{name}-autoload.php
-Source2: makesrc.sh
+Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
BuildRequires: php(language) >= 5.6
-# From composer, "require-dev": {
-# "phpbench/phpbench": "^0.13",
-# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
-# "zendframework/zend-coding-standard": "~1.0.0"
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-%global phpunit %{_bindir}/phpunit7
-BuildRequires: phpunit7 >= 7.1.4
-# remirepo:4
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# remirepo:3
%else
-%global phpunit %{_bindir}/phpunit6
-BuildRequires: phpunit >= 5.7.27
+BuildRequires: php-laminas-zendframework-bridge
%endif
+# From composer, "require-dev": {
+# "laminas/laminas-coding-standard": "~1.0.0",
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4"
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.4
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^5.6 || ^7.0"
+# "php": "^5.6 || ^7.0",
+# "laminas/laminas-zendframework-bridge": "^1.0"
Requires: php(language) >= 5.6
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# remirepo:3
+%else
+Requires: php-laminas-zendframework-bridge
+%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
-# From phpcompatinfo report for version 2.5.1
+# From phpcompatinfo report for version 2.6.1
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\Loader provides different strategies for autoloading PHP classes.
-
-You can include %{php_home}/Zend/autoload.php from
-your application to use the Zend Framework.
+%{gh_project} provides different strategies for autoloading PHP classes.
-Documentation: https://zendframework.github.io/%{gh_project}/
+Documentation: https://docs.laminas.dev/%{gh_project}/
%prep
@@ -80,41 +88,50 @@ mv LICENSE.md LICENSE
: Create autoloader
phpab --template fedora --output src/autoload.php src
+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
-install -pm 644 %{SOURCE1} %{buildroot}%{php_home}/Zend/autoload.php
+: Laminas library
+mkdir -p %{buildroot}%{php_home}/%{namespace}/
+cp -pr src %{buildroot}%{php_home}/%{namespace}/%{library}
-cp -pr src %{buildroot}%{php_home}/Zend/%{library}
+: Zend equiv
+mkdir -p %{buildroot}%{php_home}/Zend/%{library}
+cp -pr zf.php %{buildroot}%{php_home}/Zend/%{library}/autoload.php
%check
-: Deprecated autoloader
-%{_bindir}/php -r '
- require "%{buildroot}%{php_home}/Zend/autoload.php";
- exit (class_exists("Zend\\Loader\\PluginClassLoader" ? 0 : 1));
-'
-: New autoloader
-%{_bindir}/php -r '
- require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
- exit (class_exists("Zend\\Loader\\PluginClassLoader" ? 0 : 1));
-'
-
%if %{with_tests}
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
+: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" 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
fi
done
+
+: check compat autoloader
+php -r '
+require "%{buildroot}%{php_home}/Zend/%{library}/autoload.php";
+return (class_exists("\\Zend\\%{library}\\PluginClassLoader") ? 0 : 1);
+'
+
exit $ret
%else
: Test suite disabled
@@ -127,12 +144,14 @@ exit $ret
%license LICENSE
%doc *.md
%doc composer.json
-%dir %{php_home}/Zend
- %{php_home}/Zend/autoload.php
- %{php_home}/Zend/%{library}
+%{php_home}/Zend/%{library}
+%{php_home}/%{namespace}/%{library}
%changelog
+* Wed Jan 8 2020 Remi Collet <remi@remirepo.net> - 2.6.1-1
+- switch to Laminas
+
* Fri Sep 6 2019 Remi Collet <remi@remirepo.net> - 2.6.1-1
- update to 2.6.1 (no change)