Merge pull request #37 from M6Web/fix/overload-config

Fix : config always parsed even if cache is set
BedrockStreaming · Jan 6, 2016 · 8244cfc · 8244cfc
2 parents daf23d3 + 8180c80
commit 8244cfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ php:
   - 7
 
 before_script:
+  - phpenv config-rm xdebug.ini
   - wget http://getcomposer.org/composer.phar
   - php composer.phar install --dev
 

diff --git a/src/M6Web/Bundle/LogBridgeBundle/Matcher/Builder.php b/src/M6Web/Bundle/LogBridgeBundle/Matcher/Builder.php
@@ -182,10 +182,11 @@ protected function buildMatcherCache()
     public function getMatcher()
     {
         if (!$this->matcher) {
-            $cacheCode    = $this->buildMatcherCache();
+
             $matcherCache = new ConfigCache($this->getAbsoluteCachePath(), $this->isDebug());
 
             if (!$matcherCache->isFresh()) {
+                $cacheCode = $this->buildMatcherCache();
                 $resources = [];
 
                 foreach ($this->cacheResources as $resource) {