typearea / dembelo

www/src/AdminBundle/Tests/Service/TwineImport/FileExtractorTest.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function testExtract(): void
     {
         $tmpName = tempnam('/tmp', 'unittest');
-        $createdFilename = $tmpName.'.extracted';
+        $createdFilename = $tmpName . '.extracted';
         $content = <<< END
 nonsens
 lots of stuff

www/src/AdminBundle/Service/TwineImport/FileExtractor.php

Spacing +2 added lines, -2 removed lines

@@ -32,9 +32,9 @@
     public function extract(string $filename): string
     {
         if (!is_readable($filename)) {
-            throw new \InvalidArgumentException('Failed to read data from file ['.$filename.'].');
+            throw new \InvalidArgumentException('Failed to read data from file [' . $filename . '].');
         }
-        $extractedFilename = $filename.'.extracted';
+        $extractedFilename = $filename . '.extracted';
         $fileHandle = fopen($filename, 'r');
         $extractedFileHandle = fopen($extractedFilename, 'w');
         $writing = false;

www/src/AdminBundle/Service/TwineImport/HitchParser.php

Spacing +8 added lines, -8 removed lines

@@ -67,13 +67,13 @@ 
         $contentArray = explode('-->', $content, 2);
 
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0]."-->".$contentArray[1]."]]'.");
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . "-->" . $contentArray[1] . "]]'.");
         }
 
         $externalTextnode = $this->textnodeRepository->find($contentArray[1]);
 
         if (null === $externalTextnode) {
-            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.");
+            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.");
         }
 
         $hitch = array();
@@ -95,11 +95,11 @@ 
         $contentArray = explode("->", $content, 2);
 
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0]."->".$contentArray[1]."]]'.");
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . "->" . $contentArray[1] . "]]'.");
         }
 
         if (array_key_exists($contentArray[1], $this->nodeNameMapping) !== true) {
-            throw new Exception("There is a textnode which references another textnode named '".$contentArray[1]."', but this textnode doesn't exist within the same story.");
+            throw new Exception("There is a textnode which references another textnode named '" . $contentArray[1] . "', but this textnode doesn't exist within the same story.");
         }
 
         $hitch = array();
@@ -121,11 +121,11 @@ 
         $contentArray = explode("<-", $content, 2);
 
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0]."<-".$contentArray[1]."]]'.");
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . "<-" . $contentArray[1] . "]]'.");
         }
 
         if (array_key_exists($contentArray[0], $this->nodeNameMapping) !== true) {
-            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.");
+            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.");
         }
 
         $hitch = array();
@@ -145,11 +145,11 @@ 
     public function parseSimpleHitch(string $content, string $name): array
     {
         if (strlen($content) <= 0) {
-            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$content."]]'.");
+            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $content . "]]'.");
         }
 
         if (array_key_exists($content, $this->nodeNameMapping) !== true) {
-            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.");
+            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.");
         }
 
         $hitch = array();

www/src/AdminBundle/Service/TwineImport/FileCheck.php

Spacing +6 added lines, -6 removed lines

@@ -40,13 +40,13 @@ 
         $peekData = fread($fileHandler, 1024);
 
         if ($peekData === false) {
-            throw new \Exception("Failed to read data from file '".$filename."'.");
+            throw new \Exception("Failed to read data from file '" . $filename . "'.");
         }
 
         $peekDataLength = strlen($peekData);
 
         if ($peekDataLength <= 0) {
-            throw new \Exception("File '".$filename."' seems to be empty.");
+            throw new \Exception("File '" . $filename . "' seems to be empty.");
         }
 
         for ($i = 0; $i < $peekDataLength; $i++) {
@@ -59,20 +59,20 @@ 
             }
 
             if ($peekDataLength - $i < $magicStringLength) {
-                throw new \Exception("File '".$filename."' isn't a Twine archive file.");
+                throw new \Exception("File '" . $filename . "' isn't a Twine archive file.");
             }
 
             if (substr($peekData, $i, $magicStringLength) !== self::OPENING_STRING) {
-                throw new \Exception("File '".$filename."' isn't a Twine archive file.");
+                throw new \Exception("File '" . $filename . "' isn't a Twine archive file.");
             }
 
             if (fseek($fileHandler, 0) !== 0) {
-                throw new \Exception("Couldn't reset reading position after the magic string in the Twine archive file '".$filename."' was checked.");
+                throw new \Exception("Couldn't reset reading position after the magic string in the Twine archive file '" . $filename . "' was checked.");
             }
 
             return true;
         }
 
