Completed
Pull Request — master (#375)
by Michael
10:00 queued 04:48
created
www/src/AdminBundle/Tests/Service/TwineImport/FileExtractorTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
     public function testExtract(): void
46 46
     {
47 47
         $tmpName = tempnam('/tmp', 'unittest');
48
-        $createdFilename = $tmpName.'.extracted';
48
+        $createdFilename = $tmpName . '.extracted';
49 49
         $content = <<< END
50 50
 nonsens
51 51
 lots of stuff
Please login to merge, or discard this patch.
www/src/AdminBundle/Service/TwineImport/FileExtractor.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@
 block discarded – undo
32 32
     public function extract(string $filename): string
33 33
     {
34 34
         if (!is_readable($filename)) {
35
-            throw new \InvalidArgumentException('Failed to read data from file ['.$filename.'].');
35
+            throw new \InvalidArgumentException('Failed to read data from file [' . $filename . '].');
36 36
         }
37
-        $extractedFilename = $filename.'.extracted';
37
+        $extractedFilename = $filename . '.extracted';
38 38
         $fileHandle = fopen($filename, 'r');
39 39
         $extractedFileHandle = fopen($extractedFilename, 'w');
40 40
         $writing = false;
Please login to merge, or discard this patch.
www/src/AdminBundle/Service/TwineImport/HitchParser.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -67,13 +67,13 @@  discard block
 block discarded – undo
67 67
         $contentArray = explode('-->', $content, 2);
68 68
 
69 69
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
70
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0]."-->".$contentArray[1]."]]'.");
70
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . "-->" . $contentArray[1] . "]]'.");
71 71
         }
72 72
 
73 73
         $externalTextnode = $this->textnodeRepository->find($contentArray[1]);
74 74
 
75 75
         if (null === $externalTextnode) {
76
-            throw new Exception("There is a textnode which references the external Dembelo Textnode '".$contentArray[1]."', but a Dembelo Textnode with such an Id doesn't exist.");
76
+            throw new Exception("There is a textnode which references the external Dembelo Textnode '" . $contentArray[1] . "', but a Dembelo Textnode with such an Id doesn't exist.");
77 77
         }
78 78
 
79 79
         $hitch = array();
@@ -95,11 +95,11 @@  discard block
 block discarded – undo
95 95
         $contentArray = explode("->", $content, 2);
96 96
 
97 97
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
98
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0]."->".$contentArray[1]."]]'.");
98
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . "->" . $contentArray[1] . "]]'.");
99 99
         }
100 100
 
101 101
         if (array_key_exists($contentArray[1], $this->nodeNameMapping) !== true) {
102
-            throw new Exception("There is a textnode which references another textnode named '".$contentArray[1]."', but this textnode doesn't exist within the same story.");
102
+            throw new Exception("There is a textnode which references another textnode named '" . $contentArray[1] . "', but this textnode doesn't exist within the same story.");
103 103
         }
104 104
 
105 105
         $hitch = array();
@@ -121,11 +121,11 @@  discard block
 block discarded – undo
121 121
         $contentArray = explode("<-", $content, 2);
122 122
 
123 123
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
124
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0]."<-".$contentArray[1]."]]'.");
124
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . "<-" . $contentArray[1] . "]]'.");
125 125
         }
126 126
 
127 127
         if (array_key_exists($contentArray[0], $this->nodeNameMapping) !== true) {
128
-            throw new Exception("There is a textnode in the Twine archive file which references another textnode named '".$contentArray[0]."', but this textnode doesn't exist within the same story.");
128
+            throw new Exception("There is a textnode in the Twine archive file which references another textnode named '" . $contentArray[0] . "', but this textnode doesn't exist within the same story.");
129 129
         }
130 130
 
131 131
         $hitch = array();
@@ -145,11 +145,11 @@  discard block
 block discarded – undo
145 145
     public function parseSimpleHitch(string $content, string $name): array
146 146
     {
147 147
         if (strlen($content) <= 0) {
148
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$content."]]'.");
148
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $content . "]]'.");
149 149
         }
150 150
 
