Merge branch '8.x' into 9.x

# Conflicts:
#	src/Illuminate/Foundation/Application.php

Author: driesvints

src/Illuminate/Bus/PendingBatch.php

@@ -226,6 +226,20 @@ public function queue()
         return $this->options['queue'] ?? null;
     }
 
+    /**
+     * Add additional data into the batch's options array.
+     *
+     * @param  string  $key
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function withOption(string $key, $value)
+    {
+        $this->options[$key] = $value;
+
+        return $this;
+    }
+
     /**
      * Dispatch the batch.
      *

src/Illuminate/Database/Events/MigrationsEnded.php

@@ -2,9 +2,7 @@
 
 namespace Illuminate\Database\Events;
 
-use Illuminate\Contracts\Database\Events\MigrationEvent as MigrationEventContract;
-
-class MigrationsEnded implements MigrationEventContract
+class MigrationsEnded extends MigrationsEvent
 {
     //
 }

src/Illuminate/Database/Events/MigrationsEvent.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Illuminate\Database\Events;
+
+use Illuminate\Contracts\Database\Events\MigrationEvent as MigrationEventContract;
+
+abstract class MigrationsEvent implements MigrationEventContract
+{
+    /**
+     * The migration method that was invoked.
+     *
+     * @var string
+     */
+    public $method;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  string  $method
+     * @return void
+     */
+    public function __construct($method)
+    {
+        $this->method = $method;
+    }
+}

src/Illuminate/Database/Events/MigrationsStarted.php

@@ -2,9 +2,7 @@
 
 namespace Illuminate\Database\Events;
 
-use Illuminate\Contracts\Database\Events\MigrationEvent as MigrationEventContract;
-
-class MigrationsStarted implements MigrationEventContract
+class MigrationsStarted extends MigrationsEvent
 {
     //
 }

src/Illuminate/Database/Migrations/Migrator.php

@@ -158,7 +158,7 @@ public function runPending(array $migrations, array $options = [])
 
         $step = $options['step'] ?? false;
 
-        $this->fireMigrationEvent(new MigrationsStarted);
+        $this->fireMigrationEvent(new MigrationsStarted('up'));
 
         // Once we have the array of migrations, we will spin through them and run the
         // migrations "up" so the changes are made to the databases. We'll then log
@@ -171,7 +171,7 @@ public function runPending(array $migrations, array $options = [])
             }
         }
 