-        throw new \Exception("File '".$filename."' doesn't seem to be a Twine archive file.");
+        throw new \Exception("File '" . $filename . "' doesn't seem to be a Twine archive file.");
     }
 }

www/src/AdminBundle/Tests/Service/TwineImport/FileCheckTest.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     {
         $tmpName = @tempnam('/tmp/phpunit', 'filecheck');
         $fileHandler = fopen($tmpName, 'r+');
-        fwrite($fileHandler, '  '."\n".'<tw-storydata hurz');
+        fwrite($fileHandler, '  ' . "\n" . '<tw-storydata hurz');
         fseek($fileHandler, 0);
 
         $fileCheck = new FileCheck();

www/src/AdminBundle/Tests/Model/ImportTwineTest.php

Spacing +49 added lines, -49 removed lines

@@ -266,8 +266,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName" tags="Freigegeben ID:foobar" position="104,30">lorem impsum',
             'lorem impsum</tw-passagedata></tw-storydata>',
         ];
@@ -303,8 +303,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -370,8 +370,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -401,8 +401,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -432,8 +432,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -466,8 +466,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -502,8 +502,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -540,8 +540,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId" position="104,30">lorem ipsum',
@@ -574,8 +574,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -607,7 +607,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $returnValue = $this->importTwine->run($importfile);
@@ -630,8 +630,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -660,7 +660,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $returnValue = $this->importTwine->run($importfile);
@@ -683,8 +683,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -713,7 +713,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $returnValue = $this->importTwine->run($importfile);
@@ -736,8 +736,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -766,7 +766,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $returnValue = $this->importTwine->run($importfile);
@@ -789,15 +789,15 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
         ];
 
         $textnode1 = new Textnode();
-        $textnode1->setText('lorem ipsum'."\n"."foo bar");
+        $textnode1->setText('lorem ipsum' . "\n" . "foo bar");
         $textnode1->setId('someId0');
 
         $this->textnodeRepository->expects($this->any())
@@ -808,7 +808,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $returnValue = $this->importTwine->run($importfile);
@@ -830,8 +830,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -875,7 +875,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $returnValue = $this->importTwine->run($importfile);
@@ -897,8 +897,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
@@ -940,8 +940,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -970,8 +970,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="nonnumeric" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -1000,8 +1000,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,40">Lorem Ipsum',
             'lorem ipsum</tw-passagedata>',
