alpixel / AlpixelCronBundle

src/Alpixel/Bundle/CronBundle/Command/CronRunCommand.php

Doc Comments +3 added lines

@@ -136,6 +136,9 @@
         $job->setNextRun($newTime);
     }
 
+    /**
+     * @param string $output
+     */
     protected function recordJobResult(EntityManager $em, CronJob $job, $timeTaken, $output, $resultCode)
     {
         // Create a new CronJobResult

Unused Use Statements -7 removed lines

@@ -1,19 +1,12 @@
 <?php
 namespace Alpixel\Bundle\CronBundle\Command;
 use Doctrine\ORM\EntityManager;
-
 use Symfony\Component\Console\Input\ArgvInput;
-
 use Alpixel\Bundle\CronBundle\Entity\CronJobResult;
-
 use Alpixel\Bundle\CronBundle\Entity\CronJob;
-
 use Symfony\Component\Console\Output\OutputInterface;
-
 use Symfony\Component\Console\Input\InputInterface;
-
 use Symfony\Component\Console\Input\InputArgument;
-
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 
 class CronRunCommand extends ContainerAwareCommand

Indentation +2 added lines, -2 removed lines

@@ -21,8 +21,8 @@
     protected function configure()
     {
         $this->setName("cron:run")
-             ->setDescription("Runs any currently schedule cron jobs")
-             ->addArgument("job", InputArgument::OPTIONAL, "Run only this job (if enabled)");
+                ->setDescription("Runs any currently schedule cron jobs")
+                ->addArgument("job", InputArgument::OPTIONAL, "Run only this job (if enabled)");
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

Spacing +12 added lines, -12 removed lines

@@ -32,17 +32,17 @@ 
         $jobRepo = $em->getRepository('CronBundle:CronJob');
 
         $jobsToRun = array();
-        if($jobName = $input->getArgument('job'))
+        if ($jobName = $input->getArgument('job'))
         {
             try
             {
                 $jobObj = $jobRepo->findOneByCommand($jobName);
-                if($jobObj->getEnabled())
+                if ($jobObj->getEnabled())
                 {
                     $jobsToRun = array($jobObj);
                 }
             }
-            catch(\Exception $e)
+            catch (\Exception $e)
             {
                 $output->writeln("Couldn't find a job by the name of $jobName");
                 return CronJobResult::FAILED;
@@ -56,7 +56,7 @@ 
         $jobCount = count($jobsToRun);
         $output->writeln("Running $jobCount jobs:");
 
-        foreach($jobsToRun as $job)
+        foreach ($jobsToRun as $job)
         {
             $this->runJob($job, $output, $em);
         }
@@ -71,13 +71,13 @@ 
 
     protected function runJob(CronJob $job, OutputInterface $output, EntityManager $em)
     {
-        $output->write("Running " . $job->getCommand() . ": ");
+        $output->write("Running ".$job->getCommand().": ");
 
         try
         {
             $commandToRun = $this->getApplication()->get($job->getCommand());
         }
-        catch(InvalidArgumentException $ex)
+        catch (InvalidArgumentException $ex)
         {
             $output->writeln(" skipped (command no longer exists)");
             $this->recordJobResult($em, $job, 0, "Command no longer exists", CronJobResult::SKIPPED);
@@ -94,32 +94,32 @@ 
         {
             $returnCode = $commandToRun->execute($emptyInput, $jobOutput);
         }
-        catch(\Exception $ex)
+        catch (\Exception $ex)
         {
             $returnCode = CronJobResult::FAILED;
             $jobOutput->writeln("");
-            $jobOutput->writeln("Job execution failed with exception " . get_class($ex) . ":");
+            $jobOutput->writeln("Job execution failed with exception ".get_class($ex).":");
             $jobOutput->writeln($ex->__toString());
         }
         $jobEnd = microtime(true);
 
         // Clamp the result to accepted values
-        if($returnCode < CronJobResult::RESULT_MIN || $returnCode > CronJobResult::RESULT_MAX)
+        if ($returnCode < CronJobResult::RESULT_MIN || $returnCode > CronJobResult::RESULT_MAX)
         {
             $returnCode = CronJobResult::FAILED;
         }
 
         // Output the result
         $statusStr = "unknown";
-        if($returnCode == CronJobResult::SKIPPED)
+        if ($returnCode == CronJobResult::SKIPPED)
         {
             $statusStr = "skipped";
         }
-        elseif($returnCode == CronJobResult::SUCCEEDED)
+        elseif ($returnCode == CronJobResult::SUCCEEDED)
         {
             $statusStr = "succeeded";
         }
-        elseif($returnCode == CronJobResult::FAILED)
+        elseif ($returnCode == CronJobResult::FAILED)
         {
             $statusStr = "failed";
         }

Braces +6 added lines, -12 removed lines

@@ -41,14 +41,12 @@ 
                 {
                     $jobsToRun = array($jobObj);
                 }
-            }
-            catch(\Exception $e)
+            } catch(\Exception $e)
             {
                 $output->writeln("Couldn't find a job by the name of $jobName");
                 return CronJobResult::FAILED;
             }
-        }
-        else
+        } else
         {
             $jobsToRun = $jobRepo->findDueTasks();
         }
@@ -76,8 +74,7 @@ 
         try
         {
             $commandToRun = $this->getApplication()->get($job->getCommand());
-        }
-        catch(InvalidArgumentException $ex)
+        } catch(InvalidArgumentException $ex)
         {
             $output->writeln(" skipped (command no longer exists)");
             $this->recordJobResult($em, $job, 0, "Command no longer exists", CronJobResult::SKIPPED);
@@ -93,8 +90,7 @@ 
         try
         {
             $returnCode = $commandToRun->execute($emptyInput, $jobOutput);
-        }
-        catch(\Exception $ex)
+        } catch(\Exception $ex)
         {
             $returnCode = CronJobResult::FAILED;
             $jobOutput->writeln("");
@@ -114,12 +110,10 @@ 
         if($returnCode == CronJobResult::SKIPPED)
         {
             $statusStr = "skipped";
-        }
-        elseif($returnCode == CronJobResult::SUCCEEDED)
+        } elseif($returnCode == CronJobResult::SUCCEEDED)
         {
             $statusStr = "succeeded";
-        }
-        elseif($returnCode == CronJobResult::FAILED)
+        } elseif($returnCode == CronJobResult::FAILED)
         {
             $statusStr = "failed";
         }

