Merge branch '5.4' into feature/schedule-overlapping-strategy

Author: fetzi

.travis.yml

@@ -30,7 +30,7 @@ services:
 before_install:
   - if [[ $TRAVIS_PHP_VERSION != 7.1 ]] ; then phpenv config-rm xdebug.ini; fi
   - echo "extension = memcached.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - echo "extension = redis.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - pecl install -f redis
   - travis_retry composer self-update
 
 install:

CHANGELOG-5.4.md

@@ -8,14 +8,41 @@
 - Allow scheduling of queued jobs ([#18235](https://github.com/laravel/framework/pull/18235), [7bb67e2](https://github.com/laravel/framework/commit/7bb67e225646fb578c039cc0af130f7aa6858120))
 - Allow skipping mail sending if a listener to `MessageSending` returns `false` ([#18245](https://github.com/laravel/framework/pull/18245))
 - Added `BcryptHasher::cost()` method ([#18266](https://github.com/laravel/framework/pull/18266))
+- Added `Command::alert()` method ([#18272](https://github.com/laravel/framework/pull/18272))
+- Added `tap()` method to query builder ([#18284](https://github.com/laravel/framework/pull/18284))
+- Added `orderByDesc()` methods to query builder ([#18292](https://github.com/laravel/framework/pull/18292))
+- Added `Container::makeWith()` method ([#18271](https://github.com/laravel/framework/pull/18271), [#18320](https://github.com/laravel/framework/pull/18320))
+- Added `InteractsWithDatabase::assertSoftDeleted()` ([#18328](https://github.com/laravel/framework/pull/18328), [2d4e1f0](https://github.com/laravel/framework/commit/2d4e1f0fe0bae3c7e3304317a69d619e71e476cc), [f89f917](https://github.com/laravel/framework/commit/f89f917b256ad79df786c688b11247ce1e48299a))
+- Added ability to set queue parameters inside queued listeners ([#18375](https://github.com/laravel/framework/pull/18375), [cf461e2](https://github.com/laravel/framework/commit/cf461e23b6123ba6ed084d2fb8e8306482973b88))
+- Added `-q` shorthand for `make:listener --queued` ([#18362](https://github.com/laravel/framework/pull/18362))
+- Added `Model::setKeyType()` ([#18354](https://github.com/laravel/framework/pull/18354))
+- Output migration name before starting a migration or rollback ([#18379](https://github.com/laravel/framework/pull/18379), [e47e8b1](https://github.com/laravel/framework/commit/e47e8b16c1e65d752943faaa65db14ca323f5feb))
 
 ### Changed
 - Throw exception when `bootstrap/cache` directory is not writable ([#18188](https://github.com/laravel/framework/pull/18188), [b4f0005](https://github.com/laravel/framework/commit/b4f000516166b0694e842d64f5b2fde1167d4690))
 - Use `resource_path()` helper in `MakeAuthCommand` ([#18215](https://github.com/laravel/framework/pull/18215))
 - Added `file_exists()` check to `Event::emailOutput()` ([c8eafa8](https://github.com/laravel/framework/commit/c8eafa8e6741dc5add4c5030aa7362744dcdab29))
+- Allow wildcards in MIME type validations ([#18243](https://github.com/laravel/framework/pull/18243))
+- Only push existing jobs back into the queue using `queue:retry` ([#18279](https://github.com/laravel/framework/pull/18279), [e874a56](https://github.com/laravel/framework/commit/e874a56e5b75663861aab13ff8e13b82050de54e))
+- Support file uploads in nested array ([#18276](https://github.com/laravel/framework/pull/18276))
+- Don't use `config()` helper in Mail component ([#18290](https://github.com/laravel/framework/pull/18290))
+- Return the insert ID from `DatabaseJob::release()` ([#18288](https://github.com/laravel/framework/pull/18288), [#18291](https://github.com/laravel/framework/pull/18291))
+- Changed `id` in failed jobs migration stub to `bigIncrements()` ([#18300](https://github.com/laravel/framework/pull/18300))
+- Prevent `make:auth` from overwriting existing views ([#18319](https://github.com/laravel/framework/pull/18319), [bef8f35](https://github.com/laravel/framework/commit/bef8f35694b7c22516a27929dbfc4c49032f78c6))
+- Ensure Mailable view data is not overridden by order of operations ([#18322](https://github.com/laravel/framework/pull/18322))
+- Use `getAuthIdentifier()` method in broadcasters ([#18351](https://github.com/laravel/framework/pull/18351))
+- Use atomic cache operation when checking for event overlaps ([8ebb5b8](https://github.com/laravel/framework/commit/8ebb5b859ae8f2382a1836a83a47542de234d63a))
+- Return pretty JSON response from `HasInDatabase::failureDescription()` ([#18377](https://github.com/laravel/framework/pull/18377))
 
 ### Fixed
 - Fixed an issue with slots when passed content equals `null` ([#18246](https://github.com/laravel/framework/pull/18246))
+- Do require `Closure` in `orWhereHas()` ([#18277](https://github.com/laravel/framework/pull/18277))
+- Let PHP parse `@includeWhen` directive ([#18285](https://github.com/laravel/framework/pull/18285))
+- Only include `.php` files when loading database factories ([#18336](https://github.com/laravel/framework/pull/18336))
+- Fixed PHP 5.6 issue in `FileFactory::generateImage()` ([#18345](https://github.com/laravel/framework/pull/18345))
+- Allow `ImplicitRouteBinding` to match camelcase method parameter names ([#18307](https://github.com/laravel/framework/pull/18307), [4ae31a1](https://github.com/laravel/framework/commit/4ae31a154f81c2d76c7397dbdebfcac0e74e4ccd))
+- Fixing weird behaviour of `Connection::getConfig()` when `null` was passed ([#18356](https://github.com/laravel/framework/pull/18356))
+- Attempt to solve an issue with using `required_*` rules while the `ConvertEmptyStringToNull` middleware is applied ([#18376](https://github.com/laravel/framework/pull/18376))
 
 
 ## v5.4.15 (2017-03-02)

src/Illuminate/Auth/Console/MakeAuthCommand.php

@@ -14,7 +14,9 @@ class MakeAuthCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'make:auth {--views : Only scaffold the authentication views}';
+    protected $signature = 'make:auth
+                    {--views : Only scaffold the authentication views}
+                    {--force : Overwrite existing views by default}';
 
     /**
      * The console command description.
@@ -88,6 +90,12 @@ protected function createDirectories()
     protected function exportViews()
     {
         foreach ($this->views as $key => $value) {
+            if (file_exists(resource_path('views/'.$value)) && ! $this->option('force')) {
+                if (! $this->confirm("The [{$value}] view already exists. Do you want to replace it?")) {
+                    continue;
+                }
+            }
+
             copy(
                 __DIR__.'/stubs/make/views/'.$key,
                 resource_path('views/'.$value)

src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php

@@ -66,7 +66,7 @@ public function validAuthenticationResponse($request, $result)
         } else {
             return $this->decodePusherResponse(
                 $this->pusher->presence_auth(
-                    $request->channel_name, $request->socket_id, $request->user()->getKey(), $result)
+                    $request->channel_name, $request->socket_id, $request->user()->getAuthIdentifier(), $result)
             );
         }
     }

src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php

@@ -72,7 +72,7 @@ public function validAuthenticationResponse($request, $result)
         }
 
         return json_encode(['channel_data' => [
-            'user_id' => $request->user()->getKey(),
+            'user_id' => $request->user()->getAuthIdentifier(),
             'user_info' => $result,
         ]]);
     }

src/Illuminate/Console/Command.php

@@ -475,6 +475,21 @@ public function warn($string, $verbosity = null)
         $this->line($string, 'warning', $verbosity);
     }
 
+    /**
+     * Write a string in an alert box.
+     *
+     * @param  string  $string
+     * @return void
+     */
+    public function alert($string)
+    {
+        $this->comment(str_repeat('*', strlen($string) + 12));
+        $this->comment('*     '.$string.'     *');
+        $this->comment(str_repeat('*', strlen($string) + 12));
+
+        $this->output->writeln('');
+    }
+
     /**
      * Set the verbosity level.
      *

src/Illuminate/Console/ConfirmableTrait.php

@@ -26,10 +26,7 @@ public function confirmToProceed($warning = 'Application In Production!', $callb
                 return true;
             }
 
-            $this->comment(str_repeat('*', strlen($warning) + 12));
-            $this->comment('*     '.$warning.'     *');
-            $this->comment(str_repeat('*', strlen($warning) + 12));
-            $this->output->writeln('');
+            $this->alert($warning);
 
             $confirmed = $this->confirm('Do you really wish to run this command?');
 

src/Illuminate/Container/Container.php

@@ -82,6 +82,13 @@ class Container implements ArrayAccess, ContainerContract
      */
     protected $buildStack = [];
 
+    /**
+     * The parameter override stack.
+     *
+     * @var array
+     */
+    protected $with = [];
+
     /**
      * The contextual binding map.
      *
@@ -537,6 +544,18 @@ public function factory($abstract)
         };
     }
 
+    /**
+     * Resolve the given type with the given parameter overrides.
+     *
+     * @param  string  $abstract
+     * @param  array  $parameters
+     * @return mixed
+     */
+    public function makeWith($abstract, array $parameters)
+    {
+        return $this->resolve($abstract, $parameters);
+    }
+
     /**
      * Resolve the given type from the container.
      *
@@ -545,7 +564,21 @@ public function factory($abstract)
      */
     public function make($abstract)
     {
-        $needsContextualBuild = ! is_null(
+        return $this->resolve($abstract);
+    }
+
+    /**
+     * Resolve the given type from the container.
+     *
+     * @param  string  $abstract
+     * @param  array  $parameters
+     * @return mixed
+     */
+    protected function resolve($abstract, $parameters = [])
+    {
+        $this->with[] = $parameters;
+
+        $needsContextualBuild = ! empty($parameters) || ! is_null(
             $this->getContextualConcrete($abstract = $this->getAlias($abstract))
         );
 
@@ -583,8 +616,13 @@ public function make($abstract)
 
         $this->fireResolvingCallbacks($abstract, $object);
 
+        // Before returning, we will also set the resolved flag to "true" and pop off
+        // the parameter overrides for this build. After those two things are done
+        // we will be ready to return back the fully constructed class instance.
         $this->resolved[$abstract] = true;
 
+        array_pop($this->with);
+
         return $object;
     }
 
@@ -675,7 +713,7 @@ public function build($concrete)
         // hand back the results of the functions, which allows functions to be
         // used as resolvers for more fine-tuned resolution of these objects.
         if ($concrete instanceof Closure) {
-            return $concrete($this);
+            return $concrete($this, end($this->with));
         }
 
         $reflector = new ReflectionClass($concrete);
@@ -725,6 +763,15 @@ protected function resolveDependencies(array $dependencies)
         $results = [];
 
         foreach ($dependencies as $dependency) {
+            // If this dependency has a override for this particular build we will use
+            // that instead as the value. Otherwise, we will continue with this run
+            // of resolutions and let reflection attempt to determine the result.
+            if ($this->hasParameterOverride($dependency)) {
+                $results[] = $this->getParameterOverride($dependency);
+
+                continue;
+            }
+
             // If the class is null, it means the dependency is a string or some other
             // primitive type which we can not resolve since it is not a class and
             // we will just bomb out with an error since we have no-where to go.
@@ -736,6 +783,28 @@ protected function resolveDependencies(array $dependencies)
         return $results;
     }
 
+    /**
+     * Determine if the given dependency has a parameter override from makeWith.
+     *
+     * @param  \ReflectionParameter  $dependency
+     * @return bool
+     */
+    protected function hasParameterOverride($dependency)
+    {
+        return array_key_exists($dependency->name, end($this->with));
+    }
+
+    /**
+     * Get a parameter override for a dependency.
+     *
+     * @param  \ReflectionParameter  $dependency
+     * @return mixed
+     */
+    protected function getParameterOverride($dependency)
+    {
+        return end($this->with)[$dependency->name];
+    }
+
     /**
      * Resolve a non-class hinted primitive dependency.
      *

src/Illuminate/Contracts/Queue/Job.php

@@ -15,7 +15,7 @@ public function fire();
      * Release the job back into the queue.
      *
      * @param  int   $delay
-     * @return void
+     * @return mixed
      */
     public function release($delay = 0);
 

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -0,0 +1,92 @@
+<?php
+
+namespace Illuminate\Database\Concerns;
+
+trait BuildsQueries
+{
+    /**
+     * Chunk the results of the query.
+     *
+     * @param  int  $count
+     * @param  callable  $callback
+     * @return bool
+     */
+    public function chunk($count, callable $callback)
+    {
+        $this->enforceOrderBy();
+
+        $page = 1;
+
+        do {
+            // We'll execute the query for the given page and get the results. If there are
+            // no results we can just break and return from here. When there are results
+            // we will call the callback with the current chunk of these results here.
+            $results = $this->forPage($page, $count)->get();
+
+            $countResults = $results->count();
+
+            if ($countResults == 0) {
+                break;
+            }
+
+            // On each chunk result set, we will pass them to the callback and then let the
+            // developer take care of everything within the callback, which allows us to
+            // keep the memory low for spinning through large result sets for working.
+            if ($callback($results) === false) {
+                return false;
+            }
+
+            $page++;
+        } while ($countResults == $count);
+
+        return true;
+    }
+
+    /**
+     * Execute a callback over each item while chunking.
+     *
+     * @param  callable  $callback
+     * @param  int  $count
+     * @return bool
+     */
+    public function each(callable $callback, $count = 1000)
+    {
+        return $this->chunk($count, function ($results) use ($callback) {
+            foreach ($results as $key => $value) {
+                if ($callback($value, $key) === false) {
+                    return false;
+                }
+            }
+        });
+    }
+
+    /**
+     * Execute the query and get the first result.
+     *
+     * @param  array  $columns
+     * @return mixed
+     */
+    public function first($columns = ['*'])
+    {
+        return $this->take(1)->get($columns)->first();
+    }
+
+    /**
+     * Apply the callback's query changes if the given "value" is true.
+     *
+     * @param  mixed  $value
+     * @param  \Closure  $callback
+     * @param  \Closure  $default
+     * @return mixed
+     */
+    public function when($value, $callback, $default = null)
+    {
+        if ($value) {
+            return $callback($this, $value) ?: $this;
+        } elseif ($default) {
+            return $default($this, $value) ?: $this;
+        }
+
+        return $this;
+    }
+}

src/Illuminate/Database/Connection.php

@@ -957,10 +957,10 @@ public function getName()
     /**
      * Get an option from the configuration options.
      *
-     * @param  string  $option
+     * @param  string|null  $option
      * @return mixed
      */
-    public function getConfig($option)
+    public function getConfig($option = null)
     {
         return Arr::get($this->config, $option);
     }