151 151
         if (array_key_exists($content, $this->nodeNameMapping) !== true) {
152
-            throw new Exception("There is a textnode in the Twine archive file which references another textnode named '".$content."', but this textnode doesn't exist within the same story.");
152
+            throw new Exception("There is a textnode in the Twine archive file which references another textnode named '" . $content . "', but this textnode doesn't exist within the same story.");
153 153
         }
154 154
 
155 155
         $hitch = array();
Please login to merge, or discard this patch.
www/src/AdminBundle/Model/ImportTwine.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
         $fileHandler = fopen($filenameExtracted, "rb");
123 123
 
124 124
         if ($fileHandler === false) {
125
-            throw new Exception("Couldn't open file '".$this->importfile->getFilename()."'");
125
+            throw new Exception("Couldn't open file '" . $this->importfile->getFilename() . "'");
126 126
         }
127 127
 
128 128
         $this->xmlParser = xml_parser_create("UTF-8");
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
             $errorCode = xml_get_error_code($this->xmlParser);
164 164
             $errorDescription = xml_error_string($errorCode);
165 165
 
166
-            throw new Exception("Error #".$errorCode.": '".$errorDescription."' occurred while the envelope head for the Twine archive was parsed.");
166
+            throw new Exception("Error #" . $errorCode . ": '" . $errorDescription . "' occurred while the envelope head for the Twine archive was parsed.");
167 167
         }
168 168
     }
169 169
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
             $errorCode = xml_get_error_code($this->xmlParser);
174 174
             $errorDescription = xml_error_string($errorCode);
175 175
 
176
-            throw new Exception("Error #".$errorCode.": '".$errorDescription."' occurred while the envelope foot for the Twine archive was parsed.");
176
+            throw new Exception("Error #" . $errorCode . ": '" . $errorDescription . "' occurred while the envelope foot for the Twine archive was parsed.");
177 177
         }
178 178
     }
179 179
 
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
                 $errorColumnNumber = xml_get_current_column_number($this->xmlParser);
197 197
                 $errorByteIndex = xml_get_current_byte_index($this->xmlParser);
198 198
 
199
-                throw new Exception("Error #".$errorCode.": '".$errorDescription."' occurred while parsing the Twine archive file '".$this->importfile->getFilename()."' in line ".$errorRowNumber.", character ".$errorColumnNumber." (at byte index ".$errorByteIndex.").");
199
+                throw new Exception("Error #" . $errorCode . ": '" . $errorDescription . "' occurred while parsing the Twine archive file '" . $this->importfile->getFilename() . "' in line " . $errorRowNumber . ", character " . $errorColumnNumber . " (at byte index " . $errorByteIndex . ").");
200 200
             }
201 201
         } while (feof($fileHandler) === false);
202 202
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
     private function startElementStoryData(string $name, array $attrs): void
