fix conflicts

Author: taylorotwell

src/Illuminate/Cache/NullStore.php

@@ -12,7 +12,7 @@ class NullStore extends TaggableStore implements LockProvider
      * Retrieve an item from the cache by key.
      *
      * @param  string  $key
-     * @return mixed
+     * @return void
      */
     public function get($key)
     {
@@ -37,7 +37,7 @@ public function put($key, $value, $seconds)
      *
      * @param  string  $key
      * @param  mixed  $value
-     * @return int|bool
+     * @return bool
      */
     public function increment($key, $value = 1)
     {
@@ -49,7 +49,7 @@ public function increment($key, $value = 1)
      *
      * @param  string  $key
      * @param  mixed  $value
-     * @return int|bool
+     * @return bool
      */
     public function decrement($key, $value = 1)
     {

src/Illuminate/Config/Repository.php

@@ -99,7 +99,7 @@ public function set($key, $value = null)
      */
     public function prepend($key, $value)
     {
-        $array = $this->get($key);
+        $array = $this->get($key, []);
 
         array_unshift($array, $value);
 
@@ -115,7 +115,7 @@ public function prepend($key, $value)
      */
     public function push($key, $value)
     {
-        $array = $this->get($key);
+        $array = $this->get($key, []);
 
         $array[] = $value;
 

src/Illuminate/Database/Eloquent/Factories/CrossJoinSequence.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace Illuminate\Database\Eloquent\Factories;
+
+use Illuminate\Support\Arr;
+
+class CrossJoinSequence extends Sequence
+{
+    /**
+     * Create a new cross join sequence instance.
+     *
+     * @param  array  $sequences
+     * @return void
+     */
+    public function __construct(...$sequences)
+    {
+        $crossJoined = array_map(
+            function ($a) {
+                return array_merge(...$a);
+            },
+            Arr::crossJoin(...$sequences),
+        );
+
+        parent::__construct(...$crossJoined);
+    }
+}

src/Illuminate/Database/Eloquent/Factories/Factory.php

@@ -494,6 +494,17 @@ public function sequence(...$sequence)
         return $this->state(new Sequence(...$sequence));
     }
 
+    /**
+     * Add a new cross joined sequenced state transformation to the model definition.
+     *
+     * @param  array  $sequence
+     * @return static
+     */
+    public function crossJoinSequence(...$sequence)
+    {
+        return $this->state(new CrossJoinSequence(...$sequence));
+    }
+
     /**
      * Define a child relationship for the model.
      *
@@ -678,12 +689,16 @@ public function newModel(array $attributes = [])
     public function modelName()
     {
         $resolver = static::$modelNameResolver ?: function (self $factory) {
+            $namespacedFactoryBasename = Str::replaceLast(
+                'Factory', '', Str::replaceFirst(static::$namespace, '', get_class($factory))
+            );
+
             $factoryBasename = Str::replaceLast('Factory', '', class_basename($factory));
 
             $appNamespace = static::appNamespace();
 
-            return class_exists($appNamespace.'Models\\'.$factoryBasename)
-                        ? $appNamespace.'Models\\'.$factoryBasename
+            return class_exists($appNamespace.'Models\\'.$namespacedFactoryBasename)
+                        ? $appNamespace.'Models\\'.$namespacedFactoryBasename
                         : $appNamespace.$factoryBasename;
         };
 

src/Illuminate/Foundation/Console/ServeCommand.php

@@ -111,8 +111,10 @@ protected function startProcess($hasEnvironment)
                 'APP_ENV',
                 'LARAVEL_SAIL',
                 'PHP_CLI_SERVER_WORKERS',
+                'PHP_IDE_CONFIG',
                 'XDEBUG_CONFIG',
                 'XDEBUG_MODE',
+                'XDEBUG_SESSION',
             ]) ? [$key => $value] : [$key => false];
         })->all());
 

src/Illuminate/Queue/Queue.php

@@ -102,7 +102,7 @@ protected function createPayload($job, $queue, $data = '')
             $job = CallQueuedClosure::create($job);
         }
 
-        $payload = json_encode($this->createPayloadArray($job, $queue, $data));
+        $payload = json_encode($this->createPayloadArray($job, $queue, $data), \JSON_UNESCAPED_UNICODE);
 
         if (JSON_ERROR_NONE !== json_last_error()) {
             throw new InvalidPayloadException(

src/Illuminate/Queue/QueueServiceProvider.php

@@ -235,6 +235,11 @@ protected function registerFailedJobServices()
         $this->app->singleton('queue.failer', function ($app) {
             $config = $app['config']['queue.failed'];
 
+            if (array_key_exists('driver', $config) &&
+                (is_null($config['driver']) || $config['driver'] === 'null')) {
+                return new NullFailedJobProvider;
+            }
+
             if (isset($config['driver']) && $config['driver'] === 'dynamodb') {
                 return $this->dynamoFailedJobProvider($config);
             } elseif (isset($config['driver']) && $config['driver'] === 'database-uuids') {

src/Illuminate/Support/Str.php

@@ -99,6 +99,19 @@ public static function ascii($value, $language = 'en')
         return ASCII::to_ascii((string) $value, $language);
     }
 
+    /**
+     * Transliterate a string to its closest ASCII representation.
+     *
+     * @param  string  $string
+     * @param  string|null  $unknown
+     * @param  bool|null  $strict
+     * @return string
+     */
+    public static function transliterate($string, $unknown = '?', $strict = false)
+    {
+        return ASCII::to_transliterate($string, $unknown, $strict);
+    }
+
     /**
      * Get the portion of a string before the first occurrence of a given value.
      *

src/Illuminate/Support/Stringable.php

@@ -779,11 +779,11 @@ public function ucfirst()
     /**
      * Split a string by uppercase characters.
      *
-     * @return static
+     * @return \Illuminate\Support\Collection
      */
     public function ucsplit()
     {
-        return new static(Str::ucsplit($this->value));
+        return collect(Str::ucsplit($this->value));
     }
 
     /**

src/Illuminate/Support/Testing/Fakes/BusFake.php

@@ -223,7 +223,7 @@ public function assertDispatchedAfterResponse($command, $callback = null)
 
         PHPUnit::assertTrue(
             $this->dispatchedAfterResponse($command, $callback)->count() > 0,
-            "The expected [{$command}] job was not dispatched for after sending the response."
+            "The expected [{$command}] job was not dispatched after sending the response."
         );
     }
 
@@ -259,7 +259,7 @@ public function assertNotDispatchedAfterResponse($command, $callback = null)
 
         PHPUnit::assertCount(
             0, $this->dispatchedAfterResponse($command, $callback),
-            "The unexpected [{$command}] job was dispatched for after sending the response."
+            "The unexpected [{$command}] job was dispatched after sending the response."
         );
     }