typearea / dembelo

www/web/config.php

Braces +9 added lines, -3 removed lines

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +2 added lines, -2 removed lines

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

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

Spacing +2 added lines, -2 removed lines

@@ -68,12 +68,12 @@
 
         $readpathRepositoryMock->expects($this->once())
             ->method('save')
-            ->willReturnCallback(function (ReadpathDocument $readpathDocument) use ($textnodeMockId, $userMockId) {
+            ->willReturnCallback(function(ReadpathDocument $readpathDocument) use ($textnodeMockId, $userMockId) {
                 $this->assertInstanceOf(ReadpathDocument::class, $readpathDocument);
                 $this->assertEquals($textnodeMockId, $readpathDocument->getTextnodeId());
                 $this->assertEquals($userMockId, $readpathDocument->getUserId());
                 $this->assertInstanceOf(\MongoDate::class, $readpathDocument->getTimestamp());
-                $this->assertLessThanOrEqual(1, abs($readpathDocument->getTimestamp()->sec-time()));
+                $this->assertLessThanOrEqual(1, abs($readpathDocument->getTimestamp()->sec - time()));
             });
 
         $readpath = new Readpath($readpathRepositoryMock);

scripts/install.php

Spacing +17 added lines, -17 removed lines

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

www/web/app.php

Spacing +1 added lines, -1 removed lines

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

www/web/app_dev.php

Spacing +1 added lines, -1 removed lines

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

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

Spacing +26 added lines, -26 removed lines

@@ -265,8 +265,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName" tags="Freigegeben ID:foobar" position="104,30">lorem impsum',
             'lorem impsum</tw-passagedata></tw-storydata>',
         ];
@@ -310,8 +310,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -330,7 +330,7 @@ 
 
         $textnodeRepository->expects($this->once())
             ->method('save')
-            ->with($this->callback(function ($textnode) {
+            ->with($this->callback(function($textnode) {
                 return $textnode instanceof Textnode
                     && $textnode->getText() === "lorem ipsumlorem ipsum";
             }));
@@ -355,8 +355,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -376,7 +376,7 @@ 
 
         $textnodeRepository->expects($this->any())
             ->method('save')
-            ->with($this->callback(function ($textnode) {
+            ->with($this->callback(function($textnode) {
                 return $textnode instanceof Textnode
                 && $textnode->getText() === "lorem ipsumlorem ipsum";
             }));
@@ -435,8 +435,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -473,8 +473,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -511,8 +511,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -550,8 +550,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -591,8 +591,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="Freigegeben ID:foobar" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata></tw-storydata>',
         ];
@@ -636,8 +636,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId" position="104,30">lorem ipsum',
             'lorem ipsum</tw-passagedata>',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId" position="104,30">lorem ipsum',
@@ -677,8 +677,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum [[Linkdata->someNodeName3]]</tw-passagedata>',
             '</tw-storydata>',
@@ -717,8 +717,8 @@ 
 
         self::$freadStack = [
             '<tw-storydata ',
-            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>'."\n",
-            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>'."\n",
+            '<tw-storydata name="someTopicId-->someStoryName" startnode="1" creator="Twine" creator-version="2.0.8" ifid="8E30D51C-4980-4161-B57F-B11C752E879A" format="Harlowe" options=""><style role="stylesheet" id="twine-user-stylesheet" type="text/twine-css"></style>' . "\n",
+            '<script role="script" id="twine-user-script" type="text/twine-javascript"></script>' . "\n",
             '<tw-passagedata pid="1" name="someNodeName1" tags="ID:someTwineId1" position="104,30">lorem ipsum',
             'lorem ipsum [[Linkdata->someNodeName2]]</tw-passagedata>',
             '<tw-passagedata pid="2" name="someNodeName2" tags="ID:someTwineId2" position="104,30">lorem ipsum',
@@ -745,9 +745,9 @@ 
 
         $textnodeRepository->expects($this->any())
             ->method('save')
-            ->willReturnCallback(function ($textnode) {
+            ->willReturnCallback(function($textnode) {
                 static $counter = 0;
-                $textnode->setId('someTextnode'.$counter++);
+                $textnode->setId('someTextnode' . $counter++);
             });
 
         $importTwine = new ImportTwine($textnodeRepository, $topicRepository);

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

Spacing +2 added lines, -2 removed lines

@@ -152,7 +152,7 @@ 
         /* @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());
     }
 
@@ -510,7 +510,7 @@ 
         $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/Controller/TopicController.php

Spacing +2 added lines, -2 removed lines

@@ -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'];