221 221
     {
222 222
         if ($this->twineRelevant === true) {
223
-            throw new Exception("Nested '".$name."' found in Twine archive file '".$this->importfile->getFilename()."'.");
223
+            throw new Exception("Nested '" . $name . "' found in Twine archive file '" . $this->importfile->getFilename() . "'.");
224 224
         }
225 225
 
226 226
         if (isset($attrs['startnode']) !== true) {
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         }
233 233
 
234 234
         if (isset($attrs['name']) !== true) {
235
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which is missing its 'name' attribute.");
235
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which is missing its 'name' attribute.");
236 236
         }
237 237
 
238 238
         $this->twineStartnodeId = $attrs['startnode'];
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
     private function getTwineId(string $tagString, string $textnodeTitle): string
244 244
     {
245 245
         if (empty($tagString) || !is_string($tagString)) {
246
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
246
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
247 247
         }
248 248
         $tagArray = explode(' ', $tagString);
249 249
 
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
         }
257 257
 
258 258
         if ($twineId === false) {
259
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
259
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
260 260
         }
261 261
 
262 262
         return $twineId;
@@ -265,21 +265,21 @@  discard block
 block discarded – undo
265 265
     private function startElementPassageData(string $name, array $attrs): void
266 266
     {
267 267
         if ($this->twineText !== false) {
268
-            throw new Exception("Nested '".$name."' found in Twine archive file '".$this->importfile->getFilename()."'.");
268
+            throw new Exception("Nested '" . $name . "' found in Twine archive file '" . $this->importfile->getFilename() . "'.");
269 269
         }
270 270
 
271 271
         if (isset($attrs['pid']) !== true) {
272
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which is missing its 'pid' attribute.");
272
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which is missing its 'pid' attribute.");
273 273
         }
274 274
 
275 275
         if (is_numeric($attrs['pid']) !== true) {
276
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which hasn't a numeric value in its 'pid' attribute ('".$attrs['pid']."' was found instead).");
276
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which hasn't a numeric value in its 'pid' attribute ('" . $attrs['pid'] . "' was found instead).");
277 277
         }
278 278
 
279 279
         $this->twineId = $this->getTwineId($attrs['tags'], $attrs['name']);
280 280
 
281 281
         if (array_key_exists($this->twineId, $this->textnodeMapping) === true) {
282
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which has a non unique 'id' tag [".$this->twineId."], in node '".$attrs['name']."'");
282
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which has a non unique 'id' tag [" . $this->twineId . "], in node '" . $attrs['name'] . "'");
283 283
         }
284 284
 
285 285
         $this->twineTextnodeName = $attrs['name'];
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
                 $this->textnode->setAccess(true);
312 312
                 $this->accessSet = true;
313 313
             } else {
314
-                throw new Exception('There is more than one \''.$name.'\' in the Twine archive file \''.$this->importfile->getFilename().'\' with the startnode value \''.$attrs['pid'].'\' in its \'pid\' attribute.');
314
+                throw new Exception('There is more than one \'' . $name . '\' in the Twine archive file \'' . $this->importfile->getFilename() . '\' with the startnode value \'' . $attrs['pid'] . '\' in its \'pid\' attribute.');
315 315
             }
316 316
         } else {
317 317
             $this->textnode->setAccess(false);
@@ -332,7 +332,7 @@  discard block
 block discarded – undo
332 332
     private function characterData($parser, string $data)
333 333
     {
334 334
         if ($this->twineRelevant === true && $this->twineText === true) {
335
-            $this->textnode->setText($this->textnode->getText().$data);
335
+            $this->textnode->setText($this->textnode->getText() . $data);
336 336
         }
337 337
     }
338 338
 
@@ -375,7 +375,7 @@  discard block
 block discarded – undo
375 375
         $textnode = $this->textnodeRepository->find($dembeloId);
376 376
 
377 377
         if (null === $textnode) {
378
-            throw new Exception('The Dembelo Textnode with Id \''.$dembeloId.'\' doesn\'t exist, but should by now.');
378
+            throw new Exception('The Dembelo Textnode with Id \'' . $dembeloId . '\' doesn\'t exist, but should by now.');
379 379
         }
380 380
 
381 381
         $textnodeText = $textnode->getText();
@@ -394,13 +394,13 @@  discard block
 block discarded – undo
394 394
      * @param array|null $hitch
395 395
      * @throws Exception
396 396
      */
397
-    private function appendHitchToTextnode(Textnode $textnode, ?array $hitch): void
397
+    private function appendHitchToTextnode(Textnode $textnode, ? array $hitch) : void
398 398
     {
399 399
         if ($hitch === null) {
400 400
             return;
401 401
         }
402 402
         if ($textnode->getHitchCount() >= Textnode::HITCHES_MAXIMUM_COUNT) {
403
-            throw new Exception('There is a textnode in the Twine archive file which has more than '.Textnode::HITCHES_MAXIMUM_COUNT.' links.');
403
+            throw new Exception('There is a textnode in the Twine archive file which has more than ' . Textnode::HITCHES_MAXIMUM_COUNT . ' links.');
404 404
         }
405 405
 
406 406
         if ($textnode->appendHitch($hitch) !== true) {
@@ -420,7 +420,7 @@  discard block
 block discarded – undo
420 420
         $contentArray = explode(">:<", $content, 2);
421 421
 
422 422
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
423
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0].">:<".$contentArray[1]."]]'.");
423
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . ">:<" . $contentArray[1] . "]]'.");
424 424
         }
425 425
 
426 426
         $metadata = $textnode->getMetadata();
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
         }
431 431
 
