typearea / dembelo

www/web/config.php

Braces +9 added lines, -3 removed lines

@@ -382,7 +382,10 @@ 
                         <?php if ($hasMinorProblems): ?>
                             <h2>Recommendations</h2>
                             <p>
-                                <?php if ($hasMajorProblems): ?>Additionally, to<?php else: ?>To<?php endif; ?> enhance your Symfony experience,
+                                <?php if ($hasMajorProblems): ?>Additionally, to<?php else {
+    : ?>To<?php endif;
+}
+?> enhance your Symfony experience,
                                 it’s recommended that you fix the following:
                             </p>
                             <ol>
@@ -398,9 +401,12 @@ 
                             <p id="phpini">*
                                 <?php if ($symfonyRequirements->getPhpIniConfigPath()): ?>
                                     Changes to the <strong>php.ini</strong> file must be done in "<strong><?php echo $symfonyRequirements->getPhpIniConfigPath() ?></strong>".
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     To change settings, create a "<strong>php.ini</strong>".
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             </p>
                         <?php endif; ?>
 

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     exit('This script is only accessible from localhost.');
 }
 
-require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+require_once dirname(__FILE__) . '/../var/SymfonyRequirements.php';
 
 $symfonyRequirements = new SymfonyRequirements();
 

www/src/AdminBundle/Tests/Command/ImportCommandTest.php

