Allow for DropboxV2 (#47)

* Allow for DropboxV2 * Fixed broken tests * Make exception for lower versions of PHPUnit
backup-manager · Mar 13, 2018 · 3b2ed5c · 3b2ed5c
1 parent 61e9fa0
commit 3b2ed5c
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 48 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -66,4 +66,4 @@ install:
 
 script:
     - composer validate --strict --no-check-lock
-#    - $TEST_COMMAND
+    - $TEST_COMMAND
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 2.1.3
+
+### Fixed
+
+- Fixed bug that made DropboxV2 config unavailable.
+
 ## 2.1.2
 
 ### Fixed

diff --git a/DependencyInjection/BMBackupManagerExtension.php b/DependencyInjection/BMBackupManagerExtension.php
@@ -6,7 +6,6 @@
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use League\Flysystem\Dropbox\DropboxAdapter;
-use Nyholm\DSN;
 use Srmklive\Dropbox\Adapter\DropboxAdapter as Dropbox2Adapter;
 use League\Flysystem\Rackspace\RackspaceAdapter;
 use League\Flysystem\Sftp\SftpAdapter;

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -25,10 +25,6 @@ public function getConfigTreeBuilder()
                                 if (!isset($config['type'])) {
                                     throw new InvalidConfigurationException(sprintf('You must define a "type" for storage "%s"', $name));
                                 }
-                                $validTypes = ['Local', 'AwsS3', 'Rackspace', 'Dropbox', 'Ftp', 'Sftp'];
-                                if (!in_array($config['type'], $validTypes)) {
-                                    throw new InvalidConfigurationException(sprintf('Type must be one of "%s", got "%s"', implode(', ', $validTypes), $config['type']));
-                                }
 
                                 switch ($config['type']) {
                                     case 'Local':
@@ -43,12 +39,18 @@ public function getConfigTreeBuilder()
                                     case 'Dropbox':
                                         $this->validateAuthenticationType(['token', 'key', 'secret', 'app', 'root'], $config, 'Dropbox');
                                         break;
+                                    case 'DropboxV2':
+                                        $this->validateAuthenticationType(['token', 'root'], $config, 'DropboxV2');
+                                        break;
                                     case 'Ftp':
                                         $this->validateAuthenticationType(['host', 'username', 'password', 'root', 'port', 'passive', 'ssl', 'timeout'], $config, 'Ftp');
                                         break;
                                     case 'Sftp':
                                         $this->validateAuthenticationType(['host', 'username', 'password', 'root', 'port', 'timeout', 'privateKey'], $config, 'Sftp');
                                         break;
+                                    default:
+                                        $validTypes = ['Local', 'AwsS3', 'Rackspace', 'Dropbox', 'DropboxV2', 'Ftp', 'Sftp'];
+                                        throw new InvalidConfigurationException(sprintf('Type must be one of "%s", got "%s"', implode(', ', $validTypes), $config['type']));
                                 }
                             }
 

diff --git a/Tests/Functional/BundleInitializationTest.php b/Tests/Functional/BundleInitializationTest.php
@@ -57,7 +57,12 @@ public function testNoConfig()
 
     public function testNoDependencies()
     {
-        $this->expectException(\LogicException::class);
+        if (method_exists($this, 'expectException')) {
+            $this->expectException(\LogicException::class);
+        } else {
+            // Legacy
+            $this->setExpectedException(\LogicException::class);
+        }
 
         // Create a new Kernel
         $kernel = $this->createKernel();

diff --git a/Tests/Unit/DependencyInjection/BMBackupManagerExtensionTest.php b/Tests/Unit/DependencyInjection/BMBackupManagerExtensionTest.php
@@ -33,38 +33,6 @@ public function testReplacementOfConfig()
         $this->assertContainerBuilderHasServiceDefinitionWithArgument('backup_manager.config_database', 0, $dbConfig);
     }
 
-    public function testDsn()
-    {
-        $storageConfig = ['local'=>['type'=>'Local', 'root'=>'/foo']];
-        $dbConfig = ['dev'=>[
-            'type'=>'mysql',
-            'host'=>'host.com',
-            'port'=>'3306',
-            'user'=>'user',
-            'pass'=>'pass',
-            'database'=>'db',
-            // The DSN should override them all.
-            'dsn'=>'pgsql://root:[email protected]:5432/test_db',
-        ]];
-
-        $this->load([
-            'storage' => $storageConfig,
-            'database' => $dbConfig,
-        ]);
-
-        $parsedConfig = ['dev'=>[
-            'type'=>'pgsql',
-            'host'=>'127.0.0.1',
-            'port'=>'5432',
-            'user'=>'root',
-            'pass'=>'root_pass',
-            'database'=>'test_db',
-        ]];
-
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('backup_manager.config_storage', 0, $storageConfig);
-        $this->assertContainerBuilderHasServiceDefinitionWithArgument('backup_manager.config_database', 0, $parsedConfig);
-    }
-
     /**
      * Make sure we can have multiple storage names with the same type
      */

diff --git a/Tests/Unit/DependencyInjection/ConfigurationTest.php b/Tests/Unit/DependencyInjection/ConfigurationTest.php
@@ -135,32 +135,48 @@ public function testSingleTransactionOnValid()
         );
     }
 
-    public function testDsn()
+    public function testNoType()
     {
         $this->assertConfigurationIsInvalid(array(
                 [
                     'database'=>[
                         'dev'=>[
-                            'dsn' => 'pgsql://root:[email protected]:5432/test_db',
-                            'singleTransaction' => true,
+
                         ],
                     ],
                 ]
-            )
+            ),
+            'You must define a "type" or "dsn" for database "dev"'
         );
     }
-    public function testNoType()
+
+    /**
+     *
+     * @dataProvider validStorageTypes
+     */
+    public function testStorageTypes($type)
     {
-        $this->assertConfigurationIsInvalid(array(
+        $this->assertConfigurationIsValid(array(
                 [
                     'database'=>[
                         'dev'=>[
-
+                            'type' => 'mysql'
                         ],
                     ],
+                    'storage' => [
+                        'foo' => [
+                            'type' => $type,
+                        ]
+                    ]
                 ]
-            ),
-            'You must define a "type" or "dsn" for database "dev"'
+            )
         );
     }
+
+    public function validStorageTypes()
+    {
+        return [
+            ['Local'],['AwsS3'], ['Rackspace'], ['Dropbox'], ['DropboxV2'], ['Ftp'], ['Sftp'],
+        ];
+    }
 }