Merge branch '8.x'

# Conflicts:
#	composer.json
#	src/Illuminate/Mail/composer.json
#	src/Illuminate/Support/composer.json

Author: driesvints

composer.json

@@ -22,7 +22,7 @@
         "doctrine/inflector": "^2.0",
         "dragonmantank/cron-expression": "^3.1",
         "egulias/email-validator": "^3.1",
-        "league/commonmark": "^1.3",
+        "league/commonmark": "^1.3|^2.0",
         "league/flysystem": "^2.0",
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.31",

src/Illuminate/Bus/PendingBatch.php

@@ -62,7 +62,9 @@ public function __construct(Container $container, Collection $jobs)
      */
     public function add($jobs)
     {
-        $this->jobs->push($jobs);
+        foreach ($jobs as $job) {
+            $this->jobs->push($job);
+        }
 
         return $this;
     }

src/Illuminate/Database/Query/Builder.php

@@ -2045,7 +2045,7 @@ public function orderBy($column, $direction = 'asc')
     /**
      * Add a descending "order by" clause to the query.
      *
-     * @param  string  $column
+     * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Query\Expression|string  $column
      * @return $this
      */
     public function orderByDesc($column)
@@ -2056,7 +2056,7 @@ public function orderByDesc($column)
     /**
      * Add an "order by" clause for a timestamp to the query.
      *
-     * @param  string  $column
+     * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Query\Expression|string  $column
      * @return $this
      */
     public function latest($column = 'created_at')
@@ -2067,7 +2067,7 @@ public function latest($column = 'created_at')
     /**
      * Add an "order by" clause for a timestamp to the query.
      *
-     * @param  string  $column
+     * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Query\Expression|string  $column
      * @return $this
      */
     public function oldest($column = 'created_at')
@@ -2213,7 +2213,7 @@ public function forPageAfterId($perPage = 15, $lastId = 0, $column = 'id')
     /**
      * Remove all existing orders and optionally add a new order.
      *
-     * @param  string|null  $column
+     * @param  \Closure|\Illuminate\Database\Query\Builder|\Illuminate\Database\Query\Expression|string|null  $column
      * @param  string  $direction
      * @return $this
      */

src/Illuminate/Mail/Markdown.php

@@ -6,7 +6,6 @@
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\Str;
 use League\CommonMark\CommonMarkConverter;
-use League\CommonMark\Environment;
 use League\CommonMark\Extension\Table\TableExtension;
 use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
 
@@ -104,15 +103,13 @@ public function renderText($view, array $data = [])
      */
     public static function parse($text)
     {
-        $environment = Environment::createCommonMarkEnvironment();
-
-        $environment->addExtension(new TableExtension);
-
         $converter = new CommonMarkConverter([
             'allow_unsafe_links' => false,
-        ], $environment);
+        ]);
+
+        $converter->getEnvironment()->addExtension(new TableExtension());
 
-        return new HtmlString($converter->convertToHtml($text));
+        return new HtmlString((string) $converter->convertToHtml($text));
     }
 
     /**

src/Illuminate/Mail/composer.json

@@ -21,7 +21,7 @@
         "illuminate/contracts": "^9.0",
         "illuminate/macroable": "^9.0",
         "illuminate/support": "^9.0",
-        "league/commonmark": "^1.3",
+        "league/commonmark": "^1.3|^2.0",
         "psr/log": "^1.0",
         "swiftmailer/swiftmailer": "^6.2.7",
         "tijsverkoyen/css-to-inline-styles": "^2.2.2"

src/Illuminate/Support/Str.php

@@ -403,7 +403,7 @@ public static function markdown($string, array $options = [])
     {
         $converter = new GithubFlavoredMarkdownConverter($options);
 
-        return $converter->convertToHtml($string);
+        return (string) $converter->convertToHtml($string);
     }
 
     /**

src/Illuminate/Support/composer.json

@@ -42,7 +42,7 @@
     },
     "suggest": {
         "illuminate/filesystem": "Required to use the composer class (^9.0).",
-        "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^1.3).",
+        "league/commonmark": "Required to use Str::markdown() and Stringable::markdown() (^1.3|^2.0).",
         "ramsey/uuid": "Required to use Str::uuid() (^4.0).",
         "symfony/process": "Required to use the composer class (^5.3).",
         "symfony/var-dumper": "Required to use the dd function (^5.3).",