Merge branch 'debian/unstable' into debian/latest

debian/changelog

+php-laravel-framework (6.20.14+dfsg-2) unstable; urgency=medium
+
+  * Fix security issue: SQL injection with Microsoft SQL Server
+    (Closes: #987831)
+
+ -- Robin Gustafsson <robin@rgson.se>  Fri, 30 Apr 2021 18:23:38 +0200
+
 php-laravel-framework (6.20.14+dfsg-1) unstable; urgency=medium
 
   * New upstream version 6.20.14+dfsg

debian/patches/0001-cast-to-int.patch

+From: Taylor Otwell <taylorotwell@gmail.com>
+Date: Wed, 28 Apr 2021 08:18:19 -0500
+Subject: cast to int
+
+Origin: https://github.com/laravel/framework/commit/09bf1457e9df53e172e6fd5929cbafb539677c7c
+Applied-Upstream: 6.20.26
+---
+ src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
+index f0a0bfc..88a7df3 100755
+--- a/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
++++ b/src/Illuminate/Database/Query/Grammars/SqlServerGrammar.php
+@@ -60,8 +60,8 @@ class SqlServerGrammar extends Grammar
+         // If there is a limit on the query, but not an offset, we will add the top
+         // clause to the query, which serves as a "limit" type clause within the
+         // SQL Server system similar to the limit keywords available in MySQL.
+-        if ($query->limit > 0 && $query->offset <= 0) {
+-            $select .= 'top '.$query->limit.' ';
++        if (is_numeric($query->limit) && $query->limit > 0 && $query->offset <= 0) {
++            $select .= 'top '.((int) $query->limit).' ';
+         }
+ 
+         return $select.$this->columnize($columns);
+@@ -221,10 +221,10 @@ class SqlServerGrammar extends Grammar
+      */
+     protected function compileRowConstraint($query)
+     {
+-        $start = $query->offset + 1;
++        $start = (int) $query->offset + 1;
+ 
+         if ($query->limit > 0) {
+-            $finish = $query->offset + $query->limit;
++            $finish = (int) $query->offset + (int) $query->limit;
+ 
+             return "between {$start} and {$finish}";
+         }

debian/patches/series

+0001-cast-to-int.patch