Merge branch '4.x' into develop

Author: daftspunk

init/functions.php

@@ -365,20 +365,6 @@ function array_except($array, $keys)
     }
 }
 
-if (!function_exists('array_first')) {
-    /**
-     * array_first returns the first element in an array passing a given truth test
-     * @param  array  $array
-     * @param  callable|null  $callback
-     * @param  mixed  $default
-     * @return mixed
-     */
-    function array_first($array, $callback = null, $default = null)
-    {
-        return Arr::first($array, $callback, $default);
-    }
-}
-
 if (!function_exists('array_flatten')) {
     /**
      * array_flatten flattens a multi-dimensional array into a single level
@@ -432,20 +418,6 @@ function array_has($array, $keys)
     }
 }
 
-if (!function_exists('array_last')) {
-    /**
-     * array_last returns the last element in an array passing a given truth test
-     * @param  array  $array
-     * @param  callable|null  $callback
-     * @param  mixed  $default
-     * @return mixed
-     */
-    function array_last($array, $callback = null, $default = null)
-    {
-        return Arr::last($array, $callback, $default);
-    }
-}
-
 if (!function_exists('array_only')) {
     /**
      * array_only gets a subset of the items from the given array

src/Composer/ComposerManager.php

@@ -43,8 +43,9 @@ public static function instance(): static
     {
         try {
             return App::make('core.composer');
-        } catch (\Illuminate\Contracts\Container\BindingResolutionException $e) {
-            return new static();
+        }
+        catch (Exception $ex) {
+            return new static;
         }
     }
 

src/Database/Traits/SortableRelation.php

@@ -62,7 +62,7 @@ public function initializeSortableRelation()
      */
     protected function defineSortableRelations()
     {
-        $interactsWithPivot = ['belongsToMany'];
+        $interactsWithPivot = ['belongsToMany', 'morphToMany'];
         $sortableRelations = [];
 
         foreach ($interactsWithPivot as $type) {