jenskooij / cloudcontrol

src/components/BaseComponent.php

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
         {
             $this->template = $template;
             $this->request = $request;
-            $this->parameters = (array)$parameters;
+            $this->parameters = (array) $parameters;
             $this->matchedSitemapItem = $matchedSitemapItem;
         }
 
@@ -111,7 +111,7 @@ 
                 return ob_get_contents();
             } else {
                 if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-                    throw new \Exception('Couldnt find template ' . $templatePath);
+                    throw new \Exception('Couldnt find template '.$templatePath);
                 }
             }
         }
@@ -152,7 +152,7 @@ 
             if ($application !== null) {
                 $templatePath = $application->getTemplateDir();
             }
-            $templatePath = $templatePath . $template . '.php';
+            $templatePath = $templatePath.$template.'.php';
             return $templatePath;
         }
 
@@ -167,7 +167,7 @@ 
             if ($application !== null) {
                 $rootDir = $application->getRootDir();
                 if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+                    $templatePath = $rootDir.DIRECTORY_SEPARATOR.$templateDir;
                 } else {
                     $templatePath = $templateDir;
                 }

src/CloudControl.php

Spacing +23 added lines, -23 removed lines

@@ -40,9 +40,9 @@ 
         $event->getIO()->write("");
 
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+        $rootDir = realpath($vendorDir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR);
 
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+        $baseConfigTargetPath = $rootDir.DIRECTORY_SEPARATOR.'config.json';
         $configObject = self::getConfig($event, $baseConfigTargetPath);
 
         $configObject->{'vendorDir'} = realpath($vendorDir);
@@ -50,13 +50,13 @@ 
         $configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
         $configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
         $configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
-        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
-        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
-        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
-        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
+        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'js');
+        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'css');
+        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'images');
+        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'files');
 
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+        $baseStorageDefaultPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.json';
+        $baseStorageSqlPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.sql';
 
         self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
         self::saveConfig($event, $baseConfigTargetPath, $configObject);
@@ -87,12 +87,12 @@ 
     private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
     {
         file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
+        $event->getIO()->write("[INFO] Saved config to: ".$baseConfigTargetPath);
     }
 
     private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
     {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+        $sourceFilePath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_'.$sourceFileName);
 
 
         if ($destinationFileName === null) {
@@ -100,15 +100,15 @@ 
         }
 
         if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
-            $destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
+            $destinationFullPath = realpath($destinationPath).DIRECTORY_SEPARATOR.$destinationFileName;
             if (file_exists($destinationFullPath)) {
-                $event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
+                $event->getIO()->write("[INFO] File already exists: ".$destinationFullPath);
             } else {
                 copy($sourceFilePath, $destinationFullPath);
-                $event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+                $event->getIO()->write("[INSTALL] Copied file: ".$sourceFileName.' to '.$destinationPath);
             }
         } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("[ERROR] Couldnt copy file: ".$sourceFileName.' to '.$destinationPath);
         }
     }
 
@@ -125,12 +125,12 @@ 
 
     private static function createDir(Event $event, $rootDir, $dirName)
     {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+        $dir = $rootDir.DIRECTORY_SEPARATOR.$dirName.DIRECTORY_SEPARATOR;
         if (!is_dir($dir)) {
             mkdir($dir);
-            $event->getIO()->write("[INSTALL] Created dir: " . $dir);
+            $event->getIO()->write("[INSTALL] Created dir: ".$dir);
         } else {
-            $event->getIO()->write("[INFO] Dir already exists: " . $dir);
+            $event->getIO()->write("[INFO] Dir already exists: ".$dir);
         }
         return self::getRelativePath($rootDir, $dir);
     }
@@ -141,7 +141,7 @@ 
      */
     private static function getConfig(Event $event, $configTargetPath)
     {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
+        $baseConfigDefaultPath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_config.json');
 
         if (file_exists($configTargetPath)) {
             $config = json_decode(file_get_contents($configTargetPath));
@@ -164,8 +164,8 @@ 
     private static function getRelativePath($from, $to)
     {
         // some compatibility fixes for Windows paths
-        $from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
-        $to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
+        $from = is_dir($from) ? rtrim($from, '\/').DIRECTORY_SEPARATOR : $from;
+        $to = is_dir($to) ? rtrim($to, '\/').DIRECTORY_SEPARATOR : $to;
         $from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
         $to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
 
@@ -185,8 +185,8 @@ 
      */
     private static function removePointerToCurrentDir($relPath)
     {
-        while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
-            $relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
+        while (strpos($relPath, '.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR) !== false) {
+            $relPath = str_replace('.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR, '.'.DIRECTORY_SEPARATOR, $relPath);
         }
         return $relPath;
     }
@@ -213,7 +213,7 @@ 
                     $relPath = array_pad($relPath, $padLength, '..');
                     break;
                 } else {
-                    $relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
+                    $relPath[0] = '.'.DIRECTORY_SEPARATOR.$relPath[0];
                 }
             }
         }

src/util/functions.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 {
     $debug_backtrace = current(debug_backtrace());
     if (PHP_SAPI == 'cli') {
-        echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+        echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
         foreach (func_get_args() as $data) {
             var_dump($data);
         }
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-        echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+        echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
         echo '<pre>';
         foreach (func_get_args() as $data) {
             echo "<code>";
@@ -55,9 +55,9 @@ 
 {
     if (!isset($_GET['unsanitized'])) {
         $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
+            '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+            '/[^\S ]+\</s', // strip whitespaces before tags, except space
+            '/(\s)+/s', // shorten multiple whitespace sequences
             '/<!--(.|\s)*?-->/' // Remove HTML comments
         );
 
@@ -85,7 +85,7 @@ 
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
+    array_walk_recursive($array, function(&$item) {
         if (!mb_detect_encoding($item, 'utf-8', true)) {
             $item = utf8_encode($item);
         }