summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json36
-rw-r--r--php-laminas-test.spec114
2 files changed, 91 insertions, 59 deletions
diff --git a/composer.json b/composer.json
index c96f5dd..844bd54 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
{
"name": "laminas/laminas-test",
- "description": "Tools to facilitate unit testing of laminas-mvc applications",
+ "description": "Tools to facilitate integration testing of laminas-mvc applications",
"license": "BSD-3-Clause",
"keywords": [
"laminas",
@@ -18,35 +18,38 @@
"config": {
"sort-packages": true
},
+ "conflict": {
+ "zendframework/zend-test": "*"
+ },
"extra": {
},
"require": {
- "php": "^7.3 || ~8.0.0",
+ "php": "^7.3 || ~8.0.0 || ~8.1.0",
"laminas/laminas-console": "^2.6",
- "laminas/laminas-dom": "^2.8",
"laminas/laminas-eventmanager": "^3.0",
- "laminas/laminas-http": "^2.13",
- "laminas/laminas-mvc": "^3.0",
+ "laminas/laminas-http": "^2.15.0",
+ "laminas/laminas-mvc": "^3.3.0",
"laminas/laminas-servicemanager": "^3.0.3",
- "laminas/laminas-stdlib": "^3.3",
"laminas/laminas-uri": "^2.5",
- "laminas/laminas-view": "^2.6.3",
- "laminas/laminas-zendframework-bridge": "^1.1",
- "vimeo/psalm": "^4.7.0",
- "psalm/plugin-phpunit": "^0.15.0",
- "phpunit/phpunit": "^8.0 || ^9.0"
+ "laminas/laminas-view": "^2.13.1",
+ "phpunit/phpunit": "^8.5.14 || ^9.0",
+ "symfony/css-selector": "^5.4 || ^6.0",
+ "symfony/dom-crawler": "^5.4 || ^6.0"
},
"require-dev": {
- "laminas/laminas-coding-standard": "~2.2.1",
+ "laminas/laminas-coding-standard": "~2.3.0",
"laminas/laminas-i18n": "^2.6",
"laminas/laminas-log": "^2.7.1",
"laminas/laminas-modulemanager": "^2.7.1",
"laminas/laminas-mvc-console": "^1.1.8",
- "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
+ "laminas/laminas-mvc-plugin-flashmessenger": "^1.4.0",
"laminas/laminas-serializer": "^2.6.1",
- "laminas/laminas-session": "^2.8.5",
+ "laminas/laminas-session": "^2.12.0",
+ "laminas/laminas-stdlib": "^3.6.0",
"laminas/laminas-validator": "^2.8",
- "mikey179/vfsstream": "^1.6.8"
+ "mikey179/vfsstream": "^1.6.8",
+ "psalm/plugin-phpunit": "^0.16.0",
+ "vimeo/psalm": "^4.7"
},
"suggest": {
"laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
@@ -71,8 +74,5 @@
"test": "phpunit --colors",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"static-analysis": "psalm --shepherd --stats"
- },
- "replace": {
- "zendframework/zend-test": "^3.3.0"
}
}
diff --git a/php-laminas-test.spec b/php-laminas-test.spec
index e7037c4..a77aad4 100644
--- a/php-laminas-test.spec
+++ b/php-laminas-test.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit a91af6342c1f0d8d917609fca1fe960cfaac4c2e
+%global gh_commit ae49929c0060800f0e516cb984620674dfb74458
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-test
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 3.5.0
+Version: 3.8.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -36,49 +36,51 @@ BuildArch: noarch
%if %{with_tests}
BuildRequires: php(language) >= 7.3
BuildRequires: php-pcre
-BuildRequires: phpunit8
+BuildRequires: phpunit8 >= 8.5.14
BuildRequires: phpunit9
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-dom) >= 2.8 with php-autoloader(%{gh_owner}/laminas-dom) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.13 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.3 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.3 with php-autoloader(%{gh_owner}/laminas-view) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.13.1 with php-autoloader(%{gh_owner}/laminas-view) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+BuildRequires: (php-composer(symfony/css-selector) >= 4 with php-composer(symfony/css-selector) < 7)
+BuildRequires: (php-composer(symfony/dom-crawler) >= 4 with php-composer(symfony/dom-crawler) < 7)
# From composer, "require-dev": {
-# "laminas/laminas-coding-standard": "~2.2.1",
+# "laminas/laminas-coding-standard": "~2.3.0",
# "laminas/laminas-i18n": "^2.6",
# "laminas/laminas-log": "^2.7.1",
# "laminas/laminas-modulemanager": "^2.7.1",
# "laminas/laminas-mvc-console": "^1.1.8",
-# "laminas/laminas-mvc-plugin-flashmessenger": "^1.0",
+# "laminas/laminas-mvc-plugin-flashmessenger": "^1.4.0",
# "laminas/laminas-serializer": "^2.6.1",
-# "laminas/laminas-session": "^2.8.5",
+# "laminas/laminas-session": "^2.12.0",
+# "laminas/laminas-stdlib": "^3.6.0",
# "laminas/laminas-validator": "^2.8",
-# "mikey179/vfsstream": "~1.6.8"
+# "mikey179/vfsstream": "^1.6.8",
+# "psalm/plugin-phpunit": "^0.16.0",
+# "vimeo/psalm": "^4.7"
BuildRequires: (php-autoloader(%{gh_owner}/laminas-i18n) >= 2.6 with php-autoloader(%{gh_owner}/laminas-i18n) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-log) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-log) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-modulemanager) >= 2.7.1 with php-autoloader(%{gh_owner}/laminas-modulemanager) < 3)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-mvc-console) >= 1.1.8 with php-autoloader(%{gh_owner}/laminas-mvc-console) < 2)
-BuildRequires: php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.0
+BuildRequires: php-autoloader(%{gh_owner}/laminas-mvc-plugin-flashmessenger) >= 1.4.0
BuildRequires: (php-autoloader(%{gh_owner}/laminas-serializer) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-serializer) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.8.5 with php-autoloader(%{gh_owner}/laminas-session) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-session) >= 2.12 with php-autoloader(%{gh_owner}/laminas-session) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.6 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.8 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
BuildRequires: (php-composer(mikey179/vfsstream) >= 1.6.8 with php-composer(mikey179/vfsstream) < 2)
-# remirepo:21
+# remirepo:22
%else
BuildRequires: php-laminas-console
-BuildRequires: php-laminas-dom
BuildRequires: php-laminas-eventmanager
BuildRequires: php-laminas-http
BuildRequires: php-laminas-mvc
BuildRequires: php-laminas-servicemanager
-BuildRequires: php-laminas-stdlib
BuildRequires: php-laminas-uri
BuildRequires: php-laminas-view
BuildRequires: php-laminas-zendframework-bridge
@@ -90,27 +92,27 @@ BuildRequires: php-laminas-mvc-console
BuildRequires: php-laminas-mvc-plugin-flashmessenger
BuildRequires: php-laminas-serializer
BuildRequires: php-laminas-session
+BuildRequires: php-laminas-stdlib
BuildRequires: php-laminas-validator
+BuildRequires: php-symfony4-css-selector
+BuildRequires: php-symfony4-dom-crawler
%endif
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.3 || ~8.0.0",
+# "php": "^7.3 || ~8.0.0 || ~8.1.0",
# "laminas/laminas-console": "^2.6",
-# "laminas/laminas-dom": "^2.8",
# "laminas/laminas-eventmanager": "^3.0",
-# "laminas/laminas-http": "^2.13",
-# "laminas/laminas-mvc": "^3.0",
+# "laminas/laminas-http": "^2.15.0",
+# "laminas/laminas-mvc": "^3.3",
# "laminas/laminas-servicemanager": "^3.0.3",
-# "laminas/laminas-stdlib": "^3.3",
# "laminas/laminas-uri": "^2.5",
-# "laminas/laminas-view": "^2.6.3",
-# "laminas/laminas-zendframework-bridge": "^1.1",
-# "vimeo/psalm": "^4.7.0",
-# "psalm/plugin-phpunit": "^0.15.0",
-# "phpunit/phpunit": "^8.0 || ^9.0"
+# "laminas/laminas-view": "^2.13.1",
+# "phpunit/phpunit": "^8.5.14 || ^9.0",
+# "symfony/css-selector": "^5.4 || ^6.0",
+# "symfony/dom-crawler": "^5.4 || ^6.0"
Requires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -118,30 +120,31 @@ Requires: php(language) >= 7.3
Recommends: phpunit9
Recommends: phpunit8
Requires: (php-autoloader(%{gh_owner}/laminas-console) >= 2.6 with php-autoloader(%{gh_owner}/laminas-console) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-dom) >= 2.8 with php-autoloader(%{gh_owner}/laminas-dom) < 3)
Requires: (php-autoloader(%{gh_owner}/laminas-eventmanager) >= 3.0 with php-autoloader(%{gh_owner}/laminas-eventmanager) < 4)
-Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.13 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.0 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-mvc) >= 3.3 with php-autoloader(%{gh_owner}/laminas-mvc) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-servicemanager) >= 3.0.3 with php-autoloader(%{gh_owner}/laminas-servicemanager) < 4)
-Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.3 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.5 with php-autoloader(%{gh_owner}/laminas-uri) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.6.3 with php-autoloader(%{gh_owner}/laminas-view) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-view) >= 2.13.1 with php-autoloader(%{gh_owner}/laminas-view) < 3)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.1 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
+# ignore minimal version
+Requires: (php-composer(symfony/css-selector) >= 4 with php-composer(symfony/css-selector) < 7)
+Requires: (php-composer(symfony/dom-crawler) >= 4 with php-composer(symfony/dom-crawler) < 7)
# From composer.json, "suggest": {
# "laminas/laminas-mvc-console": "^1.1.8, to test MVC <-> console integration"
Suggests: php-autoloader(%{gh_owner}/laminas-mvc-console)
# remirepo:12
%else
Requires: php-laminas-console
-Requires: php-laminas-dom
Requires: php-laminas-eventmanager
Requires: php-laminas-http
Requires: php-laminas-mvc
Requires: php-laminas-servicemanager
-Requires: php-laminas-stdlib
Requires: php-laminas-uri
Requires: php-laminas-view
Requires: php-laminas-zendframework-bridge
+Requires: php-symfony4-css-selector
+Requires: php-symfony4-dom-crawler
%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
@@ -161,9 +164,9 @@ Provides: php-autoloader(zendframework/%{zf_name}) = %{version}
%description
-The %{namespace}\Test component provides tools to facilitate unit testing of your
-%{namespace} Framework applications. At this time, we offer facilities to enable
-testing of your %{namespace} Framework MVC applications.
+The %{namespace}\Test component provides tools to facilitate integration
+testing of your %{namespace} Framework applications. At this time, we offer
+facilities to enable testing of your %{namespace} Framework MVC applications.
PHPUnit is the only library supported currently.
@@ -182,14 +185,21 @@ phpab --template fedora --output src/autoload.php src
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/%{namespace}/Console/autoload.php',
- '%{php_home}/%{namespace}/Dom/autoload.php',
'%{php_home}/%{namespace}/EventManager/autoload.php',
'%{php_home}/%{namespace}/Http/autoload.php',
'%{php_home}/%{namespace}/Mvc/autoload.php',
'%{php_home}/%{namespace}/ServiceManager/autoload.php',
- '%{php_home}/%{namespace}/Stdlib/autoload.php',
'%{php_home}/%{namespace}/Uri/autoload.php',
'%{php_home}/%{namespace}/View/autoload.php',
+ [
+ '%{php_home}/Symfony6/Component/CssSelector/autoload.php',
+ '%{php_home}/Symfony5/Component/CssSelector/autoload.php',
+ '%{php_home}/Symfony4/Component/CssSelector/autoload.php',
+ ], [
+ '%{php_home}/Symfony6/Component/DomCrawler/autoload.php',
+ '%{php_home}/Symfony5/Component/DomCrawler/autoload.php',
+ '%{php_home}/Symfony4/Component/DomCrawler/autoload.php',
+ ],
]);
\Fedora\Autoloader\Dependencies::optional([
'%{php_home}/%{namespace}/Mvc/Console/autoload.php',
@@ -231,6 +241,7 @@ require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
'%{php_home}/%{namespace}/Mvc/Plugin/FlashMessenger/autoload.php',
'%{php_home}/%{namespace}/Serializer/autoload.php',
'%{php_home}/%{namespace}/Session/autoload.php',
+ '%{php_home}/%{namespace}/Stdlib/autoload.php',
'%{php_home}/%{namespace}/Validator/autoload.php',
]);
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
@@ -245,7 +256,7 @@ exit (class_exists("\\Zend\\%{library}\\Util\ModuleLoader") ? 0 : 1);
: upstream test suite
ret=0
if [ -x %{_bindir}/phpunit8 ]; then
- for cmd in php php73 php74; do
+ for cmd in php php74; do
if which $cmd; then
$cmd %{_bindir}/phpunit8 --verbose || ret=1
fi
@@ -253,7 +264,7 @@ if [ -x %{_bindir}/phpunit8 ]; then
fi
# TODO php81
if [ -x %{_bindir}/phpunit9 ]; then
- for cmd in php php73 php74 php80; do
+ for cmd in php php74 php80 php81; do
if which $cmd; then
$cmd %{_bindir}/phpunit9 --verbose || ret=1
fi
@@ -276,6 +287,27 @@ exit $ret
%changelog
+* Wed Dec 8 2021 Remi Collet <remi@remirepo.net> - 3.8.0-1
+- update to 3.8.0
+- raise dependency on laminas-http 2.15
+- raise dependency on laminas-mvc 3.3
+- raise dependency on laminas-view 2.13.1
+- drop dependency on laminas-stdlib
+
+* Tue Dec 7 2021 Remi Collet <remi@remirepo.net> - 3.7.0-1
+- update to 3.7.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+
+* Fri Dec 3 2021 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+- drop dependency on laminas-dom
+- add dependency on symfony/css-selector
+- add dependency on symfony/dom-crawler
+
+* Mon Jun 14 2021 Remi Collet <remi@remirepo.net> - 3.5.1-1
+- update to 3.5.1
+
* Thu Jun 10 2021 Remi Collet <remi@remirepo.net> - 3.5.0-1
- update to 3.5.0
- raise dependency on PHP 7.3