[5.3] add $default parameter to query builder when() method

CHANGELOG-5.3.md

@@ -1,5 +1,67 @@
 # Release Notes for 5.3.x
 
+## v5.3.8 (2016-09-09)
+
+### Added
+- Added missing `MailableMailer::later()` method ([#15364](https://github.com/laravel/framework/pull/15364))
+- Added missing `$queue` parameter on `SyncJob` ([#15368](https://github.com/laravel/framework/pull/15368))
+- Added SSL options for PostgreSQL DSN ([#15371](https://github.com/laravel/framework/pull/15371))
+- Added ability to disable touching of parent when toggling relation ([#15263](https://github.com/laravel/framework/pull/15263))
+- Added username, icon and channel options for Slack Notifications ([#14910](https://github.com/laravel/framework/pull/14910))
+
+### Changed
+- Updated `symfony/css-selector` version ([#15344](https://github.com/laravel/framework/pull/15344))
+- Renamed methods in `NotificationFake` ([69b08f6](https://github.com/laravel/framework/commit/69b08f66fbe70b4df8332a8f2a7557a49fd8c693))
+- Minor code improvements ([#15369](https://github.com/laravel/framework/pull/15369))
+
+### Fixed
+- Fixed catchable fatal error introduced [#15250](https://github.com/laravel/framework/pull/15250) ([#15350](https://github.com/laravel/framework/pull/15350))
+
+
+## v5.3.7 (2016-09-08)
+
+### Added
+- Added missing translation for `mimetypes` validation ([#15209](https://github.com/laravel/framework/pull/15209), [#3921](https://github.com/laravel/laravel/pull/3921))
+- Added ability to check if between two times when using scheduler ([#15216](https://github.com/laravel/framework/pull/15216), [#15306](https://github.com/laravel/framework/pull/15306))
+- Added `X-RateLimit-Reset` header to throttled responses ([#15275](https://github.com/laravel/framework/pull/15275))
+- Support aliases on `withCount()` ([#15279](https://github.com/laravel/framework/pull/15279))
+- Added `Filesystem::isReadable()` ([#15289](https://github.com/laravel/framework/pull/15289))
+- Added `Collection::split()` method ([#15302](https://github.com/laravel/framework/pull/15302))
+- Allow passing a `Closure` to `View::share()` ([#15312](https://github.com/laravel/framework/pull/15312))
+- Added support for `Mailable` messages in `MailChannel` ([#15318](https://github.com/laravel/framework/pull/15318))
+- Added `with*()` syntax to `Mailable` class ([#15316](https://github.com/laravel/framework/pull/15316))
+- Added `--path` option for `migrate:rollback/refresh/reset` ([#15251](https://github.com/laravel/framework/pull/15251))
+- Allow numeric keys on `morphMap()` ([#15332](https://github.com/laravel/framework/pull/15332))
+- Added fakes for bus, events, mail, queue and notifications ([5deab59](https://github.com/laravel/framework/commit/5deab59e89b85e09b2bd1642e4efe55e933805ca))
+
+### Changed
+- Update `Model::save()` to return `true` when no error occurs ([#15236](https://github.com/laravel/framework/pull/15236))
+- Optimized performance of `Arr::first()` ([#15213](https://github.com/laravel/framework/pull/15213))
+- Swapped `drop()` for `dropIfExists()` in all stubs ([#15230](https://github.com/laravel/framework/pull/15230))
+- Allow passing object instance to `class_uses_recursive()` ([#15223](https://github.com/laravel/framework/pull/15223))
+- Improved handling of failed file uploads during validation ([#15166](https://github.com/laravel/framework/pull/15166))
+- Hide pagination if it does not have multiple pages ([#15246](https://github.com/laravel/framework/pull/15246))
+- Cast Pusher message to JSON in `validAuthentiactoinResponse()` ([#15262](https://github.com/laravel/framework/pull/15262))
+- Throw exception if queue failed to create payload ([#15284](https://github.com/laravel/framework/pull/15284))
+- Call `getUrl()` first in `FilesystemAdapter::url()` ([#15291](https://github.com/laravel/framework/pull/15291))
+- Consider local key in `HasManyThrough` relationships ([#15303](https://github.com/laravel/framework/pull/15303))
+- Fail faster by checking Route Validators in likely fail order ([#15287](https://github.com/laravel/framework/pull/15287))
+- Make the `FilesystemAdapter::delete()` behave like `FileSystem::delete()` ([#15308](https://github.com/laravel/framework/pull/15308))
+- Don't call `floor()` in `Collection::median()` ([#15343](https://github.com/laravel/framework/pull/15343))
+- Always return number from aggregate method `sum()` ([#15345](https://github.com/laravel/framework/pull/15345))
+
+### Fixed
+- Reverted "Hide empty paginators" [#15125](https://github.com/laravel/framework/pull/15125) ([#15241](https://github.com/laravel/framework/pull/15241))
+- Fixed empty `multifile` uploads ([#15250](https://github.com/laravel/framework/pull/15250))
+- Fixed regression in `save(touch)` option ([#15264](https://github.com/laravel/framework/pull/15264))
+- Fixed lower case model names in policy classes ([15270](https://github.com/laravel/framework/pull/15270))
+- Allow models with global scopes to be refreshed ([#15282](https://github.com/laravel/framework/pull/15282))
+- Fix `ChannelManager::getDefaultDriver()` implementation ([#15288](https://github.com/laravel/framework/pull/15288))
+- Fire `illuminate.queue.looping` event before running daemon ([#15290](https://github.com/laravel/framework/pull/15290))
+- Check attempts before firing queue job ([#15319](https://github.com/laravel/framework/pull/15319))
+- Fixed `morphTo()` naming inconsistency ([#15334](https://github.com/laravel/framework/pull/15334))
+
+
 ## v5.3.6 (2016-09-01)
 
 ### Added
@@ -19,7 +81,6 @@
 - Optimized performance of `Str::random()` ([#15112](https://github.com/laravel/framework/pull/15112))
 - Show `app.name` in auth stub ([#15138](https://github.com/laravel/framework/pull/15138))
 - Switched from `htmlentities()` to `htmlspecialchars()` in `e()` helper ([#15159](https://github.com/laravel/framework/pull/15159))
-- Improved handling of failed file uploads during validation ([#15166](https://github.com/laravel/framework/pull/15166))
 - Hide empty paginators ([#15125](https://github.com/laravel/framework/pull/15125))
 
 ### Fixed

ISSUE_TEMPLATE.md

@@ -0,0 +1,8 @@
+- Laravel Version: #.#.#
+- PHP Version:
+- Database Driver & Version:
+
+### Description:
+
+
+### Steps To Reproduce:

src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php

@@ -56,14 +56,28 @@ public function auth($request)
     public function validAuthenticationResponse($request, $result)
     {
         if (Str::startsWith($request->channel_name, 'private')) {
-            return $this->pusher->socket_auth($request->channel_name, $request->socket_id);
+            return $this->decodePusherResponse(
+                $this->pusher->socket_auth($request->channel_name, $request->socket_id)
+            );
         } else {
-            return $this->pusher->presence_auth(
-                $request->channel_name, $request->socket_id, $request->user()->id, $result
+            return $this->decodePusherResponse(
+                $this->pusher->presence_auth(
+                    $request->channel_name, $request->socket_id, $request->user()->id, $result)
             );
         }
     }
 
+    /**
+     * Decode the given Pusher response.
+     *
+     * @param  mixed  $response
+     * @return array
+     */
+    protected function decodePusherResponse($response)
+    {
+        return json_decode($response, true);
+    }
+
     /**
      * Broadcast the given event.
      *

src/Illuminate/Console/Scheduling/Event.php

@@ -639,14 +639,10 @@ public function unlessBetween($startTime, $endTime)
      */
     private function inTimeInterval($startTime, $endTime)
     {
-        $startTime = str_replace(':', '', $startTime);
-
-        $endTime = str_replace(':', '', $endTime);
-
         return function () use ($startTime, $endTime) {
-            $now = Carbon::now()->format('Hi');
+            $now = Carbon::now()->timestamp;
 
-            return $now >= $startTime && $now <= $endTime;
+            return $now >= strtotime($startTime) && $now <= strtotime($endTime);
         };
     }
 

src/Illuminate/Contracts/Routing/UrlGenerator.php

@@ -12,7 +12,7 @@ interface UrlGenerator
     public function current();
 
     /**
-     * Generate a absolute URL to the given path.
+     * Generate an absolute URL to the given path.
      *
      * @param  string  $path
      * @param  mixed  $extra
@@ -31,7 +31,7 @@ public function to($path, $extra = [], $secure = null);
     public function secure($path, $parameters = []);
 
     /**
-     * Generate a URL to an application asset.
+     * Generate the URL to an application asset.
      *
      * @param  string  $path
      * @param  bool    $secure

src/Illuminate/Database/Connectors/Connector.php

@@ -85,7 +85,7 @@ public function setDefaultOptions(array $options)
     }
 
     /**
-     * Handle a exception that occurred during connect execution.
+     * Handle an exception that occurred during connect execution.
      *
      * @param  \Exception  $e
      * @param  string  $dsn

src/Illuminate/Database/Connectors/PostgresConnector.php

@@ -97,6 +97,18 @@ protected function getDsn(array $config)
             $dsn .= ";sslmode={$sslmode}";
         }
 
+        if (isset($config['sslcert'])) {
+            $dsn .= ";sslcert={$sslcert}";
+        }
+
+        if (isset($config['sslkey'])) {
+            $dsn .= ";sslkey={$sslkey}";
+        }
+
+        if (isset($config['sslrootcert'])) {
+            $dsn .= ";sslrootcert={$sslrootcert}";
+        }
+
         return $dsn;
     }
 

src/Illuminate/Database/Console/Migrations/RefreshCommand.php

@@ -48,11 +48,11 @@ public function fire()
 
         if ($step > 0) {
             $this->call('migrate:rollback', [
-                '--database' => $database, '--force' => $force, '--step' => $step,
+                '--database' => $database, '--force' => $force, '--path' => $path, '--step' => $step,
             ]);
         } else {
             $this->call('migrate:reset', [
-                '--database' => $database, '--force' => $force,
+                '--database' => $database, '--force' => $force, '--path' => $path,
             ]);
         }
 

src/Illuminate/Database/Console/Migrations/ResetCommand.php

@@ -59,7 +59,7 @@ public function fire()
 
         // First, we'll make sure that the migration table actually exists before we
         // start trying to rollback and re-run all of the migrations. If it's not
-        // present we will just bail out with a info message for the developer.
+        // present we'll just bail out with an info message for the developers.
         if (! $this->migrator->repositoryExists()) {
             return $this->comment('Migration table not found.');
         }
@@ -88,6 +88,8 @@ protected function getOptions()
 
             ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
 
+            ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+
             ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
         ];
     }

src/Illuminate/Database/Console/Migrations/RollbackCommand.php

@@ -81,6 +81,8 @@ protected function getOptions()
 
             ['force', null, InputOption::VALUE_NONE, 'Force the operation to run when in production.'],
 
+            ['path', null, InputOption::VALUE_OPTIONAL, 'The path of migrations files to be executed.'],
+
             ['pretend', null, InputOption::VALUE_NONE, 'Dump the SQL queries that would be run.'],
 
             ['step', null, InputOption::VALUE_OPTIONAL, 'The number of migrations to be reverted.'],

src/Illuminate/Database/Eloquent/Builder.php

@@ -1056,11 +1056,20 @@ public function withCount($relations)
         $relations = is_array($relations) ? $relations : func_get_args();
 
         foreach ($this->parseWithRelations($relations) as $name => $constraints) {
+            // First we will determine if the name has been aliased using an "as" clause on the name
+            // and if it has we will extract the actual relationship name and the desired name of
+            // the resulting column. This allows multiple counts on the same relationship name.
+            $segments = explode(' ', $name);
+
+            if (count($segments) == 3 && Str::lower($segments[1]) == 'as') {
+                list($name, $alias) = [$segments[0], $segments[2]];
+            }
+
+            $relation = $this->getHasRelationQuery($name);
+
             // Here we will get the relationship count query and prepare to add it to the main query
             // as a sub-select. First, we'll get the "has" query and use that to get the relation
             // count query. We will normalize the relation name then append _count as the name.
-            $relation = $this->getHasRelationQuery($name);
-
             $query = $relation->getRelationCountQuery(
                 $relation->getRelated()->newQuery(), $this
             );
@@ -1069,7 +1078,12 @@ public function withCount($relations)
 
             $query->mergeModelDefinedRelationConstraints($relation->getQuery());
 
-            $this->selectSub($query->toBase(), snake_case($name).'_count');
+            // Finally we will add the proper result column alias to the query and run the subselect
+            // statement against the query builder. Then we will return the builder instance back
+            // to the developer for further constraint chaining that needs to take place on it.
+            $column = snake_case(isset($alias) ? $alias : $name).'_count';
+
+            $this->selectSub($query->toBase(), $column);
         }
 
         return $this;

src/Illuminate/Database/Eloquent/Collection.php

@@ -118,7 +118,7 @@ public function merge($items)
      * Run a map over each of the items.
      *
      * @param  callable  $callback
-     * @return static
+     * @return \Illuminate\Support\Collection
      */
     public function map(callable $callback)
     {
@@ -176,7 +176,7 @@ public function intersect($items)
      *
      * @param  string|callable|null  $key
      * @param  bool  $strict
-     * @return static
+     * @return static|\Illuminate\Support\Collection
      */
     public function unique($key = null, $strict = false)
     {

src/Illuminate/Database/Eloquent/Model.php

@@ -650,7 +650,7 @@ public function fresh($with = [])
 
         $key = $this->getKeyName();
 
-        return static::with($with)->where($key, $this->getKey())->first();
+        return static::newQueryWithoutScopes()->with($with)->where($key, $this->getKey())->first();
     }
 
     /**
@@ -805,10 +805,10 @@ public function morphTo($name = null, $type = null, $id = null)
         if (is_null($name)) {
             list($current, $caller) = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
 
-            $name = Str::snake($caller['function']);
+            $name = $caller['function'];
         }
 
-        list($type, $id) = $this->getMorphs($name, $type, $id);
+        list($type, $id) = $this->getMorphs(Str::snake($name), $type, $id);
 
         // If the type value is null it is probably safe to assume we're eager loading
         // the relationship. In this case we'll just pass in a dummy query where we
@@ -1462,7 +1462,7 @@ public function save(array $options = [])
         // clause to only update this model. Otherwise, we'll just insert them.
         if ($this->exists) {
             $saved = $this->isDirty() ?
-                        $this->performUpdate($query) : true;
+                        $this->performUpdate($query, $options) : true;
         }
 
         // If the model is brand new, we'll insert it into our database and set the
@@ -1515,9 +1515,10 @@ protected function finishSave(array $options)
      * Perform a model update operation.
      *
      * @param  \Illuminate\Database\Eloquent\Builder  $query
+     * @param  array                                  $options
      * @return bool
      */
-    protected function performUpdate(Builder $query)
+    protected function performUpdate(Builder $query, array $options = [])
     {
         // If the updating event returns false, we will cancel the update operation so
         // developers can hook Validation systems into their models and cancel this
@@ -1529,7 +1530,7 @@ protected function performUpdate(Builder $query)
         // First we need to create a fresh query instance and touch the creation and
         // update timestamp on the model which are maintained by us for developer
         // convenience. Then we will just continue saving the model instances.
-        if ($this->timestamps) {
+        if ($this->timestamps && Arr::get($options, 'touch', true)) {
             $this->updateTimestamps();
         }
 

src/Illuminate/Database/Eloquent/Relations/BelongsTo.php

@@ -305,6 +305,16 @@ public function getOtherKey()
         return $this->otherKey;
     }
 
+    /**
+     * Get the name of the relationship.
+     *
+     * @return string
+     */
+    public function getRelation()
+    {
+        return $this->relation;
+    }
+
     /**
      * Get the fully qualified associated key of the relationship.
      *

src/Illuminate/Database/Eloquent/Relations/BelongsToMany.php

@@ -801,9 +801,10 @@ public function createMany(array $records, array $joinings = [])
      * Each existing model is detached, and non existing ones are attached.
      *
      * @param  mixed  $ids
+     * @param  bool   $touch
      * @return array
      */
-    public function toggle($ids)
+    public function toggle($ids, $touch = true)
     {
         $changes = [
             'attached' => [], 'detached' => [],
@@ -849,7 +850,7 @@ public function toggle($ids)
             $changes['attached'] = array_keys($attach);
         }
 
-        if (count($changes['attached']) || count($changes['detached'])) {
+        if ($touch && (count($changes['attached']) || count($changes['detached']))) {
             $this->touchIfTouching();
         }
 

src/Illuminate/Database/Eloquent/Relations/HasManyThrough.php

@@ -138,7 +138,7 @@ public function addEagerConstraints(array $models)
     {
         $table = $this->parent->getTable();
 
-        $this->query->whereIn($table.'.'.$this->firstKey, $this->getKeys($models));
+        $this->query->whereIn($table.'.'.$this->firstKey, $this->getKeys($models, $this->localKey));
     }
 
     /**

src/Illuminate/Database/Eloquent/Relations/Relation.php

@@ -306,7 +306,8 @@ public static function morphMap(array $map = null, $merge = true)
         $map = static::buildMorphMapFromModels($map);
 
         if (is_array($map)) {
-            static::$morphMap = $merge ? array_merge(static::$morphMap, $map) : $map;
+            static::$morphMap = $merge && static::$morphMap
+                            ? array_merge(static::$morphMap, $map) : $map;
         }
 
         return static::$morphMap;