[9.x] Fix master CI (#40329)

* wip

* wip

* wip

* wip

* wip

* fix builder

* fix

Co-authored-by: Taylor Otwell <[email protected]>

Author: driesvints

.github/workflows/tests.yml

@@ -62,6 +62,14 @@ jobs:
           command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update
         if: matrix.php >= 8
 
+      - name: Set Minimum PHP 8.1 Versions
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer require ramsey/collection:^1.2 brick/math:^0.9.3 --no-interaction --no-update
+        if: matrix.php >= 8.1
+
       - name: Install dependencies
         uses: nick-invision/retry@v1
         with:

composer.json

@@ -23,7 +23,7 @@
         "egulias/email-validator": "^3.1",
         "laravel/serializable-closure": "^1.0",
         "league/commonmark": "^2.0.2",
-        "league/flysystem": "^2.0",
+        "league/flysystem": "^2.3.1",
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.53.1",
         "psr/container": "^1.1.1|^2.0.1",

src/Illuminate/Database/Query/Builder.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Query;
 
 use BackedEnum;
+use Carbon\CarbonPeriod;
 use Closure;
 use DateTimeInterface;
 use Illuminate\Contracts\Database\Query\Builder as BuilderContract;
@@ -927,6 +928,10 @@ public function whereBetween($column, iterable $values, $boolean = 'and', $not =
     {
         $type = 'between';
 
+        if ($values instanceof CarbonPeriod) {
+            $values = $values->toArray();
+        }
+
         $this->wheres[] = compact('type', 'column', 'values', 'boolean', 'not');
 
         $this->addBinding(array_slice($this->cleanBindings(Arr::flatten($values)), 0, 2), 'where');

src/Illuminate/Database/Query/Grammars/Grammar.php

@@ -358,9 +358,9 @@ protected function whereBetween(Builder $query, $where)
     {
         $between = $where['not'] ? 'not between' : 'between';
 
-        $min = $this->parameter(reset($where['values']));
+        $min = $this->parameter(is_array($where['values']) ? reset($where['values']) : $where['values'][0]);
 
-        $max = $this->parameter(end($where['values']));
+        $max = $this->parameter(is_array($where['values']) ? end($where['values']) : $where['values'][1]);
 
         return $this->wrap($where['column']).' '.$between.' '.$min.' and '.$max;
     }
@@ -376,9 +376,9 @@ protected function whereBetweenColumns(Builder $query, $where)
     {
         $between = $where['not'] ? 'not between' : 'between';
 
-        $min = $this->wrap(reset($where['values']));
+        $min = $this->wrap(is_array($where['values']) ? reset($where['values']) : $where['values'][0]);
 
-        $max = $this->wrap(end($where['values']));
+        $max = $this->wrap(is_array($where['values']) ? end($where['values']) : $where['values'][1]);
 
         return $this->wrap($where['column']).' '.$between.' '.$min.' and '.$max;
     }

src/Illuminate/Encryption/Encrypter.php

@@ -109,7 +109,7 @@ public function encrypt($value, $serialize = true)
         }
 
         $iv = base64_encode($iv);
-        $tag = base64_encode($tag);
+        $tag = base64_encode($tag ?? '');
 
         $mac = self::$supportedCiphers[strtolower($this->cipher)]['aead']
             ? '' // For AEAD-algoritms, the tag / MAC is returned by openssl_encrypt...

src/Illuminate/Filesystem/composer.json

@@ -34,7 +34,7 @@
     "suggest": {
         "ext-ftp": "Required to use the Flysystem FTP driver.",
         "illuminate/http": "Required for handling uploaded files (^7.0).",
-        "league/flysystem": "Required to use the Flysystem local driver (^2.0).",
+        "league/flysystem": "Required to use the Flysystem local driver (^2.3.1).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^2.0).",
         "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^2.0).",
         "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^2.4).",

tests/Support/SupportHelpersTest.php

@@ -13,6 +13,7 @@
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
 use stdClass;
+use Traversable;
 
 class SupportHelpersTest extends TestCase
 {
@@ -836,7 +837,7 @@ public function __construct($items = [])
         $this->items = $items;
     }
 
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         return new ArrayIterator($this->items);
     }