@@ -344,7 +344,7 @@ |
||
| 344 | 344 | * |
| 345 | 345 | * @param Document $doc Data source for import data |
| 346 | 346 | * @param string $originFile Original full filename used toimport |
| 347 | - * @return bool|mixed |
|
| 347 | + * @return false|string |
|
| 348 | 348 | */ |
| 349 | 349 | private function validateUploadFile(Document $doc, $originFile) |
| 350 | 350 | { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | $responseMock |
| 46 | 46 | ->method('getHeader') |
| 47 | 47 | ->with('Link') |
| 48 | - ->willReturn(['<' . $host . $path . '>; rel="self"']); |
|
| 48 | + ->willReturn(['<'.$host.$path.'>; rel="self"']); |
|
| 49 | 49 | |
| 50 | 50 | $clientMock |
| 51 | 51 | ->method('request') |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | $cmdTester = $this->getTester($sut, $file); |
| 64 | 64 | |
| 65 | - $this->assertContains('Loading data from ' . $file, $cmdTester->getDisplay()); |
|
| 66 | - $this->assertContains('Wrote <' . $host . $path . '>; rel="self"', $cmdTester->getDisplay()); |
|
| 65 | + $this->assertContains('Loading data from '.$file, $cmdTester->getDisplay()); |
|
| 66 | + $this->assertContains('Wrote <'.$host.$path.'>; rel="self"', $cmdTester->getDisplay()); |
|
| 67 | 67 | $this->assertEquals(0, $cmdTester->getStatusCode()); |
| 68 | 68 | } |
| 69 | 69 | |
@@ -75,12 +75,12 @@ discard block |
||
| 75 | 75 | return [ |
| 76 | 76 | 'basic valid file' => [ |
| 77 | 77 | 'http://localhost', |
| 78 | - __DIR__ . '/fixtures/set-01/test-2.json', |
|
| 78 | + __DIR__.'/fixtures/set-01/test-2.json', |
|
| 79 | 79 | '/core/app/test', |
| 80 | 80 | ], |
| 81 | 81 | 'basic valid image file' => [ |
| 82 | 82 | 'http://localhost', |
| 83 | - __DIR__ . '/fixtures/file', |
|
| 83 | + __DIR__.'/fixtures/file', |
|
| 84 | 84 | '/core/app/test', |
| 85 | 85 | ], |
| 86 | 86 | ]; |
@@ -107,12 +107,12 @@ discard block |
||
| 107 | 107 | $responseMock |
| 108 | 108 | ->method('getHeader') |
| 109 | 109 | ->with('Link') |
| 110 | - ->willReturn(['<' . $host . $file . '>; rel="self"']); |
|
| 110 | + ->willReturn(['<'.$host.$file.'>; rel="self"']); |
|
| 111 | 111 | |
| 112 | 112 | $requestMock = $this->createMock('Psr\Http\Message\RequestInterface'); |
| 113 | 113 | $requestMock |
| 114 | 114 | ->method('getUri') |
| 115 | - ->willReturn($host . '/core/app/test'); |
|
| 115 | + ->willReturn($host.'/core/app/test'); |
|
| 116 | 116 | |
| 117 | 117 | $exceptionMock = $this->getMockBuilder('GuzzleHttp\Exception\RequestException') |
| 118 | 118 | ->setConstructorArgs(['Client error: 400', $requestMock, $responseMock]) |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | |
| 142 | 142 | $cmdTester = $this->getTester($sut, $file); |
| 143 | 143 | |
| 144 | - $this->assertContains('Loading data from ' . $file, $cmdTester->getDisplay()); |
|
| 144 | + $this->assertContains('Loading data from '.$file, $cmdTester->getDisplay()); |
|
| 145 | 145 | foreach ($errors as $error) { |
| 146 | 146 | $this->assertContains( |
| 147 | 147 | $error, |
@@ -159,18 +159,18 @@ discard block |
||
| 159 | 159 | return [ |
| 160 | 160 | 'invalid file (server side)' => [ |
| 161 | 161 | 'http://localhost', |
| 162 | - __DIR__ . '/fixtures/set-01/test.json', |
|
| 162 | + __DIR__.'/fixtures/set-01/test.json', |
|
| 163 | 163 | [ |
| 164 | - 'Failed to write <http://localhost/core/app/test> from \'' . |
|
| 165 | - __DIR__ . '/fixtures/set-01/test.json\' with message \'Client error: 400\'', |
|
| 164 | + 'Failed to write <http://localhost/core/app/test> from \''. |
|
| 165 | + __DIR__.'/fixtures/set-01/test.json\' with message \'Client error: 400\'', |
|
| 166 | 166 | '"message": "invalid"', |
| 167 | 167 | ], |
| 168 | 168 | ], |
| 169 | 169 | 'missing target in file (user error)' => [ |
| 170 | 170 | 'http://localhost', |
| 171 | - __DIR__ . '/fixtures/set-01/test-3.json', |
|
| 171 | + __DIR__.'/fixtures/set-01/test-3.json', |
|
| 172 | 172 | [ |
| 173 | - 'Missing target in \'' . __DIR__ . '/fixtures/set-01/test-3.json\'', |
|
| 173 | + 'Missing target in \''.__DIR__.'/fixtures/set-01/test-3.json\'', |
|
| 174 | 174 | ], |
| 175 | 175 | ] |
| 176 | 176 | ]; |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | $cmdTester = $this->getTester( |
| 219 | 219 | $sut, |
| 220 | - __DIR__ . '/fixtures/set-01/test-4.json', |
|
| 220 | + __DIR__.'/fixtures/set-01/test-4.json', |
|
| 221 | 221 | [ |
| 222 | 222 | 'host' => 'http://example.com', |
| 223 | 223 | '--rewrite-host' => 'http://localhost' |