Browse Source

Some fixes for reducing NPath complexity

Marc 11 years ago
parent
commit
39b0a066f1
1 changed files with 19 additions and 3 deletions
  1. 19 3
      Service/GearmanCacheWrapper.php

+ 19 - 3
Service/GearmanCacheWrapper.php

@@ -10,12 +10,15 @@
 namespace Mmoreram\GearmanBundle\Service;
 namespace Mmoreram\GearmanBundle\Service;
 
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Config\FileLocator;
+use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Doctrine\Common\Annotations\AnnotationRegistry;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 use Symfony\Component\Routing\Loader\AnnotationDirectoryLoader;
 use Doctrine\Common\Cache\Cache;
 use Doctrine\Common\Cache\Cache;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\Finder;
+use Doctrine\Common\Annotations\SimpleAnnotationReader;
+use \Doctrine\Common\Version as DoctrineVersion;
 
 
 use Mmoreram\GearmanBundle\Module\WorkerCollection;
 use Mmoreram\GearmanBundle\Module\WorkerCollection;
 use Mmoreram\GearmanBundle\Module\WorkerDirectoryLoader;
 use Mmoreram\GearmanBundle\Module\WorkerDirectoryLoader;
@@ -226,9 +229,9 @@ class GearmanCacheWrapper
         /**
         /**
          * Depending on Symfony2 version
          * Depending on Symfony2 version
          */
          */
-        if (version_compare(\Doctrine\Common\Version::VERSION, '2.2.0-DEV', '>=')) {
+        if (version_compare(DoctrineVersion::VERSION, '2.2.0-DEV', '>=')) {
 
 
-            $reader = new \Doctrine\Common\Annotations\SimpleAnnotationReader();
+            $reader = new SimpleAnnotationReader();
             $reader->addNamespace('Mmoreram\GearmanBundle\Driver');
             $reader->addNamespace('Mmoreram\GearmanBundle\Driver');
         } else {
         } else {
 
 
@@ -236,7 +239,6 @@ class GearmanCacheWrapper
             $reader->setDefaultAnnotationNamespace('Mmoreram\GearmanBundle\Driver\\');
             $reader->setDefaultAnnotationNamespace('Mmoreram\GearmanBundle\Driver\\');
         }
         }
 
 
-        $workerCollection = new WorkerCollection;
         $finder = new Finder();
         $finder = new Finder();
         $finder
         $finder
             ->files()
             ->files()
@@ -244,6 +246,20 @@ class GearmanCacheWrapper
             ->exclude($this->excludedPaths)
             ->exclude($this->excludedPaths)
             ->in($this->paths);
             ->in($this->paths);
 
 
+        return $this->parseFiles($finder, $reader);
+    }
+
+
+    /**
+     * Load all workers with their jobs
+     *
+     * @return WorkerCollection collection of all info
+     */
+    private function parseFiles(Finder $finder, Reader $reader)
+    {
+
+        $workerCollection = new WorkerCollection;
+        
         /**
         /**
          * Every file found is parsed
          * Every file found is parsed
          */
          */