src/Alpixel/Bundle/CronBundle/Command/CronScanCommand.php

Unused Use Statements -9 removed lines

@@ -1,21 +1,12 @@
 <?php
 namespace Alpixel\Bundle\CronBundle\Command;
 use Alpixel\Bundle\CronBundle\Entity\CronJob;
-
 use Doctrine\ORM\EntityManager;
-
 use Symfony\Component\Console\Command\Command;
-
 use Alpixel\Bundle\CronBundle\Annotation\CronJob as CronJobAnno;
-
-use Symfony\Bundle\DoctrineBundle\Registry;
-
 use Symfony\Component\Console\Output\OutputInterface;
-
 use Symfony\Component\Console\Input\InputInterface;
-
 use Symfony\Component\Console\Input\InputOption;
-
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 
 class CronScanCommand extends ContainerAwareCommand

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
     protected function configure()
     {
         $this->setName("cron:scan")
-             ->setDescription("Scans for any new or deleted cron jobs")
-             ->addOption('keep-deleted', 'k', InputOption::VALUE_NONE, 'If set, deleted cron jobs will not be removed')
-             ->addOption('default-disabled', 'd', InputOption::VALUE_NONE, 'If set, new jobs will be disabled by default');
+                ->setDescription("Scans for any new or deleted cron jobs")
+                ->addOption('keep-deleted', 'k', InputOption::VALUE_NONE, 'If set, deleted cron jobs will not be removed')
+                ->addOption('default-disabled', 'd', InputOption::VALUE_NONE, 'If set, new jobs will be disabled by default');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

Spacing +8 added lines, -8 removed lines

@@ -42,16 +42,16 @@ 
         // Enumerate all the jobs currently loaded
         $reader = $this->getContainer()->get("annotation_reader");
 
-        foreach($this->getApplication()->all() as $command)
+        foreach ($this->getApplication()->all() as $command)
         {
             // Check for an @CronJob annotation
             $reflClass = new \ReflectionClass($command);
-            foreach($reader->getClassAnnotations($reflClass) as $anno)
+            foreach ($reader->getClassAnnotations($reflClass) as $anno)
             {
-                if($anno instanceof CronJobAnno)
+                if ($anno instanceof CronJobAnno)
                 {
                     $job = $command->getName();
-                    if(array_key_exists($job, $knownJobs))
+                    if (array_key_exists($job, $knownJobs))
                     {
                         // Clear it from the known jobs so that we don't try to delete it
                         unset($knownJobs[$job]);
@@ -59,7 +59,7 @@ 
                         // Update the job if necessary
                         $currentJob = $jobRepo->findOneByCommand($job);
                         $currentJob->setDescription($command->getDescription());
-                        if($currentJob->getInterval() != $anno->value)
+                        if ($currentJob->getInterval() != $anno->value)
                         {
                             $newTime = new \DateTime();
                             $newTime = $newTime->add(new \DateInterval($anno->value));
@@ -78,9 +78,9 @@ 
         }
 
         // Clear any jobs that weren't found
-        if(!$keepDeleted)
+        if (!$keepDeleted)
         {
-            foreach(array_keys($knownJobs) as $deletedJob)
+            foreach (array_keys($knownJobs) as $deletedJob)
             {
                 $output->writeln("Deleting job: $deletedJob");
                 $jobToDelete = $jobRepo->findOneByCommand($deletedJob);
@@ -101,7 +101,7 @@ 
         $newJob->setNextRun(new \DateTime());
         $newJob->setEnabled(!$defaultDisabled);
 
-        $output->writeln("Added the job " . $newJob->getCommand() . " with interval " . $newJob->getInterval());
+        $output->writeln("Added the job ".$newJob->getCommand()." with interval ".$newJob->getInterval());
         $em->persist($newJob);
     }
 }

Braces +1 added lines, -2 removed lines

@@ -68,8 +68,7 @@
                             $currentJob->setNextRun($newTime);
                             $output->writeln("Updated interval for $job to {$anno->value}");
                         }
-                    }
-                    else
+                    } else
                     {
                         $this->newJobFound($em, $output, $command, $anno, $defaultDisabled);
                     }

src/Alpixel/Bundle/CronBundle/Command/CronStatusCommand.php

Unused Use Statements -5 removed lines

@@ -1,15 +1,10 @@
 <?php
 namespace Alpixel\Bundle\CronBundle\Command;
 use Alpixel\Bundle\CronBundle\Entity\CronJobResult;
-
 use Alpixel\Bundle\CronBundle\Entity\CronJob;
-
 use Symfony\Component\Console\Output\OutputInterface;
-
 use Symfony\Component\Console\Input\InputInterface;
-
 use Symfony\Component\Console\Input\InputArgument;
-
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 
 class CronStatusCommand extends ContainerAwareCommand

Indentation +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
     protected function configure()
     {
         $this->setName("cron:status")
-             ->setDescription("Displays the current status of cron jobs")
-             ->addArgument("job", InputArgument::OPTIONAL, "Show information for only this job");
+                ->setDescription("Displays the current status of cron jobs")
+                ->addArgument("job", InputArgument::OPTIONAL, "Show information for only this job");
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

Spacing +10 added lines, -10 removed lines

@@ -27,13 +27,13 @@ 
         $output->writeln("Cron job statuses:");
 
         $cronJobs = array();
-        if($jobName = $input->getArgument('job'))
+        if ($jobName = $input->getArgument('job'))
         {
             try
             {
                 $cronJobs = array($jobRepo->findOneByCommand($jobName));
             }
-            catch(\Exception $e)
+            catch (\Exception $e)
             {
                 $output->writeln("Couldn't find a job by the name of $jobName");
                 return CronJobResult::FAILED;
@@ -44,16 +44,16 @@ 
             $cronJobs = $em->getRepository('CronBundle:CronJob')->findAll();
         }
 
-        foreach($cronJobs as $cronJob)
+        foreach ($cronJobs as $cronJob)
         {
-            $output->write(" - " . $cronJob->getCommand());
-            if(!$cronJob->getEnabled())
+            $output->write(" - ".$cronJob->getCommand());
+            if (!$cronJob->getEnabled())
             {
                 $output->write(" (disabled)");
             }
             $output->writeln("");
-            $output->writeln("   Description: " . $cronJob->getDescription());
-            if(!$cronJob->getEnabled())
+            $output->writeln("   Description: ".$cronJob->getDescription());
+            if (!$cronJob->getEnabled())
             {
                 $output->writeln("   Not scheduled");
             }
@@ -61,7 +61,7 @@ 
             {
                 $output->write("   Scheduled for: ");
                 $now = new \DateTime();
-                if($cronJob->getNextRun() <= $now)
+                if ($cronJob->getNextRun() <= $now)
                 {
                     $output->writeln("Next run");
                 }
@@ -70,10 +70,10 @@ 
                     $output->writeln(strftime("%c", $cronJob->getNextRun()->getTimestamp()));
                 }
             }
-            if($cronJob->getMostRecentRun())
+            if ($cronJob->getMostRecentRun())
             {
                 $status = "Unknown";
-                switch($cronJob->getMostRecentRun()->getResult())
+                switch ($cronJob->getMostRecentRun()->getResult())
                 {
                     case CronJobResult::SUCCEEDED:
                         $status = "Successful";

Braces +5 added lines, -10 removed lines

@@ -32,14 +32,12 @@ 
             try
             {
                 $cronJobs = array($jobRepo->findOneByCommand($jobName));
-            }
-            catch(\Exception $e)
+            } catch(\Exception $e)
             {
                 $output->writeln("Couldn't find a job by the name of $jobName");
                 return CronJobResult::FAILED;
             }
-        }
-        else
+        } else
         {
             $cronJobs = $em->getRepository('CronBundle:CronJob')->findAll();
         }
@@ -56,16 +54,14 @@ 
             if(!$cronJob->getEnabled())
             {
                 $output->writeln("   Not scheduled");
-            }
-            else
+            } else
             {
                 $output->write("   Scheduled for: ");
                 $now = new \DateTime();
                 if($cronJob->getNextRun() <= $now)
                 {
                     $output->writeln("Next run");
-                }
-                else
+                } else
                 {
                     $output->writeln(strftime("%c", $cronJob->getNextRun()->getTimestamp()));
                 }
@@ -86,8 +82,7 @@ 
                         break;
                 }
                 $output->writeln("   Last run was: $status");
-            }
-            else
+            } else
             {
                 $output->writeln("   This job has not yet been run");
             }

