| @@ -2,11 +2,9 @@ | ||
| 2 | 2 | namespace Dtc\QueueBundle\Command; | 
| 3 | 3 | |
| 4 | 4 | use Dtc\QueueBundle\Documents\Job; | 
| 5 | - | |
| 6 | 5 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; | 
| 7 | 6 | use Symfony\Component\Console\Input\InputArgument; | 
| 8 | 7 | use Symfony\Component\Console\Input\InputInterface; | 
| 9 | -use Symfony\Component\Console\Input\InputOption; | |
| 10 | 8 | use Symfony\Component\Console\Output\OutputInterface; | 
| 11 | 9 | |
| 12 | 10 | class CreateJobCommand | 
| @@ -2,9 +2,7 @@ | ||
| 2 | 2 | namespace Dtc\QueueBundle\Command; | 
| 3 | 3 | |
| 4 | 4 | use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; | 
| 5 | -use Symfony\Component\Console\Input\InputArgument; | |
| 6 | 5 | use Symfony\Component\Console\Input\InputInterface; | 
| 7 | -use Symfony\Component\Console\Input\InputOption; | |
| 8 | 6 | use Symfony\Component\Console\Output\OutputInterface; | 
| 9 | 7 | |
| 10 | 8 | class PruneCommand | 
| @@ -3,10 +3,7 @@ | ||
| 3 | 3 | |
| 4 | 4 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 
| 5 | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; | 
| 6 | - | |
| 7 | 6 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 
| 8 | -use Symfony\Component\HttpFoundation\Response; | |
| 9 | -use Symfony\Component\HttpFoundation\Request; | |
| 10 | 7 | |
| 11 | 8 | class QueueController | 
| 12 | 9 | extends Controller | 
| @@ -11,6 +11,9 @@ | ||
| 11 | 11 | protected $dm; | 
| 12 | 12 | protected $documentName; | 
| 13 | 13 | |
| 14 | + /** | |
| 15 | + * @param string $documentName | |
| 16 | + */ | |
| 14 | 17 | public function __construct(DocumentManager $dm, $documentName) | 
| 15 | 18 |      { | 
| 16 | 19 | $this->dm = $dm; | 
| @@ -115,8 +115,7 @@ | ||
| 115 | 115 |          if ($priority) { | 
| 116 | 116 | $this->assertEquals($priority, $job->getPriority(), | 
| 117 | 117 | "Priority should be the same."); | 
| 118 | - } | |
| 119 | -        else { | |
| 118 | +        } else { | |
| 120 | 119 | $this->assertNull($job->getPriority(), "Priority should be null"); | 
| 121 | 120 | } | 
| 122 | 121 | |
| @@ -16,7 +16,7 @@ discard block | ||
| 16 | 16 | } | 
| 17 | 17 | |
| 18 | 18 | /** | 
| 19 | - * @param field_type $jobClass | |
| 19 | + * @param string $jobClass | |
| 20 | 20 | */ | 
| 21 | 21 | public function setJobClass($jobClass) | 
| 22 | 22 |      { | 
| @@ -29,7 +29,7 @@ discard block | ||
| 29 | 29 | } | 
| 30 | 30 | |
| 31 | 31 | /** | 
| 32 | - * @return the $jobManager | |
| 32 | + * @return JobManagerInterface $jobManager | |
| 33 | 33 | */ | 
| 34 | 34 | public function getJobManager() | 
| 35 | 35 |      { | 
| @@ -53,6 +53,9 @@ discard block | ||
| 53 | 53 | return new $this->jobClass($this, $batch, $priority, $dateTime); | 
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | + /** | |
| 57 | + * @param integer $priority | |
| 58 | + */ | |
| 56 | 59 | public function later($delay = 0, $priority = null) | 
| 57 | 60 |      { | 
| 58 | 61 | $job = $this->at(time() + $delay, false, $priority); | 
| @@ -60,6 +63,9 @@ discard block | ||
| 60 | 63 | return $job; | 
| 61 | 64 | } | 
| 62 | 65 | |
| 66 | + /** | |
| 67 | + * @param integer $priority | |
| 68 | + */ | |
| 63 | 69 | public function batchLater($delay = 0, $priority = null) | 
| 64 | 70 |      { | 
| 65 | 71 | $job = $this->at($delay, true, $priority); | 
| @@ -67,6 +73,10 @@ discard block | ||
| 67 | 73 | return $job; | 
| 68 | 74 | } | 
| 69 | 75 | |
| 76 | + /** | |
| 77 | + * @param integer $time | |
| 78 | + * @param integer $priority | |
| 79 | + */ | |
| 70 | 80 | public function batchAt($time = null, $priority = null) | 
| 71 | 81 |      { | 
| 72 | 82 | return $this->at($time, true, $priority); | 
| @@ -115,8 +115,7 @@ | ||
| 115 | 115 |          if ($priority) { | 
| 116 | 116 | $this->assertEquals($priority, $job->getPriority(), | 
| 117 | 117 | "Priority should be the same."); | 
| 118 | - } | |
| 119 | -        else { | |
| 118 | +        } else { | |
| 120 | 119 | $this->assertNull($job->getPriority(), "Priority should be null"); | 
| 121 | 120 | } | 
| 122 | 121 | |
| @@ -33,6 +33,9 @@ | ||
| 33 | 33 | return $job; | 
| 34 | 34 | } | 
| 35 | 35 | |
| 36 | + /** | |
| 37 | + * @param string $workerName | |
| 38 | + */ | |
| 36 | 39 | public function getJob($workerName = null, $methodName = null, $prioritize = true) | 
| 37 | 40 |      { | 
| 38 | 41 |          if ($methodName) { | 
| @@ -3,7 +3,6 @@ | ||
| 3 | 3 | |
| 4 | 4 | use Dtc\QueueBundle\Model\Job as BaseJob; | 
| 5 | 5 | use Dtc\QueueBundle\Model\JobManagerInterface; | 
| 6 | - | |
| 7 | 6 | use PhpAmqpLib\Connection\AMQPConnection; | 
| 8 | 7 | use PhpAmqpLib\Message\AMQPMessage; | 
| 9 | 8 | |
| @@ -15,12 +15,12 @@ | ||
| 15 | 15 | |
| 16 | 16 |      public function __construct(AMQPConnection $connection) { | 
| 17 | 17 | $this->connection = $connection; | 
| 18 | - $this->channel = $connection->channel();; | |
| 18 | + $this->channel = $connection->channel(); ; | |
| 19 | 19 | } | 
| 20 | 20 | |
| 21 | 21 |      public function save($job) { | 
| 22 | 22 | $queue = $job->getWorkerName(); | 
| 23 | - $exchange = null; // User default exchange | |
| 23 | + $exchange = null; // User default exchange | |
| 24 | 24 | |
| 25 | 25 | $this->channel->queue_declare($queue, false, true, false, false); | 
| 26 | 26 | $this->channel->exchange_declare($exchange, 'direct', false, true, false); | 
| @@ -115,8 +115,7 @@ | ||
| 115 | 115 |          if ($priority) { | 
| 116 | 116 | $this->assertEquals($priority, $job->getPriority(), | 
| 117 | 117 | "Priority should be the same."); | 
| 118 | - } | |
| 119 | -        else { | |
| 118 | +        } else { | |
| 120 | 119 | $this->assertNull($job->getPriority(), "Priority should be null"); | 
| 121 | 120 | } | 
| 122 | 121 | |
| @@ -3,10 +3,7 @@ | ||
| 3 | 3 | |
| 4 | 4 | use Dtc\QueueBundle\BeanStalkd\JobManager; | 
| 5 | 5 | use Dtc\QueueBundle\Model\Job; | 
| 6 | -use Dtc\QueueBundle\Model\WorkerManager; | |
| 7 | - | |
| 8 | 6 | use Dtc\QueueBundle\Tests\FibonacciWorker; | 
| 9 | -use Dtc\QueueBundle\Tests\StaticJobManager; | |
| 10 | 7 | use Dtc\QueueBundle\Tests\Model\BaseJobManagerTest; | 
| 11 | 8 | |
| 12 | 9 | /** | 
| @@ -3,12 +3,8 @@ | ||
| 3 | 3 | |
| 4 | 4 | use Dtc\QueueBundle\Tests\Model\BaseJobManagerTest; | 
| 5 | 5 | use Dtc\QueueBundle\Tests\FibonacciWorker; | 
| 6 | -use Dtc\QueueBundle\Tests\StaticJobManager; | |
| 7 | - | |
| 8 | -use Dtc\QueueBundle\Model\WorkerManager; | |
| 9 | 6 | use Dtc\QueueBundle\Documents\JobManager; | 
| 10 | 7 | use Dtc\QueueBundle\Model\Job; | 
| 11 | - | |
| 12 | 8 | use Doctrine\MongoDB\Connection; | 
| 13 | 9 | use Doctrine\ODM\MongoDB\Configuration; | 
| 14 | 10 | use Doctrine\ODM\MongoDB\DocumentManager; | 
| @@ -41,14 +41,14 @@ | ||
| 41 | 41 |          $config->setHydratorDir('/tmp/dtcqueuetest/generate/hydrators'); | 
| 42 | 42 |          $config->setHydratorNamespace('Hydrators'); | 
| 43 | 43 | |
| 44 | - $classPath = __DIR__ . '../../Documents'; | |
| 44 | + $classPath = __DIR__.'../../Documents'; | |
| 45 | 45 | $config->setMetadataDriverImpl(AnnotationDriver::create($classPath)); | 
| 46 | 46 | |
| 47 | 47 | self::$dm = DocumentManager::create(new Connection(), $config); | 
| 48 | 48 | |
| 49 | 49 | $documentName = 'Dtc\QueueBundle\Documents\Job'; | 
| 50 | 50 | $sm = self::$dm->getSchemaManager(); | 
| 51 | - $timeout = 1000; | |
| 51 | + $timeout = 1000; | |
| 52 | 52 | |
| 53 | 53 | $sm->dropDocumentCollection($documentName); | 
| 54 | 54 | $sm->createDocumentCollection($documentName); | 
| @@ -2,9 +2,6 @@ | ||
| 2 | 2 | namespace Dtc\QueueBundle\Tests\Model; | 
| 3 | 3 | |
| 4 | 4 | use Dtc\QueueBundle\Model\Job; | 
| 5 | -use Dtc\QueueBundle\Tests\FibonacciWorker; | |
| 6 | -use Dtc\QueueBundle\Tests\StaticJobManager; | |
| 7 | -use Dtc\QueueBundle\Model\WorkerManager; | |
| 8 | 5 | |
| 9 | 6 | class BaseJobManagerTest | 
| 10 | 7 | extends \PHPUnit_Framework_TestCase | 
| @@ -83,7 +83,7 @@ | ||
| 83 | 83 |      public function testPerformance() { | 
| 84 | 84 | $start = microtime(true); | 
| 85 | 85 | $jobsTotal = 1000; | 
| 86 | - self::$jobManager->enableSorting = false; // Ignore priority | |
| 86 | + self::$jobManager->enableSorting = false; // Ignore priority | |
| 87 | 87 | |
| 88 | 88 |          for ($i = 0; $i < $jobsTotal; $i++) { | 
| 89 | 89 | self::$worker->later()->fibonacci(1); |