Merge pull request #99 from mirko-pagliai/develop

Develop
mirko-pagliai · Jan 3, 2024 · ca56d12 · ca56d12
2 parents 90ac332 + 6954c94
commit ca56d12
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.4",

diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -4,8 +4,4 @@
     <file>.</file>
 
     <rule ref="./vendor/mirko-pagliai/php-tools/sniffer-ruleset.xml"/>
-
-    <rule ref="SlevomatCodingStandard.Namespaces.UseFromSameNamespace.UseFromSameNamespace">
-        <severity>0</severity>
-    </rule>
 </ruleset>
diff --git 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};
     }
 
     /**

diff --git a/version b/version
@@ -1 +1 @@
-2.12.2
+2.12.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ public function __get(string $name) @@
                 throw new LogicException('Undefined property: ' . get_class($class) . '::$' . $name);
             }
-            return $this->$name;
+            return $this->{$name};
         }
         /**
@@ Expand Down @@