typearea / dembelo

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

Spacing +27 added lines, -27 removed lines

@@ -273,8 +273,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>',
         ];
@@ -319,8 +319,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>',
         ];
@@ -365,8 +365,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>',
         ];
@@ -448,8 +448,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>',
         ];
@@ -487,8 +487,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>',
         ];
@@ -526,8 +526,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>',
         ];
@@ -566,8 +566,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>',
         ];
@@ -608,8 +608,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>',
         ];
@@ -654,8 +654,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',
@@ -696,8 +696,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',
@@ -737,7 +737,7 @@ 
             ->method('save')
             ->willReturnCallback(function ($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $importTwine = new ImportTwine($textnodeRepository, $topicRepository, $hitchParserMock);
@@ -756,8 +756,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',
@@ -802,8 +802,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',
@@ -843,8 +843,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',

www/src/AdminBundle/Controller/DefaultController.php

Spacing +15 added lines, -15 removed lines

@@ -86,7 +86,7 @@ 
                     //$value = $value === 'aktiv' ? 1 : 0;
                     $query->field($field)->equals((int) $value);
                 } else {
-                    $query->field($field)->equals(new \MongoRegex('/.*'.$value.'.*/i'));
+                    $query->field($field)->equals(new \MongoRegex('/.*' . $value . '.*/i'));
                 }
             }
         }
@@ -151,7 +151,7 @@ 
         /* @var $repository \Doctrine\ODM\MongoDB\DocumentRepository */
         $repository = $mongo->getRepository('DembeloMain:Licensee');
 
-        $licensees = $repository->findBy(array('name' => new \MongoRegex('/'.$searchString.'/')), null, 10);
+        $licensees = $repository->findBy(array('name' => new \MongoRegex('/' . $searchString . '/')), null, 10);
 
         $output = array();
         /* @var $licensee \DembeloMain\Document\Licensee */
@@ -209,7 +209,7 @@ 
         $formtype = $params['formtype'];
 
         /* @var $repository AbstractRepository */
-        $repository = $this->get('app.model_repository_'.$formtype);
+        $repository = $this->get('app.model_repository_' . $formtype);
 
         if (isset($params['id']) && $params['id'] == 'new') {
             $className = $repository->getClassName();
@@ -235,7 +235,7 @@ 
             } elseif ($param === 'imported' && $value === '') {
                 $value = null;
             }
-            $method = 'set'.ucfirst($param);
+            $method = 'set' . ucfirst($param);
             if (method_exists($item, $method)) {
                 $item->$method($value);
             }
@@ -286,7 +286,7 @@ 
         if (null === $user) {
             return new Response(\json_encode(['error' => false]));
         }
-        $user->setActivationHash(sha1($user->getEmail().$user->getPassword().\time()));
+        $user->setActivationHash(sha1($user->getEmail() . $user->getPassword() . \time()));
 
         $dm->persist($user);
         $dm->flush();
@@ -357,9 +357,9 @@ 
 
         $directory = $this->container->getParameter('twine_directory');
 
-        $filename = md5(uniqid().$file['name']);
+        $filename = md5(uniqid() . $file['name']);
 
-        move_uploaded_file($file["tmp_name"], $directory.$filename);
+        move_uploaded_file($file["tmp_name"], $directory . $filename);
 
         $output['filename'] = $filename;
         $output['orgname'] = $file['name'];
@@ -393,7 +393,7 @@ 
             $obj->access = $textnode->getAccess() ? 'ja' : 'nein';
             $obj->licensee = $licenseeIndex[$textnode->getLicenseeId()];
             $obj->importfile = isset($importfileIndex[$textnode->getImportfileId()]) ? $importfileIndex[$textnode->getImportfileId()] : 'unbekannt';
-            $obj->beginning = substr(htmlentities(strip_tags($textnode->getText())), 0, 200)."...";
+            $obj->beginning = substr(htmlentities(strip_tags($textnode->getText())), 0, 200) . "...";
             $obj->financenode = $textnode->isFinanceNode() ? 'ja' : 'nein';
             $obj->twineId = $textnode->getTwineId();
             $obj->metadata = $this->formatMetadata($textnode->getMetadata());
@@ -456,12 +456,12 @@ 
         }
 
         $directory = $this->container->getParameter('twine_directory');
-        $finalDirectory = $directory.$item->getLicenseeId().'/';
+        $finalDirectory = $directory . $item->getLicenseeId() . '/';
         if (!is_dir($finalDirectory)) {
             mkdir($finalDirectory);
         }
