Merge branch '8.x' into master

Author: GrahamCampbell

CHANGELOG-6.x.md

@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.18.37...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.18.38...6.x)
+
+
+## [v6.18.38 (2020-09-01)](https://github.com/laravel/framework/compare/v6.18.37...v6.18.38)
+
+### Changed
+- Changed postgres processor ([#34055](https://github.com/laravel/framework/pull/34055))
 
 
 ## [v6.18.37 (2020-08-27)](https://github.com/laravel/framework/compare/v6.18.36...v6.18.37)

CHANGELOG-7.x.md

@@ -1,6 +1,22 @@
 # Release Notes for 7.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v7.26.1...7.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v7.27.0...7.x)
+
+
+## [v7.27.0 (2020-09-01)](https://github.com/laravel/framework/compare/v7.26.1...v7.27.0)
+
+### Added
+- Allow to use alias of morphed model ([#34032](https://github.com/laravel/framework/pull/34032))
+- Introduced basic padding (both, left, right) methods to Str and Stringable ([#34053](https://github.com/laravel/framework/pull/34053))
+
+### Refactoring
+- RefreshDatabase migration commands parameters moved to methods ([#34007](https://github.com/laravel/framework/pull/34007), [8b35c8e](https://github.com/laravel/framework/commit/8b35c8e6ba5879e71fd81fd03b5687ee2b46c55a), [256f71c](https://github.com/laravel/framework/commit/256f71c1f81da2d4bb3e327b18389ac43fa97a72))
+
+### Changed
+- allow to reset forced scheme and root-url in UrlGenerator ([#34039](https://github.com/laravel/framework/pull/34039))
+- Updating the make commands to use a custom views path ([#34060](https://github.com/laravel/framework/pull/34060), [b593c62](https://github.com/laravel/framework/commit/b593c6242942623fcc12638d0390da7c58dbbb11))
+- Using "public static property" in View Component causes an error ([#34058](https://github.com/laravel/framework/pull/34058))
+- Changed postgres processor ([#34055](https://github.com/laravel/framework/pull/34055))
 
 
 ## [v7.26.1 (2020-08-27)](https://github.com/laravel/framework/compare/v7.26.0...v7.26.1)

bin/release.sh

@@ -10,7 +10,7 @@ then
     exit 1
 fi
 
-RELEASE_BRANCH="master"
+RELEASE_BRANCH="8.x"
 CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 VERSION=$1
 

bin/split.sh

@@ -3,7 +3,7 @@
 set -e
 set -x
 
-CURRENT_BRANCH="master"
+CURRENT_BRANCH="8.x"
 
 function split()
 {

src/Illuminate/Bus/Batch.php

@@ -5,9 +5,11 @@
 use Carbon\CarbonImmutable;
 use Illuminate\Contracts\Queue\Factory as QueueFactory;
 use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Queue\SerializableClosure;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Collection;
 use JsonSerializable;
+use Throwable;
 
 class Batch implements Arrayable, JsonSerializable
 {
@@ -211,13 +213,17 @@ public function recordSuccessfulJob(string $jobId)
         if ($counts->pendingJobs === 0 && $this->hasThenCallbacks()) {
             $batch = $this->fresh();
 
-            collect($this->options['then'])->each->__invoke($batch);
+            collect($this->options['then'])->each(function ($handler) use ($batch) {
+                $this->invokeHandlerCallback($handler, $batch);
+            });
         }
 
         if ($counts->allJobsHaveRanExactlyOnce() && $this->hasFinallyCallbacks()) {
             $batch = $this->fresh();
 
-            collect($this->options['finally'])->each->__invoke($batch);
+            collect($this->options['finally'])->each(function ($handler) use ($batch) {
+                $this->invokeHandlerCallback($handler, $batch);
+            });
         }
     }
 
@@ -290,13 +296,17 @@ public function recordFailedJob(string $jobId, $e)
         if ($counts->failedJobs === 1 && $this->hasCatchCallbacks()) {
             $batch = $this->fresh();
 
-            collect($this->options['catch'])->each->__invoke($batch, $e);
+            collect($this->options['catch'])->each(function ($handler) use ($batch, $e) {
+                $this->invokeHandlerCallback($handler, $batch, $e);
+            });
         }
 
         if ($counts->allJobsHaveRanExactlyOnce() && $this->hasFinallyCallbacks()) {
             $batch = $this->fresh();
 
-            collect($this->options['finally'])->each->__invoke($batch, $e);
+            collect($this->options['finally'])->each(function ($handler) use ($batch, $e) {
+                $this->invokeHandlerCallback($handler, $batch, $e);
+            });
         }
     }
 
@@ -371,6 +381,21 @@ public function delete()
         $this->repository->delete($this->id);
     }
 
+    /**
+     * Invoke a batch callback handler.
+     *
+     * @param  \Illuminate\Queue\SerializableClosure|callable  $handler
+     * @param  \Illuminate\Bus  $batch
+     * @param  \Throwable|null  $e
+     * @return void
+     */
+    protected function invokeHandlerCallback($handler, Batch $batch, Throwable $e = null)
+    {
+        return $handler instanceof SerializableClosure
+                    ? $handler->__invoke($batch, $e)
+                    : call_user_func($handler, $batch, $e);
+    }
+
     /**
      * Convert the batch to an array.
      *

src/Illuminate/Bus/PendingBatch.php

@@ -57,12 +57,14 @@ public function __construct(Container $container, Collection $jobs)
     /**
      * Add a callback to be executed after all jobs in the batch have executed successfully.
      *
-     * @param  \Closure  $callback
+     * @param  callable  $callback
      * @return $this
      */
-    public function then(Closure $callback)
+    public function then($callback)
     {
-        $this->options['then'][] = new SerializableClosure($callback);
+        $this->options['then'][] = $callback instanceof Closure
+                        ? new SerializableClosure($callback)
+                        : $callback;
 
         return $this;
     }
@@ -80,12 +82,14 @@ public function thenCallbacks()
     /**
      * Add a callback to be executed after the first failing job in the batch.
      *
-     * @param  \Closure  $callback
+     * @param  callable  $callback
      * @return $this
      */
-    public function catch(Closure $callback)
+    public function catch($callback)
     {
-        $this->options['catch'][] = new SerializableClosure($callback);
+        $this->options['catch'][] = $callback instanceof Closure
+                    ? new SerializableClosure($callback)
+                    : $callback;
 
         return $this;
     }
@@ -103,12 +107,14 @@ public function catchCallbacks()
     /**
      * Add a callback to be executed after the batch has finished executing.
      *
-     * @param  \Closure  $callback
+     * @param  callable  $callback
      * @return $this
      */
-    public function finally(Closure $callback)
+    public function finally($callback)
     {
-        $this->options['finally'][] = new SerializableClosure($callback);
+        $this->options['finally'][] = $callback instanceof Closure
+                    ? new SerializableClosure($callback)
+                    : $callback;
 
         return $this;
     }

src/Illuminate/Bus/Queueable.php

@@ -4,6 +4,7 @@
 
 use Closure;
 use Illuminate\Queue\CallQueuedClosure;
+use Illuminate\Queue\SerializableClosure;
 use Illuminate\Support\Arr;
 use RuntimeException;
 
@@ -210,6 +211,8 @@ public function dispatchNextJobInChain()
      */
     public function invokeChainCatchCallbacks($e)
     {
-        collect($this->chainCatchCallbacks)->each->__invoke($e);
+        collect($this->chainCatchCallbacks)->each(function ($callback) use ($e) {
+            $callback instanceof SerializableClosure ? $callback->__invoke($e) : call_user_func($callback, $e);
+        });
     }
 }

src/Illuminate/Collections/Enumerable.php

@@ -118,6 +118,14 @@ public function avg($callback = null);
      */
     public function contains($key, $operator = null, $value = null);
 
+    /**
+     * Cross join with the given lists, returning all possible permutations.
+     *
+     * @param  mixed  ...$lists
+     * @return static
+     */
+    public function crossJoin(...$lists);
+
     /**
      * Dump the collection and end the script.
      *
@@ -309,6 +317,22 @@ public function unlessNotEmpty(callable $callback, callable $default = null);
      */
     public function where($key, $operator = null, $value = null);
 
+    /**
+     * Filter items where the value for the given key is null.
+     *
+     * @param  string|null  $key
+     * @return static
+     */
+    public function whereNull($key = null);
+
+    /**
+     * Filter items where the value for the given key is not null.
+     *
+     * @param  string|null  $key
+     * @return static
+     */
+    public function whereNotNull($key = null);
+
     /**
      * Filter items by the given key value pair using strict comparison.
      *
@@ -401,6 +425,14 @@ public function first(callable $callback = null, $default = null);
      */
     public function firstWhere($key, $operator = null, $value = null);
 
+    /**
+     * Get a flattened array of the items in the collection.
+     *
+     * @param  int  $depth
+     * @return static
+     */
+    public function flatten($depth = INF);
+
     /**
      * Flip the values with their keys.
      *
@@ -727,6 +759,22 @@ public function shuffle($seed = null);
      */
     public function skip($count);
 
+    /**
+     * Skip items in the collection until the given condition is met.
+     *
+     * @param  mixed  $value
+     * @return static
+     */
+    public function skipUntil($value);
+
+    /**
+     * Skip items in the collection while the given condition is met.
+     *
+     * @param  mixed  $value
+     * @return static
+     */
+    public function skipWhile($value);
+
     /**
      * Get a slice of items from the enumerable.
      *
@@ -828,6 +876,22 @@ public function sum($callback = null);
      */
     public function take($limit);
 
+    /**
+     * Take items in the collection until the given condition is met.
+     *
+     * @param  mixed  $value
+     * @return static
+     */
+    public function takeUntil($value);
+
+    /**
+     * Take items in the collection while the given condition is met.
+     *
+     * @param  mixed  $value
+     * @return static
+     */
+    public function takeWhile($value);
+
     /**
      * Pass the collection to the given callback and then return it.
      *
@@ -902,6 +966,17 @@ public function pad($size, $value);
      */
     public function countBy($callback = null);
 
+    /**
+     * Zip the collection together with one or more arrays.
+     *
+     * e.g. new Collection([1, 2, 3])->zip([4, 5, 6]);
+     *      => [[1, 4], [2, 5], [3, 6]]
+     *
+     * @param  mixed  ...$items
+     * @return static
+     */
+    public function zip($items);
+
     /**
      * Collect the values into a collection.
      *

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -723,21 +723,6 @@ public function uniqueStrict($key = null)
         return $this->unique($key, true);
     }
 
-    /**
-     * Take items in the collection until the given condition is met.
-     *
-     * This is an alias to the "takeUntil" method.
-     *
-     * @param  mixed  $value
-     * @return static
-     *
-     * @deprecated Use the "takeUntil" method directly.
-     */
-    public function until($value)
-    {
-        return $this->takeUntil($value);
-    }
-
     /**
      * Collect the values into a collection.
      *

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -682,7 +682,7 @@ public function joiningTableSegment()
      */
     public function touches($relation)
     {
-        return in_array($relation, $this->touches);
+        return in_array($relation, $this->getTouchedRelations());
     }
 
     /**
@@ -692,7 +692,7 @@ public function touches($relation)
      */
     public function touchOwners()
     {
-        foreach ($this->touches as $relation) {
+        foreach ($this->getTouchedRelations() as $relation) {
             $this->$relation()->touch();
 
             if ($this->$relation instanceof self) {