Merge branch 'master' into 5.1

Author: sebastianfeldmann

phpstan.neon

@@ -6,5 +6,3 @@ parameters:
       - '#Call to an undefined method SebastianFeldmann\\Ftp\\Client::delete\(\)#'
       - '#Call to an undefined method ObjectStorage_Abstract::setLocalFile\(\)#'
       - '#Instantiated class phpbu\\App\\Runner\\Restore not found#'
-      - '#Cannot cast DateTimeImmutable to int#'
-      - '#Cannot call method getTimestamp\(\) on string#'

src/Backup/Collector/Dropbox.php

@@ -49,8 +49,7 @@ protected function collectBackups()
         $items = $this->client->listFolder(
             Util\Path::withTrailingSlash($this->path->getPathThatIsNotChanging()),
             [
-                'limit'     => 100,
-                'recursive' => true,
+                'recursive' => true
             ]
         );
         /** @var \Kunnu\Dropbox\Models\FileMetadata $item */

src/Log/Mail.php

@@ -197,7 +197,6 @@ public function onPhpbuEnd(Event\App\End $event)
                      . $info
                      . $footer
                      . '</body></html>';
-            $sent    = null;
             $state   = $result->allOk() ? 'OK' : ($result->backupOkButSkipsOrFails() ? 'WARNING' : 'ERROR');
 
             $this->mailer->Subject = $this->subject . ' [' . $state . ']';
@@ -208,8 +207,8 @@ public function onPhpbuEnd(Event\App\End $event)
                 $this->mailer->addAddress($recipient);
             }
 
-            if (!$this->mailer->send()) {
-                throw new Exception($this->mailer->ErrorInfo);
+            if ($this->transportType !== 'null') {
+                $this->sendMail();
             }
         }
     }
@@ -351,6 +350,22 @@ protected function setupSendmailMailer(array $options)
         // nothing to do here
     }
 
+    /**
+     * Send the email
+     *
+     * @throws \phpbu\App\Exception
+     */
+    protected function sendMail()
+    {
+        try {
+            if (!$this->mailer->send()) {
+                throw new Exception($this->mailer->ErrorInfo);
+            }
+        } catch (\Exception $e)  {
+            throw new Exception($e->getMessage());
+        }
+    }
+
     /**
      * Return mail header html
      *

tests/phpbu/Backup/Collector/DropboxTest.php

@@ -66,7 +66,7 @@ function ($item) {
 
         $dropboxClientStub->expects($this->once())
                           ->method('listFolder')
-                          ->with('backups/', ['limit' => 100, 'recursive' => true])
+                          ->with('backups/', ['recursive' => true])
                           ->willReturn($dropboxFileListResult);
 
         $time = time();