Merge pull request #112 from marekk/master

sfBrowserBase - don't post unnamed submit fields

Author: j0k3r

lib/autoload/sfCoreAutoload.class.php

@@ -163,7 +163,9 @@ static public function make()
       $class = basename($file, false === strpos($file, '.class.php') ? '.php' : '.class.php');
 
       $contents = file_get_contents($file);
-      if (false !== stripos($contents, 'class '.$class) || false !== stripos($contents, 'interface '.$class))
+      if (false !== stripos($contents, 'class '.$class)
+          || false !== stripos($contents, 'interface '.$class)
+          || false !== stripos($contents, 'trait '.$class))
       {
         $classes .= sprintf("    '%s' => '%s',\n", strtolower($class), substr(str_replace($libDir, '', $file), 1));
       }

lib/autoload/sfSimpleAutoload.class.php

@@ -286,7 +286,7 @@ public function addFile($file, $register = true)
       $this->cacheChanged = true;
     }
 
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface)\s+(\w+)~mi', file_get_contents($file), $classes);
+    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
     foreach ($classes[1] as $class)
     {
       $this->classes[strtolower($class)] = $file;

lib/config/sfAutoloadConfigHandler.class.php

@@ -126,7 +126,7 @@ protected function parse(array $configFiles)
   static public function parseFile($path, $file, $prefix)
   {
     $mapping = array();
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface)\s+(\w+)~mi', file_get_contents($file), $classes);
+    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
     foreach ($classes[1] as $class)
     {
       $localPrefix = '';

lib/util/sfBrowserBase.class.php

@@ -778,8 +778,11 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     }
     else if ('button' == $item->nodeName || ('input' == $item->nodeName && in_array($item->getAttribute('type'), array('submit', 'button', 'image'))))
     {
-      // add the item's value to the arguments
-      $this->parseArgumentAsArray($item->getAttribute('name'), $item->getAttribute('value'), $arguments);
+      // add the item's value to the arguments if name is provided
+      if ($item->getAttribute('name'))
+      {
+        $this->parseArgumentAsArray($item->getAttribute('name'), $item->getAttribute('value'), $arguments);
+      }
 
       // use the ancestor form element
       do

test/unit/util/sfBrowserTest.php

@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(74);
+$t = new lime_test(76);
 
 // ->click()
 $t->diag('->click()');
@@ -127,6 +127,11 @@ public function getDefaultServerArray($name)
       </span></div>
     </form>
 
+    <form action="/myform7" method="post">
+      <input type="text" name="text_default_value" value="default" />
+      <input type="submit" value="submit7" />
+    </form>
+
     <a href="/myotherlink">test link</a>
     <a href="/submitlink">submit</a>
     <a href="/submitimagelink"><img src="myimage.gif" alt="submit" /></a>
@@ -353,3 +358,9 @@ public function getDefaultServerArray($name)
 list($method, $uri, $parameters) = $b->click('submit6');
 $t->is($parameters['bar'], 'bar', '->click() overrides input elements defined several times');
 $t->is($parameters['foo']['bar'], 'bar', '->click() overrides input elements defined several times');
+
+// bug #106
+$t->diag('bug #106');
+list($method, $uri, $parameters) = $b->click('submit7');
+$t->is(isset($parameters['']), false, 'submit without name is not submitted');
+$t->is($parameters['text_default_value'], 'default', 'input field with name is still submitted');