@@ -1031,8 +1031,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
@@ -1068,8 +1068,8 @@ 
             ->willReturn('readable.extracted');
 
         self::$freadStack = [
-            '<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",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<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",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
@@ -1100,7 +1100,7 @@ 
     public function testRunWithParserException(): void
     {
         self::$freadStack = [
-            '<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",
+            '<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",
             '<tw-passagedata pid"1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',
@@ -1134,7 +1134,7 @@ 
     public function testRunWithInvalidStoryDataElement(): void
     {
         self::$freadStack = [
-            '<tw-storydata 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",
+            '<tw-storydata 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",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '</tw-storydata>',

www/src/AdminBundle/Model/ImportTwine.php

Spacing +19 added lines, -19 removed lines

@@ -122,7 +122,7 @@ 
         $fileHandler = fopen($filenameExtracted, "rb");
 
         if ($fileHandler === false) {
-            throw new Exception("Couldn't open file '".$this->importfile->getFilename()."'");
+            throw new Exception("Couldn't open file '" . $this->importfile->getFilename() . "'");
         }
 
         $this->xmlParser = xml_parser_create("UTF-8");
@@ -163,7 +163,7 @@ 
             $errorCode = xml_get_error_code($this->xmlParser);
             $errorDescription = xml_error_string($errorCode);
 
-            throw new Exception("Error #".$errorCode.": '".$errorDescription."' occurred while the envelope head for the Twine archive was parsed.");
+            throw new Exception("Error #" . $errorCode . ": '" . $errorDescription . "' occurred while the envelope head for the Twine archive was parsed.");
         }
     }
 
@@ -173,7 +173,7 @@ 
             $errorCode = xml_get_error_code($this->xmlParser);
             $errorDescription = xml_error_string($errorCode);
 
-            throw new Exception("Error #".$errorCode.": '".$errorDescription."' occurred while the envelope foot for the Twine archive was parsed.");
+            throw new Exception("Error #" . $errorCode . ": '" . $errorDescription . "' occurred while the envelope foot for the Twine archive was parsed.");
         }
     }
 
@@ -223,7 +223,7 @@ 
         $errorColumnNumber = xml_get_current_column_number($this->xmlParser);
         $errorByteIndex = xml_get_current_byte_index($this->xmlParser);
 
-        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.").");
+        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 . ").");
     }
 
     /**
@@ -245,7 +245,7 @@ 
     private function checkElementStoryData(string $name, array $attributes): bool
     {
         if ($this->twineRelevant === true) {
-            throw new Exception("Nested '".$name."' found in Twine archive file '".$this->importfile->getFilename()."'.");
+            throw new Exception("Nested '" . $name . "' found in Twine archive file '" . $this->importfile->getFilename() . "'.");
         }
 
         if (isset($attributes['startnode']) !== true) {
@@ -257,7 +257,7 @@ 
         }
 
         if (isset($attributes['name']) !== true) {
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which is missing its 'name' attribute.");
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which is missing its 'name' attribute.");
         }
 
         return true;
@@ -266,7 +266,7 @@ 
     private function getTwineId(string $tagString, string $textnodeTitle): string
     {
         if (empty($tagString) || !is_string($tagString)) {
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
         $tagArray = explode(' ', $tagString);
 
@@ -279,7 +279,7 @@ 
         }
 
         if ($twineId === false) {
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
 
         return $twineId;
@@ -301,21 +301,21 @@ 
     private function startElementPassageData(string $name, array $attrs): void
     {
         if ($this->twineText !== false) {
-            throw new Exception("Nested '".$name."' found in Twine archive file '".$this->importfile->getFilename()."'.");
+            throw new Exception("Nested '" . $name . "' found in Twine archive file '" . $this->importfile->getFilename() . "'.");
         }
 
         if (isset($attrs['pid']) !== true) {
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which is missing its 'pid' attribute.");
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which is missing its 'pid' attribute.");
         }
 
         if (is_numeric($attrs['pid']) !== true) {
-            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).");
+            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).");
         }
 
         $this->twineId = $this->getTwineId($attrs['tags'], $attrs['name']);
 
         if (array_key_exists($this->twineId, $this->textnodeMapping) === true) {
-            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']."'");
+            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'] . "'");
         }
 
         $this->twineTextnodeName = $attrs['name'];
@@ -341,7 +341,7 @@ 
                 $this->textnode->setAccess(true);
                 $this->accessSet = true;
             } else {
-                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.');
+                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.');
             }
         } else {
             $this->textnode->setAccess(false);
@@ -362,7 +362,7 @@ 
     private function characterData($parser, string $data)
     {
         if ($this->twineRelevant === true && $this->twineText === true) {
-            $this->textnode->setText($this->textnode->getText().$data);
+            $this->textnode->setText($this->textnode->getText() . $data);
         }
     }
 
@@ -405,7 +405,7 @@ 
         $textnode = $this->textnodeRepository->find($dembeloId);
 
         if (null === $textnode) {
-            throw new Exception('The Dembelo Textnode with Id \''.$dembeloId.'\' doesn\'t exist, but should by now.');
+            throw new Exception('The Dembelo Textnode with Id \'' . $dembeloId . '\' doesn\'t exist, but should by now.');
         }
 
         $textnodeText = $textnode->getText();
@@ -424,13 +424,13 @@ 
      * @param array|null $hitch
      * @throws Exception
      */
