From 215f20b8c2b6f2011682c697745269016fb2abfb Mon Sep 17 00:00:00 2001 From: Tom Shafer Date: Thu, 8 Feb 2018 08:25:51 -0800 Subject: [PATCH 1/6] Update composer.json --- composer.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 30e2c2da..0ef2d98a 100755 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ ], "require": { "php": ">=7.0.0", - "illuminate/http": "5.6.x-dev", - "illuminate/routing": "5.6.x-dev", - "illuminate/session": "5.6.x-dev", - "illuminate/support": "5.6.x-dev", - "illuminate/view": "5.6.x-dev" + "illuminate/http": "5.5.*", + "illuminate/routing": "5.5.*", + "illuminate/session": "5.5.*", + "illuminate/support": "5.5.*", + "illuminate/view": "5.5.*" }, "require-dev": { - "illuminate/database": "5.6.x-dev", + "illuminate/database": "5.5.*", "mockery/mockery": "~0.9.4", "phpunit/phpunit": "~5.4" }, @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.5.*" }, "laravel": { "providers": [ From b79edc7acf574144c9811277286b4cafee8a07cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anderson=20Fria=C3=A7a?= Date: Mon, 12 Feb 2018 11:19:55 -0300 Subject: [PATCH 2/6] [5.5] Validation in select field for boolean value of selected option (#490) * [5.5] Validation in select field for boolean value of selected option * Adjustment --- src/FormBuilder.php | 6 ++++-- tests/FormBuilderTest.php | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/FormBuilder.php b/src/FormBuilder.php index 1c7e22d9..62584941 100644 --- a/src/FormBuilder.php +++ b/src/FormBuilder.php @@ -572,7 +572,7 @@ protected function setQuickTextAreaSize($options) * * @param string $name * @param array $list - * @param string $selected + * @param string|bool $selected * @param array $selectAttributes * @param array $optionsAttributes * @param array $optgroupsAttributes @@ -784,7 +784,9 @@ protected function getSelectedValue($value, $selected) } elseif ($selected instanceof Collection) { return $selected->contains($value) ? 'selected' : null; } - + if (is_int($value) && is_bool($selected)) { + return (bool)$value === $selected; + } return ((string) $value === (string) $selected) ? 'selected' : null; } diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php index e6b1765d..834afaae 100644 --- a/tests/FormBuilderTest.php +++ b/tests/FormBuilderTest.php @@ -464,6 +464,12 @@ public function testSelect() '', $result ); + + $select = $this->formBuilder->select('avc', [1 => 'Yes', 0 => 'No'], true, ['placeholder' => 'Select']); + $this->assertEquals( + '', + $select + ); } public function testSelectCollection() From 33984f5e87221b362cce54cc73d3ef0f1c6aa472 Mon Sep 17 00:00:00 2001 From: Tortue Torche Date: Thu, 22 Mar 2018 15:00:50 +0100 Subject: [PATCH 3/6] [5.5] Fix form method of hidden input '_method' is preserved on next request (#505) This fix was merged in the pull request https://github.com/LaravelCollective/html/pull/460 But the pull request https://github.com/LaravelCollective/html/pull/471 accidentally revert this fix --- src/FormBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FormBuilder.php b/src/FormBuilder.php index 62584941..00ba728f 100644 --- a/src/FormBuilder.php +++ b/src/FormBuilder.php @@ -1183,7 +1183,7 @@ public function getValueAttribute($name, $value = null) } $request = $this->request($name); - if (! is_null($request)) { + if (! is_null($request) && $name !== '_method') { return $request; } From 3b177c17aaddfadcc4f5f7435e83596a46ce601b Mon Sep 17 00:00:00 2001 From: Tom Shafer Date: Fri, 23 Mar 2018 17:38:57 -0700 Subject: [PATCH 4/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0ef2d98a..67af3b93 100755 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.5.*" + "dev-master": "5.5.*-dev" }, "laravel": { "providers": [ From 04c596a69975b901f2223eb6eb4adf55354121c2 Mon Sep 17 00:00:00 2001 From: Tom Shafer Date: Fri, 23 Mar 2018 17:39:21 -0700 Subject: [PATCH 5/6] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 67af3b93..9746b163 100755 --- a/composer.json +++ b/composer.json @@ -40,7 +40,7 @@ }, "extra": { "branch-alias": { - "dev-master": "5.5.*-dev" + "dev-master": "5.5-dev" }, "laravel": { "providers": [ From 7c781e74fbc9e95f7c67636ed6728040dae23b44 Mon Sep 17 00:00:00 2001 From: Quentin Bontemps Date: Mon, 2 Apr 2018 16:20:40 +0200 Subject: [PATCH 6/6] Update composer.json (#507) Remove minimum-stability dev --- composer.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 9746b163..4fff3fc2 100755 --- a/composer.json +++ b/composer.json @@ -51,7 +51,5 @@ "Html": "Collective\\Html\\HtmlFacade" } } - }, - "minimum-stability": "dev", - "prefer-stable": true + } }