typearea / dembelo

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

Spacing +57 added lines, -57 removed lines

@@ -32,7 +32,7 @@ 
  * @param string $filename
  * @return bool
  */
-function fopen($filename)
+function fopen ($filename)
 {
     return strpos($filename, 'readable') !== false;
 }
@@ -42,7 +42,7 @@ 
  *
  * @return bool|mixed
  */
-function fgets()
+function fgets ()
 {
     if (empty(ImportTwineTest::$fgetsStack)) {
         return false;
@@ -57,7 +57,7 @@ 
  * @param Resource $handle
  * @param string   $string
  */
-function fputs($handle, $string)
+function fputs ($handle, $string)
 {
     ImportTwineTest::$fputsStack[] = $string;
 }
@@ -65,7 +65,7 @@ 
 /**
  * mock function
  */
-function fclose()
+function fclose ()
 {
 }
 
@@ -74,7 +74,7 @@ 
  *
  * @return bool|mixed
  */
-function fread()
+function fread ()
 {
     if (empty(ImportTwineTest::$freadStack)) {
         return false;
@@ -88,7 +88,7 @@ 
  *
  * @return bool
  */
-function feof()
+function feof ()
 {
     return empty(ImportTwineTest::$freadStack);
 }
@@ -98,7 +98,7 @@ 
  *
  * @return int
  */
-function fseek()
+function fseek ()
 {
     return 0;
 }
@@ -106,7 +106,7 @@ 
 /**
  * @param Resource $parser
  */
-function xml_parser_free($parser)
+function xml_parser_free ($parser)
 {
     ImportTwineTest::$parserFreeCalled = true;
 
@@ -142,7 +142,7 @@ 
     /**
      * resets some variables
      */
-    public function setUp()
+    public function setUp ()
     {
         self::$freadStack = self::$fgetsStack = self::$fputsStack = [];
         $this->mocks = [];
@@ -153,7 +153,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage Failed to read data from file 'somefilename'
      */
-    public function testRunWithFopenIsFalse()
+    public function testRunWithFopenIsFalse ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -168,7 +168,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage Failed to read data from file 'somefilename_readable'
      */
-    public function testRunWithFreadReturnFalse()
+    public function testRunWithFreadReturnFalse ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -187,7 +187,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage File 'somefilename_readable' isn't a Twine archive file
      */
-    public function testRunWithWrongFileFormat()
+    public function testRunWithWrongFileFormat ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -209,7 +209,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage File 'somefilename_readable' seems to be empty.
      */
-    public function testRunWithEmptyFirstLine()
+    public function testRunWithEmptyFirstLine ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -232,7 +232,7 @@ 
      *
      * @throws \Exception
      */
-    public function testRunWithCorrectButIncompleteData()
+    public function testRunWithCorrectButIncompleteData ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -256,7 +256,7 @@ 
      *
      * @throws \Exception
      */
-    public function testRunButNoTextnodeIsWritten()
+    public function testRunButNoTextnodeIsWritten ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
         ];
@@ -301,7 +301,7 @@ 
      *
      * @throws \Exception
      */
-    public function testRunWithSingleNodeWithText()
+    public function testRunWithSingleNodeWithText ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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";
             }));
@@ -346,7 +346,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage The Twine archive file 'somefilename_readable' has a textnode named 'someNodeName1' which contains a malformed link that starts with '[[' but has no corresponding ']]'.
      */
-    public function testRunWithUnfinishedLinkTag()
+    public function testRunWithUnfinishedLinkTag ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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";
             }));
@@ -394,7 +394,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage no licensee available
      */
-    public function testRunWithExceptionWhenNoLicenseeIsAvailable()
+    public function testRunWithExceptionWhenNoLicenseeIsAvailable ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -411,7 +411,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage no filename available
      */
-    public function testRunWithExceptionWhenNoFilenameIsAvailable()
+    public function testRunWithExceptionWhenNoFilenameIsAvailable ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -426,7 +426,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage no ID given for Textnode "someNodeName1"
      */
-    public function testRunWithTextnodeWithoutTwineID()
+    public function testRunWithTextnodeWithoutTwineID ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
         ];
