Add coke to require dev and travis, update style to please coke.

.coke

@@ -1,4 +1,4 @@
-standard=Cytron
+standard=vendor/m6web/symfony2-coding-standard/M6Web_Symfony2
 
 src/
 !Tests/

.travis.yml

@@ -12,3 +12,4 @@ before_script:
 
 script:
   - bin/atoum
+  - bin/coke

composer.json

@@ -9,7 +9,9 @@
     "require-dev": {
         "symfony/symfony": "~2.3|~3.0",
         "m6web/firewall-bundle": "~1.0",
-        "atoum/atoum": "~2.0"
+        "atoum/atoum": "~2.0",
+        "m6web/coke": "~2.1",
+        "m6web/symfony2-coding-standard": "~3.1"
     },
     "autoload": {
         "psr-4": {

src/Bundle/DataCollector/CacheActionDataCollector.php

@@ -51,7 +51,7 @@ public function collect(Request $request, Response $response, \Exception $except
                 'blocks' => $blocks,
                 'total'  => $total,
                 'hits'   => $nbHits,
-                'miss'   => $nbMiss
+                'miss'   => $nbMiss,
             ];
         }
     }

src/Bundle/DependencyInjection/M6WebCacheExtraExtension.php

@@ -17,6 +17,14 @@ class M6WebCacheExtraExtension extends Extension
 {
     protected $twigExtension = array('renderCache');
 
+    /**
+     * @return string
+     */
+    public function getAlias()
+    {
+        return 'm6_cache_extra';
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -45,6 +53,7 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
+
     /**
      * Load the cache action configuration
      *
@@ -70,13 +79,4 @@ protected function loadActionCacheConfiguration(ContainerBuilder $container, $ca
         $definition->addTag('kernel.event_subscriber');
         $container->setDefinition('m6.action_cache.listener', $definition);
     }
-
-
-    /**
-     * @return string
-     */
-    public function getAlias()
-    {
-        return 'm6_cache_extra';
-    }
 }

src/Bundle/Fragment/CachedFragmentRenderer.php

@@ -9,6 +9,14 @@
  */
 class CachedFragmentRenderer extends InlineFragmentRenderer
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'cached';
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -30,12 +38,4 @@ protected function createSubRequest($uri, Request $request)
 
         return $subRequest;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'cached';
-    }
 }

src/Bundle/Listener/CacheActionListener.php

@@ -60,6 +60,29 @@ public function setCacheKeyExclude(array $exclude)
         $this->excludeKey = $exclude;
     }
 
+    /**
+     * Return list of cached blocks with status
+     *
+     * @return array list of cached controller with status
+     */
+    public function getCachedBlocks()
+    {
+        return $this->cachedBlocks;
+    }
+
+    /**
+     * Return static list of subscribed events
+     *
+     * @return array List of events we want to subscribe to
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            KernelEvents::RESPONSE => 'onKernelResponse',
+            KernelEvents::REQUEST  => 'onKernelRequest',
+        ];
+    }
+
     /**
      * Method called on kernel.request event. Handle only "subrequest"
      * @param KernelEvent $event The received event
@@ -81,7 +104,7 @@ public function onKernelRequest(KernelEvent $event)
             $fromCache  = false;
 
             $responseContent = $this->cacheService->getConcurrent($cacheKey);
-            if ($responseContent || ($responseContent === '' &&  !$request->attributes->get('ignore_errors')) ) {
+            if ($responseContent || ($responseContent === '' &&  !$request->attributes->get('ignore_errors'))) {
 
                 $response = new Response($responseContent);
                 $response->headers->set('server_cached', 1);
@@ -136,7 +159,7 @@ public function onKernelResponse(FilterResponseEvent $event)
     private function getRequestCacheKey(Request $request)
     {
         $p          = $request->attributes->all();
-        $parameters = array();
+        $parameters = [];
         foreach ($p as $k => $v) {
 
             // On ne prend pas ces clefs
@@ -221,27 +244,4 @@ private function decorateResponse(Request $request, Response $response, $control
 
         $response->setContent($html);
     }
-
-    /**
-     * Return static list of subscribed events
-     *
-     * @return array List of events we want to subscribe to
-     */
-    public static function getSubscribedEvents()
-    {
-        return array(
-            KernelEvents::RESPONSE => 'onKernelResponse',
-            KernelEvents::REQUEST  => 'onKernelRequest'
-        );
-    }
-
-    /**
-     * Return list of cached blocks with status
-     *
-     * @return array list of cached controller with status
-     */
-    public function getCachedBlocks()
-    {
-        return $this->cachedBlocks;
-    }
 }

src/Bundle/Listener/VarnishPurgeListener.php

@@ -27,6 +27,20 @@ public function __construct(CacheResetterInterface $cacheResetter, $purgeHelper
         $this->cacheResetter = $cacheResetter;
     }
 
+    /**
+     * Return static list of subscribed events
+     *
+     * @return array List of events we want to subscribe to
+     */
+    public static function getSubscribedEvents()
+    {
+        return [
+            'kernel.request' => [
+                ['onKernelRequest', 0],
+            ],
+        ];
+    }
+
     /**
      * Purge varnish servers when a kernel.request event is dispatched
      *
@@ -109,18 +123,4 @@ protected function cleanUrl($url)
 
         return $url;
     }
-
-    /**
-     * Return static list of subscribed events
-     *
-     * @return array List of events we want to subscribe to
-     */
-    public static function getSubscribedEvents()
-    {
-        return [
-            'kernel.request' => [
-                ['onKernelRequest', 0],
-            ],
-        ];
-    }
 }

src/Bundle/M6WebCacheExtraBundle.php

@@ -9,6 +9,9 @@
  */
 class M6WebCacheExtraBundle extends Bundle
 {
+    /**
+     * @return DependencyInjection\M6WebCacheExtraExtension
+     */
     public function getContainerExtension()
     {
         return new DependencyInjection\M6WebCacheExtraExtension();

src/Bundle/Resetter/CacheResetter.php

@@ -23,7 +23,7 @@ class CacheResetter implements CacheResetterInterface
 
     /**
      * Construct the cache resetter
-     * 
+     *
      * @param EventDispatcherInterface $eventDispatcher  The Event Dispatcher to dispatch the cache.reset event
      * @param string                   $paramName        Name of the parameter to check to purge
      * @param Provider                 $firewallProvider Firewall provider (Factory)
@@ -69,7 +69,7 @@ public function getAllowedIps()
 
     /**
      * Set the request object
-     * 
+     *
      * @param Request $request The Request object
      *
      * @return $this