432 432
         if (array_key_exists($contentArray[0], $metadata) === true) {
433
-            throw new Exception("There is a textnode in the Twine archive file which contains the metadata field '".$contentArray[0]."' twice or would overwrite the already existing value of that field.");
433
+            throw new Exception("There is a textnode in the Twine archive file which contains the metadata field '" . $contentArray[0] . "' twice or would overwrite the already existing value of that field.");
434 434
         }
435 435
 
436 436
         $metadata[$contentArray[0]] = $contentArray[1];
Please login to merge, or discard this patch.
www/src/AdminBundle/Service/TwineImport/FileCheck.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -40,13 +40,13 @@  discard block
 block discarded – undo
40 40
         $peekData = fread($fileHandler, 1024);
41 41
 
42 42
         if ($peekData === false) {
43
-            throw new \Exception("Failed to read data from file '".$filename."'.");
43
+            throw new \Exception("Failed to read data from file '" . $filename . "'.");
44 44
         }
45 45
 
46 46
         $peekDataLength = strlen($peekData);
47 47
 
48 48
         if ($peekDataLength <= 0) {
49
-            throw new \Exception("File '".$filename."' seems to be empty.");
49
+            throw new \Exception("File '" . $filename . "' seems to be empty.");
50 50
         }
51 51
 
52 52
         for ($i = 0; $i < $peekDataLength; $i++) {
@@ -59,20 +59,20 @@  discard block
 block discarded – undo
59 59
             }
60 60
 
61 61
             if ($peekDataLength - $i < $magicStringLength) {
62
-                throw new \Exception("File '".$filename."' isn't a Twine archive file.");
62
+                throw new \Exception("File '" . $filename . "' isn't a Twine archive file.");
63 63
             }
64 64
 
65 65
             if (substr($peekData, $i, $magicStringLength) !== self::OPENING_STRING) {
66
-                throw new \Exception("File '".$filename."' isn't a Twine archive file.");
66
+                throw new \Exception("File '" . $filename . "' isn't a Twine archive file.");
67 67
             }
68 68
 
69 69
             if (fseek($fileHandler, 0) !== 0) {
70
-                throw new \Exception("Couldn't reset reading position after the magic string in the Twine archive file '".$filename."' was checked.");
70
+                throw new \Exception("Couldn't reset reading position after the magic string in the Twine archive file '" . $filename . "' was checked.");
71 71
             }
72 72
 
73 73
             return true;
74 74
         }
75 75
 
76
-        throw new \Exception("File '".$filename."' doesn't seem to be a Twine archive file.");
76
+        throw new \Exception("File '" . $filename . "' doesn't seem to be a Twine archive file.");
77 77
     }
78 78
 }
Please login to merge, or discard this patch.
www/src/AdminBundle/Tests/Model/ImportTwineTest.php 1 patch
Spacing   +45 added lines, -45 removed lines patch added patch discarded remove patch
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
             ->willReturn('readable.extracted');
267 267
 
268 268
         self::$freadStack = [
269
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
270
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
269
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
270
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
271 271
             '<tw-passagedata pid="1" name="someNodeName" tags="Freigegeben ID:foobar" position="104,30">lorem impsum',
272 272
             'lorem impsum</tw-passagedata></tw-storydata>',
273 273
         ];
@@ -303,8 +303,8 @@  discard block
 block discarded – undo
303 303
             ->willReturn('readable.extracted');
304 304
 
305 305
         self::$freadStack = [
306
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
307
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
306
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
307
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
308 308
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
309 309
             'lorem ipsum</tw-passagedata></tw-storydata>',
310 310
         ];
@@ -370,8 +370,8 @@  discard block
 block discarded – undo
370 370
             ->willReturn('readable.extracted');
371 371
 
372 372
         self::$freadStack = [
373
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
374
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
373
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
374
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
375 375
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben" position="104,30">lorem ipsum',
376 376
             'lorem ipsum</tw-passagedata></tw-storydata>',
377 377
         ];
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
             ->willReturn('readable.extracted');
402 402
 
403 403
         self::$freadStack = [
404
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
405
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
404
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
405
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
406 406
             '<tw-passagedata pid="1" name="someNodeName1" tags="" position="104,30">lorem ipsum',
407 407
             'lorem ipsum</tw-passagedata></tw-storydata>',
408 408
         ];
@@ -432,8 +432,8 @@  discard block
 block discarded – undo
