summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json12
-rw-r--r--php-laminas-filter.spec35
2 files changed, 23 insertions, 24 deletions
diff --git a/composer.json b/composer.json
index ce307f9..b9caf9d 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
"composer/package-versions-deprecated": true
},
"platform": {
- "php": "7.4.99"
+ "php": "8.0.99"
}
},
"extra": {
@@ -32,20 +32,20 @@
}
},
"require": {
- "php": "^7.4 || ~8.0.0 || ~8.1.0",
+ "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+ "ext-mbstring": "*",
"laminas/laminas-servicemanager": "^3.14.0",
"laminas/laminas-stdlib": "^3.13.0"
},
"require-dev": {
"laminas/laminas-coding-standard": "~2.4.0",
- "laminas/laminas-crypt": "^3.5.1",
+ "laminas/laminas-crypt": "^3.8",
"laminas/laminas-uri": "^2.9.1",
"pear/archive_tar": "^1.4.14",
- "phpspec/prophecy-phpunit": "^2.0.1",
- "phpunit/phpunit": "^9.5.24",
+ "phpunit/phpunit": "^9.5.25",
"psalm/plugin-phpunit": "^0.17.0",
"psr/http-factory": "^1.0.1",
- "vimeo/psalm": "^4.27.0"
+ "vimeo/psalm": "^4.28"
},
"conflict": {
"laminas/laminas-validator": "<2.10.1",
diff --git a/php-laminas-filter.spec b/php-laminas-filter.spec
index e7c5e9d..10faece 100644
--- a/php-laminas-filter.spec
+++ b/php-laminas-filter.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 7835f3f3227b1892676cb7366fbed0e521cac845
+%global gh_commit 41cff2f850753f0bb3fc75c5ce011fcad6aa1731
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner laminas
%global gh_project laminas-filter
@@ -18,7 +18,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-%{gh_project}
-Version: 2.21.0
+Version: 2.23.0
Release: 1%{?dist}
Summary: %{namespace} Framework %{library} component
@@ -30,7 +30,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-iconv
BuildRequires: php-mbstring
@@ -45,40 +45,39 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.13
BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# From composer, "require-dev": {
# "laminas/laminas-coding-standard": "~2.4.0",
-# "laminas/laminas-crypt": "^3.5.1",
+# "laminas/laminas-crypt": "^3.8",
# "laminas/laminas-uri": "^2.9",
# "pear/archive_tar": "^1.4.14",
-# "phpspec/prophecy-phpunit": "^2.0.1",
-# "phpunit/phpunit": "^9.5.24",
+# "phpunit/phpunit": "^9.5.25",
# "psalm/plugin-phpunit": "^0.17.0",
# "psr/http-factory": "^1.0.1",
-# "vimeo/psalm": "^4.27.0"
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.5.1 with php-autoloader(%{gh_owner}/laminas-crypt) < 4)
+# "vimeo/psalm": "^4.28"
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-crypt) >= 3.8 with php-autoloader(%{gh_owner}/laminas-crypt) < 4)
BuildRequires: (php-autoloader(%{gh_owner}/laminas-uri) >= 2.9.1 with php-autoloader(%{gh_owner}/laminas-uri) < 3)
-BuildRequires: (php-composer(phpspec/prophecy-phpunit) >= 2.0.1 with php-composer(phpspec/prophecy-phpunit) < 3)
BuildRequires: (php-composer(psr/http-factory) >= 1.0.1 with php-composer(psr/http-factory) < 2)
-# remirepo:9
+# remirepo:8
%else
BuildRequires: php-laminas-servicemanager
BuildRequires: php-laminas-stdlib
BuildRequires: php-laminas-zendframework-bridge
BuildRequires: php-laminas-crypt
BuildRequires: php-laminas-uri
-BuildRequires: php-phpspec-prophecy-phpunit
BuildRequires: php-psr-http-factory
%endif
BuildRequires: php-composer(pear/archive_tar) >= 1.4.14
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.5.24
+BuildRequires: phpunit9 >= 9.5.25
%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",
+# "ext-mbstring": "*",
# "laminas/laminas-servicemanager": "^3.14.0",
# "laminas/laminas-stdlib": "^3.13.0"
-Requires: php(language) >= 7.4
+Requires: php(language) >= 8.0
+Requires: php-mbstring
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Requires: (php-autoloader(%{gh_owner}/laminas-stdlib) >= 3.13 with php-autoloader(%{gh_owner}/laminas-stdlib) < 4)
@@ -112,7 +111,6 @@ Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 2.9.3
Requires: php-date
Requires: php-iconv
-Requires: php-mbstring
Requires: php-openssl
Requires: php-pcre
Requires: php-spl
@@ -186,9 +184,6 @@ cat << 'EOF' | tee vendor/autoload.php
<?php
require_once '%{buildroot}%{php_home}/%{namespace}/%{library}/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('%{namespace}Test\\%{library}\\', dirname(__DIR__) . '/test');
-\Fedora\Autoloader\Dependencies::required([
- '%{php_home}/Prophecy/PhpUnit/autoload.php',
-]);
EOF
# Need investigation
@@ -230,6 +225,10 @@ exit $ret
%changelog
+* Tue Oct 11 2022 Remi Collet <remi@remirepo.net> - 2.23.0-1
+- update to 2.23.0
+- raise dependency on PHP 8.0
+
* Fri Sep 30 2022 Remi Collet <remi@remirepo.net> - 2.21.0-1
- update to 2.21.0