Merge pull request #98 from mirko-pagliai/develop

Develop

Author: mirko-pagliai

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1']
+        php-version: ['7.4', '8.0', '8.1', '8.2']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
         exclude:
@@ -30,6 +30,9 @@ jobs:
           - php-version: '8.1'
             db-type: 'mysql'
             prefer-lowest: 'prefer-lowest'
+          - php-version: '8.2'
+            db-type: 'mysql'
+            prefer-lowest: 'prefer-lowest'
 
     steps:
         - name: Setup Database
@@ -53,7 +56,7 @@ jobs:
 
         - name: Cache Composer packages
           id: composer-cache
-          uses: actions/cache@v2
+          uses: actions/cache@v3
           with:
             path: vendor
             key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
@@ -93,7 +96,7 @@ jobs:
 
         - name: Submit code coverage
           if: matrix.php-version == '8.0'
-          uses: codecov/codecov-action@v2
+          uses: codecov/codecov-action@v3
 
   cs-stan:
     name: Coding Standard & Static Analysis
@@ -105,7 +108,7 @@ jobs:
         - name: Setup PHP
           uses: shivammathur/setup-php@v2
           with:
-            php-version: '8.0'
+            php-version: '8.1'
             coverage: none
             tools: cs2pr
 
@@ -126,13 +129,13 @@ jobs:
           if: success() || failure()
           env:
             db_dsn: 'sqlite:///:memory:'
-          run: vendor/bin/psalm.phar --output-format=github --php-version=8.0
+          run: vendor/bin/psalm --output-format=github --php-version=8.1
 
         - name: Run phpstan
           if: success() || failure()
           env:
             db_dsn: 'sqlite:///:memory:'
-          run: vendor/bin/phpstan.phar analyse --error-format=github
+          run: vendor/bin/phpstan analyse --error-format=github
 
 
   testsuite-windows:
@@ -161,7 +164,7 @@ jobs:
 
     - name: Cache Composer packages
       id: composer-cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: vendor
         key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}

.gitignore

@@ -1,6 +1,6 @@
 .directory
 .idea
-.phpunit.result.cache
+.phpunit.*cache
 *_old
 *.old.*
 composer.lock

CHANGELOG.md

@@ -1,5 +1,18 @@
 # 2.x branch
 ## 2.12 branch
+### 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;
+* some, possible changes that prepare it for CakePHP 5 and PHPUnit 10 ([issue #97](https://github.com/mirko-pagliai/cakephp-database-backup/issues/97));
+* little fixes. Fixed some deprecations for CakePHP 4.5 ([issue #97](https://github.com/mirko-pagliai/cakephp-database-backup/issues/97));
+* improved `BackuManager::index()` method, also regarding the correct files sorting. This also solves a small bug for
+  the `rotate()` method (which precisely affects `index()`). The `index()` method now returns a collection of arrays (
+  and no longer a collection of `Entity`);
+* some testing methods that have been missing for a long time have been added;
+* the `BackupTrait::getDriverName()` method can no longer be static;
+* removed (old and useless) `BaseCommandTestCase` class;
+* added tests for PHP 8.2.
+
 ### 2.12.1
 * fixed a little bug in the `bootstrap.php` file;
 * the `Exceptionist` class provided by me-tools is no longer used (in anticipation of an upcoming deprecation).

composer.json

@@ -11,18 +11,17 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": ">=7.4.0",
         "ext-fileinfo": "*",
         "cakephp/cakephp": "^4.0",
         "mirko-pagliai/php-tools": "~1.7.4"
     },
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^4.4",
         "cakephp/migrations": "^3.2",
-        "mirko-pagliai/me-tools": "^2.20.9",
         "phpunit/phpunit": "^9.1|^9.5",
-        "phpstan/phpstan": "^1.7",
-        "psalm/phar": "^4.24"
+        "phpstan/phpstan": "^1.10.38",
+        "vimeo/psalm": "^5.15.0"
     },
     "autoload": {
         "psr-4": {

config/bootstrap.php

@@ -17,6 +17,13 @@
 use Cake\Core\Configure;
 use Symfony\Component\Process\ExecutableFinder;
 
+/**
+ * @todo remove the `file_exists()` on CakePHP >= 5
+ */
+if (file_exists(CAKE . 'functions.php')) {
+    require CAKE . 'functions.php';
+}
+
 /**
  * Executables. Name of driver as keys, Then, as value, an array that contains
  *  first the executable to export and then the executable to import backups.

php-doc-maker.xml

@@ -14,4 +14,3 @@ parameters:
 			message: "#^Expression \"\\$this\\-\\>BackupExport\\-\\>noExistingProperty\" on a separate line does not do anything\\.$#"
 			count: 1
 			path: tests/TestCase/Utility/BackupExportAndImportTest.php
-

phpstan-baseline.neon

@@ -16,9 +16,4 @@
       <code>empty($this-&gt;Driver)</code>
     </TypeDoesNotContainType>
   </file>
-  <file src="src/Utility/BackupManager.php">
-    <TooManyTemplateParams occurrences="1">
-      <code>\Cake\Collection\CollectionInterface&lt;\Cake\ORM\Entity&gt;</code>
-    </TooManyTemplateParams>
-  </file>
 </files>

psalm-baseline.xml

@@ -7,7 +7,8 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
     autoloader="tests/bootstrap.php"
     errorBaseline="psalm-baseline.xml"
->
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false">
     <projectFiles>
         <directory name="src" />
         <ignoreFiles>

psalm.xml

@@ -64,9 +64,9 @@ public static function getConnection(?string $name = null): ConnectionInterface
      * @throws \ReflectionException
      * @since 2.9.2
      */
-    public static function getDriverName(): string
+    public function getDriverName(): string
     {
-        return get_class_short_name(self::getConnection()->getDriver());
+        return get_class_short_name($this->getConnection()->getDriver());
     }
 
     /**