432 432
             ->willReturn('readable.extracted');
433 433
 
434 434
         self::$freadStack = [
435
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
436
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
435
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
436
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
437 437
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
438 438
             'lorem ipsum</tw-passagedata></tw-storydata>',
439 439
         ];
@@ -466,8 +466,8 @@  discard block
 block discarded – undo
466 466
             ->willReturn('readable.extracted');
467 467
 
468 468
         self::$freadStack = [
469
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
470
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
469
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
470
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
471 471
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
472 472
             'lorem ipsum</tw-passagedata></tw-storydata>',
473 473
         ];
@@ -502,8 +502,8 @@  discard block
 block discarded – undo
502 502
             ->willReturn('readable.extracted');
503 503
 
504 504
         self::$freadStack = [
505
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
506
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
505
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
506
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
507 507
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
508 508
             'lorem ipsum</tw-passagedata></tw-storydata>',
509 509
         ];
@@ -540,8 +540,8 @@  discard block
 block discarded – undo
540 540
             ->willReturn('readable.extracted');
541 541
 
542 542
         self::$freadStack = [
543
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
544
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
543
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
544
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
545 545
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId" position="104,30">lorem ipsum',
546 546
             'lorem ipsum</tw-passagedata>',
547 547
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId" position="104,30">lorem ipsum',
@@ -574,8 +574,8 @@  discard block
 block discarded – undo
574 574
             ->willReturn('readable.extracted');
575 575
 
576 576
         self::$freadStack = [
577
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
578
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
577
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
578
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
579 579
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
580 580
             'lorem ipsum</tw-passagedata>',
581 581
             '</tw-storydata>',
@@ -607,7 +607,7 @@  discard block
 block discarded – undo
607 607
             ->method('save')
608 608
             ->willReturnCallback(function ($textnode) {
609 609
                 static $counter = 0;
610
-                $textnode->setId('someTextnode'.$counter++);
610
+                $textnode->setId('someTextnode' . $counter++);
611 611
             });
612 612
 
613 613
         $returnValue = $this->importTwine->run($importfile);
@@ -630,8 +630,8 @@  discard block
 block discarded – undo
630 630
             ->willReturn('readable.extracted');
631 631
 
632 632
         self::$freadStack = [
633
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
634
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
633
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
634
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
635 635
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
636 636
             'lorem ipsum</tw-passagedata>',
637 637
             '</tw-storydata>',
@@ -660,7 +660,7 @@  discard block
 block discarded – undo
660 660
             ->method('save')
661 661
             ->willReturnCallback(function ($textnode) {
662 662
                 static $counter = 0;
663
-                $textnode->setId('someTextnode'.$counter++);
663
+                $textnode->setId('someTextnode' . $counter++);
664 664
             });
665 665
 
666 666
         $returnValue = $this->importTwine->run($importfile);
@@ -683,8 +683,8 @@  discard block
 block discarded – undo
683 683
             ->willReturn('readable.extracted');
684 684
 
685 685
         self::$freadStack = [
686
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
687
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
686
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
687
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
688 688
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
689 689
             'lorem ipsum</tw-passagedata>',
690 690
             '</tw-storydata>',
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
             ->method('save')
714 714
             ->willReturnCallback(function ($textnode) {
715 715
                 static $counter = 0;
716
-                $textnode->setId('someTextnode'.$counter++);
716
+                $textnode->setId('someTextnode' . $counter++);
717 717
             });
718 718
 
719 719
         $returnValue = $this->importTwine->run($importfile);
@@ -736,8 +736,8 @@  discard block
 block discarded – undo
736 736
             ->willReturn('readable.extracted');
737 737
 
738 738
         self::$freadStack = [
739
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
740
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
739
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
740
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
741 741
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
742 742
             'lorem ipsum</tw-passagedata>',
743 743
             '</tw-storydata>',
@@ -766,7 +766,7 @@  discard block
 block discarded – undo
766 766
             ->method('save')
767 767
             ->willReturnCallback(function ($textnode) {
768 768
                 static $counter = 0;
769
-                $textnode->setId('someTextnode'.$counter++);
769
+                $textnode->setId('someTextnode' . $counter++);
770 770
             });
771 771
 
772 772
         $returnValue = $this->importTwine->run($importfile);
@@ -789,15 +789,15 @@  discard block
 block discarded – undo
789 789
             ->willReturn('readable.extracted');
790 790
 
791 791
         self::$freadStack = [
792
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
793
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
792
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
793
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
794 794
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
795 795
             'lorem ipsum</tw-passagedata>',
796 796
             '</tw-storydata>',
797 797
         ];
798 798
 
799 799
         $textnode1 = new Textnode();
800
-        $textnode1->setText('lorem ipsum'."\n"."foo bar");
800
+        $textnode1->setText('lorem ipsum' . "\n" . "foo bar");
801 801
         $textnode1->setId('someId0');
802 802
 
803 803
         $this->textnodeRepository->expects($this->any())
@@ -808,7 +808,7 @@  discard block
 block discarded – undo
808 808
             ->method('save')
809 809
             ->willReturnCallback(function ($textnode) {
810 810
                 static $counter = 0;
811
-                $textnode->setId('someTextnode'.$counter++);
811
+                $textnode->setId('someTextnode' . $counter++);
812 812
             });
813 813
 
814 814
         $returnValue = $this->importTwine->run($importfile);
@@ -830,8 +830,8 @@  discard block
 block discarded – undo
830 830
             ->willReturn('readable.extracted');
831 831
 
832 832
         self::$freadStack = [
833
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
834
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
833
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
834
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
835 835
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
836 836
             'lorem ipsum</tw-passagedata>',
837 837
             '</tw-storydata>',
@@ -875,7 +875,7 @@  discard block
 block discarded – undo
875 875
             ->method('save')
876 876
             ->willReturnCallback(function ($textnode) {
877 877
                 static $counter = 0;
878
-                $textnode->setId('someTextnode'.$counter++);
878
+                $textnode->setId('someTextnode' . $counter++);
879 879
             });
880 880
 
881 881
         $returnValue = $this->importTwine->run($importfile);
@@ -897,8 +897,8 @@  discard block
 block discarded – undo
897 897
             ->willReturn('readable.extracted');
898 898
 
899 899
         self::$freadStack = [
900
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
901
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
900
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
901
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
902 902
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
903 903
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
904 904
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
@@ -940,8 +940,8 @@  discard block
 block discarded – undo
940 940
             ->willReturn('readable.extracted');
941 941
 
942 942
         self::$freadStack = [
943
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
944
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
943
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
944
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
945 945
             '<tw-passagedata name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
946 946
             'lorem ipsum</tw-passagedata>',
947 947
             '</tw-storydata>',
@@ -970,8 +970,8 @@  discard block
 block discarded – undo
970 970
             ->willReturn('readable.extracted');
971 971
 
972 972
         self::$freadStack = [
973
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
974
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
973
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
974
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
975 975
             '<tw-passagedata pid="nonnumeric" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
976 976
             'lorem ipsum</tw-passagedata>',
977 977
             '</tw-storydata>',
@@ -999,8 +999,8 @@  discard block
 block discarded – undo
999 999
             ->willReturn('readable.extracted');
1000 1000
 
1001 1001
         self::$freadStack = [
1002
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
1003
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
1002
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
1003
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
1004 1004
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
1005 1005
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
1006 1006
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
@@ -1036,8 +1036,8 @@  discard block
 block discarded – undo
1036 1036
             ->willReturn('readable.extracted');
1037 1037
 
1038 1038
         self::$freadStack = [
1039
-            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
1040
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
1039
+            '<tw-storydata name="someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
1040
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
1041 1041
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
1042 1042
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
1043 1043
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
Please login to merge, or discard this patch.
www/src/AdminBundle/Tests/Service/TwineImport/FileCheckTest.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@
 block discarded – undo
50 50
     {
51 51
         $tmpName = @tempnam('/tmp/phpunit', 'filecheck');
52 52
         $fileHandler = fopen($tmpName, 'r+');
53
-        fwrite($fileHandler, '  '."\n".'<tw-storydata hurz');
53
+        fwrite($fileHandler, '  ' . "\n" . '<tw-storydata hurz');
54 54
         fseek($fileHandler, 0);
55 55
 
56 56
         $fileCheck = new FileCheck();
Please login to merge, or discard this patch.