Better handling of hidden fields and route inferring

glhd · Dec 28, 2018 · 151f437 · 151f437
1 parent 0f9f70f
commit 151f437
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 8 deletions.
diff --git a/src/DTD/Concerns/HasGlobalAttributes.php b/src/DTD/Concerns/HasGlobalAttributes.php
@@ -152,7 +152,7 @@ public function dropZone($value = null)
 	 * @param bool $hidden
 	 * @return $this
 	 */
-	public function hidden(?bool $hidden = true)
+	public function hide(?bool $hidden = true)
 	{
 		$this->attributes['hidden'] = $hidden;
 

diff --git a/src/DTD/Form.php b/src/DTD/Form.php
@@ -177,7 +177,9 @@ public function encType($value = null)
 	 */
 	public function method($value = null)
 	{
-		$this->attributes['method'] = $value;
+		$this->attributes['method'] = $value
+			? strtoupper($value)
+			: null;
 
 		return $this;
 	}

diff --git a/src/Elements/Concerns/CreatesInputTypes.php b/src/Elements/Concerns/CreatesInputTypes.php
@@ -8,6 +8,19 @@ trait CreatesInputTypes
 {
 	abstract public function input($name = null, $label = null) : Input;
 
+	public function hidden($name = null, $value = null) : Input
+	{
+		$input = $this->input($name);
+
+		$input->type('hidden');
+
+		if ($value) {
+			$input->value($value);
+		}
+
+		return $input;
+	}
+
 	public function checkbox($name = null, $label = null) : Input
 	{
 		$input = $this->input($name, $label);

diff --git a/src/Elements/Form.php b/src/Elements/Form.php
@@ -5,7 +5,6 @@
 use Galahad\Aire\Aire;
 use Galahad\Aire\Elements\Concerns\CreatesElements;
 use Galahad\Aire\Elements\Concerns\CreatesInputTypes;
-use Illuminate\Routing\RouteCollection;
 use Illuminate\Routing\Router;
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Session\Store;
@@ -330,6 +329,10 @@ protected function initGroup()
 
 	protected function inferMethodFromRoute($route_name)
 	{
+		if ($this->attributes['method'] !== $this->default_attributes['method']) {
+			return;
+		}
+
 		if (!$this->router) {
 			return;
 		}
@@ -342,7 +345,7 @@ protected function inferMethodFromRoute($route_name)
 			return 'HEAD' !== $method;
 		});
 
-		if (1 !== count($methods)) {
+		if (!count($methods)) {
 			return;
 		}
 

diff --git a/tests/DTD/FormTest.php b/tests/DTD/FormTest.php
@@ -277,10 +277,10 @@ public function test_method_attribute_can_be_set_and_unset() : void
 		$form = $this->aire()->form();
 
 		$form->method('get');
-		$this->assertSelectorAttribute($form, 'form', 'method', 'get');
+		$this->assertSelectorAttribute($form, 'form', 'method', 'GET');
 
 		$form->method('post');
-		$this->assertSelectorAttribute($form, 'form', 'method', 'post');
+		$this->assertSelectorAttribute($form, 'form', 'method', 'POST');
 
 		$form->method(null);
 		$this->assertSelectorAttributeMissing($form, 'form', 'method');

diff --git a/tests/DTD/GlobalAttributesTest.php b/tests/DTD/GlobalAttributesTest.php
@@ -136,10 +136,10 @@ public function test_hidden_flag_can_be_set_on_and_off() : void
 	{
 		$form = $this->aire()->form();
 
-		$form->hidden();
+		$form->hide();
 		$this->assertSelectorAttribute($form, 'form', 'hidden');
 
-		$form->hidden(false);
+		$form->hide(false);
 		$this->assertSelectorAttributeMissing($form, 'form', 'hidden');
 	}