-        $finalName = $finalDirectory.$item->getId();
-        $file = $directory.$filename;
+        $finalName = $finalDirectory . $item->getId();
+        $file = $directory . $filename;
         rename($file, $finalName);
 
         $item->setOriginalname($orgname);
@@ -505,12 +505,12 @@ 
             return;
         }
         $directory = $this->container->getParameter('topic_image_directory');
-        $finalDirectory = $directory.$item->getId().'/';
+        $finalDirectory = $directory . $item->getId() . '/';
         if (!is_dir($finalDirectory)) {
             mkdir($finalDirectory);
         }
-        $finalName = $finalDirectory.$orgname;
-        $file = $directory.$filename;
+        $finalName = $finalDirectory . $orgname;
+        $file = $directory . $filename;
         rename($file, $finalName);
         $item->setOriginalImageName($orgname);
         $item->setImageFilename($finalName);
@@ -520,7 +520,7 @@ 
     {
         $string = '';
         foreach ($metadata as $key => $value) {
-            $string .= $key.': '.$value."\n";
+            $string .= $key . ': ' . $value . "\n";
         }
 
         return $string;

www/src/AdminBundle/Model/ImportTwine.php

Spacing +30 added lines, -30 removed lines

@@ -109,7 +109,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");
@@ -137,12 +137,12 @@ 
             throw new Exception('no filename available');
         }
 
-        $extractedFilename = $this->importfile->getFilename().'.extracted';
+        $extractedFilename = $this->importfile->getFilename() . '.extracted';
 
         $fileHandle = fopen($this->importfile->getFilename(), 'r');
         $extractedFileHandle = fopen($extractedFilename, '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();
@@ -175,13 +175,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++) {
@@ -194,21 +194,21 @@ 
             }
 
             if ($peekDataLength - $i < $magicStringLength) {
-                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 (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 setXmlHandler(): void
@@ -230,7 +230,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.");
         }
     }
 
@@ -240,7 +240,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.");
         }
     }
 
@@ -263,7 +263,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);
 
@@ -282,7 +282,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) {
@@ -294,13 +294,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];
@@ -308,7 +308,7 @@ 
         $topic = $this->topicRepository->find($this->topicId);
 
         if (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'];
@@ -319,7 +319,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);
 
@@ -332,7 +332,7 @@ 
         }
 
         if ($twineId === false) {
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
 
         return $twineId;
@@ -341,21 +341,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'];
@@ -387,7 +387,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);
@@ -408,7 +408,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);
         }
     }
 
@@ -418,7 +418,7 @@ 
         $twineName = array_search($dembeloId, $this->nodeNameMapping);
 
         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.");
         }
 
         /** @todo The links should be exported as XML as well instead of a custom Twine inline format. */
@@ -433,7 +433,7 @@ 
                 $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("[[")));
@@ -456,11 +456,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.");
                     }
                 }
 
@@ -494,7 +494,7 @@ 
         $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();
@@ -504,7 +504,7 @@ 
         }
 
         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/AdminBundle/Service/TwineImport/HitchParser.php

Spacing +8 added lines, -8 removed lines

@@ -51,13 +51,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 named '".$twineName."' 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 named '" . $twineName . "' which references the external Dembelo Textnode '" . $contentArray[1] . "', but a Dembelo Textnode with such an Id doesn't exist.");
         }
 
         $hitch = array();
@@ -73,11 +73,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();
@@ -93,11 +93,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();
@@ -111,11 +111,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/DembeloMain/Model/Repository/Doctrine/ODM/TextNodeRepository.php

Spacing +1 added lines, -1 removed lines

@@ -156,7 +156,7 @@
      */
     private function createArbitraryId(Textnode $object): string
     {
-        $id = substr(md5(time().$object->getTwineId().substr($object->getText(), 0, 100)), 0, 15);
+        $id = substr(md5(time() . $object->getTwineId() . substr($object->getText(), 0, 100)), 0, 15);
         $exists = count($this->findBy(array('arbitraryId' => $id))) > 0;
 
         if ($exists) {

www/src/DembeloMain/Model/FavoriteManager.php

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
     public function setFavorite(Textnode $textnode, User $user = null): void
     {
         if (null === $user) {
-            $this->session->set('favorite_'.$textnode->getTopicId(), $textnode->getArbitraryId());
+            $this->session->set('favorite_' . $textnode->getTopicId(), $textnode->getArbitraryId());
 
             return;
         }
@@ -67,7 +67,7 @@ 
     public function getFavorite(Topic $topic, User $user = null): string
     {
         if (null === $user) {
-            return $this->session->get('favorite_'.$topic->getId());
+            return $this->session->get('favorite_' . $topic->getId());
         }
 
         return $user->getFavorite($topic->getId());