libgraviton / import-export

src/Command/CoreExportCommand.php

Unused Use Statements -1 removed lines

@@ -7,7 +7,6 @@
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
-
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;

src/Command/CoreImportCommand.php

Doc Comments +1 added lines, -1 removed lines

@@ -97,7 +97,7 @@
     /**
      * import a single file into a collection
      *
-     * @param SplFileInfo     $file   file
+     * @param \SplFileInfo     $file   file
      * @param InputInterface  $input  User input on console
      * @param OutputInterface $output Output of the command
      *

src/Command/ImportCommand.php

Doc Comments +1 added lines, -1 removed lines

@@ -344,7 +344,7 @@
      *
      * @param Document $doc        Data source for import data
      * @param string   $originFile Original full filename used toimport
-     * @return bool|mixed
+     * @return false|string
      */
     private function validateUploadFile(Document $doc, $originFile)
     {

Spacing +12 added lines, -12 removed lines

@@ -231,7 +231,7 @@ 
             $output->writeln("<info>Loading data from ${file}</info>");
 
             if (!array_key_exists('target', $doc->getData())) {
-                throw new MissingTargetException('Missing target in \'' . $file . '\'');
+                throw new MissingTargetException('Missing target in \''.$file.'\'');
             }
 
             $targetUrl = sprintf('%s%s', $host, $doc->getData()['target']);
@@ -277,16 +277,16 @@ 
         $content = str_replace($rewriteHost, $rewriteTo, $doc->getContent());
         $uploadFile = $this->validateUploadFile($doc, $file);
 
-        $successFunc = function (ResponseInterface $response) use ($output) {
+        $successFunc = function(ResponseInterface $response) use ($output) {
             $output->writeln(
-                '<comment>Wrote ' . $response->getHeader('Link')[0] . '</comment>'
+                '<comment>Wrote '.$response->getHeader('Link')[0].'</comment>'
             );
         };
 
-        $errFunc = function (RequestException $e) use ($output, $file) {
+        $errFunc = function(RequestException $e) use ($output, $file) {
             $this->errors[$file] = $e->getMessage();
             $output->writeln(
-                '<error>' . str_pad(
+                '<error>'.str_pad(
                     sprintf(
                         'Failed to write <%s> from \'%s\' with message \'%s\'',
                         $e->getRequest()->getUri(),
@@ -295,17 +295,17 @@ 
                     ),
                     140,
                     ' '
-                ) . '</error>'
+                ).'</error>'
             );
             if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
                 $this->dumper->dump(
                     $this->cloner->cloneVar(
                         $this->parser->parse($e->getResponse()->getBody(), false, false, true)
                     ),
-                    function ($line, $depth) use ($output) {
+                    function($line, $depth) use ($output) {
                         if ($depth > 0) {
                             $output->writeln(
-                                '<error>' . str_pad(str_repeat('  ', $depth) . $line, 140, ' ') . '</error>'
+                                '<error>'.str_pad(str_repeat('  ', $depth).$line, 140, ' ').'</error>'
                             );
                         }
                     }
@@ -321,7 +321,7 @@ 
 
         // Authentication or custom headers.
         if ($this->headerBasicAuth) {
-            $data['headers']['Authorization'] = 'Basic '. base64_encode($this->headerBasicAuth);
+            $data['headers']['Authorization'] = 'Basic '.base64_encode($this->headerBasicAuth);
         }
         if ($this->customHeaders) {
             foreach ($this->customHeaders as $headers) {
@@ -343,11 +343,11 @@ 
         // TODO This part, $uploadFile, promise should be removed once Graviton/File service is resolved in new Story.
         $fileRepeatFunc = false;
         if ($uploadFile) {
-            $fileRepeatFunc = function () use ($targetUrl, $successFunc, $errFunc, $output, $file, $data) {
+            $fileRepeatFunc = function() use ($targetUrl, $successFunc, $errFunc, $output, $file, $data) {
                 unset($this->errors[$file]);
                 $output->writeln('<info>File deleting: '.$targetUrl.'</info>');
                 $deleteRequest = $this->client->requestAsync('DELETE', $targetUrl);
-                $insert = function () use ($targetUrl, $successFunc, $errFunc, $output, $data) {
+                $insert = function() use ($targetUrl, $successFunc, $errFunc, $output, $data) {
                     $output->writeln('<info>File inserting: '.$targetUrl.'</info>');
                     $promiseInsert = $this->client->requestAsync('PUT', $targetUrl, $data);
                     $promiseInsert->then($successFunc, $errFunc);
@@ -417,7 +417,7 @@ 
         }
 
         // Find file
-        $fileName = dirname($originFile) . DIRECTORY_SEPARATOR . $documentData['file'];
+        $fileName = dirname($originFile).DIRECTORY_SEPARATOR.$documentData['file'];
         $fileName = str_replace('//', '/', $fileName);
         if (!file_exists($fileName)) {
             return false;

test/Command/CoreImportCommandTest.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
         $clientMock = $this->getMockBuilder('\MongoClient')->disableOriginalConstructor()->getMock();
 
         $collectionMock = $this->getMockBuilder('\MongoCollection')->disableOriginalConstructor()->getMock();
-        $collectionMock->method('save')->will($this->returnCallback(array($this,'saveCollectionCallback')));
+        $collectionMock->method('save')->will($this->returnCallback(array($this, 'saveCollectionCallback')));
 
         $dbMock = $this->getMockBuilder('\MongoDB')->disableOriginalConstructor()->getMock();
         $dbMock->method('selectCollection')->willReturn($collectionMock);
@@ -118,7 +118,7 @@ 
 
         // fail in output?
         $this->assertContains(
-            'Could not deserialize file <' . $this->sourceDir . '/Dudess/Invalid.json>',
+            'Could not deserialize file <'.$this->sourceDir.'/Dudess/Invalid.json>',
             $this->cmdTester->getDisplay()
         );
         $this->assertEquals(1, $this->cmdTester->getStatusCode());

test/Command/ImportCommandTest.php

Spacing +16 added lines, -16 removed lines

@@ -51,13 +51,13 @@ 
         $responseMock
             ->method('getHeader')
             ->with('Link')
-            ->willReturn(['<' . $host . $path . '>; rel="self"']);
+            ->willReturn(['<'.$host.$path.'>; rel="self"']);
 
         $promiseMock
             ->method('then')
             ->will(
                 $this->returnCallback(
-                    function ($ok) use ($responseMock) {
+                    function($ok) use ($responseMock) {
                         $ok($responseMock);
                     }
                 )
@@ -74,8 +74,8 @@ 
 
         $cmdTester = $this->getTester($sut, $file);
 
-        $this->assertContains('Loading data from ' . $file, $cmdTester->getDisplay());
-        $this->assertContains('Wrote <' . $host . $path . '>; rel="self"', $cmdTester->getDisplay());
+        $this->assertContains('Loading data from '.$file, $cmdTester->getDisplay());
+        $this->assertContains('Wrote <'.$host.$path.'>; rel="self"', $cmdTester->getDisplay());
         $this->assertEquals(0, $cmdTester->getStatusCode());
     }
 
@@ -87,12 +87,12 @@ 
         return [
             'basic valid file' => [
                 'http://localhost',
-                __DIR__ . '/fixtures/set-01/test-2.json',
+                __DIR__.'/fixtures/set-01/test-2.json',
                 '/core/app/test',
             ],
             'basic valid image file' => [
                 'http://localhost',
-                __DIR__ . '/fixtures/file',
+                __DIR__.'/fixtures/file',
                 '/core/app/test',
             ],
         ];
@@ -126,7 +126,7 @@ 
         $requestMock = $this->createMock('Psr\Http\Message\RequestInterface');
         $requestMock
             ->method('getUri')
-            ->willReturn($host . '/core/app/test');
+            ->willReturn($host.'/core/app/test');
 
         $exceptionMock = $this->getMockBuilder('GuzzleHttp\Exception\RequestException')
             ->setConstructorArgs(['Client error: 400', $requestMock, $responseMock])
@@ -144,7 +144,7 @@ 
             ->method('then')
             ->will(
                 $this->returnCallback(
-                    function ($ok, $nok) use ($exceptionMock) {
+                    function($ok, $nok) use ($exceptionMock) {
                         return $nok($exceptionMock);
                     }
                 )
@@ -161,7 +161,7 @@ 
 
         $cmdTester = $this->getTester($sut, $file);
 
-        $this->assertContains('Loading data from ' . $file, $cmdTester->getDisplay());
+        $this->assertContains('Loading data from '.$file, $cmdTester->getDisplay());
         foreach ($errors as $error) {
             $this->assertContains(
                 $error,
@@ -179,18 +179,18 @@ 
         return [
             'invalid file (server side)' => [
                 'http://localhost',
-                __DIR__ . '/fixtures/set-01/test.json',
+                __DIR__.'/fixtures/set-01/test.json',
                 [
-                    'Failed to write <http://localhost/core/app/test> from \'' .
-                    __DIR__ . '/fixtures/set-01/test.json\' with message \'Client error: 400\'',
+                    'Failed to write <http://localhost/core/app/test> from \''.
+                    __DIR__.'/fixtures/set-01/test.json\' with message \'Client error: 400\'',
                     '"message": "invalid"',
                 ],
             ],
             'missing target in file (user error)' => [
                 'http://localhost',
-                __DIR__ . '/fixtures/set-01/test-3.json',
+                __DIR__.'/fixtures/set-01/test-3.json',
                 [
-                    'Missing target in \'' . __DIR__ . '/fixtures/set-01/test-3.json\'',
+                    'Missing target in \''.__DIR__.'/fixtures/set-01/test-3.json\'',
                 ],
             ]
         ];
@@ -232,7 +232,7 @@ 
             ->method('then')
             ->will(
                 $this->returnCallback(
-                    function ($ok) use ($responseMock) {
+                    function($ok) use ($responseMock) {
                         $ok($responseMock);
                     }
                 )
@@ -249,7 +249,7 @@ 
 
         $cmdTester = $this->getTester(
             $sut,
-            __DIR__ . '/fixtures/set-01/test-4.json',
+            __DIR__.'/fixtures/set-01/test-4.json',
             [
                 'host' => 'http://example.com',
                 '--rewrite-host' => 'http://localhost'

src/Command/ValidationCommand.php

Unused Use Statements -2 removed lines

@@ -6,12 +6,10 @@
 
 namespace Graviton\ImportExport\Command;
 
-use Graviton\ImportExport\Exception\MissingTargetException;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;

Spacing +3 added lines, -3 removed lines

@@ -84,15 +84,15 @@
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $files = $input->getArgument('file');
-        $finder =  new Finder();
+        $finder = new Finder();
         $finder = $finder->files();
 
         /**
          * @param SplFileInfo $file
          * @return bool
          */
-        $filter = function (SplFileInfo $file) {
-            if (!in_array($file->getExtension(), ['yml','json']) || $file->isDir()) {
+        $filter = function(SplFileInfo $file) {
+            if (!in_array($file->getExtension(), ['yml', 'json']) || $file->isDir()) {
                 return false;
             }
             return true;

src/Command/ImportCommandAbstract.php

Doc Comments +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
      *
      * @param InputInterface $input User input on console
      *
-     * @return Finder|SplFileInfo[] finder
+     * @return Finder finder
      */
     protected function getFinder($input)
     {

Spacing +4 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
         try {
             $exitCode = $this->doImport($this->getFinder($input), $input, $output);
         } catch (MissingTargetException $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('<error>'.$e->getMessage().'</error>');
         }
         return $exitCode;
     }
@@ -76,8 +76,8 @@ 
          * @param SplFileInfo $file
          * @return bool
          */
-        $filter = function (SplFileInfo $file) {
-            if (!in_array($file->getExtension(), ['yml','json']) || $file->isDir()) {
+        $filter = function(SplFileInfo $file) {
+            if (!in_array($file->getExtension(), ['yml', 'json']) || $file->isDir()) {
                 return false;
             }
             return true;
@@ -102,7 +102,7 @@ 
 
             $fileList = array_filter(
                 $fileList,
-                function ($val) {
+                function($val) {
                     if (!empty($val)) {
                         return true;
                     }