From eaf20b89993b3f990b3029ae0e253d6c304194b4 Mon Sep 17 00:00:00 2001 From: mirko-pagliai Date: Sat, 30 Dec 2023 09:38:06 +0100 Subject: [PATCH 1/4] updated for `php-tools` 1.8 --- CHANGELOG.md | 3 +++ composer.json | 2 +- version | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c22d8ca..450e27e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # 2.x branch ## 2.12 branch +### 2.12.3 +* updated for `php-tools` 1.8. + ### 2.12.2 * improved and fixed a bug for `ExportCommand` and `ImportCommand`, in handling some exceptions; * it no longer needs the `me-tools` package. This removes several (useless) dependencies; diff --git a/composer.json b/composer.json index fe04f0d3..6cac7642 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "php": ">=7.4.0", "ext-fileinfo": "*", "cakephp/cakephp": "^4.0", - "mirko-pagliai/php-tools": "~1.7.4" + "mirko-pagliai/php-tools": "^1.7.4|1.8" }, "require-dev": { "cakephp/cakephp-codesniffer": "^4.4", diff --git a/version b/version index 371a952d..ccc99d02 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.12.2 +2.12.3 From ad9844502617d04a6e1a2cb4b4e3addf93c7e62f Mon Sep 17 00:00:00 2001 From: mirko-pagliai Date: Tue, 2 Jan 2024 13:43:02 +0100 Subject: [PATCH 2/4] fixed --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6cac7642..cc51c609 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "php": ">=7.4.0", "ext-fileinfo": "*", "cakephp/cakephp": "^4.0", - "mirko-pagliai/php-tools": "^1.7.4|1.8" + "mirko-pagliai/php-tools": "^1.7.4" }, "require-dev": { "cakephp/cakephp-codesniffer": "^4.4", From 0ae2b231f552fc3cc4eb5d8f51f97b6666ae1806 Mon Sep 17 00:00:00 2001 From: mirko-pagliai Date: Tue, 2 Jan 2024 13:56:21 +0100 Subject: [PATCH 3/4] fixed --- src/Utility/AbstractBackupUtility.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Utility/AbstractBackupUtility.php b/src/Utility/AbstractBackupUtility.php index c75995ed..dbfe467d 100644 --- a/src/Utility/AbstractBackupUtility.php +++ b/src/Utility/AbstractBackupUtility.php @@ -64,7 +64,7 @@ public function __get(string $name) throw new LogicException('Undefined property: ' . get_class($class) . '::$' . $name); } - return $this->$name; + return $this->{$name}; } /** From 6954c944cf1ec400e5384f38409abcd76265489c Mon Sep 17 00:00:00 2001 From: mirko-pagliai Date: Tue, 2 Jan 2024 13:57:50 +0100 Subject: [PATCH 4/4] fixed --- phpcs.xml.dist | 4 ---- 1 file changed, 4 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index b17f7aa5..4e33e248 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -4,8 +4,4 @@ . - - - 0 -