summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-11-03 08:06:33 +0100
committerRemi Collet <remi@php.net>2022-11-03 08:06:33 +0100
commit25fa5037d9cf86e41121835a07546554bfbb1494 (patch)
tree4d7120d43f5a76ed467d18b6dd58d962ae18e325
parentd4379e4caa9cd2ea31f16d36a1c4729f46164e1a (diff)
update to 4.4.6
-rw-r--r--composer.json2
-rw-r--r--php-cakephp4.spec10
-rw-r--r--src/Database/composer.json3
3 files changed, 10 insertions, 5 deletions
diff --git a/composer.json b/composer.json
index a2702b5..229f041 100644
--- a/composer.json
+++ b/composer.json
@@ -115,7 +115,7 @@
],
"stan-tests": "phpstan.phar analyze -c tests/phpstan.neon",
"stan-baseline": "phpstan.phar --generate-baseline",
- "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.8.0 psalm/phar:~4.26.0 && mv composer.backup composer.json",
+ "stan-setup": "cp composer.json composer.backup && composer require --dev symfony/polyfill-php81 phpstan/phpstan:~1.8.0 psalm/phar:~4.28.0 && mv composer.backup composer.json",
"lowest": "validate-prefer-lowest",
"lowest-setup": "composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction && cp composer.json composer.backup && composer require --dev dereuromark/composer-prefer-lowest && mv composer.backup composer.json",
"test": "phpunit",
diff --git a/php-cakephp4.spec b/php-cakephp4.spec
index a0db491..7355d77 100644
--- a/php-cakephp4.spec
+++ b/php-cakephp4.spec
@@ -9,7 +9,7 @@
# https://github.com/cakephp/cakephp/releases
-%global gh_commit 074248ad68fb6669e951862d0f2f82a0d7c99b23
+%global gh_commit 20668423818ede9878df06a9d0621c77a5514dba
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner cakephp
%global gh_project cakephp
@@ -25,8 +25,8 @@
%global chronos_version 2.3.1
Name: php-%{pk_vendor}%{major}
-Version: 4.4.6
-Release: 2%{?dist}
+Version: 4.4.7
+Release: 1%{?dist}
Summary: The CakePHP framework
License: MIT
@@ -259,6 +259,7 @@ Requires: php-pcre
Requires: php-spl
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
Recommends: php-composer(%{pk_vendor}/i18n) = %{version}
+Recommends: php-composer(%{pk_vendor}/log) = %{version}
%endif
Provides: php-composer(%{pk_vendor}/database) = %{version}
@@ -1154,6 +1155,9 @@ exit $ret
%changelog
+* Thu Nov 3 2022 Remi Collet <remi@remirepo.net> - 4.4.6-1
+- update to 4.4.6
+
* Fri Oct 21 2022 Remi Collet <remi@remirepo.net> - 4.4.6-2
- update chronos to 2.3.1
diff --git a/src/Database/composer.json b/src/Database/composer.json
index bc39d49..64c22e8 100644
--- a/src/Database/composer.json
+++ b/src/Database/composer.json
@@ -29,7 +29,8 @@
"cakephp/datasource": "^4.0"
},
"suggest": {
- "cakephp/i18n": "If you are using locale-aware datetime formats or Chronos types."
+ "cakephp/i18n": "If you are using locale-aware datetime formats or Chronos types.",
+ "cakephp/log": "If you want to use query logging without providing a logger yourself."
},
"autoload": {
"psr-4": {