Skip to content

Commit 781445a

Browse files
committed
Merge branch '10.x'
# Conflicts: # src/Application.php
2 parents 7a8963d + ef69ade commit 781445a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/ISSUE_TEMPLATE/1_Bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: Bug Report
2-
description: "Report a general library issue."
2+
description: "Report something that's broken."
33
body:
44
- type: markdown
55
attributes:
6-
value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
6+
value: "Please read [our full contribution guide](https://laravel.com/docs/contributions#bug-reports) before submitting bug reports. If you notice improper DocBlock, PHPStan, or IDE warnings while using Laravel, do not create a GitHub issue. Instead, please submit a pull request to fix the problem."
77
- type: input
88
attributes:
99
label: Lumen Version

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
},
5555
"require-dev": {
5656
"mockery/mockery": "^1.4.4",
57-
"phpunit/phpunit": "^10.0"
57+
"phpunit/phpunit": "10.5.3"
5858
},
5959
"suggest": {
6060
"laravel/tinker": "Required to use the tinker console command (^2.7).",

src/Routing/UrlGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ public function forceScheme($schema)
202202
* @param bool|null $secure
203203
* @return string
204204
*/
205-
public function formatScheme($secure)
205+
public function formatScheme($secure = null)
206206
{
207207
if (! is_null($secure)) {
208208
return $secure ? 'https://' : 'http://';

0 commit comments

Comments
 (0)