libgraviton / import-export

src/Command/CoreImportCommand.php

Unused Use Statements -1 removed lines

@@ -5,7 +5,6 @@
 
 namespace Graviton\ImportExport\Command;
 
-use Monolog\Logger;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;

src/Command/ImportCommand.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use Graviton\ImportExport\Exception\ParseException;
 use Graviton\ImportExport\Exception\UnknownFileTypeException;
 use Graviton\ImportExport\Service\HttpClient;
-use Monolog\Logger;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;

Spacing +7 added lines, -7 removed lines

@@ -240,7 +240,7 @@ 
             $this->logger->info("Loading data from ${file}");
 
             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']);
@@ -288,7 +288,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) {
@@ -329,7 +329,7 @@ 
                         $targetUrl,
                         array_merge($data, ['http_errors' => false])
                     );
-                    $this->logger->info("File deleted: ${targetUrl} (response code " . $response->getStatusCode().")");
+                    $this->logger->info("File deleted: ${targetUrl} (response code ".$response->getStatusCode().")");
                 }
             }
 
@@ -339,7 +339,7 @@ 
                 $data
             );
 
-            $this->logger->info('Wrote ' . $response->getHeader('Link')[0]);
+            $this->logger->info('Wrote '.$response->getHeader('Link')[0]);
         } catch (\Exception $e) {
             $this->errors[$file] = $e->getMessage();
             $this->logger->error(
@@ -356,10 +356,10 @@ 
                     $this->cloner->cloneVar(
                         $this->parser->parse($e->getResponse()->getBody(), Yaml::PARSE_OBJECT_FOR_MAP)
                     ),
-                    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>'
                             );
                         }
                     }
@@ -428,7 +428,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

@@ -52,7 +52,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);
@@ -127,7 +127,7 @@ 
 
         // fail in output?
         $this->assertStringContainsString(
-            'Error in <' . $this->sourceDir . '/Dudess/Invalid.json>: Invalid JSON to unserialize.',
+            'Error in <'.$this->sourceDir.'/Dudess/Invalid.json>: Invalid JSON to unserialize.',
             $this->cmdTester->getDisplay()
         );
         $this->assertEquals(1, $this->cmdTester->getStatusCode());

test/Command/ImportCommandTest.php

Spacing +14 added lines, -14 removed lines

@@ -46,7 +46,7 @@ 
         $responseMock
             ->method('getHeader')
             ->with('Link')
-            ->willReturn(['<' . $host . $path . '>; rel="self"']);
+            ->willReturn(['<'.$host.$path.'>; rel="self"']);
 
         $clientMock
             ->method('request')
@@ -64,8 +64,8 @@ 
         $cmdTester = $this->getTester($sut, $file);
         $display = $cmdTester->getDisplay();
 
-        $this->assertStringContainsString('Loading data from ' . $file, $display);
-        $this->assertStringContainsString('Wrote <' . $host . $path . '>; rel="self"', $display);
+        $this->assertStringContainsString('Loading data from '.$file, $display);
+        $this->assertStringContainsString('Wrote <'.$host.$path.'>; rel="self"', $display);
         $this->assertEquals(0, $cmdTester->getStatusCode());
     }
 
@@ -77,12 +77,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',
             ],
         ];
@@ -109,12 +109,12 @@ 
         $responseMock
             ->method('getHeader')
             ->with('Link')
-            ->willReturn(['<' . $host . $file . '>; rel="self"']);
+            ->willReturn(['<'.$host.$file.'>; rel="self"']);
 
         $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 @@ 
         $cmdTester = $this->getTester($sut, $file);
         $display = $cmdTester->getDisplay();
 
-        $this->assertStringContainsString('Loading data from ' . $file, $display);
+        $this->assertStringContainsString('Loading data from '.$file, $display);
         foreach ($errors as $error) {
             $this->assertStringContainsString(
                 $error,
@@ -162,18 +162,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\'',
                 ],
             ]
         ];
@@ -220,7 +220,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/ImportCommandAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -83,8 +83,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;
@@ -109,7 +109,7 @@ 
 
             $fileList = array_filter(
                 $fileList,
-                function ($val) {
+                function($val) {
                     if (!empty($val)) {
                         return true;
                     }