comodojo / extender.framework

src/Log/ConsoleHandler.php

Doc Comments +3 added lines

@@ -42,6 +42,9 @@
         600 => '%M',
     );
 
+    /**
+     * @param integer $level
+     */
     public function __construct($level = Logger::DEBUG, $bubble = true) {
 
         $this->color = new Console_Color2();

src/Runner/JobsRunner.php

Doc Comments +2 added lines, -1 removed lines

@@ -122,7 +122,7 @@ 
     /**
      * Runner constructor
      *
-     * @param   \Comodojo\Extender\Debug   $logger                             Logger instance
+     * @param   Logger   $logger                             Logger instance
      * @param   bool                      $multithread                        Enable/disable multithread mode
      * @param   int                       $max_result_bytes_in_multithread    Max result bytes
      * @param   int                       $max_childs_runtime                 Max child runtime
@@ -676,6 +676,7 @@ 
     /**
      * Change child process priority according to EXTENDER_NICENESS
      *
+     * @param Logger $logger
      */
     private static function adjustNiceness($pid, $logger) {
 

src/Shell/Controller.php

Doc Comments +3 added lines, -4 removed lines

@@ -74,8 +74,6 @@ 
     /**
      * Class constructor
      *
-     * @param \Console_CommandLine  $parser
-     * @param \Monolog\logger       $logger
      */
     public function add($command, $parameters) {
 
@@ -140,11 +138,12 @@ 
     /**
      * Execute command
      *
-     * @param   string          $command   Command to execute
+     * @param   string          $command_name   Command to execute
      * @param   array           $options   Options provided
      * @param   array           $args      Arguments provided
      * @param   Console_Color2  $color     Injected Console_Color2 instance
-     * @param   array           $tasks     Array of available tasks
+     * @param   TasksTable           $tasks     Array of available tasks
+     * @param Logger $logger
      *
      * @return  string
      */

Spacing +1 added lines, -1 removed lines

@@ -200,7 +200,7 @@
 
             $commands = Spyc::YAMLLoad(EXTENDER_COMMANDS_CONFIG);
 
-            foreach ($commands as $command => $parameters) {
+            foreach ( $commands as $command => $parameters ) {
                 
                 $controller->add($command, $parameters["data"]);
 

src/TasksTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -170,7 +170,7 @@
      *
      * @param \Monolog\Logger $logger
      * 
-     * @return array
+     * @return TasksTable
      */
     public static function load(\Monolog\Logger $logger) {
 

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
 
             $tasks = Spyc::YAMLLoad(EXTENDER_TASKS_CONFIG);
 
-            foreach ($tasks as $task => $parameters) {
+            foreach ( $tasks as $task => $parameters ) {
 
                 $description = empty($parameters["data"]["description"]) ? null : $parameters["data"]["description"];
                 

src/Events.php

Spacing +1 added lines, -1 removed lines

@@ -305,7 +305,7 @@
 
             $events = Spyc::YAMLLoad(EXTENDER_PLUGINS_CONFIG);
 
-            foreach ($events as $event) {
+            foreach ( $events as $event ) {
                 
                 $method = empty($event["data"]["method"]) ? null : $event["data"]["method"];
 

src/Extender.php

Indentation +89 added lines, -89 removed lines

@@ -653,175 +653,175 @@
 
     private function cycle() {
 
-      // fire extender ready event
+        // fire extender ready event
 
-      $this->events->fire("extender", "VOID", $this);
+        $this->events->fire("extender", "VOID", $this);
 
-      // dispatch signals (if multithread active)
+        // dispatch signals (if multithread active)
 
-      if ( $this->getMultithreadMode() ) pcntl_signal_dispatch();
+        if ( $this->getMultithreadMode() ) pcntl_signal_dispatch();
 
-      // if extender is paused (SIGINT), skip to extend
+        // if extender is paused (SIGINT), skip to extend
 
-      if ( $this->paused ) return;
+        if ( $this->paused ) return;
 
-      // fix relative timestamp
+        // fix relative timestamp
 
-      $this->timestamp = microtime(true);
+        $this->timestamp = microtime(true);
 
-      // fire tasktable event
+        // fire tasktable event
 
-      $this->tasks = $this->events->fire("extender.tasks", "TASKSTABLE", $this->tasks);
+        $this->tasks = $this->events->fire("extender.tasks", "TASKSTABLE", $this->tasks);
 
-      // get the next planned activity interval
+        // get the next planned activity interval
 
-      $plans = Planner::get();
+        $plans = Planner::get();
 
-      if ( !is_null($plans) AND $this->timestamp < $plans ) {
+        if ( !is_null($plans) AND $this->timestamp < $plans ) {
 
-          // nothing to do right now, still waiting if in daemon mode
+            // nothing to do right now, still waiting if in daemon mode
 
-          $this->logger->info("Next planned job: ".date('c', $plans));
+            $this->logger->info("Next planned job: ".date('c', $plans));
 
-          $this->logger->notice("Extender completed\n");
+            $this->logger->notice("Extender completed\n");
 
-          if ( $this->getDaemonMode() === false ) {
+            if ( $this->getDaemonMode() === false ) {
 
-              $this->shutdown(true);
+                $this->shutdown(true);
 
-              self::end(0);
+                self::end(0);
 
-          }
+            }
 
-          return;
+            return;
 
-      }
+        }
 
-      // if no plan is retrieved, try to retrieve it from scheduler
+        // if no plan is retrieved, try to retrieve it from scheduler
 
-      try {
+        try {
 
-          // get schedules and dispatch schedule event
+            // get schedules and dispatch schedule event
 
-          list($schedules, $planned) = Scheduler::getSchedules($this->logger, $this->timestamp);
+            list($schedules, $planned) = Scheduler::getSchedules($this->logger, $this->timestamp);
 
-          // write next planned activity interval
+            // write next planned activity interval
 
-          if ( !is_null($planned) AND $planned != 0 ) Planner::set($planned);
+            if ( !is_null($planned) AND $planned != 0 ) Planner::set($planned);
 
-          $scheduled = new Schedule();
+            $scheduled = new Schedule();
 
-          $scheduled->setSchedules($schedules);
+            $scheduled->setSchedules($schedules);
 
-          // expose the current shcedule via events
+            // expose the current shcedule via events
 
-          $scheduled = $this->events->fire("extender.schedule", "SCHEDULE", $scheduled);
+            $scheduled = $this->events->fire("extender.schedule", "SCHEDULE", $scheduled);
 
-          // if no jobs in queue, exit gracefully
+            // if no jobs in queue, exit gracefully
 
-          if ( $scheduled->howMany() == 0 ) {
+            if ( $scheduled->howMany() == 0 ) {
 
-              $this->logger->info("No jobs to process right now, exiting");
+                $this->logger->info("No jobs to process right now, exiting");
 
-              $this->logger->notice("Extender completed\n");
+                $this->logger->notice("Extender completed\n");
 
-              if ( $this->getDaemonMode() === false ) {
+                if ( $this->getDaemonMode() === false ) {
 
-                  $this->shutdown(true);
+                    $this->shutdown(true);
 
-                  self::end(0);
+                    self::end(0);
 
-              }
+                }
 
-              return;
+                return;
 
-          }
+            }
 
-          // compose jobs
+            // compose jobs
 
-          foreach ( $scheduled->getSchedules() as $schedule ) {
+            foreach ( $scheduled->getSchedules() as $schedule ) {
 
-              if ( $this->tasks->isRegistered($schedule['task']) ) {
+                if ( $this->tasks->isRegistered($schedule['task']) ) {
 
-                  $job = new Job();
+                    $job = new Job();
 
-                  $job->setName($schedule['name'])
-                      ->setId($schedule['id'])
-                      ->setParameters(unserialize($schedule['params']))
-                      ->setTask($schedule['task'])
-                      ->setClass($this->tasks->getClass($schedule['task']));
+                    $job->setName($schedule['name'])
+                        ->setId($schedule['id'])
+                        ->setParameters(unserialize($schedule['params']))
+                        ->setTask($schedule['task'])
+                        ->setClass($this->tasks->getClass($schedule['task']));
 
-                  $this->runner->addJob($job);
+                    $this->runner->addJob($job);
 
-              } else {
+                } else {
 
-                  $this->logger->warning("Skipping job due to unknown task", array(
-                      "ID"     => $schedule['id'],
-                      "NAME"   => $schedule['name'],
-                      "TASK"   => $schedule['task']
-                  ));
+                    $this->logger->warning("Skipping job due to unknown task", array(
+                        "ID"     => $schedule['id'],
+                        "NAME"   => $schedule['name'],
+                        "TASK"   => $schedule['task']
+                    ));
 
-              }
+                }
 
-          }
+            }
 
-          // lauch runner
+            // lauch runner
 
-          $result = $this->runner->run();
+            $result = $this->runner->run();
 
-          // free runner for next cycle
+            // free runner for next cycle
 
-          $this->runner->free();
+            $this->runner->free();
 
-          // compose results
+            // compose results
 
-          $results = new JobsResult($result);
+            $results = new JobsResult($result);
 
-          // update schedules
+            // update schedules
 
-          Scheduler::updateSchedules($this->logger, $result);
+            Scheduler::updateSchedules($this->logger, $result);
 
-          // increment counters
+            // increment counters
 
-          foreach ( $result as $r ) {
+            foreach ( $result as $r ) {
 
-              if ( $r[2] ) $this->completed_processes++;
+                if ( $r[2] ) $this->completed_processes++;
 
-              else $this->failed_processes++;
+                else $this->failed_processes++;
 
-          }
+            }
 
-      } catch (Exception $e) {
+        } catch (Exception $e) {
 
-          $this->logger->error($e->getMessage());
+            $this->logger->error($e->getMessage());
 
-          if ( $this->getDaemonMode() === false ) {
+            if ( $this->getDaemonMode() === false ) {
 
-              self::end(1);
+                self::end(1);
 
-          }
+            }
 
-      }
+        }
 
-      // fire result event
+        // fire result event
 
-      $this->events->fire("extender.result", "VOID", $results);
+        $this->events->fire("extender.result", "VOID", $results);
 
-      $this->logger->notice("Extender completed\n");
+        $this->logger->notice("Extender completed\n");
 
-      // show summary (if -s)
+        // show summary (if -s)
 
-      if ( $this->summary_mode ) self::showSummary($this->timestamp, $result, $this->color);
+        if ( $this->summary_mode ) self::showSummary($this->timestamp, $result, $this->color);
 
-      Status::dump($this->timestamp_absolute, $this->parent_pid, $this->completed_processes, $this->failed_processes, $this->paused);
+        Status::dump($this->timestamp_absolute, $this->parent_pid, $this->completed_processes, $this->failed_processes, $this->paused);
 
-      if ( $this->getDaemonMode() === false ) {
+        if ( $this->getDaemonMode() === false ) {
 
-          $this->shutdown(true);
+            $this->shutdown(true);
 
-          self::end(0);
+            self::end(0);
 
-      }
+        }
 
     }
 

Spacing +1 added lines, -1 removed lines

@@ -482,7 +482,7 @@
                 )
             )) : 1;
 
-            while (true) {
+            while ( true ) {
 
                 $this->cycle();
 

src/Scheduler/Scheduler.php

Braces +5 added lines, -10 removed lines

@@ -340,8 +340,7 @@ 
 
             $db->tablePrefix(EXTENDER_DATABASE_PREFIX)->table(EXTENDER_DATABASE_TABLE_JOBS)->keys("lastrun")->values($lastrun)->where('name', '=', $name)->update();
 
-        }
-        catch (DatabaseException $de) {
+        } catch (DatabaseException $de) {
 
             unset($db);
 
@@ -474,8 +473,7 @@ 
 
             if ( $e_count == 5 ) $e_array[] = "*";
 
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
 
             throw $e;
 
@@ -516,8 +514,7 @@ 
                 ->where("enabled", "=", true)
                 ->get();
 
-        }
-        catch (DatabaseException $de) {
+        } catch (DatabaseException $de) {
 
             unset($db);
 
@@ -565,8 +562,7 @@ 
 
                 $next_calculated_run = $cron->getNextRunDate($last_date)->format('U');
 
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
 
                 $logger->error("Job ".$job['name']." cannot be executed due to cron parsing error", array(
                     "ERROR" => $e->getMessage(),
@@ -619,8 +615,7 @@ 
 
                 $next_calculated_run = $cron->getNextRunDate($last_date)->format('U');
 
-            }
-            catch (Exception $e) {
+            } catch (Exception $e) {
 
                 return false;
 

src/Task/Task.php

Braces +4 added lines, -8 removed lines

@@ -239,8 +239,7 @@ 
 
             $job_run_info = $this->execTask();
 
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
 
             throw new TaskException($e->getMessage(), $e->getCode(), $e, $this->worklog_id);
             
@@ -271,8 +270,7 @@ 
 
             $this->closeWorklog(true);
 
-        }
-        catch (Exception $e) {
+        } catch (Exception $e) {
 
             $this->result = $e->getMessage();
 
@@ -316,8 +314,7 @@ 
                 ->values(array($this->pid, $this->name, $this->jobid, $this->class, 'STARTED', $this->start_timestamp))
                 ->store();
 
-        }
-        catch (DatabaseException $de) {
+        } catch (DatabaseException $de) {
             
             throw $de;
 
@@ -341,8 +338,7 @@ 
                 ->where("id", "=", $this->worklog_id)
                 ->update();
 
-        }
-        catch (DatabaseException $de) {
+        } catch (DatabaseException $de) {
             
             throw $de;