Merge pull request #222 from marcelthole

Update PHPStan to level 3 and fix wrong typehints

Author: sebastianfeldmann

phpstan.neon

@@ -1,5 +1,5 @@
 parameters:
-  level: 2
+  level: 3
   paths:
   - %currentWorkingDirectory%/src/
   ignoreErrors:

src/Backup/Cleaner/Capacity.php

@@ -64,7 +64,7 @@ public function setup(array $options)
      *
      * @param  \phpbu\App\Backup\Target    $target
      * @param  \phpbu\App\Backup\Collector $collector
-     * @return \phpbu\App\Backup\File\Local[]
+     * @return \phpbu\App\Backup\File[]
      * @throws \phpbu\App\Exception
      */
     protected function getFilesToDelete(Target $target, Collector $collector)
@@ -76,7 +76,7 @@ protected function getFilesToDelete(Target $target, Collector $collector)
 
 
         // sum up the size of all backups
-        /** @var \phpbu\App\Backup\File\Local $file */
+        /** @var \phpbu\App\Backup\File $file */
         foreach ($files as $file) {
             $size += $file->getSize();
         }
@@ -89,6 +89,9 @@ protected function getFilesToDelete(Target $target, Collector $collector)
             while ($this->isCapacityExceeded($size) && count($files) > 0) {
                 // get oldest backup from list, move it to delete list
                 $file = array_shift($files);
+                if ($file === null) {
+                    break;
+                }
                 $size -= $file->getSize();
                 $delete[] = $file;
             }

src/Backup/Cleaner/Quantity.php

@@ -53,7 +53,7 @@ public function setup(array $options)
      *
      * @param  \phpbu\App\Backup\Target    $target
      * @param  \phpbu\App\Backup\Collector $collector
-     * @return \phpbu\App\Backup\File\Local[]
+     * @return \phpbu\App\Backup\File[]
      */
     protected function getFilesToDelete(Target $target, Collector $collector)
     {
@@ -66,6 +66,9 @@ protected function getFilesToDelete(Target $target, Collector $collector)
 
             while ($this->isCapacityExceeded($files)) {
                 $file     = array_shift($files);
+                if ($file === null) {
+                    break;
+                }
                 $delete[] = $file;
             }
         }

src/Backup/Cleaner/Stepwise.php

@@ -139,7 +139,7 @@ protected function setupRanges()
      *
      * @param  \phpbu\App\Backup\Target    $target
      * @param  \phpbu\App\Backup\Collector $collector
-     * @return \phpbu\App\Backup\File\Local[]
+     * @return \phpbu\App\Backup\File[]
      * @throws \phpbu\App\Exception
      */
     protected function getFilesToDelete(Target $target, Collector $collector)

src/Backup/Cleaner/Stepwise/Keeper/OnePerGroup.php

@@ -27,7 +27,7 @@ class OnePerGroup implements Keeper
     /**
      * List of groups containing the files.
      *
-     * @var \phpbu\App\Backup\File\Local[]
+     * @var \phpbu\App\Backup\File\Local[][]
      */
     private $groups = [];
 

src/Backup/Collector/Abstraction.php

@@ -36,7 +36,7 @@ abstract class Abstraction
     /**
      * Collection cache
      *
-     * @var \phpbu\App\Backup\File\Local[]
+     * @var \phpbu\App\Backup\File[]
      */
     protected $files;
 
@@ -67,7 +67,7 @@ public function setSimulation(bool $isSimulation)
     /**
      * Get all created backups.
      *
-     * @return \phpbu\App\Backup\File\Local[]
+     * @return \phpbu\App\Backup\File[]
      */
     public function getBackupFiles() : array
     {

src/Configuration/Loader/File.php

@@ -209,7 +209,7 @@ protected function getAdapterizedValue($value)
      *
      * @param  string $filename
      * @throws \phpbu\App\Exception
-     * @return \stdClass
+     * @return string
      */
     protected function loadFile($filename)
     {