@@ -464,7 +464,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage no ID given for Textnode "someNodeName1"
      */
-    public function testRunWithTextnodeWithoutAnyTag()
+    public function testRunWithTextnodeWithoutAnyTag ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
         ];
@@ -502,7 +502,7 @@ 
      * tests identifying a textnode by a twine ID
      * @throws \Exception
      */
-    public function testRunWithTextnodeWithTwineID()
+    public function testRunWithTextnodeWithTwineID ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
         ];
@@ -541,7 +541,7 @@ 
      * tests the freeing of xml parser
      * @throws \Exception
      */
-    public function testParserFree()
+    public function testParserFree ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
         ];
@@ -582,7 +582,7 @@ 
      * tests disabling of a textnode that is no longer found in import file
      * @throws \Exception
      */
-    public function testRunWithTextnodeDeletedInImportfile()
+    public function testRunWithTextnodeDeletedInImportfile ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
         ];
@@ -627,7 +627,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage There is a 'tw-passagedata' in the Twine archive file 'somefilename_readable' which has a non unique 'id' tag [someTwineId], in node 'someNodeName2'
      */
-    public function testRunWithDuplicateTwineId()
+    public function testRunWithDuplicateTwineId ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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',
@@ -668,7 +668,7 @@ 
      * @expectedException Exception
      * @expectedExceptionMessage There is a textnode which references another textnode named 'someNodeName3', but this textnode doesn't exist within the same story.
      */
-    public function testRunWithLinkToNonExistingTextnode()
+    public function testRunWithLinkToNonExistingTextnode ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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>',
@@ -708,7 +708,7 @@ 
      * tests a hitch to another textnode
      * @throws \Exception
      */
-    public function testRunWithLinkToAnotherTextnode()
+    public function testRunWithLinkToAnotherTextnode ()
     {
         $textnodeRepository = $this->getTextnodeRepositoryMock();
         $topicRepository = $this->getTopicRepositoryMock();
@@ -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);
@@ -756,7 +756,7 @@ 
         $this->assertTrue($returnValue);
     }
 
