From 5c405512d75dcaf5d37791badce02d86ed8e4bc4 Mon Sep 17 00:00:00 2001 From: Rishabh Pandey Date: Sat, 11 Aug 2018 01:10:01 +0530 Subject: [PATCH 1/6] Fixes #25174 (#25175) incorrect PHPDoc --- Facades/Route.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Facades/Route.php b/Facades/Route.php index 4fa804136..ab2086c4d 100755 --- a/Facades/Route.php +++ b/Facades/Route.php @@ -22,7 +22,7 @@ * @method static \Illuminate\Support\Facades\Route name(string $value) * @method static \Illuminate\Support\Facades\Route namespace(string $value) * @method static \Illuminate\Support\Facades\Route where(array|string $name, string $expression = null) - * @method static \Illuminate\Routing\Router group(\Closure|string|array $value) + * @method static \Illuminate\Routing\Router group(\Closure|string|array $value, \Closure|string $routes) * @method static \Illuminate\Support\Facades\Route redirect(string $uri, string $destination, int $status = 301) * @method static \Illuminate\Support\Facades\Route view(string $uri, string $view, array $data = []) * From 56f5d53c66c042cf949b80b8233cd95f59ca6387 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 13 Nov 2018 15:14:43 +0100 Subject: [PATCH 2/6] [5.5] Fix cache repository (#26497) * Fix a bug with PHP 7.2.12 PHP 7.2.12 broke the way Carbon's diffInSeconds method works. Using diffInRealSeconds instead fixes the problem. See https://github.com/briannesbitt/Carbon/issues/1503 * Clean up diff check in cache repository We can pass the duration here directly. Signed-off-by: Dries Vints * Upgrade minimum Carbon requirement We need this for the diffInRealSeconds method. Signed-off-by: Dries Vints --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 35f3ebd21..a98450c02 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "ext-mbstring": "*", "doctrine/inflector": "~1.1", "illuminate/contracts": "5.5.*", - "nesbot/carbon": "^1.24.1" + "nesbot/carbon": "^1.26.0" }, "replace": { "tightenco/collect": "<5.5.33" From 20d540bc292cd7a421f74eb503c9a70d73e9e0af Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 1 Feb 2019 09:35:50 +0100 Subject: [PATCH 3/6] Fix for route facade phpdoc to avoid Phan errors --- Facades/Route.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Facades/Route.php b/Facades/Route.php index ab2086c4d..a164cc1da 100755 --- a/Facades/Route.php +++ b/Facades/Route.php @@ -14,7 +14,7 @@ * @method static \Illuminate\Support\Facades\Route prefix(string $prefix) * @method static \Illuminate\Routing\PendingResourceRegistration resource(string $name, string $controller, array $options = []) * @method static \Illuminate\Routing\PendingResourceRegistration apiResource(string $name, string $controller, array $options = []) - * @method static \Illuminate\Support\Facades\Route middleware(array|string|null $middleware) + * @method static \Illuminate\Routing\RouteRegistrar middleware(array|string|null $middleware) * @method static \Illuminate\Support\Facades\Route substituteBindings(\Illuminate\Support\Facades\Route $route) * @method static void substituteImplicitBindings(\Illuminate\Support\Facades\Route $route) * @method static \Illuminate\Support\Facades\Route as(string $value) From a09e05f7f4810c1973abdda6a824cf63b6e23d84 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 11 Feb 2019 14:48:57 +0100 Subject: [PATCH 4/6] Add license file to each component Since we use a sub-split to split components into separate packages it's wanted that we also provide a license file for each component. Fixes https://github.com/laravel/framework/issues/27392 --- LICENSE.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..79810c848 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) Taylor Otwell + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. From c0e71ca2f341cd5089c426e2db6a85deaf8e62b1 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 3 Jul 2019 13:29:57 +0200 Subject: [PATCH 5/6] Added return type to avoid errors in tests --- Testing/Fakes/MailFake.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Testing/Fakes/MailFake.php b/Testing/Fakes/MailFake.php index 0d11c0863..0b7ac27a4 100644 --- a/Testing/Fakes/MailFake.php +++ b/Testing/Fakes/MailFake.php @@ -311,6 +311,6 @@ public function queue($view, $queue = null) */ public function failures() { - // + return []; } } From a10c113b750f3b4221ead41962bef9c65af580b5 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Thu, 13 Aug 2020 16:04:30 +0200 Subject: [PATCH 6/6] [5.5] Security fixes (#33858) * fix casing issue with guarded * block json mass assignment * formatting * add boolean * protect table names and guarded * Apply fixes from StyleCI (#33772) * dont allow mass filling with table names * Apply fixes from StyleCI (#33773) * [6.x] Verify column names are actual columns when using guarded (#33777) * verify column names are actual columns when using guarded * Apply fixes from StyleCI (#33778) * remove json check * Apply fixes from StyleCI (#33857) Co-authored-by: Taylor Otwell Co-authored-by: Taylor Otwell --- Collection.php | 2 +- helpers.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Collection.php b/Collection.php index 38dd526f0..528a83337 100644 --- a/Collection.php +++ b/Collection.php @@ -275,7 +275,7 @@ public function dd(...$args) call_user_func_array([$this, 'dump'], $args); - die(1); + exit(1); } /** diff --git a/helpers.php b/helpers.php index c52fd66fa..a574f7d15 100755 --- a/helpers.php +++ b/helpers.php @@ -559,7 +559,7 @@ function dd(...$args) (new Dumper)->dump($x); } - die(1); + exit(1); } }