Merge branch 'master' into 6.0

Author: sebastianfeldmann

.gitignore

@@ -16,4 +16,5 @@ composer.lock
 /phpbu.xml
 /phpbu.json
 /vendor/
+/tools/
 cache.properties

.travis.yml

@@ -3,16 +3,17 @@ language: php
 php:
   - 7.2
   - 7.3
+  - 7.4
 
 before_script:
   - composer self-update
   - composer install --no-interaction --prefer-source
-  - wget -O phpunit.phar https://phar.phpunit.de/phpunit-7.5.9.phar
-  - if [ $TRAVIS_PHP_VERSION = "7.3" ]; then wget -O phpstan.phar https://github.com/phpstan/phpstan/releases/download/0.10.5/phpstan.phar ; fi
+  - wget -O phpunit.phar https://phar.phpunit.de/phpunit-8.5.3.phar
+  - if [ $TRAVIS_PHP_VERSION = "7.4" ]; then wget -O phpstan.phar https://github.com/phpstan/phpstan/releases/download/0.12.18/phpstan.phar ; fi
 
 script:
   - php phpunit.phar --configuration ./build/travis-ci.phpunit.xml
-  - if [ $TRAVIS_PHP_VERSION = "7.3" ]; then php phpstan.phar analyse --no-progress -c phpstan.neon; fi
+  - if [ $TRAVIS_PHP_VERSION = "7.4" ]; then php phpstan.phar analyse --no-progress -c phpstan.neon; fi
 
 notifications:
   email: false

composer.json

@@ -27,6 +27,12 @@
   "support": {
     "issues": "https://github.com/sebastianfeldmann/phpbu/issues"
   },
+  "funding": [
+    {
+      "type": "github",
+      "url": "https://github.com/sponsors/sebastianfeldmann"
+    }
+  ],
   "autoload": {
     "psr-4": {
       "phpbu\\App\\": "src/"
@@ -84,6 +90,10 @@
     }
   },
   "scripts": {
-    "post-autoload-dump": "vendor/bin/captainhook install -f -s"
+    "post-autoload-dump": "vendor/bin/captainhook install -f -s",
+    "setup": "phive install",
+    "test": "tools/phpunit",
+    "analyse": "tools/phpstan analyse",
+    "style": "tools/phpcs --standard=psr2 src"
   }
 }

doc/config/source/ldapdump.xml

@@ -16,5 +16,5 @@
   <option name="attrs" value="*" />
 
   <!-- define your custom ldapdump executable location -->
-  <option name="pathToInfluxdump" value="/path/to/custom/bin" />
+  <option name="pathToLdapdump" value="/path/to/custom/bin" />
 </source>

phive.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="phpunit" version="^7.0.0" location="./tools/phpunit" copy="true" installed="7.5.20"/>
+  <phar name="phpcs" version="^3.5.2" location="./tools/phpcs" copy="true" installed="3.5.4"/>
+  <phar name="phpstan" version="^0.12.2" location="./tools/phpstan" copy="true" installed="0.12.9"/>
+</phive>

phpstan.neon

@@ -5,3 +5,4 @@ parameters:
   ignoreErrors:
       - '#Call to an undefined method SebastianFeldmann\\Ftp\\Client::delete\(\)#'
       - '#Call to an undefined method ObjectStorage_Abstract::setLocalFile\(\)#'
+      - '#Parameter \#1 \$buffer \(array\) of method phpbu\\App\\Log\\Json::write\(\) should be compatible with parameter \$buffer \(string\) of method phpbu\\App\\Log\\File::write\(\)#'

src/Backup/Cleaner/Abstraction.php

@@ -2,7 +2,6 @@
 namespace phpbu\App\Backup\Cleaner;
 
 use phpbu\App\Backup\Collector;
-use phpbu\App\Backup\File\Simulation;
 use phpbu\App\Backup\Target;
 use phpbu\App\Result;
 

src/Backup/Cleaner/Capacity.php

@@ -2,10 +2,7 @@
 namespace phpbu\App\Backup\Cleaner;
 
 use phpbu\App\Backup\Collector;
-use phpbu\App\Backup\File\Local;
 use phpbu\App\Backup\Target;
-use phpbu\App\Result;
-use phpbu\App\Util\Arr;
 use phpbu\App\Util\Str;
 use RuntimeException;
 

src/Backup/Cleaner/Stepwise.php

@@ -117,7 +117,10 @@ protected function setupRanges()
         $daily = new Range($all->getEnd(), $end, new Stepwise\Keeper\OnePerGroup('Ymd'));
 
         // define the range that keeps backups per week
-        $end    = mktime(0, 0, 0, date('m', $end), (int) date('d', $end) - (7 * $this->weeksToKeepWeekly), date('Y', $end));
+        $month  = date('m', $end);
+        $day    = (int) date('d', $end) - (7 * $this->weeksToKeepWeekly);
+        $year   = date('Y', $end);
+        $end    = mktime(0, 0, 0, $month, $day, $year);
         $weekly = new Range($daily->getEnd(), $end, new Stepwise\Keeper\OnePerGroup('YW'));
 
         // define the range that keeps backups per month

src/Backup/Collector/Abstraction.php

@@ -2,8 +2,6 @@
 namespace phpbu\App\Backup\Collector;
 
 use phpbu\App\Backup\File;
-use phpbu\App\Util;
-use phpbu\App\Backup\Target;
 
 /**
  * Abstraction class.