pass TokenCollection instead of Tokenizer to Metrics

src/Hal/Application/Command/Job/Analyze/FileAnalyzer.php

@@ -10,6 +10,7 @@
 namespace Hal\Application\Command\Job\Analyze;
 use Hal\Component\OOP\Extractor\ClassMap;
 use Hal\Component\OOP\Extractor\Extractor;
+use Hal\Component\Token\TokenCollection;
 use Hal\Metrics\Complexity\Component\McCabe\McCabe;
 use Hal\Metrics\Complexity\Component\Myer\Myer;
 use Hal\Metrics\Complexity\Text\Halstead\Halstead;
@@ -111,19 +112,19 @@ public function __construct(
         $this->classMap = $classMap;
     }
 
-
     /**
      * Run analyze
      *
-     * @param $filename
+     * @param string $filename
+     * @param TokenCollection $tokens
      * @return \Hal\Component\Result\ResultSet
      */
-    public function execute($filename) {
+    public function execute($filename, $tokens) {
 
-        $rHalstead = $this->halstead->calculate($filename);
-        $rLoc = $this->loc->calculate($filename);
-        $rMcCabe = $this->mcCabe->calculate($filename);
-        $rMyer = $this->myer->calculate($filename);
+        $rHalstead = $this->halstead->calculate($tokens);
+        $rLoc = $this->loc->calculate($filename, $tokens);
+        $rMcCabe = $this->mcCabe->calculate($tokens);
+        $rMyer = $this->myer->calculate($tokens);
         $rMaintainability = $this->maintainabilityIndex->calculate($rHalstead, $rLoc, $rMcCabe);
 
         $resultSet = new \Hal\Component\Result\ResultSet($filename);
@@ -135,7 +136,7 @@ public function execute($filename) {
             ->setMaintainabilityIndex($rMaintainability);
 
         if($this->withOOP) {
-            $rOOP = $this->extractor->extract($filename);
+            $rOOP = $this->extractor->extract($tokens);
             $this->classMap->push($filename, $rOOP);
             $resultSet->setOOP($rOOP);
         }

src/Hal/Application/Command/Job/DoAnalyze.php

@@ -13,7 +13,6 @@
 use Hal\Application\Command\Job\Analyze\FileAnalyzer;
 use Hal\Application\Command\Job\Analyze\LcomAnalyzer;
 use Hal\Component\Compatibility\PhpCompatibility;
-use Hal\Component\Cache\CacheMemory;
 use Hal\Component\File\Finder;
 use Hal\Component\File\SyntaxChecker;
 use Hal\Component\OOP\Extractor\ClassMap;
@@ -101,18 +100,18 @@ public function execute(ResultCollection $collection, ResultCollection $aggregat
 
         // tools
         $classMap = new ClassMap();
-        $tokenizer = new Tokenizer(new CacheMemory());
+        $tokenizer = new Tokenizer();
         $syntaxChecker = new SyntaxChecker();
 
         $fileAnalyzer = new FileAnalyzer(
             $this->output
             , $this->withOOP
-            , new Extractor($tokenizer)
-            , new \Hal\Metrics\Complexity\Text\Halstead\Halstead($tokenizer, new \Hal\Component\Token\TokenType())
-            , new \Hal\Metrics\Complexity\Text\Length\Loc($tokenizer)
+            , new Extractor()
+            , new \Hal\Metrics\Complexity\Text\Halstead\Halstead(new \Hal\Component\Token\TokenType())
+            , new \Hal\Metrics\Complexity\Text\Length\Loc()
             , new \Hal\Metrics\Design\Component\MaintainabilityIndex\MaintainabilityIndex()
-            , new \Hal\Metrics\Complexity\Component\McCabe\McCabe($tokenizer)
-            , new \Hal\Metrics\Complexity\Component\Myer\Myer($tokenizer)
+            , new \Hal\Metrics\Complexity\Component\McCabe\McCabe()
+            , new \Hal\Metrics\Complexity\Component\Myer\Myer()
             , $classMap
         );
 
@@ -129,7 +128,8 @@ public function execute(ResultCollection $collection, ResultCollection $aggregat
 
             // Analyze
             try {
-                $resultSet = $fileAnalyzer->execute($filename);
+                $tokens = $tokenizer->tokenize($filename);
+                $resultSet = $fileAnalyzer->execute($filename, $tokens);
             } catch(NoTokenizableException $e) {
                 $this->output->writeln(sprintf("<error>file %s has been skipped: \n%s</error>", $filename, $e->getMessage()));
                 unset($files[$k]);

src/Hal/Component/Cache/Cache.php

@@ -39,4 +39,4 @@ public function has($key);
      * @return mixed
      */
     public function clear($key);
-}
+}

src/Hal/Component/Cache/CacheMemory.php

@@ -8,7 +8,6 @@
  */
 
 namespace Hal\Component\Cache;
-use Hal\Component\Result\ResultCollection;
 
 /**
  * Cache
@@ -49,4 +48,4 @@ public function has($key) {
     public function clear($key) {
         $this->data = array();
     }
-}
+}

src/Hal/Component/Cache/CacheNull.php

@@ -41,4 +41,4 @@ public function has($key) {
      */
     public function clear($key) {
     }
-}
+}

src/Hal/Component/OOP/Extractor/Extractor.php

@@ -10,7 +10,7 @@
 namespace Hal\Component\OOP\Extractor;
 use Hal\Component\OOP\Reflected\ReflectedClass\ReflectedAnonymousClass;
 use Hal\Component\OOP\Resolver\NameResolver;
-use Hal\Component\Token\Tokenizer;
+use Hal\Component\Token\TokenCollection;
 
 
 /**
@@ -36,17 +36,11 @@ class Extractor {
      */
     private $extractors;
 
-    /**
-     * @var \Hal\Component\Token\Tokenizer
-     */
-    private $tokenizer;
-
     /**
      * Constructor
      */
-    public function __construct(Tokenizer $tokenizer) {
+    public function __construct() {
 
-        $this->tokenizer = $tokenizer;
         $this->searcher = new Searcher();
         $this->result= new Result;
 
@@ -62,15 +56,14 @@ public function __construct(Tokenizer $tokenizer) {
     /**
      * Extract infos from file
      *
-     * @param $filename
+     * @param TokenCollection $tokens
      * @return Result
      */
-    public function extract($filename)
+    public function extract($tokens)
     {
 
         $result = new Result;
 
-        $tokens = $this->tokenizer->tokenize($filename);
         $nameResolver = new NameResolver();
 
         // default current values
@@ -174,4 +167,4 @@ public function extract($filename)
         return $result;
     }
 
-};
+};

src/Hal/Component/Token/Tokenizer.php

@@ -8,8 +8,6 @@
  */
 
 namespace Hal\Component\Token;
-use Hal\Component\Cache\Cache;
-use Hal\Component\Cache\CacheNull;
 
 /**
  * Tokenize file
@@ -18,21 +16,6 @@
  */
 class Tokenizer {
 
-    private $cache;
-
-    /**
-     * Tokenizer constructor.
-     * @param $cache
-     */
-    public function __construct(Cache $cache = null)
-    {
-        if(null == $cache) {
-            $cache = new CacheNull();
-        }
-        $this->cache = $cache;
-    }
-
-
     /**
      * Tokenize file
      *
@@ -41,19 +24,14 @@ public function __construct(Cache $cache = null)
      */
     public function tokenize($filename) {
 
-        if($this->cache->has($filename)) {
-            return new TokenCollection($this->cache->get($filename));
-        }
-
         $size = filesize($filename);
         $limit = 102400; // around 100 Ko
-        if($size > $limit) {
+        if ($size > $limit) {
             $tokens = $this->tokenizeLargeFile($filename);
         } else {
             $tokens = token_get_all($this->cleanup(file_get_contents($filename)));
         }
 
-        $this->cache->set($filename, $tokens);
         return new TokenCollection($tokens);
     }
 
@@ -74,7 +52,7 @@ protected function tokenizeLargeFile($filename) {
 EOT;
         $output = shell_exec('php -r \''.$code.'\'');
         $tokens = unserialize($output);
-        if(false === $tokens) {
+        if (false === $tokens) {
             throw new NoTokenizableException(sprintf('Cannot tokenize "%s". This file is probably too big. Please try to increase memory_limit', $filename));
         }
         return $tokens;

src/Hal/Metrics/Complexity/Component/McCabe/McCabe.php

@@ -8,7 +8,7 @@
  */
 
 namespace Hal\Metrics\Complexity\Component\McCabe;
-use Hal\Component\Token\Tokenizer;
+use Hal\Component\Token\TokenCollection;
 
 /**
  * Calculates cyclomatic complexity
@@ -17,22 +17,6 @@
  */
 class McCabe {
 
-    /**
-     * Tokenizer
-     *
-     * @var \Hal\Component\Token\Tokenizer
-     */
-    private $tokenizer;
-
-    /**
-     * Constructor
-     *
-     * @param Tokenizer $tokenizer
-     */
-    public function __construct(Tokenizer $tokenizer) {
-        $this->tokenizer = $tokenizer;
-    }
-
     /**
      * Calculate cyclomatic complexity number
      *
@@ -46,14 +30,12 @@ public function __construct(Tokenizer $tokenizer) {
      *
      * 2. CC = Number of each decision point
      *
-     * @param string $filename
+     * @param TokenCollection $tokens
      * @return Result
      */
-    public function calculate($filename)
+    public function calculate($tokens)
     {
-
         $info = new Result;
-        $tokens = $this->tokenizer->tokenize($filename);
 
         $ccn = 1; // default path
         foreach($tokens as $token) {
@@ -91,4 +73,4 @@ public function calculate($filename)
         $info->setCyclomaticComplexityNumber(max(1, $ccn));
         return $info;
     }
-}
+}

src/Hal/Metrics/Complexity/Component/Myer/Myer.php

@@ -9,7 +9,7 @@
 
 namespace Hal\Metrics\Complexity\Component\Myer;
 
-use Hal\Component\Token\Tokenizer;
+use Hal\Component\Token\TokenCollection;
 use Hal\Metrics\Complexity\Component\McCabe\McCabe;
 
 /**
@@ -19,41 +19,22 @@
  */
 class Myer {
 
-    /**
-     * Tokenizer
-     *
-     * @var \Hal\Component\Token\Tokenizer
-     */
-    private $tokenizer;
-
-    /**
-     * Constructor
-     *
-     * @param Tokenizer $tokenizer
-     */
-    public function __construct(Tokenizer $tokenizer) {
-        $this->tokenizer = $tokenizer;
-
-    }
-
     /**
      * Calculates Myer's interval
      *
      *      Cyclomatic complexity : Cyclomatic complexity + L
      *      where L is the number of logical operators
      *
-     * @param string $filename
+     * @param TokenCollection $tokens
      * @return Result
      */
-    public function calculate($filename)
+    public function calculate($tokens)
     {
-        $mcCabe = new McCabe($this->tokenizer);
+        $mcCabe = new McCabe();
         $result = new Result;
 
-        $tokens = $this->tokenizer->tokenize($filename);
-
         // Cyclomatic complexity
-        $cc = $mcCabe->calculate($filename);
+        $cc = $mcCabe->calculate($tokens);
 
         // Number of operator
         $L = 0;
@@ -75,4 +56,4 @@ public function calculate($filename)
 
         return $result;
     }
-}
+}