From 1195155c287d64ccde2e4515787917f5c3cb83f0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 1 Mar 2021 15:22:38 +0100
Subject: update to 4.2.4

---
 composer.json     | 72 +++++++++++++++++++++++++++----------------------------
 php-cakephp4.spec |  9 ++++---
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/composer.json b/composer.json
index 41ba806..089778e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "cakephp/cakephp",
-    "description": "The CakePHP framework",
     "type": "library",
+    "description": "The CakePHP framework",
     "keywords": [
         "framework",
         "mvc",
@@ -21,16 +21,10 @@
             "homepage": "https://github.com/cakephp/cakephp/graphs/contributors"
         }
     ],
-    "support": {
-        "issues": "https://github.com/cakephp/cakephp/issues",
-        "forum": "https://stackoverflow.com/tags/cakephp",
-        "irc": "irc://irc.freenode.org/cakephp",
-        "source": "https://github.com/cakephp/cakephp"
-    },
     "require": {
         "php": ">=7.2.0",
-        "ext-json": "*",
         "ext-intl": "*",
+        "ext-json": "*",
         "ext-mbstring": "*",
         "cakephp/chronos": "^2.0",
         "composer/ca-bundle": "^1.2",
@@ -43,11 +37,22 @@
         "psr/log": "^1.0.0",
         "psr/simple-cache": "^1.0.0"
     },
-    "suggest": {
-        "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
-        "ext-curl": "To enable more efficient network calls in Http\\Client.",
-        "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()",
-        "paragonie/csp-builder": "CSP builder, to use the CSP Middleware"
+    "replace": {
+        "cakephp/cache": "self.version",
+        "cakephp/collection": "self.version",
+        "cakephp/console": "self.version",
+        "cakephp/core": "self.version",
+        "cakephp/database": "self.version",
+        "cakephp/datasource": "self.version",
+        "cakephp/event": "self.version",
+        "cakephp/filesystem": "self.version",
+        "cakephp/form": "self.version",
+        "cakephp/http": "self.version",
+        "cakephp/i18n": "self.version",
+        "cakephp/log": "self.version",
+        "cakephp/orm": "self.version",
+        "cakephp/utility": "self.version",
+        "cakephp/validation": "self.version"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.0",
@@ -55,6 +60,16 @@
         "paragonie/csp-builder": "^2.3",
         "phpunit/phpunit": "^8.5 || ^9.3"
     },
+    "suggest": {
+        "ext-curl": "To enable more efficient network calls in Http\\Client.",
+        "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
+        "lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()",
+        "paragonie/csp-builder": "CSP builder, to use the CSP Middleware"
+    },
+    "config": {
+        "process-timeout": 900,
+        "sort-packages": true
+    },
     "autoload": {
         "psr-4": {
             "Cake\\": "src/"
@@ -80,23 +95,6 @@
             "ParentPlugin\\": "tests/test_app/Plugin/ParentPlugin/src/"
         }
     },
-    "replace": {
-        "cakephp/cache": "self.version",
-        "cakephp/collection": "self.version",
-        "cakephp/console": "self.version",
-        "cakephp/core": "self.version",
-        "cakephp/datasource": "self.version",
-        "cakephp/database": "self.version",
-        "cakephp/event": "self.version",
-        "cakephp/filesystem": "self.version",
-        "cakephp/form": "self.version",
-        "cakephp/http": "self.version",
-        "cakephp/i18n": "self.version",
-        "cakephp/log": "self.version",
-        "cakephp/orm": "self.version",
-        "cakephp/utility": "self.version",
-        "cakephp/validation": "self.version"
-    },
     "scripts": {
         "check": [
             "@cs-check",
@@ -104,18 +102,20 @@
         ],
         "cs-check": "phpcs --colors --parallel=16 -p src/ tests/",
         "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
-        "test": "phpunit",
-        "test-coverage": "phpunit --coverage-clover=clover.xml",
         "phpstan": "phpstan.phar analyse",
         "psalm": "psalm.phar --show-info=false",
         "stan": [
             "@phpstan",
             "@psalm"
         ],
-        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.58 psalm/phar:~4.3.0 && mv composer.backup composer.json"
+        "stan-setup": "cp composer.json composer.backup && composer require --dev phpstan/phpstan:0.12.58 psalm/phar:~4.3.0 && mv composer.backup composer.json",
+        "test": "phpunit",
+        "test-coverage": "phpunit --coverage-clover=clover.xml"
     },
-    "config": {
-        "sort-packages": true,
-        "process-timeout": 900
+    "support": {
+        "issues": "https://github.com/cakephp/cakephp/issues",
+        "forum": "https://stackoverflow.com/tags/cakephp",
+        "irc": "irc://irc.freenode.org/cakephp",
+        "source": "https://github.com/cakephp/cakephp"
     }
 }
diff --git a/php-cakephp4.spec b/php-cakephp4.spec
index a44fd26..5f1c2eb 100644
--- a/php-cakephp4.spec
+++ b/php-cakephp4.spec
@@ -12,7 +12,7 @@
 
 
 # https://github.com/cakephp/cakephp/releases
-%global gh_commit    6d733756ec4d3d30cd9747a909cf183c481a0e77
+%global gh_commit    40f8c07632abcc0d6a2aeb1cec560b60e3850bbd
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     cakephp
 %global gh_project   cakephp
@@ -28,8 +28,8 @@
 %global chronos_version 2.1.1
 
 Name:           php-%{pk_vendor}%{major}
-Version:        4.2.3
-Release:        2%{?dist}
+Version:        4.2.4
+Release:        1%{?dist}
 Summary:        The CakePHP framework
 
 License:        MIT
@@ -1132,6 +1132,9 @@ exit $ret
 
 
 %changelog
+* Mon Mar  1 2021 Remi Collet <remi@remirepo.net> - 4.2.4-1
+- update to 4.2.4
+
 * Sat Feb  6 2021 Remi Collet <remi@remirepo.net> - 4.2.3-2
 - update chronos to 2.1.1
 
-- 
cgit