libgraviton / import-export

src/Command/ImportCommandAbstract.php

Spacing +3 added lines, -3 removed lines

@@ -52,8 +52,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;
@@ -64,7 +64,7 @@ 
         try {
             $this->doImport($finder, $input, $output);
         } catch (MissingTargetException $e) {
-            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            $output->writeln('<error>'.$e->getMessage().'</error>');
         }
     }
 

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());
     }
 
     /**
@@ -86,7 +86,7 @@ 
         return [
             'basic valid file' => [
                 'http://localhost',
-                __DIR__ . '/fixtures/set-01/test-2.json',
+                __DIR__.'/fixtures/set-01/test-2.json',
                 '/core/app/test',
             ],
         ];
@@ -100,7 +100,7 @@ 
         return [
             'basic valid image file' => [
                 'http://localhost',
-                __DIR__ . '/fixtures/file',
+                __DIR__.'/fixtures/file',
                 '/core/app/test',
             ],
         ];
@@ -134,7 +134,7 @@ 
         $requestMock = $this->getMock('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])
@@ -152,7 +152,7 @@ 
             ->method('then')
             ->will(
                 $this->returnCallback(
-                    function ($ok, $nok) use ($exceptionMock) {
+                    function($ok, $nok) use ($exceptionMock) {
                         return $nok($exceptionMock);
                     }
                 )
@@ -169,7 +169,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,
@@ -186,18 +186,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\'',
                 ],
             ]
         ];
@@ -234,7 +234,7 @@ 
             ->method('then')
             ->will(
                 $this->returnCallback(
-                    function ($ok) use ($responseMock) {
+                    function($ok) use ($responseMock) {
                         $ok($responseMock);
                     }
                 )
@@ -251,7 +251,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/ImportCommand.php

Doc Comments +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
      * @param string          $rewriteTo   string to replace value from $rewriteHost with during loading
      * @param boolean         $sync        send requests syncronously
      *
-     * @return Promise\Promise|null
+     * @return Promise\PromiseInterface
      */
     protected function importResource(
         $targetUrl,
@@ -330,7 +330,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)
     {