src/Alpixel/Bundle/CronBundle/Entity/CronJob.php

Doc Comments +4 added lines, -4 removed lines

@@ -136,7 +136,7 @@ 
     /**
      * Set nextRun
      *
-     * @param datetime $nextRun
+     * @param \DateTime $nextRun
      */
     public function setNextRun($nextRun)
     {
@@ -156,7 +156,7 @@ 
     /**
      * Add results
      *
-     * @param Alpixel\Bundle\CronBundle\Entity\CronJobResult $results
+     * @param CronJobResult $results
      */
     public function addCronJobResult(\Alpixel\Bundle\CronBundle\Entity\CronJobResult $results)
     {
@@ -176,7 +176,7 @@ 
     /**
      * Set mostRecentRun
      *
-     * @param Alpixel\Bundle\CronBundle\Entity\CronJobResult $mostRecentRun
+     * @param CronJobResult $mostRecentRun
      */
     public function setMostRecentRun(\Alpixel\Bundle\CronBundle\Entity\CronJobResult $mostRecentRun)
     {
@@ -186,7 +186,7 @@ 
     /**
      * Get mostRecentRun
      *
-     * @return Alpixel\Bundle\CronBundle\Entity\CronJobResult
+     * @return CronJobResult
      */
     public function getMostRecentRun()
     {

src/Alpixel/Bundle/CronBundle/Entity/CronJobResult.php

Doc Comments +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
     /**
      * Set job
      *
-     * @param Alpixel\Bundle\CronBundle\Entity\CronJob $job
+     * @param CronJob $job
      */
     public function setJob(\Alpixel\Bundle\CronBundle\Entity\CronJob $job)
     {
@@ -160,7 +160,7 @@ 
     /**
      * Get job
      *
-     * @return Alpixel\Bundle\CronBundle\Entity\CronJob
+     * @return CronJob
      */
     public function getJob()
     {

src/Alpixel/Bundle/CronBundle/Command/CronEnableJobCommand.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
     protected function configure()
     {
         $this->setName("cron:enable-job")
-             ->setDescription("Enables a cron job")
-             ->addArgument("job", InputArgument::REQUIRED, "Name of the job to enable");
+                ->setDescription("Enables a cron job")
+                ->addArgument("job", InputArgument::REQUIRED, "Name of the job to enable");
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

Spacing +3 added lines, -3 removed lines

@@ -24,15 +24,15 @@
         $jobRepo = $em->getRepository('CronBundle:CronJob');
 
         $job = $jobRepo->findOneByCommand($jobName);
-        if(!$job)
+        if (!$job)
         {
-            $output->writeln("Couldn't find a job by the name of " . $jobName);
+            $output->writeln("Couldn't find a job by the name of ".$jobName);
             return CronJobResult::FAILED;
         }
 
         $job->setEnabled(true);
         $em->flush();
 
-        $output->writeln("Enabled cron job by the name of " . $jobName);
+        $output->writeln("Enabled cron job by the name of ".$jobName);
     }
 }

src/Alpixel/Bundle/CronBundle/Command/MemoryWriter.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 
     public function doWrite($message, $newline) {
         $this->backingStore .= $message;
-        if($newline) {
+        if ($newline) {
             $this->backingStore .= "\n";
         }
     }

src/Alpixel/Bundle/CronBundle/Command/CronPruneLogsCommand.php

Indentation +2 added lines, -2 removed lines

@@ -16,8 +16,8 @@
     protected function configure()
     {
         $this->setName("cron:pruneLogs")
-             ->setDescription("Prunes the logs for each cron job, leaving only recent failures and the most recent success")
-             ->addArgument('job', InputArgument::OPTIONAL, 'Operate only on this job');
+                ->setDescription("Prunes the logs for each cron job, leaving only recent failures and the most recent success")
+                ->addArgument('job', InputArgument::OPTIONAL, 'Operate only on this job');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

Spacing +4 added lines, -4 removed lines

@@ -25,7 +25,7 @@ 
         $em = $this->getContainer()->get("doctrine.orm.entity_manager");
         $job = $input->getArgument('job');
 
-        if($job)
+        if ($job)
         {
             $output->writeln("Pruning logs for cron job $job");
         }
@@ -34,12 +34,12 @@ 
             $output->writeln("Pruning logs for all cron jobs");
         }
 
-        if($job)
+        if ($job)
         {
             $jobObj = $em->getRepository('CronBundle:CronJob')->findOneByCommand($job);
-            if(!$jobObj)
+            if (!$jobObj)
             {
-                $output->writeln("Couldn't find a job by the name of " . $job);
+                $output->writeln("Couldn't find a job by the name of ".$job);
                 return CronJobResult::FAILED;
             }
 

Braces +2 added lines, -4 removed lines

@@ -28,8 +28,7 @@ 
         if($job)
         {
             $output->writeln("Pruning logs for cron job $job");
-        }
-        else
+        } else
         {
             $output->writeln("Pruning logs for all cron jobs");
         }
@@ -44,8 +43,7 @@ 
             }
 
             $em->getRepository('CronBundle:CronJobResult')->deleteOldLogs($jobObj);
-        }
-        else
+        } else
         {
             $em->getRepository('CronBundle:CronJobResult')->deleteOldLogs();
         }

src/Alpixel/Bundle/CronBundle/Command/CronDisableJobCommand.php

Indentation +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
     protected function configure()
     {
         $this->setName("cron:disable-job")
-             ->setDescription("Disables a cron job")
-             ->addArgument("job", InputArgument::REQUIRED, "Name of the job to disable");
+                ->setDescription("Disables a cron job")
+                ->addArgument("job", InputArgument::REQUIRED, "Name of the job to disable");
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

Spacing +3 added lines, -3 removed lines

@@ -26,15 +26,15 @@
         $jobRepo = $em->getRepository('CronBundle:CronJob');
 
         $job = $jobRepo->findOneByCommand($jobName);
-        if(!$job)
+        if (!$job)
         {
-            $output->writeln("Couldn't find a job by the name of " . $jobName);
+            $output->writeln("Couldn't find a job by the name of ".$jobName);
             return CronJobResult::FAILED;
         }
 
         $job->setEnabled(false);
         $em->flush();
 
-        $output->writeln("Disabled cron job by the name of " . $jobName);
+        $output->writeln("Disabled cron job by the name of ".$jobName);
     }
 }