make requirement and default optional

FriendsOfSymfony · Jun 7, 2012 · 55d76e1 · 55d76e1
1 parent 1fd5129
commit 55d76e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Controller/Annotations/QueryParam.php b/Controller/Annotations/QueryParam.php
@@ -22,9 +22,9 @@ class QueryParam
     /** @var string */
     public $name;
     /** @var string */
-    public $requirements;
+    public $requirements = '';
     /** @var string */
-    public $default;
+    public $default = '';
     /** @var string */
     public $description;
 }
diff --git a/Request/QueryFetcher.php b/Request/QueryFetcher.php
@@ -88,7 +88,10 @@ public function get($name, $strict = false)
         $param = $this->request->query->get($name, $default);
 
         // Set default if the requirements do not match
-        if ($param !== $default && !preg_match('#^'.$config->requirements.'$#xs', $param)) {
+        if ("" !== $config->requirements
+            && $param !== $default
+            && !preg_match('#^'.$config->requirements.'$#xs', $param)
+        ) {
             if ($strict) {
                 throw new \RuntimeException("Query parameter value '$param', does not match requirements '{$config->requirements}'");
             }