Merge pull request #37 from liip/support_method_ips_attributes

added support for method, ips and attributes in the rules matcher

Author: dbu

DependencyInjection/Configuration.php

@@ -51,6 +51,24 @@ private function addRulesSection(ArrayNodeDefinition $rootNode)
                         ->children()
                             ->scalarNode('unless_role')->defaultNull()->end()
                             ->scalarNode('path')->defaultNull()->info('URL path info')->end()
+                            ->arrayNode('method')
+                                ->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                                ->useAttributeAsKey('name')
+                                ->prototype('scalar')->end()
+                                ->info('HTTP method')
+                            ->end()
+                            ->arrayNode('ips')
+                                ->beforeNormalization()->ifString()->then(function($v) { return preg_split('/\s*,\s*/', $v); })->end()
+                                ->useAttributeAsKey('name')
+                                ->prototype('scalar')->end()
+                                ->info('List of ips')
+                            ->end()
+                            ->arrayNode('attributes')
+                                ->addDefaultsIfNotSet()
+                                ->cannotBeEmpty()
+                                ->treatNullLike(array())
+                                ->info('Request attributes')
+                            ->end()
                             ->scalarNode('domain')->defaultNull()->info('depreciated, use host instead')->end()
                             ->scalarNode('host')->defaultNull()->info('URL host name')->end()
                             ->scalarNode('controller')->defaultNull()->info('controller action name')->end()

DependencyInjection/LiipCacheControlExtension.php

@@ -39,11 +39,17 @@ public function load(array $configs, ContainerBuilder $container)
                     $container,
                     $cache['path'],
                     $host,
+                    $cache['method'],
+                    $cache['ips'],
+                    $cache['attributes'],
                     $cache['controller']
                 );
 
                 unset(
                     $cache['path'],
+                    $cache['method'],
+                    $cache['ips'],
+                    $cache['attributes'],
                     $cache['domain'],
                     $cache['host'],
                     $cache['controller']
@@ -82,11 +88,13 @@ public function load(array $configs, ContainerBuilder $container)
         }
     }
 
-    protected function createRequestMatcher(ContainerBuilder $container, $path = null, $host = null, $controller = null)
+    protected function createRequestMatcher(ContainerBuilder $container, $path = null, $host = null, $methods = null, $ips = null, array $attributes = array(), $controller = null)
     {
-        $attributes = is_null($controller) ? array() : array('_controller' => $controller);
+        if (null !== $controller) {
+            $attributes['_controller'] = $controller;
+        }
 
-        $arguments = array($path, $host, null, null, $attributes);
+        $arguments = array($path, $host, $methods, $ips, $attributes);
         $serialized = serialize($arguments);
         $id = $this->getAlias().'.request_matcher.'.md5($serialized).sha1($serialized);
 

README.md

@@ -58,6 +58,7 @@ liip_cache_control:
 
 The matches are tried from top to bottom, the first match is taken and applied.
 
+Run ``app/console config:dump-reference liip_cache_control`` to get the full list of configuration options.
 
 About the path parameter
 ------------------------