Merge branch 'master' into 6.0

Author: sebastianfeldmann

composer.json

@@ -61,7 +61,7 @@
     "tightenco/collect": "^5.0",
     "phpseclib/phpseclib": "^2.0",
     "softlayer/objectstorage": "dev-master",
-    "vlucas/phpdotenv": "^3.0",
+    "vlucas/phpdotenv": "^4.0",
     "google/apiclient":"^2.0",
     "php-opencloud/openstack": "^3.0",
     "arhitector/yandex": "^2.0",
@@ -76,7 +76,7 @@
     "phpseclib/phpseclib": "Require '^2.0' to use SFTP sync",
     "softlayer/objectstorage": "Require 'dev-master' to sync to Softlayer",
     "php-opencloud/openstack": "Require ^3.0 to sync to OpenStack",
-    "vlucas/phpdotenv": "Require ^3.0 to use Dotenv adapter",
+    "vlucas/phpdotenv": "Require ^3.0 or ^4.0 to use the Dotenv adapter",
     "google/apiclient":"Require ^2.0 to sync to Google Drive",
     "arhitector/yandex":"Require ^2.0 to sync to Yandex Disk",
     "microsoft/azure-storage-blob": "Require ^1.4 to sync to Azure Blob Storage"

src/Adapter/Dotenv.php

@@ -43,7 +43,13 @@ public function setup(array $conf)
     {
         $path         = AppUtil\Arr::getValue($conf, 'file', '.env');
         $this->file   = AppUtil\Path::toAbsolutePath($path, Configuration::getWorkingDirectory());
-        $this->dotenv = DotenvLib::create(dirname($this->file), basename($this->file));
+
+        // dotenv version 4 and higher
+        if (method_exists('Dotenv\\Dotenv','createImmutable')) {
+            $this->dotenv = DotenvLib::createImmutable(dirname($this->file), basename($this->file));
+        } else {
+            $this->dotenv = DotenvLib::create(dirname($this->file), basename($this->file));
+        }
         $this->dotenv->load();
     }