-    private function appendHitchToTextnode(Textnode $textnode, ?array $hitch): void
+    private function appendHitchToTextnode(Textnode $textnode, ? array $hitch) : void
     {
         if ($hitch === null) {
             return;
         }
         if ($textnode->getHitchCount() >= Textnode::HITCHES_MAXIMUM_COUNT) {
-            throw new Exception('There is a textnode in the Twine archive file which has more than '.Textnode::HITCHES_MAXIMUM_COUNT.' links.');
+            throw new Exception('There is a textnode in the Twine archive file which has more than ' . Textnode::HITCHES_MAXIMUM_COUNT . ' links.');
         }
 
         if ($textnode->appendHitch($hitch) !== true) {
@@ -450,13 +450,13 @@ 
         $contentArray = explode(">:<", $content, 2);
 
         if (strlen($contentArray[0]) <= 0 || strlen($contentArray[1]) <= 0) {
-            throw new \Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$contentArray[0].">:<".$contentArray[1]."]]'.");
+            throw new \Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $contentArray[0] . ">:<" . $contentArray[1] . "]]'.");
         }
 
         $metadata = $textnode->getMetadata() ?? [];
 
         if (array_key_exists($contentArray[0], $metadata) === true) {
-            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.");
+            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.");
         }
 
         $metadata[$contentArray[0]] = $contentArray[1];

www/src/DembeloMain/Document/Textnode.php

Spacing +1 added lines, -1 removed lines

@@ -228,7 +228,7 @@
      *
      * @return array
      */
-    public function getMetadata(): ?array
+    public function getMetadata(): ? array
     {
         return $this->metadata;
     }

www/src/AdminBundle/Service/TwineImport/PassageDataParser.php

Spacing +7 added lines, -7 removed lines

@@ -64,21 +64,21 @@ 
     public function startElement(string $name, array $attrs): void
     {
         if ($this->parserContext->isTwineText()) {
-            throw new \Exception("Nested '".$name."' found in Twine archive file '".$this->parserContext->getFilename()."'.");
+            throw new \Exception("Nested '" . $name . "' found in Twine archive file '" . $this->parserContext->getFilename() . "'.");
         }
 
         if (isset($attrs['pid']) !== true) {
-            throw new \Exception("There is a '".$name."' in the Twine archive file '".$this->parserContext->getFilename()."' which is missing its 'pid' attribute.");
+            throw new \Exception("There is a '" . $name . "' in the Twine archive file '" . $this->parserContext->getFilename() . "' which is missing its 'pid' attribute.");
         }
 
         if (is_numeric($attrs['pid']) !== true) {
-            throw new \Exception("There is a '".$name."' in the Twine archive file '".$this->parserContext->getFilename()."' which hasn't a numeric value in its 'pid' attribute ('".$attrs['pid']."' was found instead).");
+            throw new \Exception("There is a '" . $name . "' in the Twine archive file '" . $this->parserContext->getFilename() . "' which hasn't a numeric value in its 'pid' attribute ('" . $attrs['pid'] . "' was found instead).");
         }
 
         $twineId = $this->getTwineId($attrs['tags'], $attrs['name']);
 
         if (array_key_exists($twineId, $this->parserContext->getTextnodeMapping()) === true) {
-            throw new \Exception("There is a '".$name."' in the Twine archive file '".$this->parserContext->getFilename()."' which has a non unique 'id' tag [".$twineId."], in node '".$attrs['name']."'");
+            throw new \Exception("There is a '" . $name . "' in the Twine archive file '" . $this->parserContext->getFilename() . "' which has a non unique 'id' tag [" . $twineId . "], in node '" . $attrs['name'] . "'");
         }
 
         $textnode = $this->textnodeRepository->findByTwineId($this->parserContext->getImportfile(), $twineId);
@@ -102,7 +102,7 @@ 
                 $textnode->setAccess(true);
                 $this->parserContext->setAccessSet(true);
             } else {
-                throw new \Exception('There is more than one \''.$name.'\' in the Twine archive file \''.$this->parserContext->getFilename().'\' with the startnode value \''.$attrs['pid'].'\' in its \'pid\' attribute.');
+                throw new \Exception('There is more than one \'' . $name . '\' in the Twine archive file \'' . $this->parserContext->getFilename() . '\' with the startnode value \'' . $attrs['pid'] . '\' in its \'pid\' attribute.');
             }
         } else {
             $textnode->setAccess(false);
@@ -139,7 +139,7 @@ 
     private function getTwineId(string $tagString, string $textnodeTitle): string
     {
         if (empty($tagString)) {
-            throw new \Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new \Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
         $tagArray = explode(' ', $tagString);
 
@@ -152,7 +152,7 @@ 
         }
 
         if ($twineId === false) {
-            throw new \Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new \Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
 
         return $twineId;