summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-20 07:58:55 +0200
committerRemi Collet <remi@remirepo.net>2020-04-20 07:58:55 +0200
commitc5ab9ff9fa2f1ab9042d4b54f4b1e812375c3da6 (patch)
tree5db8df479192634076aeaff74d99262afafa42b3
parentc24007e24e59eecc8b5f19fe6706957a41d92848 (diff)
v4.0.6
-rw-r--r--composer.json3
-rw-r--r--php-cakephp4.spec7
2 files changed, 7 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 4024299..f22ffcc 100644
--- a/composer.json
+++ b/composer.json
@@ -29,6 +29,7 @@
},
"require": {
"php": ">=7.2.0",
+ "ext-json": "*",
"ext-intl": "*",
"ext-mbstring": "*",
"aura/intl": "^3.0.0",
@@ -110,7 +111,7 @@
"@phpstan",
"@psalm"
],
- "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12.7 psalm/phar:~3.8.0 && mv composer.backup composer.json"
+ "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:^0.12.7 psalm/phar:~3.11.2 && mv composer.backup composer.json"
},
"config": {
"sort-packages": true,
diff --git a/php-cakephp4.spec b/php-cakephp4.spec
index 714f79a..bf83ec2 100644
--- a/php-cakephp4.spec
+++ b/php-cakephp4.spec
@@ -11,7 +11,7 @@
# Auth, Command, Controller, Error, Mailer, Network, Routing, Shell, TestSuite, View
# https://github.com/cakephp/cakephp/releases
-%global gh_commit 0838ec85670337d1f7da1b903f39ae16deacf1cf
+%global gh_commit 776a053fd360ac9c030730027bf37c7b7f69fba8
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner cakephp
%global gh_project cakephp
@@ -27,7 +27,7 @@
%global chronos_version 2.0.3
Name: php-%{pk_vendor}%{major}
-Version: 4.0.5
+Version: 4.0.6
Release: 1%{?dist}
Summary: The CakePHP framework
@@ -1134,6 +1134,9 @@ exit $ret
%changelog
+* Mon Apr 20 2020 Remi Collet <remi@remirepo.net> - 4.0.6-1
+- update to 4.0.6
+
* Mon Mar 30 2020 Remi Collet <remi@remirepo.net> - 4.0.5-1
- update to 4.0.5