summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json4
-rw-r--r--php-cakephp4.spec72
-rw-r--r--src/Cache/composer.json2
-rw-r--r--src/Collection/composer.json2
-rw-r--r--src/Console/composer.json2
-rw-r--r--src/Core/composer.json2
-rw-r--r--src/Database/composer.json2
-rw-r--r--src/Datasource/composer.json2
-rw-r--r--src/Event/composer.json2
-rw-r--r--src/Filesystem/composer.json2
-rw-r--r--src/Form/composer.json2
-rw-r--r--src/Http/composer.json2
-rw-r--r--src/I18n/composer.json2
-rw-r--r--src/Log/composer.json2
-rw-r--r--src/ORM/composer.json2
-rw-r--r--src/Utility/composer.json2
-rw-r--r--src/Validation/composer.json2
17 files changed, 55 insertions, 51 deletions
diff --git a/composer.json b/composer.json
index 2ed1cad..29e898c 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
}
],
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
@@ -97,7 +97,7 @@
"TestPluginTwo\\": "tests/test_app/Plugin/TestPluginTwo/src/",
"Company\\TestPluginThree\\": "tests/test_app/Plugin/Company/TestPluginThree/src/",
"Company\\TestPluginThree\\Test\\": "tests/test_app/Plugin/Company/TestPluginThree/tests/",
- "ParentPlugin\\": "tests/test_app/Plugin/ParentPlugin/src/"
+ "Named\\": "tests/test_app/Plugin/Named/src/"
}
},
"scripts": {
diff --git a/php-cakephp4.spec b/php-cakephp4.spec
index b36dcc0..aab9f08 100644
--- a/php-cakephp4.spec
+++ b/php-cakephp4.spec
@@ -9,7 +9,7 @@
# https://github.com/cakephp/cakephp/releases
-%global gh_commit c73d4428b6bd9d8e4481b5030319432b51191257
+%global gh_commit f43b3f58680ae869fb2e9fa56e65406cd1250702
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner cakephp
%global gh_project cakephp
@@ -25,7 +25,7 @@
%global chronos_version 2.3.0
Name: php-%{pk_vendor}%{major}
-Version: 4.3.10
+Version: 4.4.0
Release: 1%{?dist}
Summary: The CakePHP framework
@@ -39,7 +39,7 @@ BuildArch: noarch
BuildRequires: php-cli
%if %{with tests}
# For tests
-BuildRequires: php(language) >= 7.2
+BuildRequires: php(language) >= 7.4
BuildRequires: php-ctype
BuildRequires: php-date
BuildRequires: php-dom
@@ -97,10 +97,10 @@ to flexibility.
%package cache
Summary: CakePHP Collection Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "psr/simple-cache": "^1.0 || ^2.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
# from main composer.json
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -156,8 +156,8 @@ A simple API extension for DateTime.
%package collection
Summary: CakePHP Collection Library
# From composer.json "require": {
-# "php": ">=7.2.0",
-Requires: php(language) >= 7.2
+# "php": ">=7.4.0",
+Requires: php(language) >= 7.4
# From phpcompatinfo report
Requires: php-spl
Provides: php-composer(%{pk_vendor}/collection) = %{version}
@@ -173,13 +173,13 @@ idea of what you can expect from the collection classes.
%package console
Summary: CakePHP Console Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "cakephp/event": "^4.0",
# "cakephp/filesystem": "^4.0",
# "cakephp/log": "^4.0",
# "cakephp/utility": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
Requires: php-composer(%{pk_vendor}/event) = %{version}
Requires: php-composer(%{pk_vendor}/filesystem) = %{version}
@@ -204,9 +204,9 @@ argument parsers, and dispatching commands.
%package core
Summary: CakePHP Framework Core classes
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/utility": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/utility) = %{version}
# not in composer.json
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -244,10 +244,10 @@ CakePHP framework.
%package database
Summary: CakePHP Database Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "cakephp/datasource": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
Requires: php-composer(%{pk_vendor}/datasource) = %{version}
# From phpcompatinfo report
@@ -286,11 +286,11 @@ them to the database, and convert them back when retrieving.
%package datasource
Summary: CakePHP Datasource Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "psr/log": "^1.0 || ^2.0",
# "psr/simple-cache": "^1.0 || ^2.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 3)
@@ -325,9 +325,9 @@ provided by this package.
%package event
Summary: CakePHP Event Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
# From phpcompatinfo report
Requires: php-pcre
@@ -343,9 +343,9 @@ CakePHP event dispatcher library that helps implementing the observer pattern.
%package filesystem
Summary: CakePHP FileSystem Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
# From phpcompatinfo report
Requires: php-fileinfo
@@ -363,10 +363,10 @@ CakePHP filesystem convenience classes to help you work with files and folders.
%package form
Summary: CakePHP Form Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/event": "^4.0",
# "cakephp/validation": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/event) = %{version}
Requires: php-composer(%{pk_vendor}/validation) = %{version}
# From phpcompatinfo report
@@ -382,7 +382,7 @@ CakePHP Form Library:
%package http
Summary: CakePHP Http Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "cakephp/event": "^4.0",
# "cakephp/utility": "^4.0",
@@ -392,7 +392,7 @@ Summary: CakePHP Http Library
# "psr/http-server-middleware": "^1.0",
# "laminas/laminas-diactoros": "^2.1",
# "laminas/laminas-httphandlerrunner": "^1.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
Requires: php-composer(%{pk_vendor}/event) = %{version}
Requires: php-composer(%{pk_vendor}/utility) = %{version}
@@ -454,11 +454,11 @@ CakePHP HTTP client and PSR7/15 middleware libraries.
%package i18n
Summary: CakePHP I18n Library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "ext-intl": "*",
# "cakephp/core": "^4.0",
# "cakephp/chronos": "^2.0.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-intl
Requires: php-composer(%{pk_vendor}/core) = %{version}
Requires: php-composer(%{pk_vendor}/chronos) = %{chronos_version}
@@ -481,10 +481,10 @@ output dates, currencies and any numbers in the right format for the specified l
%package log
Summary: logging library
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "psr/log": "^1.0 || ^2.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
BuildRequires: (php-composer(psr/log) >= 1.0.0 with php-composer(psr/log) < 3)
@@ -507,7 +507,7 @@ CakePHP logging library with support for multiple different streams.
%package orm
Summary: CakePHP ORM Classes
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/collection": "^4.0",
# "cakephp/core": "^4.0",
# "cakephp/datasource": "^4.0",
@@ -515,7 +515,7 @@ Summary: CakePHP ORM Classes
# "cakephp/event": "^4.0",
# "cakephp/utility": "^4.0",
# "cakephp/validation": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/collection) = %{version}
Requires: php-composer(%{pk_vendor}/core) = %{version}
Requires: php-composer(%{pk_vendor}/datasource) = %{version}
@@ -540,9 +540,9 @@ a data-mapper pattern.
%package utility
Summary: CakePHP Utility Classes
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
# From phpcompatinfo report
Requires: php-simplexml
@@ -567,11 +567,11 @@ the CakePHP framework.
%package validation
Summary: CakePHP Validation Classes
# From composer.json "require": {
-# "php": ">=7.2.0",
+# "php": ">=7.4.0",
# "cakephp/core": "^4.0",
# "cakephp/utility": "^4.0",
# "psr/http-message": "^1.0.0"
-Requires: php(language) >= 7.2
+Requires: php(language) >= 7.4
Requires: php-composer(%{pk_vendor}/core) = %{version}
Requires: php-composer(%{pk_vendor}/utility) = %{version}
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -651,7 +651,7 @@ require_once dirname(__DIR__) . '/src/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('TestPluginTwo\\', dirname(__DIR__).'/tests/test_app/Plugin/TestPluginTwo/src');
\Fedora\Autoloader\Autoload::addPsr4('Company\\TestPluginThree\\', dirname(__DIR__).'/tests/test_app/Plugin/Company/TestPluginThree/src');
\Fedora\Autoloader\Autoload::addPsr4('Company\\TestPluginThree\\Test\\', dirname(__DIR__).'/tests/test_app/Plugin/Company/TestPluginThree/tests');
-\Fedora\Autoloader\Autoload::addPsr4('ParentPlugin\\', dirname(__DIR__).'/tests/test_app/Plugin/ParentPlugin/src');
+\Fedora\Autoloader\Autoload::addPsr4('Named\\', dirname(__DIR__).'/tests/test_app/Plugin/Named/src/');
\Fedora\Autoloader\Autoload::addPsr4('PluginJs\\', dirname(__DIR__).'/tests/test_app/Plugin/PluginJs/src');
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/org/bovigo/vfs/autoload.php',
@@ -1148,6 +1148,10 @@ exit $ret
%changelog
+* Thu Jun 9 2022 Remi Collet <remi@remirepo.net> - 4.4.0-1
+- update to 4.4.0
+- raise dependency on PHP 7.4
+
* Fri Jun 3 2022 Remi Collet <remi@remirepo.net> - 4.3.10-1
- update to 4.3.10
- switch to phpunit9
diff --git a/src/Cache/composer.json b/src/Cache/composer.json
index 001a8a9..96aec19 100644
--- a/src/Cache/composer.json
+++ b/src/Cache/composer.json
@@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/cache"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"psr/simple-cache": "^1.0 || ^2.0"
},
diff --git a/src/Collection/composer.json b/src/Collection/composer.json
index 87c0566..16ec802 100644
--- a/src/Collection/composer.json
+++ b/src/Collection/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/collection"
},
"require": {
- "php": ">=7.2.0"
+ "php": ">=7.4.0"
},
"autoload": {
"psr-4": {
diff --git a/src/Console/composer.json b/src/Console/composer.json
index 971d9a6..d7d392b 100644
--- a/src/Console/composer.json
+++ b/src/Console/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/console"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"cakephp/event": "^4.0",
"cakephp/filesystem": "^4.0",
diff --git a/src/Core/composer.json b/src/Core/composer.json
index ffd17ba..2a62b03 100644
--- a/src/Core/composer.json
+++ b/src/Core/composer.json
@@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/core"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/utility": "^4.0"
},
"suggest": {
diff --git a/src/Database/composer.json b/src/Database/composer.json
index 9325117..bc39d49 100644
--- a/src/Database/composer.json
+++ b/src/Database/composer.json
@@ -24,7 +24,7 @@
"source": "https://github.com/cakephp/database"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"cakephp/datasource": "^4.0"
},
diff --git a/src/Datasource/composer.json b/src/Datasource/composer.json
index ca90fc1..16322f1 100644
--- a/src/Datasource/composer.json
+++ b/src/Datasource/composer.json
@@ -24,7 +24,7 @@
"source": "https://github.com/cakephp/datasource"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"psr/log": "^1.0 || ^2.0",
"psr/simple-cache": "^1.0 || ^2.0"
diff --git a/src/Event/composer.json b/src/Event/composer.json
index d3a9bc5..7e7ed74 100644
--- a/src/Event/composer.json
+++ b/src/Event/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/event"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0"
},
"autoload": {
diff --git a/src/Filesystem/composer.json b/src/Filesystem/composer.json
index edaffd5..82688b7 100644
--- a/src/Filesystem/composer.json
+++ b/src/Filesystem/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/filesystem"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0"
},
"autoload": {
diff --git a/src/Form/composer.json b/src/Form/composer.json
index 7942811..016644c 100644
--- a/src/Form/composer.json
+++ b/src/Form/composer.json
@@ -21,7 +21,7 @@
"source": "https://github.com/cakephp/form"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/event": "^4.0",
"cakephp/validation": "^4.0"
},
diff --git a/src/Http/composer.json b/src/Http/composer.json
index 5802f3e..c5d3842 100644
--- a/src/Http/composer.json
+++ b/src/Http/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/http"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"cakephp/event": "^4.0",
"cakephp/utility": "^4.0",
diff --git a/src/I18n/composer.json b/src/I18n/composer.json
index 8b75144..5b75e59 100644
--- a/src/I18n/composer.json
+++ b/src/I18n/composer.json
@@ -28,7 +28,7 @@
"source": "https://github.com/cakephp/i18n"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"ext-intl": "*",
"cakephp/core": "^4.0",
"cakephp/chronos": "^2.0.0"
diff --git a/src/Log/composer.json b/src/Log/composer.json
index 81d234e..2551255 100644
--- a/src/Log/composer.json
+++ b/src/Log/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/log"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"psr/log": "^1.0 || ^2.0"
},
diff --git a/src/ORM/composer.json b/src/ORM/composer.json
index c0f2675..d3f1c88 100644
--- a/src/ORM/composer.json
+++ b/src/ORM/composer.json
@@ -23,7 +23,7 @@
"source": "https://github.com/cakephp/orm"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/collection": "^4.0",
"cakephp/core": "^4.0",
"cakephp/datasource": "^4.0",
diff --git a/src/Utility/composer.json b/src/Utility/composer.json
index fccb2f8..949ca60 100644
--- a/src/Utility/composer.json
+++ b/src/Utility/composer.json
@@ -25,7 +25,7 @@
"source": "https://github.com/cakephp/utility"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0"
},
"suggest": {
diff --git a/src/Validation/composer.json b/src/Validation/composer.json
index eceaafd..a8998a9 100644
--- a/src/Validation/composer.json
+++ b/src/Validation/composer.json
@@ -22,7 +22,7 @@
"source": "https://github.com/cakephp/validation"
},
"require": {
- "php": ">=7.2.0",
+ "php": ">=7.4.0",
"cakephp/core": "^4.0",
"cakephp/utility": "^4.0",
"psr/http-message": "^1.0.0"