-    private function getDummyImportfile(array $data = [])
+    private function getDummyImportfile (array $data = [])
     {
         $default = [
             'filename'   => 'somefilename_readable',
@@ -789,17 +789,17 @@ 
         return $importfile;
     }
 
-    private function getTextnodeRepositoryMock()
+    private function getTextnodeRepositoryMock ()
     {
         return $this->getMockBuilder(TextNodeRepository::class)->disableOriginalConstructor()->setMethods(['createQueryBuilder', 'field', 'equals', 'getQuery', 'save', 'find', 'findByTwineId', 'disableOrphanedNodes', 'setHyphenatedText'])->getMock();
     }
 
-    private function getTopicRepositoryMock()
+    private function getTopicRepositoryMock ()
     {
         return $this->getMockBuilder(TopicRepository::class)->disableOriginalConstructor()->setMethods(['find'])->getMock();
     }
 
-    private function getDmMock()
+    private function getDmMock ()
     {
         return $this->getMockBuilder('dmMock')->setMethods(['flush', 'persist', 'find'])->getMock();
     }

www/src/AdminBundle/Tests/Controller/DefaultControllerTest.php

Spacing +20 added lines, -20 removed lines

@@ -56,7 +56,7 @@ 
     /**
      * tests the index action
      */
-    public function testIndexAction()
+    public function testIndexAction ()
     {
         $client = static::createClient();
         $crawler = $client->request('GET', '/admin/');
@@ -68,7 +68,7 @@ 
     /**
      * tests controller's userAction with no users in db
      */
-    public function testUserAction()
+    public function testUserAction ()
     {
         $request = $this->getMockBuilder(Request::class)->disableOriginalConstructor()->getMock();
         $postMock = $this->getMockBuilder(ParameterBag::class)->disableOriginalConstructor()->getMock();
@@ -105,7 +105,7 @@ 
     /**
      * tests controller's userAction with two users in db
      */
-    public function testUserActionWithUsers()
+    public function testUserActionWithUsers ()
     {
         $request = $this->getMockBuilder(Request::class)->disableOriginalConstructor()->getMock();
         $postMock = $this->getMockBuilder(ParameterBag::class)->disableOriginalConstructor()->getMock();
@@ -152,14 +152,14 @@ 
         /* @var $response \Symfony\Component\HttpFoundation\Response */
         $response = $controller->usersAction($request);
         $this->assertInstanceOf(Response::class, $response);
-        $this->assertJsonStringEqualsJsonString('[{"id":"id1","gender":null,"email":"email1","roles":"ROLE_ADMIN","licenseeId":"lic1","status":null,"source":null,"reason":null,"created":"'.date('Y-m-d H:i:s', 0).'","updated":"'.date('Y-m-d H:i:s', 0).'"},{"id":"id2","email":"email2","roles":"ROLE_USER","licenseeId":"lic2","status":null,"source":null,"reason":null,"gender":null,"created":"'.date('Y-m-d H:i:s', 0).'","updated":"'.date('Y-m-d H:i:s', 0).'"}]', $response->getContent());
+        $this->assertJsonStringEqualsJsonString('[{"id":"id1","gender":null,"email":"email1","roles":"ROLE_ADMIN","licenseeId":"lic1","status":null,"source":null,"reason":null,"created":"' . date('Y-m-d H:i:s', 0) . '","updated":"' . date('Y-m-d H:i:s', 0) . '"},{"id":"id2","email":"email2","roles":"ROLE_USER","licenseeId":"lic2","status":null,"source":null,"reason":null,"gender":null,"created":"' . date('Y-m-d H:i:s', 0) . '","updated":"' . date('Y-m-d H:i:s', 0) . '"}]', $response->getContent());
         $this->assertEquals('200', $response->getStatusCode());
     }
 
     /**
      * tear down method
      */
-    public function tearDown()
+    public function tearDown ()
     {
         $this->container = null;
         $this->repository = null;
@@ -169,7 +169,7 @@ 
     /**
      * tests the formsaveAction without parameters
      */
-    public function testFormsaveActionWithoutParameters()
+    public function testFormsaveActionWithoutParameters ()
     {
         $request = $this->getMockBuilder(Request::class)->disableOriginalConstructor()->getMock();
         $postMock = $this->getMockBuilder(ParameterBag::class)->disableOriginalConstructor()->getMock();
@@ -194,7 +194,7 @@ 
     /**
      * tests the formsaveAction with wrong parameters
      */
-    public function testFormsaveActionWithWrongParameters()
+    public function testFormsaveActionWithWrongParameters ()
     {
         $request = $this->getMockBuilder(Request::class)->disableOriginalConstructor()->getMock();
         $postMock = $this->getMockBuilder(ParameterBag::class)->disableOriginalConstructor()->getMock();
@@ -221,7 +221,7 @@ 
     /**
      * tests the formsaveAction with an existing user
      */
-    public function testFormsaveActionExistingUser()
+    public function testFormsaveActionExistingUser ()
     {
         $user = new User();
         $user->setId('someId');
@@ -261,7 +261,7 @@ 
     /**
      * tests the formsaveAction with a nonexisting user
      */
-    public function testFormsaveActionNotExistingUser()
+    public function testFormsaveActionNotExistingUser ()
     {
         $user = new User();
         $user->setId('someId');
@@ -300,7 +300,7 @@ 
     /**
      * tests the formsaveAction without admin permission
      */
-    public function testFormsaveActionWithoutAdminPermission()
+    public function testFormsaveActionWithoutAdminPermission ()
     {
         $client = static::createClient();
         $crawler = $client->request('GET', '/admin/save');
@@ -313,7 +313,7 @@ 
     /**
      * tests the formsaveAction with missing id parameter
      */
-    public function testFormsaveActionWithMissingIdParameter()
+    public function testFormsaveActionWithMissingIdParameter ()
     {
         $request = $this->getMockBuilder(Request::class)->disableOriginalConstructor()->getMock();
         $postMock = $this->getMockBuilder(ParameterBag::class)->disableOriginalConstructor()->getMock();
@@ -341,7 +341,7 @@ 
     /**
      * tests licenseeAction with no licensees
      */
-    public function testLicenseeActionWithNoLicensees()
+    public function testLicenseeActionWithNoLicensees ()
     {
         $repository = $this->getMockBuilder(LicenseeRepository::class)->disableOriginalConstructor()->setMethods(['findAll'])->getMock();
         $repository->expects($this->once())
@@ -367,7 +367,7 @@ 
     /**
      * tests licenseeAction() with one licensee
      */
-    public function testLicenseeActionWithOneLicensee()
+    public function testLicenseeActionWithOneLicensee ()
     {
         $licensee = new Licensee();
         $licensee->setName('someName');
@@ -397,7 +397,7 @@ 
     /**
      * tests textnode action
      */
-    public function testTextnodesAction()
+    public function testTextnodesAction ()
     {
         $textnode = new Textnode();
         $textnode->setId('someId');
@@ -464,7 +464,7 @@ 
         $this->assertJsonStringEqualsJsonString($expectedJson, $response->getContent());
     }
 
-    private function getLicenseeRepositoryMock()
+    private function getLicenseeRepositoryMock ()
     {
         $repository = $this->getMockBuilder(LicenseeRepository::class)
             ->disableOriginalConstructor()
@@ -474,7 +474,7 @@ 
         return $repository;
     }
 
-    private function getImportfileRepositoryMock()
+    private function getImportfileRepositoryMock ()
     {
         $repository = $this->getMockBuilder(ImportfileRepository::class)
             ->disableOriginalConstructor()
@@ -487,7 +487,7 @@ 
     /**
      * load mockoed container and mocked mongodb repository
      */
-    private function loadMongoContainer($repository)
+    private function loadMongoContainer ($repository)
     {
         $this->loadMockedContainer();
         $this->loadMockedMongoRepository($repository);
@@ -496,7 +496,7 @@ 
     /**
      * load mocked container
      */
-    private function loadMockedContainer()
+    private function loadMockedContainer ()
     {
         $this->container = $this->createMock(ContainerInterface::class);
     }
@@ -504,13 +504,13 @@ 
     /**
      * load mocked mongodb repository
      */
-    private function loadMockedMongoRepository($repository)
+    private function loadMockedMongoRepository ($repository)
     {
         $this->service = $this->getMockBuilder(ManagerRegistry::class)->disableOriginalConstructor()->getMock();
         $this->repository = $this->getMockBuilder(DocumentRepository::class)->disableOriginalConstructor()->getMock();
         $this->container->expects($this->once())
             ->method("get")
-            ->with($this->equalTo('app.model_repository_'.$repository))
+            ->with($this->equalTo('app.model_repository_' . $repository))
             ->will($this->returnValue($this->repository));
     }
 }

www/src/AdminBundle/Tests/Controller/TopicControllerTest.php

Spacing +6 added lines, -6 removed lines

@@ -36,7 +36,7 @@ 
     /**
      * tests topicAction() with no topics
      */
-    public function testListActionWithNoTopics()
+    public function testListActionWithNoTopics ()
     {
         $container = $this->getMockBuilder(ContainerInterface::class)->getMock();
 
@@ -62,7 +62,7 @@ 
     /**
      * tests topicAction with one topic
      */
-    public function testListActionWithOneTopic()
+    public function testListActionWithOneTopic ()
     {
         $topic = new Topic();
         $topic->setName('someName');
@@ -95,7 +95,7 @@ 
     /**
      * tests topicAction with some filters
      */
-    public function testListActionWithSomeFilters()
+    public function testListActionWithSomeFilters ()
     {
         $topic = new Topic();
         $topic->setName('someName');
@@ -136,7 +136,7 @@ 
     /**
      * tests uploadImageAction with an error in $_FILES
      */
-    public function testUploadImageActionWithNoFileError()
+    public function testUploadImageActionWithNoFileError ()
     {
         $repository = $this->getMockBuilder(TopicRepository::class)->disableOriginalConstructor()->setMethods(['findBy'])->getMock();
 
@@ -160,7 +160,7 @@ 
     /**
      * tests uploadImageAction
      */
-    public function testUploadImageActionWithNoError()
+    public function testUploadImageActionWithNoError ()
     {
         $repository = $this->getMockBuilder(TopicRepository::class)->disableOriginalConstructor()->setMethods(['findBy'])->getMock();
 
@@ -188,7 +188,7 @@ 
     /**
      * tear down method
      */
-    public function tearDown()
+    public function tearDown ()
     {
         $this->container = null;
         $this->repository = null;

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

Spacing +12 added lines, -12 removed lines

@@ -29,7 +29,7 @@ 
  * @param string $filename
  * @return bool
  */
-function is_readable($filename)
+function is_readable ($filename)
 {
     return \strpos($filename, 'readable') !== false;
 }
@@ -38,7 +38,7 @@ 
  * @param string $filename
  * @return bool
  */
-function file_exists($filename)
+function file_exists ($filename)
 {
     return \strpos($filename, 'exists') !== false;
 }
@@ -61,7 +61,7 @@ 
     private $command;
     private $commandTester;
 
-    protected function setUp()
+    protected function setUp ()
     {
         self::bootKernel();
         $application = new Application(self::$kernel);
@@ -75,11 +75,11 @@ 
     /**
      * tests the execute method
      */
-    public function testExecute()
+    public function testExecute ()
     {
         $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'
@@ -103,7 +103,7 @@ 
     /**
      * tests execute method with unreadable file
      */
-    public function testExecuteWithUnreadableFile()
+    public function testExecuteWithUnreadableFile ()
     {
         $this->mockObjects['importTwine']->expects($this->never())
             ->method('run');
@@ -125,7 +125,7 @@ 
     /**
      * tests execute() method with non existing file
      */
-    public function testExecuteWithFileNotExisting()
+    public function testExecuteWithFileNotExisting ()
     {
         $this->mockObjects['importTwine']->expects($this->never())
             ->method('run');
@@ -147,11 +147,11 @@ 
     /**
      * tests execute() method with exception thrown by importTwine
      */
-    public function testExecuteWithExeptionInImportTwine()
+    public function testExecuteWithExeptionInImportTwine ()
     {
         $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'
@@ -179,7 +179,7 @@ 
     /**
      * @expectedException Exception
      */
-    public function testExecuteWithLicenseeNotFound()
+    public function testExecuteWithLicenseeNotFound ()
     {
         $this->mockObjects['importTwine']->expects($this->never())
             ->method('run');
@@ -205,7 +205,7 @@ 
      * @param string $arg
      * @return null|\PHPUnit_Framework_MockObject_MockObject
      */
-    public function findOneByNameCallback($arg)
+    public function findOneByNameCallback ($arg)
     {
         if ($arg === 'somelicensee') {
             $licenseeMock = $this->getMockBuilder('DembeloMain\Document\Licensee')->disableOriginalConstructor()->getMock();
@@ -219,7 +219,7 @@ 
         return null;
     }
 
-    private function getMockObjects()
+    private function getMockObjects ()
     {
         $container = $this->getMockBuilder('Symfony\Component\DependencyInjection\ContainerInterface')->getMock();
 

www/src/AdminBundle/Model/ImportTwine.php

Spacing +52 added lines, -52 removed lines

@@ -76,7 +76,7 @@ 
      * @param TextnodeRepositoryInterface $textnodeRepository
      * @param TopicRepositoryInterface    $topicRepository
      */
-    public function __construct(TextNodeRepositoryInterface $textnodeRepository, TopicRepositoryInterface $topicRepository)
+    public function __construct (TextNodeRepositoryInterface $textnodeRepository, TopicRepositoryInterface $topicRepository)
     {
         $this->textnodeRepository = $textnodeRepository;
         $this->topicRepository = $topicRepository;
@@ -89,7 +89,7 @@ 
      * @return bool
      * @throws Exception
      */
-    public function run(Importfile $importfile)
+    public function run (Importfile $importfile)
     {
         $this->importfile = $importfile;
 
@@ -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");
@@ -119,23 +119,23 @@ 
     /**
      * destroys the parser object
      */
-    public function parserFree()
+    public function parserFree ()
     {
         xml_parser_free($this->xmlParser);
     }
 
-    private function extractTwineFile()
+    private function extractTwineFile ()
     {
         if (is_null($this->importfile->getFilename())) {
             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();
@@ -160,7 +160,7 @@ 
         return $extractedFile;
     }
 
-    private function checkTwineFile($fileHandler)
+    private function checkTwineFile ($fileHandler)
     {
         $magicString = "<tw-storydata ";
         $magicStringLength = strlen($magicString);
@@ -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++) {
@@ -187,24 +187,24 @@ 
             }
 
             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 initParser($fileHandler)
+    private function initParser ($fileHandler)
     {
         xml_parser_set_option($this->xmlParser, XML_OPTION_CASE_FOLDING, 0);
 
@@ -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();
@@ -258,10 +258,10 @@ 
         return true;
     }
 
-    private function startElementStoryData($name, array $attrs)
+    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'];
@@ -295,10 +295,10 @@ 
         $this->twineRelevant = true;
     }
 
-    private function getTwineId($tagString, $textnodeTitle)
+    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,30 +311,30 @@ 
         }
 
         if ($twineId === false) {
-            throw new Exception('no ID given for Textnode "'.$textnodeTitle.'"');
+            throw new Exception('no ID given for Textnode "' . $textnodeTitle . '"');
         }
 
         return $twineId;
     }
 
-    private function startElementPassageData($name, $attrs)
+    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);
@@ -375,7 +375,7 @@ 
         $this->twineText = true;
     }
 
-    private function startElement($parser, $name, $attrs)
+    private function startElement ($parser, $name, $attrs)
     {
         if ($name === "tw-storydata") {
             $this->startElementStoryData($name, $attrs);
@@ -384,21 +384,21 @@ 
         }
     }
 
-    private function characterData($parser, $data)
+    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);
         }
     }
 
-    private function endElementStoryData($name)
+    private function endElementStoryData ($name)
     {
         foreach ($this->textnodeMapping as $twineId => $dembeloId) {
             $textnode = $this->textnodeRepository->find($dembeloId);
             $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. */
@@ -413,7 +413,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("[[")));
@@ -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.");
                         }
                     }
 
@@ -561,7 +561,7 @@ 
         $this->accessSet = false;
     }
 
-    private function endElementPassageData()
+    private function endElementPassageData ()
     {
         $this->textnodeRepository->save($this->textnode);
 
@@ -580,7 +580,7 @@ 
      * @param string $name
      * @throws Exception
      */
-    private function endElement($parser, $name)
+    private function endElement ($parser, $name)
     {
         if ($name === "tw-storydata") {
             $this->endElementStoryData($name);

www/src/AdminBundle/Controller/TopicController.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
      * @param ContainerInterface       $container
      * @param TopicRepositoryInterface $topicRepository
      */
-    public function __construct(ContainerInterface $container, TopicRepositoryInterface $topicRepository)
+    public function __construct (ContainerInterface $container, TopicRepositoryInterface $topicRepository)
     {
         $this->container = $container;
         $this->topicRepository = $topicRepository;
@@ -56,7 +56,7 @@ 
      * @param Request $request
      * @return Response
      */
-    public function listAction(Request $request)
+    public function listAction (Request $request)
     {
         $filters = $request->query->get('filter');
 
@@ -86,7 +86,7 @@ 
      *
      * @return Response
      */
-    public function uploadImageAction()
+    public function uploadImageAction ()
     {
         $output = array();
         $file = $_FILES['upload'];
@@ -96,8 +96,8 @@ 
             return new Response(\json_encode($output));
         }
         $directory = $this->getParameter('topic_image_directory');
-        $filename = md5(uniqid().$file['name']);
-        move_uploaded_file($file["tmp_name"], $directory.$filename);
+        $filename = md5(uniqid() . $file['name']);
+        move_uploaded_file($file["tmp_name"], $directory . $filename);
         $output['imageFileName'] = $filename;
         $output['originalImageName'] = $file['name'];
 

www/src/AdminBundle/Controller/DefaultController.php

Spacing +31 added lines, -31 removed lines

@@ -49,7 +49,7 @@ 
      *
      * @return string
      */
-    public function indexAction()
+    public function indexAction ()
     {
         $mainMenuData = [
             ['id' => "1", 'type' => "folder", 'value' => "Benutzer", 'css' => "folder_music"],
@@ -70,7 +70,7 @@ 
      * @param Request $request
      * @return String
      */
-    public function usersAction(Request $request)
+    public function usersAction (Request $request)
     {
         $repository = $this->get('app.model_repository_user');
 
@@ -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'));
                 }
             }
         }
@@ -117,7 +117,7 @@ 
      *
      * @return String
      */
-    public function licenseesAction()
+    public function licenseesAction ()
     {
         $repository = $this->get('app.model_repository_licensee');
 
@@ -141,7 +141,7 @@ 
      * @param Request $request
      * @return String
      */
-    public function licenseeSuggestAction(Request $request)
+    public function licenseeSuggestAction (Request $request)
     {
         $filter = $request->query->get('filter');
 
@@ -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 */
@@ -170,7 +170,7 @@ 
      *
      * @return String
      */
-    public function topicsAction()
+    public function topicsAction ()
     {
         $mongo = $this->get('doctrine_mongodb');
         /* @var $repository \Doctrine\ODM\MongoDB\DocumentRepository */
@@ -196,7 +196,7 @@ 
      * @param Request $request
      * @return String
      */
-    public function formsaveAction(Request $request)
+    public function formsaveAction (Request $request)
     {
         $params = $request->request->all();
 
@@ -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);
             }
@@ -270,7 +270,7 @@ 
      * @param Request $request
      * @return String
      */
-    public function useractivationmailAction(Request $request)
+    public function useractivationmailAction (Request $request)
     {
         $userId = $request->request->get('userId');
 
@@ -283,7 +283,7 @@ 
 
         /* @var $user \DembeloMain\Document\User */
         $user = $repository->find($userId);
-        $user->setActivationHash(sha1($user->getEmail().$user->getPassword().\time()));
+        $user->setActivationHash(sha1($user->getEmail() . $user->getPassword() . \time()));
 
         $dm->persist($user);
         $dm->flush();
@@ -311,7 +311,7 @@ 
      *
      * @return Response
      */
-    public function importfilesAction()
+    public function importfilesAction ()
     {
         $mongo = $this->get('doctrine_mongodb');
         /* @var $repository \Doctrine\ODM\MongoDB\DocumentRepository */
@@ -341,7 +341,7 @@ 
      *
      * @return Response
      */
-    public function uploadImportfileAction()
+    public function uploadImportfileAction ()
     {
         $output = array();
 
@@ -355,9 +355,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'];
@@ -372,7 +372,7 @@ 
      *
      * @return Response
      */
-    public function textnodesAction()
+    public function textnodesAction ()
     {
         $repository = $this->get('app.model_repository_textNode');
         $textnodes = $repository->findAll();
@@ -391,7 +391,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());
@@ -408,7 +408,7 @@ 
      *
      * @return Response
      */
-    public function importAction(Request $request)
+    public function importAction (Request $request)
     {
         $importfileId = $request->get('importfileId');
 
@@ -447,26 +447,26 @@ 
      * @param string $filename filename hash
      * @param string $orgname original name
      */
-    private function saveFile(Importfile $item, $filename, $orgname)
+    private function saveFile (Importfile $item, $filename, $orgname)
     {
         if (empty($filename) || empty($orgname)) {
             return;
         }
 
         $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);
         $item->setFilename($finalName);
     }
 
-    private function buildLicenseeIndex()
+    private function buildLicenseeIndex ()
     {
         $repository = $this->get('app.model_repository_licensee');
         $licensees = $repository->findAll();
@@ -478,7 +478,7 @@ 
         return $index;
     }
 
-    private function buildImportfileIndex()
+    private function buildImportfileIndex ()
     {
         $repository = $this->get('app.model_repository_importfile');
         $importfiles = $repository->findAll();
@@ -497,28 +497,28 @@ 
      * @param string $filename filename hash
      * @param string $orgname original name
      */
-    private function saveTopicImage(Topic $item, $filename, $orgname)
+    private function saveTopicImage (Topic $item, $filename, $orgname)
     {
         if (empty($filename) || empty($orgname)) {
             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);
     }
 
-    private function formatMetadata(array $metadata)
+    private function formatMetadata (array $metadata)
     {
         $string = '';
         foreach ($metadata as $key => $value) {
-            $string .= $key.': '.$value."\n";
+            $string .= $key . ': ' . $value . "\n";
         }
 
         return $string;

www/src/AdminBundle/Command/ImportCommand.php

Spacing +7 added lines, -7 removed lines

@@ -61,7 +61,7 @@ 
     /**
      * configures the symfony cli command
      */
-    protected function configure()
+    protected function configure ()
     {
         $this
             ->setName('dembelo:import')
@@ -91,20 +91,20 @@ 
             );
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute (InputInterface $input, OutputInterface $output)
     {
         $importTwine = $this->getContainer()->get('admin.import.twine');
         $this->output = $output;
         $this->prepare($input);
 
         if (file_exists($this->twineArchivePath) !== true) {
-            $this->output->writeln("<error>Parameter 'twine-archive-file': File '".$this->twineArchivePath."' doesn't exist.</error>");
+            $this->output->writeln("<error>Parameter 'twine-archive-file': File '" . $this->twineArchivePath . "' doesn't exist.</error>");
 
             return -1;
         }
 
         if (is_readable($this->twineArchivePath) !== true) {
-            $this->output->writeln("<error>Parameter 'twine-archive-file': File '".$this->twineArchivePath."' isn't readable.</error>");
+            $this->output->writeln("<error>Parameter 'twine-archive-file': File '" . $this->twineArchivePath . "' isn't readable.</error>");
 
             return -1;
         }
@@ -123,7 +123,7 @@ 
 
             $this->dm->flush();
         } catch (\Exception $ex) {
-            $output->writeln('<error>'.$ex->getMessage().'</error>');
+            $output->writeln('<error>' . $ex->getMessage() . '</error>');
 
             $importTwine->parserFree();
 
@@ -133,7 +133,7 @@ 
         return 0;
     }
 
-    private function prepare(InputInterface $input)
+    private function prepare (InputInterface $input)
     {
         $styleWarning = new OutputFormatterStyle('black', 'yellow');
         $this->output->getFormatter()->setStyle('warning', $styleWarning);
@@ -151,7 +151,7 @@ 
          */
         $licensee = $repositoryLicensee->findOneByName($input->getOption('licensee-name'));
         if (is_null($licensee)) {
-            throw new \Exception("<error>A Licensee named '".$input->getOption('licensee-name')."' doesn't exist.</error>");
+            throw new \Exception("<error>A Licensee named '" . $input->getOption('licensee-name') . "' doesn't exist.</error>");
         }
 
         $this->author = $input->getOption('metadata-author');

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

Spacing +5 added lines, -5 removed lines

@@ -46,7 +46,7 @@ 
     /**
      * @inheritdoc
      */
-    public function setUp()
+    public function setUp ()
     {
         parent::setUp(); // TODO: Change the autogenerated stub
         $this->topic = new Topic();
@@ -64,7 +64,7 @@ 
     /**
      * tests setting of a favorite via cookie
      */
-    public function testSetFavoriteWithCookie()
+    public function testSetFavoriteWithCookie ()
     {
         $this->favMgr->setFavorite($this->textnode);
         $this->assertEquals('textnodeId', $this->favMgr->getFavorite($this->topic));
@@ -74,7 +74,7 @@ 
     /**
      * tests setting of a favorite via user object
      */
-    public function testSetFavoriteWithUser()
+    public function testSetFavoriteWithUser ()
     {
         $this->favMgr->setFavorite($this->textnode, $this->user);
         $this->assertEquals('textnodeId', $this->favMgr->getFavorite($this->topic, $this->user));
@@ -84,7 +84,7 @@ 
     /**
      * tests setting of a favorite across multiple instances via user object
      */
-    public function testSetFavoriteWithMultipleInstancesWithUser()
+    public function testSetFavoriteWithMultipleInstancesWithUser ()
     {
         $this->favMgr->setFavorite($this->textnode, $this->user);
 
@@ -96,7 +96,7 @@ 
     /**
      * tests setting of a favorite across multiple instances via cookie
      */
-    public function testSetFavoriteWithMultipleInstancesWithCookie()
+    public function testSetFavoriteWithMultipleInstancesWithCookie ()
     {
         $this->favMgr->setFavorite($this->textnode);