Saiyan / selim

src/classes/SelimConfig.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
      * @param string $name
      * @param string $path
      *
-     * @return boolean
+     * @return boolean|null
      */
     public function addSite($name, $path)
     {

Spacing +13 added lines, -13 removed lines

@@ -21,8 +21,8 @@ 
     }
 
     public function sitePathExists($path) {
-        foreach($this->sites as $site){
-            if(dirname($path) === dirname($site->path)){
+        foreach ($this->sites as $site) {
+            if (dirname($path) === dirname($site->path)) {
                 return true;
             }
         }
@@ -38,16 +38,16 @@ 
         $request = Request::createFromGlobals();
         $server = $request->server;
         $selim_foldername = "/.selim/";
-        if($server->get("HOME")){
+        if ($server->get("HOME")) {
             $conf_dir = $server->get("HOME").$selim_foldername;
-        }else if($server->get("HOMEDRIVE")){
+        } else if ($server->get("HOMEDRIVE")) {
             $conf_dir = "{$server->get("HOMEDRIVE")}{$server->get("HOMEPATH")}{$selim_foldername}";
-        }else{
+        } else {
             Util::reportError("Can't find Homedir. Aborting...");
             return;
         }
 
-        if(!file_exists($conf_dir)){
+        if (!file_exists($conf_dir)) {
             mkdir($conf_dir);
         }
 
@@ -135,7 +135,7 @@ 
     public function removeSite($name)
     {
         $size = count($this->sites);
-        for ($i = 0; $i < $size;$i++) {
+        for ($i = 0; $i < $size; $i++) {
             $s = $this->sites[$i];
             if ($s->name === $name) {
                 array_splice($this->sites, $i, 1);
@@ -144,21 +144,21 @@ 
         }
     }
 
-    public function setPath($config_path = "",$is_cli = true) {
+    public function setPath($config_path = "", $is_cli = true) {
         $dir = dirname($config_path);
-        if(file_exists($dir)) {
-            if(!file_exists($config_path) && $is_cli){
+        if (file_exists($dir)) {
+            if (!file_exists($config_path) && $is_cli) {
                 echo "The file $config_path doesn't exist. Do you want to create it? yes/[no]";
                 $line = fgets(STDIN);
-                if(preg_match("/^y|yes/", $line)) {
+                if (preg_match("/^y|yes/", $line)) {
                     file_put_contents($config_path, '{"sites":{}}');
-                }else{
+                } else {
                     Util::reportError("Aborting...");
                 }
             }
             $this->path_config = $config_path;
             $this->load();
-        }else{
+        } else {
             Util::reportError("The directory \"$dir\" doesnt exist.");
         }
     }

Braces +4 added lines, -4 removed lines

@@ -40,9 +40,9 @@ 
         $selim_foldername = "/.selim/";
         if($server->get("HOME")){
             $conf_dir = $server->get("HOME").$selim_foldername;
-        }else if($server->get("HOMEDRIVE")){
+        } else if($server->get("HOMEDRIVE")){
             $conf_dir = "{$server->get("HOMEDRIVE")}{$server->get("HOMEPATH")}{$selim_foldername}";
-        }else{
+        } else{
             Util::reportError("Can't find Homedir. Aborting...");
             return;
         }
@@ -152,13 +152,13 @@ 
                 $line = fgets(STDIN);
                 if(preg_match("/^y|yes/", $line)) {
                     file_put_contents($config_path, '{"sites":{}}');
-                }else{
+                } else{
                     Util::reportError("Aborting...");
                 }
             }
             $this->path_config = $config_path;
             $this->load();
-        }else{
+        } else{
             Util::reportError("The directory \"$dir\" doesnt exist.");
         }
     }

src/classes/SilverstripePage.php

Doc Comments +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      *

      * @param string $path

      *

-     * @return boolean

+     * @return boolean|null

      */

     public function setupPaths($path)

     {

Unused Use Statements +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 

 namespace Selim;

 

-use Exception;

-use Symfony\Component\Yaml\Exception\ParseException;

+use Exception;
+use Symfony\Component\Yaml\Exception\ParseException;
 use Symfony\Component\Yaml\Yaml;

 

 class SilverstripePage

Spacing +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
                     echo $e->getMessage().PHP_EOL;

                 }

             }

-        }else{

+        } else {

             $this->envtype = "live";

         }

     }

Braces +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
                     echo $e->getMessage().PHP_EOL;

                 }

             }

-        }else{

+        } else{

             $this->envtype = "live";

         }

     }

src/classes/SelimApplication.php

Spacing +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 
 class SelimApplication extends Application {
-    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN'){
-        parent::__construct($name,$version);
+    public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN') {
+        parent::__construct($name, $version);
         $this->selim_config = SelimConfig::getInstance();
     }
 
@@ -15,9 +15,9 @@ 
      * @param InputInterface $input
      * @return SelimConfig
      */
-    public function getSelimConfig(InputInterface $input){
+    public function getSelimConfig(InputInterface $input) {
         $config_path = $input->getOption('config');
-        if($config_path) {
+        if ($config_path) {
             $this->selim_config->setPath($config_path);
         }
         return $this->selim_config;

src/classes/Commands/SecurityCommand.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class SecurityCommand extends SelimCommand{
+class SecurityCommand extends SelimCommand {
     protected function configure()
     {
         parent::configure();
@@ -34,11 +34,11 @@ 
             $sc = SecurityChecker::getInstance();
             $issues = $sc->findIssues(new SilverstripePage($site), true);
 
-            if(count($issues)) {
+            if (count($issues)) {
                 foreach ($issues as $iss) {
                     echo $iss;
                 }
-            }else{
+            } else {
                 echo "No security issues found.";
             }
         } else {

Braces +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                 foreach ($issues as $iss) {
                     echo $iss;
                 }
-            }else{
+            } else{
                 echo "No security issues found.";
             }
         } else {

src/classes/Commands/RemoveSiteCommand.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class RemoveSiteCommand extends SelimCommand{
+class RemoveSiteCommand extends SelimCommand {
     protected function configure()
     {
         parent::configure();

src/classes/Commands/DefaultCommand.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
-class DefaultCommand extends SelimCommand{
+class DefaultCommand extends SelimCommand {
     protected function configure()
     {
         parent::configure();

src/classes/Commands/FindSitesCommand.php

Spacing +13 added lines, -13 removed lines

@@ -10,7 +10,7 @@ 
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 
-class FindSitesCommand extends SelimCommand{
+class FindSitesCommand extends SelimCommand {
     protected function configure()
     {
         parent::configure();
@@ -35,40 +35,40 @@ 
         $skippaths = $input->getOption("skip-known-paths") ? true : false;
         $path = realpath($input->getArgument("path"));
         $projects = array();
-        $question_helper =  $this->getHelper("question");
+        $question_helper = $this->getHelper("question");
 
         $output->write("Start searching _config.php files...");
         $fact = new File_Iterator_Factory();
-        $iterator = $fact->getFileIterator($path,"php","_config");
+        $iterator = $fact->getFileIterator($path, "php", "_config");
         $output->writeln("OK");
 
         $output->write("Filter for project paths...");
-        while($file = $iterator->current()){
+        while ($file = $iterator->current()) {
             $content = Util::stripPhpComments(file_get_contents($file));
-            if(preg_match("/\\\$project\\s=/",$content)){
-                array_push($projects,dirname($file));
+            if (preg_match("/\\\$project\\s=/", $content)) {
+                array_push($projects, dirname($file));
             }
             $iterator->next();
         }
         $output->writeln("OK");
 
-        if(count($projects)){
+        if (count($projects)) {
             $sites_added = false;
             $output->writeln("found ".count($projects)." possible sites");
-            foreach($projects as $p){
-                if($skippaths && $cfg->sitePathExists($p)) continue;
+            foreach ($projects as $p) {
+                if ($skippaths && $cfg->sitePathExists($p)) continue;
 
                 $question = new Question("Please enter name for '$p' (leave empty to skip)");
                 do {
                     $name = $question_helper->ask($input, $output, $question);
-                }while($cfg->siteExists($name));
+                }while ($cfg->siteExists($name));
 
-                if($name){
+                if ($name) {
                     $sites_added = true;
-                    $cfg->addSite($name,$p);
+                    $cfg->addSite($name, $p);
                 }
             }
-            if($sites_added) {
+            if ($sites_added) {
                 $output->write("Writing config.json ...");
                 $cfg->write();
                 $output->writeln("OK");

Braces +3 added lines, -1 removed lines

@@ -56,7 +56,9 @@
             $sites_added = false;
             $output->writeln("found ".count($projects)." possible sites");
             foreach($projects as $p){
-                if($skippaths && $cfg->sitePathExists($p)) continue;
+                if($skippaths && $cfg->sitePathExists($p)) {
+                    continue;
+                }
 
                 $question = new Question("Please enter name for '$p' (leave empty to skip)");
                 do {

src/classes/Commands/AddSiteCommand.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 use Symfony\Component\Console\Input\InputInterface;

 use Symfony\Component\Console\Output\OutputInterface;

 

-class AddSiteCommand extends SelimCommand{

+class AddSiteCommand extends SelimCommand {

     protected function configure()

     {

         parent::configure();

src/classes/Commands/SelimCommand.php

Spacing +3 added lines, -3 removed lines

@@ -7,20 +7,20 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 
-abstract class SelimCommand extends Command{
+abstract class SelimCommand extends Command {
 
     /**
      * @param InputInterface $input
      * @return SelimConfig
      */
-    protected function getSelimConfig(InputInterface $input){
+    protected function getSelimConfig(InputInterface $input) {
         return $this->getApplication()->getSelimConfig($input);
     }
 
     /**
      * @return SelimApplication
      */
-    public function getApplication(){
+    public function getApplication() {
         return parent::getApplication();
     }
 }
\ No newline at end of file