Spacing +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
     {
         $this->mockObjects['importTwine']->expects($this->once())
             ->method('run')
-            ->will($this->returnCallback(function ($importfile) {
+            ->will($this->returnCallback(function($importfile) {
                 return $importfile->getFilename() === 'somefile_readable_exists.html'
                 && $importfile->getLicenseeId() === 'licenseeId'
                 && $importfile->getAuthor() === 'someauthor'
@@ -151,7 +151,7 @@ 
     {
         $this->mockObjects['importTwine']->expects($this->once())
             ->method('run')
-            ->will($this->returnCallback(function ($importfile) {
+            ->will($this->returnCallback(function($importfile) {
                 return $importfile->getFilename() === 'somefile_readable_exists.html'
                 && $importfile->getLicenseeId() === 'licenseeId'
                 && $importfile->getAuthor() === 'someauthor'

www/src/DembeloMain/Tests/Document/TextnodeTest.php

Spacing +9 added lines, -9 removed lines

@@ -183,7 +183,7 @@ 
         $hitch['status'] = Textnode::HITCH_STATUS_ACTIVE;
         $this->textnode->appendHitch($hitch);
 
-        $result = $this->textnode->getHitch($this->textnode->getHitchCount() - 1);
+        $result = $this->textnode->getHitch($this->textnode->getHitchCount()-1);
 
         $this->assertFalse(is_null($result));
 
@@ -280,7 +280,7 @@ 
      */
     public function testAppendHitchMoreThanMaximum()
     {
-        for ($i = 0; $i < Textnode::HITCHES_MAXIMUM_COUNT + 1; $i++) {
+        for ($i = 0; $i < Textnode::HITCHES_MAXIMUM_COUNT+1; $i++) {
             $hitch = array();
             $hitch['textnodeId'] = $i;
             $hitch['description'] = "Continue.";
@@ -311,12 +311,12 @@ 
         $hitch['textnodeId'] = "55f5ab3708985c4b188b4578";
         $hitch['description'] = "Abort.";
         $hitch['status'] = Textnode::HITCH_STATUS_INACTIVE;
-        $result = $this->textnode->setHitch($this->textnode->getHitchCount() - 1, $hitch);
+        $result = $this->textnode->setHitch($this->textnode->getHitchCount()-1, $hitch);
 
         $this->assertTrue($result);
         $this->assertEquals($this->textnode->getHitchCount(), 1);
 
-        $result = $this->textnode->getHitch($this->textnode->getHitchCount() - 1);
+        $result = $this->textnode->getHitch($this->textnode->getHitchCount()-1);
 
         $this->assertFalse(is_null($result));
 
@@ -367,7 +367,7 @@ 
         $hitch = array();
         $hitch['description'] = "Abort.";
         $hitch['status'] = Textnode::HITCH_STATUS_INACTIVE;
-        $result = $this->textnode->setHitch($this->textnode->getHitchCount() - 1, $hitch);
+        $result = $this->textnode->setHitch($this->textnode->getHitchCount()-1, $hitch);
 
         $this->assertFalse($result);
     }
@@ -388,7 +388,7 @@ 
         $hitch = array();
         $hitch['textnodeId'] = "55f5ab3708985c4b188b4578";
         $hitch['status'] = Textnode::HITCH_STATUS_INACTIVE;
-        $result = $this->textnode->setHitch($this->textnode->getHitchCount() - 1, $hitch);
+        $result = $this->textnode->setHitch($this->textnode->getHitchCount()-1, $hitch);
 
         $this->assertFalse($result);
     }
@@ -409,7 +409,7 @@ 
         $hitch = array();
         $hitch['textnodeId'] = "55f5ab3708985c4b188b4578";
         $hitch['description'] = "Abort.";
-        $result = $this->textnode->setHitch($this->textnode->getHitchCount() - 1, $hitch);
+        $result = $this->textnode->setHitch($this->textnode->getHitchCount()-1, $hitch);
 
         $this->assertFalse($result);
     }
@@ -431,7 +431,7 @@ 
         $hitch['textnodeId'] = null;
         $hitch['description'] = "Abort.";
         $hitch['status'] = Textnode::HITCH_STATUS_INACTIVE;
-        $result = $this->textnode->setHitch($this->textnode->getHitchCount() - 1, $hitch);
+        $result = $this->textnode->setHitch($this->textnode->getHitchCount()-1, $hitch);
 
         $this->assertFalse($result);
     }
@@ -449,7 +449,7 @@ 
         $this->assertTrue($this->textnode->appendHitch($hitch));
         $this->assertEquals($this->textnode->getHitchCount(), 1);
 
-        $this->assertTrue($this->textnode->removeHitch($this->textnode->getHitchCount() - 1));
+        $this->assertTrue($this->textnode->removeHitch($this->textnode->getHitchCount()-1));
         $this->assertEquals($this->textnode->getHitchCount(), 0);
     }
 

www/src/DembeloMain/Tests/Model/ReadpathTest.php

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
         $readpathRepositoryMock->expects($this->once())
             ->method('save')
-            ->willReturnCallback(function (ReadpathDocument $readpathDocument) use ($textnodeMockId, $userMockId) {
+            ->willReturnCallback(function(ReadpathDocument $readpathDocument) use ($textnodeMockId, $userMockId) {
                 $this->assertInstanceOf(ReadpathDocument::class, $readpathDocument);
                 $this->assertEquals($textnodeMockId, $readpathDocument->getTextnodeId());
                 $this->assertEquals($userMockId, $readpathDocument->getUserId());

scripts/install.php

Spacing +17 added lines, -17 removed lines

@@ -26,7 +26,7 @@ 
 $options = getopt($shortOptions, $longOptions);
 
 if (array_key_exists('help', $options)) {
-    echo "dembelo install script, ".file_get_contents('./files/version')."\n";
+    echo "dembelo install script, " . file_get_contents('./files/version') . "\n";
     echo "\n";
     echo "options:\n";
     echo " -u\tuser for chmod (for example: www-data)\n";
@@ -35,7 +35,7 @@ 
 }
 
 $url = 'https://api.github.com/repos/typearea/dembelo/releases';
-$data = shell_exec('curl '.$url);
+$data = shell_exec('curl ' . $url);
 
 $releases = json_decode($data);
 
@@ -66,36 +66,36 @@ 
 if (file_exists("files/version")) {
     $installedVersion = trim(file_get_contents("files/version"));
     if ($installedVersion === $newVersion) {
-        echo 'latest version ['.$installedVersion.'] already installed. exit' . "\n";
+        echo 'latest version [' . $installedVersion . '] already installed. exit' . "\n";
         exit(1);
     }
 }
 
-echo 'download '.$downloadUrl."...\n";
-shell_exec('wget -q '.$downloadUrl);
-echo 'finished'."\n";
+echo 'download ' . $downloadUrl . "...\n";
+shell_exec('wget -q ' . $downloadUrl);
+echo 'finished' . "\n";
 
-echo 'extract '.$downloadName."...\n";
-shell_exec('unzip -o '.$downloadName);
-echo 'finished'."\n";
+echo 'extract ' . $downloadName . "...\n";
+shell_exec('unzip -o ' . $downloadName);
+echo 'finished' . "\n";
 
 if (array_key_exists('u', $options)) {
-    echo 'chown to '.$options['u']."...\n";
-    shell_exec('chown -R '.$options['u']. ' www/');
+    echo 'chown to ' . $options['u'] . "...\n";
+    shell_exec('chown -R ' . $options['u'] . ' www/');
 }
 
-echo 'clearing cache '."...\n";
+echo 'clearing cache ' . "...\n";
 shell_exec('cd www && php bin/console cache:clear --env=prod');
 shell_exec('cd www && php bin/console assetic:dump --env=prod');
-echo 'finished'."\n";
+echo 'finished' . "\n";
 
-echo 'prepare some apache stuff'."\n";
+echo 'prepare some apache stuff' . "\n";
 shell_exec('cp files/apache/htaccess www/web/.htaccess');
 if (array_key_exists('u', $options)) {
     shell_exec('chown ' . $options['u'] . ' www/web/.htaccess');
 }
-echo 'finished'."\n";
+echo 'finished' . "\n";
 
-shell_exec('rm '.$downloadName);
-echo 'installation ['.$newVersion.'] finished'."\n";
+shell_exec('rm ' . $downloadName);
+echo 'installation [' . $newVersion . '] finished' . "\n";
 exit(0);
\ No newline at end of file

www/web/app.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 use Symfony\Component\HttpFoundation\Request;
 
-$loader = require __DIR__.'/../vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 
 $kernel = new AppKernel('prod', false);
 //$kernel->loadClassCache();

www/web/app_dev.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     //exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
 }
 
-$loader = require __DIR__.'/../vendor/autoload.php';
+$loader = require __DIR__ . '/../vendor/autoload.php';
 Debug::enable();
 
 $kernel = new AppKernel('dev', true);

www/src/AdminBundle/Model/ImportTwine.php

Spacing +42 added lines, -42 removed lines

@@ -102,7 +102,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");
@@ -130,12 +130,12 @@ 
             throw new Exception('no filename available');
         }
 
-        $extractedFile = $this->importfile->getFilename().'.extracted';
+        $extractedFile = $this->importfile->getFilename() . '.extracted';
 
         $fileHandle = fopen($this->importfile->getFilename(), 'r');
         $extractedFileHandle = fopen($extractedFile, 'w');
         if ($fileHandle === false) {
-            throw new Exception("Failed to read data from file '".$this->importfile->getFilename()."'.");
+            throw new Exception("Failed to read data from file '" . $this->importfile->getFilename() . "'.");
         }
         $writing = false;
         $matches = array();
@@ -168,13 +168,13 @@ 
         $peekData = fread($fileHandler, 1024);
 
         if ($peekData === false) {
-            throw new Exception("Failed to read data from file '".$this->importfile->getFilename()."'.");
+            throw new Exception("Failed to read data from file '" . $this->importfile->getFilename() . "'.");
         }
 
         $peekDataLength = strlen($peekData);
 
         if ($peekDataLength <= 0) {
-            throw new Exception("File '".$this->importfile->getFilename()."' seems to be empty.");
+            throw new Exception("File '" . $this->importfile->getFilename() . "' seems to be empty.");
         }
 
         for ($i = 0; $i < $peekDataLength; $i++) {
@@ -186,22 +186,22 @@ 
                 continue;
             }
 
-            if ($peekDataLength - $i < $magicStringLength) {
-                throw new Exception("File '".$this->importfile->getFilename()."' isn't a Twine archive file.");
+            if ($peekDataLength-$i < $magicStringLength) {
+                throw new Exception("File '" . $this->importfile->getFilename() . "' isn't a Twine archive file.");
             }
 
             if (substr($peekData, $i, $magicStringLength) !== $magicString) {
-                throw new Exception("File '".$this->importfile->getFilename()."' isn't a Twine archive file.");
+                throw new Exception("File '" . $this->importfile->getFilename() . "' 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 '".$this->importfile->getFilename()."' was checked.");
+                throw new Exception("Couldn't reset reading position after the magic string in the Twine archive file '" . $this->importfile->getFilename() . "' was checked.");
             }
 
             return true;
         }
 
-        throw new Exception("File '".$this->importfile->getFilename()."' doesn't seem to be a Twine archive file.");
+        throw new Exception("File '" . $this->importfile->getFilename() . "' doesn't seem to be a Twine archive file.");
     }
 
     private function initParser($fileHandler)
@@ -221,7 +221,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.");
         }
 
         do {
@@ -237,7 +237,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 . ").");
             }
         } while (feof($fileHandler) === false);
 
@@ -245,7 +245,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.");
         }
 
         $this->parserFree();
@@ -261,7 +261,7 @@ 
     private function startElementStoryData($name, array $attrs)
     {
         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($attrs['startnode']) !== true) {
@@ -273,13 +273,13 @@ 
         }
 
         if (isset($attrs['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.");
         }
 
         $twineStory = explode("-->", $attrs['name'], 2);
 
         if (count($twineStory) !== 2) {
-            throw new Exception("There is a '".$name."' in the Twine archive file '".$this->importfile->getFilename()."' which has an incomplete 'name' attribute. Twine stories must use the naming schema '?-->story name', where '?' is an existing Dembelo Topic Id. Instead, '".$attrs['name']."' was found.");
+            throw new Exception("There is a '" . $name . "' in the Twine archive file '" . $this->importfile->getFilename() . "' which has an incomplete 'name' attribute. Twine stories must use the naming schema '?-->story name', where '?' is an existing Dembelo Topic Id. Instead, '" . $attrs['name'] . "' was found.");
         }
 
         $this->topicId = $twineStory[0];
@@ -287,7 +287,7 @@ 
         $topic = $this->topicRepository->find($this->topicId);
 
         if (is_null($topic)) {
-            throw new Exception("The Dembelo Topic with Id '".$this->topicId."', referenced by Twine story '".$attrs['name']."' in the Twine archive file '".$this->importfile->getFilename()."', doesn't exist.");
+            throw new Exception("The Dembelo Topic with Id '" . $this->topicId . "', referenced by Twine story '" . $attrs['name'] . "' in the Twine archive file '" . $this->importfile->getFilename() . "', doesn't exist.");
         }
 
         $this->twineStartnodeId = $attrs['startnode'];
@@ -298,7 +298,7 @@ 
     private function getTwineId($tagString, $textnodeTitle)
     {
         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);
 
@@ -311,7 +311,7 @@ 
         }
 
         if ($twineId === false) {
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
 
         return $twineId;
@@ -320,21 +320,21 @@ 
     private function startElementPassageData($name, $attrs)
     {
         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'];
@@ -366,7 +366,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);
@@ -387,7 +387,7 @@ 
     private function characterData($parser, $data)
     {
         if ($this->twineRelevant === true && $this->twineText === true) {
-            $this->textnode->setText($this->textnode->getText().$data);
+            $this->textnode->setText($this->textnode->getText() . $data);
         }
     }
 
@@ -398,7 +398,7 @@ 
             $twineName = array_search($dembeloId, $this->nodeNameMapping);
 
             if (is_null($textnode) === true) {
-                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.");
             }
 
             /** @todo The links should be exported as XML as well instead of a custom Twine inline format. */
@@ -410,13 +410,13 @@ 
                 $textnodeTextNew = substr($textnodeText, 0, $startPos);
 
                 while ($startPos !== false) {
-                    $endPos = strpos($textnodeText, "]]", $startPos + strlen("[["));
+                    $endPos = strpos($textnodeText, "]]", $startPos+strlen("[["));
 
                     if ($endPos === false) {
-                        throw new Exception("The Twine archive file '".$this->importfile->getFilename()."' has a textnode named '".$twineName."' which contains a malformed link that starts with '[[' but has no corresponding ']]'.");
+                        throw new Exception("The Twine archive file '" . $this->importfile->getFilename() . "' has a textnode named '" . $twineName . "' which contains a malformed link that starts with '[[' but has no corresponding ']]'.");
                     }
 
-                    $content = substr($textnodeText, $startPos + strlen("[["), $endPos - ($startPos + strlen("[[")));
+                    $content = substr($textnodeText, $startPos+strlen("[["), $endPos-($startPos+strlen("[[")));
                     $hitch = null;
                     $metadata = null;
 
@@ -424,13 +424,13 @@ 
                         $content = explode("-->", $content, 2);
 
                         if (strlen($content[0]) <= 0 || strlen($content[1]) <= 0) {
-                            throw new Exception("The Twine archive file '".$this->importfile->getFilename()."' contains a '".$name."' with the invalid element '[[".$content[0]."-->".$content[1]."]]'.");
+                            throw new Exception("The Twine archive file '" . $this->importfile->getFilename() . "' contains a '" . $name . "' with the invalid element '[[" . $content[0] . "-->" . $content[1] . "]]'.");
                         }
 
                         $externalTextnode = $this->textnodeRepository->find($content[1]);
 
                         if (is_null($externalTextnode)) {
-                            throw new Exception("There is a textnode named '".$twineName."' which references the external Dembelo Textnode '".$content[1]."', but a Dembelo Textnode with such an Id doesn't exist.");
+                            throw new Exception("There is a textnode named '" . $twineName . "' which references the external Dembelo Textnode '" . $content[1] . "', but a Dembelo Textnode with such an Id doesn't exist.");
                         }
 
                         $hitch = array();
@@ -441,11 +441,11 @@ 
                         $content = explode("->", $content, 2);
 
                         if (strlen($content[0]) <= 0 || strlen($content[1]) <= 0) {
-                            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$content[0]."->".$content[1]."]]'.");
+                            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $content[0] . "->" . $content[1] . "]]'.");
                         }
 
                         if (array_key_exists($content[1], $this->nodeNameMapping) !== true) {
-                            throw new Exception("There is a textnode which references another textnode named '".$content[1]."', but this textnode doesn't exist within the same story.");
+                            throw new Exception("There is a textnode which references another textnode named '" . $content[1] . "', but this textnode doesn't exist within the same story.");
                         }
 
                         $hitch = array();
@@ -456,12 +456,12 @@ 
                         $content = explode("<-", $content, 2);
 
                         if (strlen($content[0]) <= 0 || strlen($content[1]) <= 0) {
-                            throw new Exception("The Twine archive file '".$this->importfile->getFilename()."' contains a '".$name."' with the invalid element '[[".$content[0]."<-".$content[1]."]]'.");
+                            throw new Exception("The Twine archive file '" . $this->importfile->getFilename() . "' contains a '" . $name . "' with the invalid element '[[" . $content[0] . "<-" . $content[1] . "]]'.");
                         }
 
                         if (array_key_exists($content[0], $this->nodeNameMapping) !== true) {
                             var_dump($this->nodeNameMapping);
-                            throw new Exception("There is a textnode in the Twine archive file which references another textnode named '".$content[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 '" . $content[0] . "', but this textnode doesn't exist within the same story.");
                         }
 
                         $hitch = array();
@@ -472,7 +472,7 @@ 
                         $content = explode(">:<", $content, 2);
 
                         if (strlen($content[0]) <= 0 || strlen($content[1]) <= 0) {
-                            throw new Exception("The Twine archive file contains a '".$name."' with the invalid element '[[".$content[0].">:<".$content[1]."]]'.");
+                            throw new Exception("The Twine archive file contains a '" . $name . "' with the invalid element '[[" . $content[0] . ">:<" . $content[1] . "]]'.");
                         }
 
                         $metadata = $textnode->getMetadata();
@@ -482,17 +482,17 @@ 
                         }
 
                         if (array_key_exists($content[0], $metadata) === true) {
-                            throw new Exception("There is a textnode in the Twine archive file which contains the metadata field '".$content[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 '" . $content[0] . "' twice or would overwrite the already existing value of that field.");
                         }
 
                         $metadata[$content[0]] = $content[1];
                     } else {
                         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();
@@ -503,11 +503,11 @@ 
 
                     if ($hitch !== null) {
                         if ($textnode->getHitchCount() >= Textnode::HITCHES_MAXIMUM_COUNT) {
-                            throw new Exception("There is a textnode named '".$twineName."' in the Twine archive file which has more than ".Textnode::HITCHES_MAXIMUM_COUNT." links.");
+                            throw new Exception("There is a textnode named '" . $twineName . "' in the Twine archive file which has more than " . Textnode::HITCHES_MAXIMUM_COUNT . " links.");
                         }
 
                         if ($textnode->appendHitch($hitch) !== true) {
-                            throw new Exception("Failed to append hitch for the textnode named '".$twineName."' from the Twine archive file.");
+                            throw new Exception("Failed to append hitch for the textnode named '" . $twineName . "' from the Twine archive file.");
                         }
                     }
 
@@ -519,7 +519,7 @@ 
                     $startPos = strpos($textnodeText, "[[", $endPos);
 
                     if ($startPos !== false) {
-                        $textnodeTextNew .= substr($textnodeText, $endPos, $startPos - $endPos);
+                        $textnodeTextNew .= substr($textnodeText, $endPos, $startPos-$endPos);
                     } else {
                         $textnodeTextNew .= substr($textnodeText, $endPos);
                     }

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

Spacing +26 added lines, -26 removed lines

@@ -265,8 +265,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -310,8 +310,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -330,7 +330,7 @@ 
 
         $textnodeRepository->expects($this->once())
             ->method('save')
-            ->with($this->callback(function ($textnode) {
+            ->with($this->callback(function($textnode) {
                 return $textnode instanceof Textnode
                     && $textnode->getText() === "lorem ipsumlorem ipsum";
             }));
@@ -355,8 +355,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -376,7 +376,7 @@ 
 
         $textnodeRepository->expects($this->any())
             ->method('save')
-            ->with($this->callback(function ($textnode) {
+            ->with($this->callback(function($textnode) {
                 return $textnode instanceof Textnode
                 && $textnode->getText() === "lorem ipsumlorem ipsum";
             }));
@@ -435,8 +435,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -473,8 +473,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -511,8 +511,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -550,8 +550,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -591,8 +591,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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>',
         ];
@@ -636,8 +636,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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',
@@ -677,8 +677,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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->someNodeName3]]</tw-passagedata>',
             '</tw-storydata>',
@@ -717,8 +717,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->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="someTopicId-->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',
@@ -745,9 +745,9 @@ 
 
         $textnodeRepository->expects($this->any())
             ->method('save')
-            ->willReturnCallback(function ($textnode) {
+            ->willReturnCallback(function($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $importTwine = new ImportTwine($textnodeRepository, $topicRepository);