Merge branch '6.x' into 8.x

GrahamCampbell · GrahamCampbell · commit 6bc7d1b250ad · 2021-01-28T12:52:34.000Z
diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
@@ -1,6 +1,19 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.13...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.15...6.x)
+
+
+## [v6.20.15 (2021-01-26)](https://github.com/laravel/framework/compare/v6.20.14...v6.20.15)
+
+### Changed
+- Pipe new through render and report exception methods ([#36037](https://github.com/laravel/framework/pull/36037))
+
+
+## [v6.20.14 (2021-01-21)](https://github.com/laravel/framework/compare/v6.20.13...v6.20.14)
+
+### Fixed
+- Fixed type error in `Illuminate\Http\Concerns\InteractsWithContentTypes::isJson()` ([#35956](https://github.com/laravel/framework/pull/35956))
+- Limit expected bindings ([#35972](https://github.com/laravel/framework/pull/35972), [006873d](https://github.com/laravel/framework/commit/006873df411d28bfd03fea5e7f91a2afe3918498))
 
 
 ## [v6.20.13 (2021-01-19)](https://github.com/laravel/framework/compare/v6.20.12...v6.20.13)
diff --git a/src/Illuminate/Pagination/AbstractPaginator.php b/src/Illuminate/Pagination/AbstractPaginator.php
@@ -494,7 +494,7 @@ public static function currentPathResolver(Closure $resolver)
     public static function resolveCurrentPage($pageName = 'page', $default = 1)
     {
         if (isset(static::$currentPageResolver)) {
-            return call_user_func(static::$currentPageResolver, $pageName);
+            return (int) call_user_func(static::$currentPageResolver, $pageName);
         }
 
         return $default;

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ public static function currentPathResolver(Closure $resolver)`
`494`	`494`	`public static function resolveCurrentPage($pageName = 'page', $default = 1)`
`495`	`495`	`{`
`496`	`496`	`if (isset(static::$currentPageResolver)) {`
`497`		`- return call_user_func(static::$currentPageResolver, $pageName);`
	`497`	`+ return (int) call_user_func(static::$currentPageResolver, $pageName);`
`498`	`498`	`}`
`499`	`499`
`500`	`500`	`return $default;`