-        $this->fireMigrationEvent(new MigrationsEnded);
+        $this->fireMigrationEvent(new MigrationsEnded('up'));
     }
 
     /**
@@ -265,7 +265,7 @@ protected function rollbackMigrations(array $migrations, $paths, array $options)
 
         $this->requireFiles($files = $this->getMigrationFiles($paths));
 
-        $this->fireMigrationEvent(new MigrationsStarted);
+        $this->fireMigrationEvent(new MigrationsStarted('down'));
 
         // Next we will run through all of the migrations and call the "down" method
         // which will reverse each migration in order. This getLast method on the
@@ -287,7 +287,7 @@ protected function rollbackMigrations(array $migrations, $paths, array $options)
             );
         }
 
-        $this->fireMigrationEvent(new MigrationsEnded);
+        $this->fireMigrationEvent(new MigrationsEnded('down'));
 
         return $rolledBack;
     }

src/Illuminate/Database/Schema/Builder.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Database\Schema;
 
 use Closure;
+use Illuminate\Container\Container;
 use Illuminate\Database\Connection;
 use InvalidArgumentException;
 use LogicException;
@@ -380,7 +381,7 @@ protected function createBlueprint($table, Closure $callback = null)
             return call_user_func($this->resolver, $table, $callback, $prefix);
         }
 
-        return new Blueprint($table, $callback, $prefix);
+        return Container::getInstance()->make(Blueprint::class, compact('table', 'callback', 'prefix'));
     }
 
     /**

src/Illuminate/Log/LogManager.php

@@ -112,14 +112,6 @@ public function driver($driver = null)
         return $this->get($this->parseDriver($driver));
     }
 
-    /**
-     * @return array
-     */
-    public function getChannels()
-    {
-        return $this->channels;
-    }
-
     /**
      * Attempt to get the log from the local cache.
      *
@@ -534,6 +526,16 @@ protected function parseDriver($driver)
         return $driver;
     }
 
+    /**
+     * Get all of the resolved log channels.
+     *
+     * @return array
+     */
+    public function getChannels()
+    {
+        return $this->channels;
+    }
+
     /**
      * System is unusable.
      *

src/Illuminate/Support/Pluralizer.php

@@ -2,10 +2,8 @@
 
 namespace Illuminate\Support;
 
-use Doctrine\Inflector\CachedWordInflector;
 use Doctrine\Inflector\Inflector;
-use Doctrine\Inflector\Rules\English;
-use Doctrine\Inflector\RulesetInflector;
+use Doctrine\Inflector\InflectorFactory;
 
 class Pluralizer
 {
@@ -136,14 +134,7 @@ public static function inflector()
         static $inflector;
 
         if (is_null($inflector)) {
-            $inflector = new Inflector(
-                new CachedWordInflector(new RulesetInflector(
-                    English\Rules::getSingularRuleset()
-                )),
-                new CachedWordInflector(new RulesetInflector(
-                    English\Rules::getPluralRuleset()
-                ))
-            );
+            $inflector = InflectorFactory::createForLanguage('english')->build();
         }
 
         return $inflector;

src/Illuminate/Support/Stringable.php

@@ -775,17 +775,7 @@ public function ucfirst()
      */
     public function whenContains($needles, $callback, $default = null)
     {
-        if ($this->contains($needles)) {
-            $result = $callback($this);
-
-            return $result ?? $this;
-        } elseif ($default) {
-            $result = $default($this);
-
-            return $result ?? $this;
-        }
-
-        return $this;
+        return $this->when($this->contains($needles), $callback, $default);
     }
 
     /**
@@ -798,17 +788,7 @@ public function whenContains($needles, $callback, $default = null)
      */
     public function whenContainsAll(array $needles, $callback, $default = null)
     {
-        if ($this->containsAll($needles)) {
-            $result = $callback($this);
-
-            return $result ?? $this;
-        } elseif ($default) {
-            $result = $default($this);
-
-            return $result ?? $this;
-        }
-
-        return $this;
+        return $this->when($this->containsAll($needles), $callback, $default);
     }
 
     /**
@@ -845,6 +825,95 @@ public function whenNotEmpty($callback)
         return $this;
     }
 
+    /**
+     * Execute the given callback if the string ends with a given substring.
+     *
+     * @param  string|array  $needles
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenEndsWith($needles, $callback, $default = null)
+    {
+        return $this->when($this->endsWith($needles), $callback, $default);
+    }
+
+    /**
+     * Execute the given callback if the string is an exact match with the given value.
+     *
+     * @param  string  $value
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenExactly($value, $callback, $default = null)
+    {
+        return $this->when($this->exactly($value), $callback, $default);
+    }
+
+    /**
+     * Execute the given callback if the string matches a given pattern.
+     *
+     * @param  string|array  $pattern
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenIs($pattern, $callback, $default = null)
+    {
+        return $this->when($this->is($pattern), $callback, $default);
+    }
+
+    /**
+     * Execute the given callback if the string is 7 bit ASCII.
+     *
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenIsAscii($callback, $default = null)
+    {
+        return $this->when($this->isAscii(), $callback, $default);
+    }
+
+    /**
+     * Execute the given callback if the string is a valid UUID.
+     *
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenIsUuid($callback, $default = null)
+    {
+        return $this->when($this->isUuid(), $callback, $default);
+    }
+
+    /**
+     * Execute the given callback if the string starts with a given substring.
+     *
+     * @param  string|array  $needles
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenStartsWith($needles, $callback, $default = null)
+    {
+        return $this->when($this->startsWith($needles), $callback, $default);
+    }
+
+    /**
+     * Execute the given callback if the string matches the given pattern.
+     *
+     * @param  string  $pattern
+     * @param  callable  $callback
+     * @param  callable|null  $default
+     * @return static
+     */
+    public function whenTest($pattern, $callback, $default = null)
+    {
+        return $this->when($this->test($pattern), $callback, $default);
+    }
+
     /**
      * Limit the number of words in a string.
      *

src/Illuminate/Validation/Rules/Enum.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Validation\Rules;
 
 use Illuminate\Contracts\Validation\Rule;
+use TypeError;
 
 class Enum implements Rule
 {
@@ -37,7 +38,11 @@ public function passes($attribute, $value)
             return false;
         }
 
-        return ! is_null($this->type::tryFrom($value));
+        try {
+            return ! is_null($this->type::tryFrom($value));
+        } catch (TypeError $e) {
+            return false;
+        }
     }
 
     /**