Merge branch 'main' into 6.0

Author: sebastianfeldmann

.github/workflows/integration.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        php: ['8.0', '8.1', '8.2', '8.3']
+        php: ['8.0', '8.1', '8.2', '8.3', '8.4']
     steps:
     - uses: actions/checkout@master
 

composer.json

@@ -48,7 +48,7 @@
     "ext-dom": "*",
     "ext-json": "*",
     "ext-spl": "*",
-    "sebastian/environment": "^3.0|^4.0|^5.0|^6.0",
+    "sebastian/environment": "^3.0|^4.0|^5.0|^6.0|^7.0|^8.0",
     "sebastianfeldmann/cli": "^3.4",
     "symfony/process": "^3.0|^4.0|^5.0|^6.0|^7.0"
   },

src/Backup/Cli.php

@@ -48,7 +48,7 @@ abstract class Cli
      * @param \SebastianFeldmann\Cli\Command\Runner $runner
      * @param int|null                              $time
      */
-    public function __construct(Runner $runner = null, ?int $time = null)
+    public function __construct(?Runner $runner = null, ?int $time = null)
     {
         $this->runner = $runner ? : new Runner\Simple(new Symfony());
         $this->time   = $time   ? : time();

src/Backup/Compressor/Abstraction.php

@@ -42,7 +42,7 @@ abstract class Abstraction extends Cli implements Compressible
      * @param  \SebastianFeldmann\Cli\Command\Runner $runner
      * @throws \phpbu\App\Exception
      */
-    public function __construct($path, $pathToCommand = '', Runner $runner = null)
+    public function __construct($path, $pathToCommand = '', ?Runner $runner = null)
     {
         if (empty($path)) {
             throw new Exception('no path to compress set');

src/Backup/Target/Compression/Factory.php

@@ -26,7 +26,7 @@ class Factory
         'bzip2' => 'Bzip2',
         'xz'    => 'Xz',
         'zip'   => 'Zip',
-        'zstd'   => 'Zstd'
+        'zstd'  => 'Zstd'
     ];
 
     /**