php-resta / resta-core

src/resta/Console/Source/Schedule/Schedule.php

Spacing +22 added lines, -22 removed lines

@@ -34,11 +34,11 @@ 
     /**

      * @return void

      */

-    public function create(){

+    public function create() {

 

         $schedulePath = app()->path()->schedule();

 

-        if(!file_exists($schedulePath)){

+        if (!file_exists($schedulePath)) {

             $this->directory['schedule'] = $schedulePath;

             $this->file->makeDirectory($this);

         }

@@ -47,7 +47,7 @@ 
         $this->argument['scheduleClass'] = ucfirst($this->argument['schedule']).'';

         $this->argument['projectName'] = strtolower($this->projectName());

 

-        $this->touch['schedule/schedule']= $schedulePath.'/'.$this->argument['schedule'].'.php';

+        $this->touch['schedule/schedule'] = $schedulePath.'/'.$this->argument['schedule'].'.php';

 

 

         $this->file->touch($this);

@@ -57,30 +57,30 @@ 
 

     public function list()

     {

-        exec('crontab -l',$list);

+        exec('crontab -l', $list);

 

-        $this->table->setHeaders(['no','minute','hour','day','month','week','schedule','description']);

+        $this->table->setHeaders(['no', 'minute', 'hour', 'day', 'month', 'week', 'schedule', 'description']);

 

 

-        foreach ($list as $key=>$item){

+        foreach ($list as $key=>$item) {

 

-            if(preg_match('@.*php api schedule run '.strtolower($this->projectName()).'.*@is',$item,$result)){

-                if(isset($result[0])){

+            if (preg_match('@.*php api schedule run '.strtolower($this->projectName()).'.*@is', $item, $result)) {

+                if (isset($result[0])) {

 

                     $cron = [];

 

-                    if(preg_match('@(.*)\scd@',$result[0],$cron)){

-                        $cron = (isset($cron[1])) ? explode(' ',$cron[1]) : '';

+                    if (preg_match('@(.*)\scd@', $result[0], $cron)) {

+                        $cron = (isset($cron[1])) ? explode(' ', $cron[1]) : '';

 

                     }

 

                     $scheduleName = '';

 

-                    if(preg_match('@schedule\:(.*?)\s@',$result[0],$scheduler)){

+                    if (preg_match('@schedule\:(.*?)\s@', $result[0], $scheduler)) {

                         $scheduleName = (isset($scheduler[1])) ? $scheduler[1] : '';

 

                         $schedulerInstance = $this->scheduleInstance(ucfirst($scheduleName));

-                        $description = ClosureDispatcher::bind($schedulerInstance)->call(function(){

+                        $description = ClosureDispatcher::bind($schedulerInstance)->call(function() {

                             return $this->description;

                         });

 

@@ -111,7 +111,7 @@ 
         $schedules = Utils::glob(app()->path()->schedule());

 

 

-        if(isset($schedules[$this->argument['schedule']])){

+        if (isset($schedules[$this->argument['schedule']])) {

 

             $scheduleNamespace = Utils::getNamespace($schedules[$this->argument['schedule']]);

             $scheduleInstance = app()->resolve($scheduleNamespace);

@@ -119,11 +119,11 @@ 
             $scheduleManager = new ScheduleManager();

             $scheduleInstance->when($scheduleManager);

 

-            $cronScheduler = implode(' ',$scheduleManager->getCronScheduler());

+            $cronScheduler = implode(' ', $scheduleManager->getCronScheduler());

 

             $command = $cronScheduler.' cd '.root.' && php api schedule run munch schedule:'.lcfirst($this->argument['schedule']).' >> /dev/null 2>&1';

 

-            if($this->cronjob_exists($command)===false){

+            if ($this->cronjob_exists($command)===false) {

 

                 $output = shell_exec('crontab -l');

                 file_put_contents('/tmp/crontab.txt', $output.''.$command.''.PHP_EOL);

@@ -141,7 +141,7 @@ 
     {

         $schedules = Utils::glob(app()->path()->schedule());

 

-        if(isset($schedules[$this->argument['schedule']])){

+        if (isset($schedules[$this->argument['schedule']])) {

             $scheduleNamespace = Utils::getNamespace($schedules[$this->argument['schedule']]);

             $scheduleInstance = app()->resolve($scheduleNamespace);

 

@@ -149,20 +149,20 @@ 
         }

     }

 

-    private function cronjob_exists($command){

+    private function cronjob_exists($command) {

 

-        $cronjob_exists=false;

+        $cronjob_exists = false;

 

         exec('crontab -l', $crontab);

 

 

-        if(isset($crontab)&&is_array($crontab)){

+        if (isset($crontab) && is_array($crontab)) {

 

             $crontab = array_flip($crontab);

 

-            if(isset($crontab[$command])){

+            if (isset($crontab[$command])) {

 

-                $cronjob_exists=true;

+                $cronjob_exists = true;

 

             }

 

@@ -178,7 +178,7 @@ 
     {

         $schedules = Utils::glob(app()->path()->schedule());

 

-        if(isset($schedules[$schedule])){

+        if (isset($schedules[$schedule])) {

             $scheduleNamespace = Utils::getNamespace($schedules[$schedule]);

             return $scheduleInstance = app()->resolve($scheduleNamespace);

         }

src/resta/Console/Source/Track/Track.php

Spacing +8 added lines, -8 removed lines

@@ -29,15 +29,15 @@ 
      */

     public function log()

     {

-        if(app()->has('track.path')){

+        if (app()->has('track.path')) {

             $trackPath = app()->get('track.path');

             $logger = $trackPath($this->argument);

         }

-        else{

+        else {

             $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';

         }

 

-        if(!file_exists($logger)){

+        if (!file_exists($logger)) {

             echo 'No requests for a log tracker have been detected yet.';

             echo PHP_EOL;

             exit();

@@ -53,18 +53,18 @@ 
         while (!feof($proc))

         {

             $result = fread($proc, 4096);

-            if(preg_match('@\{(.*)\}@',$result,$output)){

-                $outputArray = json_decode($output[0],1);

+            if (preg_match('@\{(.*)\}@', $result, $output)) {

+                $outputArray = json_decode($output[0], 1);

 

                 $outputArray['trackNumber'] = ++$number;

 

-                if(app()->has('track.log')){

+                if (app()->has('track.log')) {

 

                     $track = app()->get('track.log');

-                    echo $track($outputArray,$this->argument);

+                    echo $track($outputArray, $this->argument);

                 }

             }

-            else{

+            else {

                 echo $result;

             }

             @ flush();

Braces +2 added lines, -4 removed lines

@@ -32,8 +32,7 @@ 
         if(app()->has('track.path')){

             $trackPath = app()->get('track.path');

             $logger = $trackPath($this->argument);

-        }

-        else{

+        } else{

             $logger = app()->path()->appLog().''.DIRECTORY_SEPARATOR.''.date('Y').''.DIRECTORY_SEPARATOR.''.date('m').''.DIRECTORY_SEPARATOR.''.date('d').'-access.log';

         }

 

@@ -63,8 +62,7 @@ 
                     $track = app()->get('track.log');

                     echo $track($outputArray,$this->argument);

                 }

-            }

-            else{

+            } else{

                 echo $result;

             }

             @ flush();

src/resta/Support/JsonHandler.php

Spacing +21 added lines, -21 removed lines

@@ -23,13 +23,13 @@ 
      */
     private static function checkFile()
     {
-        if(!is_null(self::$singleton)) return self::$singleton;
+        if (!is_null(self::$singleton)) return self::$singleton;
 
-        $filePortions = explode(DIRECTORY_SEPARATOR,self::$file);
+        $filePortions = explode(DIRECTORY_SEPARATOR, self::$file);
         $pop = array_pop($filePortions);
 
-        if(file_exists(implode(DIRECTORY_SEPARATOR,$filePortions))
-            && preg_match('@[a-zA-Z0-9]+\.json@',$pop)){
+        if (file_exists(implode(DIRECTORY_SEPARATOR, $filePortions))
+            && preg_match('@[a-zA-Z0-9]+\.json@', $pop)) {
             self::$singleton = self::$file;
             return self::$singleton;
         }
@@ -46,8 +46,8 @@ 
     {
         $file = self::checkFile();
 
-        if(!file_exists($file)){
-            files()->put($file,self::encode([]));
+        if (!file_exists($file)) {
+            files()->put($file, self::encode([]));
         }
     }
 
@@ -59,7 +59,7 @@ 
      */
     public static function decode($data)
     {
-        return json_decode($data,1);
+        return json_decode($data, 1);
     }
 
     /**
@@ -71,26 +71,26 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function delete($key,$arrayKey=null)
+    public static function delete($key, $arrayKey = null)
     {
         $data = self::get();
 
-        if(is_null($arrayKey)){
+        if (is_null($arrayKey)) {
 
-            if(isset($data[$key])){
+            if (isset($data[$key])) {
                 unset($data[$key]);
-                files()->put(self::checkFile(),self::encode($data),true);
+                files()->put(self::checkFile(), self::encode($data), true);
                 return true;
             }
         }
 
         // if the data to be deleted
         // in json data contains a nested array data.
-        if(!is_null($arrayKey) && is_string($arrayKey)){
+        if (!is_null($arrayKey) && is_string($arrayKey)) {
 
-            if(isset($data[$key][$arrayKey])){
+            if (isset($data[$key][$arrayKey])) {
                 unset($data[$key][$arrayKey]);
-                files()->put(self::checkFile(),self::encode($data),true);
+                files()->put(self::checkFile(), self::encode($data), true);
                 return true;
             }
         }
@@ -106,7 +106,7 @@ 
      */
     public static function encode($data)
     {
-        return json_encode($data,JSON_PRETTY_PRINT);
+        return json_encode($data, JSON_PRETTY_PRINT);
     }
 
     /**
@@ -132,18 +132,18 @@ 
      *
      * @throws FileNotFoundException
      */
-    public static function set($key,$value)
+    public static function set($key, $value)
     {
         self::createIfNotFileExist();
         
         $file = self::get();
         
-        if(isset($file[$key]) && is_array($value)){
-            $file[$key] = array_merge($file[$key],$value);
-            files()->put(self::checkFile(),self::encode($file));
+        if (isset($file[$key]) && is_array($value)) {
+            $file[$key] = array_merge($file[$key], $value);
+            files()->put(self::checkFile(), self::encode($file));
         }
-        else{
-            files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value])));
+        else {
+            files()->put(self::checkFile(), self::encode(array_merge($file, [$key=>$value])));
         }
 
         return self::get();

Braces +4 added lines, -3 removed lines

@@ -23,7 +23,9 @@ 
      */
     private static function checkFile()
     {
-        if(!is_null(self::$singleton)) return self::$singleton;
+        if(!is_null(self::$singleton)) {

+            return self::$singleton;

+        }

 
         $filePortions = explode(DIRECTORY_SEPARATOR,self::$file);
         $pop = array_pop($filePortions);
@@ -141,8 +143,7 @@ 
         if(isset($file[$key]) && is_array($value)){
             $file[$key] = array_merge($file[$key],$value);
             files()->put(self::checkFile(),self::encode($file));
-        }
-        else{
+        } else{
             files()->put(self::checkFile(),self::encode(array_merge($file,[$key=>$value])));
         }