summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-11-15 12:02:32 +0100
committerRemi Collet <remi@php.net>2022-11-15 12:02:32 +0100
commit326ea74b01a450829f2f7e6019d6e9bb9c9f2c94 (patch)
tree94d5ebb33f6a6504afaa9a6257e8a6047b79e9f7
parent47343f53f489c37748119ce2b0087351c158ab28 (diff)
update to 2.14.0
raise dependency on PHP 8.0
-rw-r--r--composer.json24
-rw-r--r--php-laminas-session.spec50
2 files changed, 34 insertions, 40 deletions
diff --git a/composer.json b/composer.json
index e76dd77..b7f9973 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
"config": {
"sort-packages": true,
"platform": {
- "php": "7.4.99"
+ "php": "8.0.99"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
@@ -32,24 +32,22 @@
}
},
"require": {
- "php": "^7.4 || ~8.0.0 || ~8.1.0",
+ "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
"laminas/laminas-eventmanager": "^3.5",
"laminas/laminas-servicemanager": "^3.15.1",
"laminas/laminas-stdlib": "^3.10.1"
},
"require-dev": {
- "laminas/laminas-cache": "^3.1.3",
- "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
- "laminas/laminas-coding-standard": "~2.3.0",
- "laminas/laminas-db": "^2.13.4",
- "laminas/laminas-http": "^2.15",
- "laminas/laminas-validator": "^2.15",
- "mongodb/mongodb": "~1.12.0",
- "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
- "phpspec/prophecy-phpunit": "^2.0",
- "phpunit/phpunit": "^9.5.9",
+ "laminas/laminas-cache": "^3.8",
+ "laminas/laminas-cache-storage-adapter-memory": "^2.2",
+ "laminas/laminas-coding-standard": "~2.4.0",
+ "laminas/laminas-db": "^2.15",
+ "laminas/laminas-http": "^2.17.1",
+ "laminas/laminas-validator": "^2.28",
+ "mongodb/mongodb": "~1.13.0",
+ "phpunit/phpunit": "^9.5.26",
"psalm/plugin-phpunit": "^0.17.0",
- "vimeo/psalm": "^4.24.0"
+ "vimeo/psalm": "^4.30"
},
"suggest": {
"laminas/laminas-cache": "Laminas\\Cache component",
diff --git a/php-laminas-session.spec b/php-laminas-session.spec
index 6c75445..8c1d285 100644
--- a/php-laminas-session.spec
+++ b/php-laminas-session.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 9f8a6077dd22b3b253583b1be84ddd5bf6fa1ef4
+%global gh_commit d4498592e0af23ab800f7b28b8e13072487af4b3
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-session
@@ -22,7 +22,7 @@
%endif
Name: php-%{gh_project}
-Version: 2.13.0
+Version: 2.14.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -34,7 +34,7 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 7.4
+BuildRequires: php(language) >= 8.0
BuildRequires: php-date
BuildRequires: php-hash
BuildRequires: php-pcre
@@ -48,26 +48,22 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.10
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
# "container-interop/container-interop": "^1.1",
-# "laminas/laminas-cache": "3.1.3",
-# "laminas/laminas-cache-storage-adapter-memory": "2.0.0",
-# "laminas/laminas-coding-standard": "~2.3.0",
-# "laminas/laminas-db": "^2.13.4",
-# "laminas/laminas-http": "^2.15",
-# "laminas/laminas-validator": "^2.15",
-# "mongodb/mongodb": "v1.12.0",
-# "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-# "phpspec/prophecy-phpunit": "^2.0",
-# "phpunit/phpunit": "^9.5.9",
+# "laminas/laminas-cache": "3.8",
+# "laminas/laminas-cache-storage-adapter-memory": "2.2",
+# "laminas/laminas-coding-standard": "~2.4.0",
+# "laminas/laminas-db": "^2.15",
+# "laminas/laminas-http": "^2.17.1",
+# "laminas/laminas-validator": "^2.28",
+# "mongodb/mongodb": "v1.13.0",
+# "phpunit/phpunit": "^9.5.26",
# "psalm/plugin-phpunit": "^0.17.0",
-# "vimeo/psalm": "^4.24.0"
+# "vimeo/psalm": "^4.30.0"
# ignore versions
BuildRequires: (php-autoloader(%{gh_owner}/laminas-cache) >= 2.6.1 with php-autoloader(%{gh_owner}/laminas-cache) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.13.4 with php-autoloader(%{gh_owner}/laminas-db) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.15 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
-BuildRequires: (php-composer(php-mock/php-mock-phpunit) >= 2.0 with php-composer(php-mock/php-mock-phpunit) < 3)
-BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0 with php-composer(phpspec/prophecy-phpunit) < 3)
-# remirepo:12
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-db) >= 2.15 with php-autoloader(%{gh_owner}/laminas-db) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.17.1 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-validator) >= 2.28 with php-autoloader(%{gh_owner}/laminas-validator) < 3)
+# remirepo:10
%else
BuildRequires: php-laminas-eventmanager
BuildRequires: php-laminas-servicemanager
@@ -77,20 +73,18 @@ BuildRequires: php-laminas-cache
BuildRequires: php-laminas-db
BuildRequires: php-laminas-http
BuildRequires: php-laminas-validator
-BuildRequires: php-mock-phpunit2 >= 2.1.0
-BuildRequires: php-phpspec-prophecy-phpunit
%endif
-BuildRequires: phpunit9 >= 9.5
+BuildRequires: phpunit9 >= 9.5.26
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^7.4 || ~8.0.0 || ~8.1.0",
+# "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
# "laminas/laminas-eventmanager": "^3.5",
# "laminas/laminas-servicemanager": "^3.15.1",
# "laminas/laminas-stdlib": "^3.10.1"
-Requires: php(language) >= 7.4
+Requires: php(language) >= 8.0
%if ! %{bootstrap}
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -202,8 +196,6 @@ cat << 'EOF' | tee vendor/autoload.php
require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/%{namespace}/ServiceManager/autoload.php',
- '%{php_home}/phpmock2/phpunit/autoload.php',
- '%{php_home}/Prophecy/PhpUnit/autoload.php',
dirname(__DIR__) . '/autoload-dev/ReturnTypeWillChange.php',
]);
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
@@ -241,6 +233,10 @@ exit $ret
%changelog
+* Tue Nov 15 2022 Remi Collet <remi@remirepo.net> - 2.14.0-1
+- update to 2.14.0
+- raise dependency on PHP 8.0
+
* Fri Jul 22 2022 Remi Collet <remi@remirepo.net> - 2.13.0-1
- update to 2.13.0
- raise dependency on PHP 7.4