From 568264df0a6e453ff3cfbd9940813cc13a5bd497 Mon Sep 17 00:00:00 2001 From: Ragnar Castillo Date: Sat, 17 Dec 2022 21:59:10 +0000 Subject: [PATCH 1/2] updating to CakePHP 4.4.8 --- composer.json | 10 +++++----- composer.lock | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index a058fcc36..c6504d09e 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "type": "project", "license": "MIT", "require": { - "php": ">=5.6", - "cakephp/cakephp": "3.9.*", + "php": ">=7.4.0", + "cakephp/cakephp": "4.4.8", "cakephp/migrations": "@stable", "cakephp/plugin-installer": "^1.0", "josegonzalez/dotenv": "3.*", @@ -14,9 +14,9 @@ }, "require-dev": { "cakephp/bake": "^1.1", - "cakephp/cakephp-codesniffer": "^3.0", + "cakephp/cakephp-codesniffer": "^4.5", "cakephp/debug_kit": "^3.22", - "phpunit/phpunit": "^5.7|^6.0", + "phpunit/phpunit": "^8.5|^9.3", "psy/psysh": "@stable" }, "suggest": { @@ -49,7 +49,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.2" + "php": "7.4.0" } } } diff --git a/composer.lock b/composer.lock index 61a85b6db..d4b8468ee 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "aura/intl", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/auraphp/Aura.Intl.git", From 06c0cd2d3f5e08d48796fce51d20603a33c67cfc Mon Sep 17 00:00:00 2001 From: root Date: Sun, 18 Dec 2022 12:58:26 +0000 Subject: [PATCH 2/2] reverted changes --- composer.json | 10 +++++----- composer.lock | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index c6504d09e..a058fcc36 100644 --- a/composer.json +++ b/composer.json @@ -5,8 +5,8 @@ "type": "project", "license": "MIT", "require": { - "php": ">=7.4.0", - "cakephp/cakephp": "4.4.8", + "php": ">=5.6", + "cakephp/cakephp": "3.9.*", "cakephp/migrations": "@stable", "cakephp/plugin-installer": "^1.0", "josegonzalez/dotenv": "3.*", @@ -14,9 +14,9 @@ }, "require-dev": { "cakephp/bake": "^1.1", - "cakephp/cakephp-codesniffer": "^4.5", + "cakephp/cakephp-codesniffer": "^3.0", "cakephp/debug_kit": "^3.22", - "phpunit/phpunit": "^8.5|^9.3", + "phpunit/phpunit": "^5.7|^6.0", "psy/psysh": "@stable" }, "suggest": { @@ -49,7 +49,7 @@ "config": { "sort-packages": true, "platform": { - "php": "7.4.0" + "php": "7.2" } } } diff --git a/composer.lock b/composer.lock index d4b8468ee..61a85b6db 100644 --- a/composer.lock +++ b/composer.lock @@ -8,7 +8,7 @@ "packages": [ { "name": "aura/intl", - "version": "3.0.1", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/auraphp/Aura.Intl.git",