Merge branch '3.x' into develop

src/Database/Concerns/HasEvents.php

@@ -55,6 +55,15 @@ protected function bootNicerEvents()
         static::$eventsBooted[$class] = true;
     }
 
+    /**
+     * initializeModelEvent is called every time the model is constructed.
+     */
+    protected function initializeModelEvent()
+    {
+        $this->fireEvent('model.afterInit');
+        $this->afterInit();
+    }
+
     /**
      * flushEventListeners removes all of the event listeners for the model
      * Also flush registry of models that had events booted
@@ -104,8 +113,7 @@ public static function fetched($callback)
     }
 
     /**
-     * afterBoot is called after the model is constructed, a nicer version
-     * of overriding the __construct method.
+     * afterBoot is called after the model is constructed for the first time.
      */
     protected function afterBoot()
     {
@@ -122,6 +130,25 @@ protected function afterBoot()
          */
     }
 
+    /**
+     * afterInit is called after the model is constructed, a nicer version
+     * of overriding the __construct method.
+     */
+    protected function afterInit()
+    {
+        /**
+         * @event model.afterInit
+         * Called after the model is initialized
+         *
+         * Example usage:
+         *
+         *     $model->bindEvent('model.afterInit', function () use (\October\Rain\Database\Model $model) {
+         *         \Log::info(get_class($model) . ' has initialized');
+         *     });
+         *
+         */
+    }
+
     /**
      * beforeCreate handles the "creating" model event
      */

src/Database/Model.php

@@ -63,6 +63,8 @@ public function __construct(array $attributes = [])
 
         $this->extendableConstruct();
 
+        $this->initializeModelEvent();
+
         $this->fill($attributes);
     }
 
@@ -515,5 +517,7 @@ public function __wakeup()
         $this->bootNicerEvents();
 
         $this->extendableConstruct();
+
+        $this->initializeModelEvent();
     }
 }

src/Database/Schema/Blueprint.php

@@ -10,4 +10,19 @@
  */
 class Blueprint extends BaseBlueprint
 {
+    /**
+     * multisite adds columns used by the Multisite trait
+     *
+     * @param  string  $column
+     * @param  string|null  $indexName
+     * @return void
+     */
+    public function multisite($column = 'site_id', $indexName = null)
+    {
+        $this->unsignedBigInteger($column)->nullable();
+
+        $this->unsignedBigInteger('site_root_id')->nullable();
+
+        $this->index([$column, 'site_root_id'], $indexName);
+    }
 }

src/Database/Traits/Multisite.php

@@ -148,7 +148,7 @@ protected function defineMultisiteRelation($name, $type = null)
             if ($type === 'belongsToMany') {
                 $this->$type[$name]['parentKey'] = 'site_root_id';
             }
-            elseif (in_array($type, ['hasOne', 'hasMany'])) {
+            elseif (in_array($type, ['belongsTo', 'hasOne', 'hasMany'])) {
                 $this->$type[$name]['otherKey'] = 'site_root_id';
             }
             elseif (in_array($type, ['attachOne', 'attachMany'])) {

src/Database/Traits/SortableRelation.php

@@ -32,6 +32,10 @@ trait SortableRelation
      */
     public function initializeSortableRelation()
     {
+        $this->bindEvent('model.afterInit', function() {
+            $this->defineSortableRelations();
+        });
+
         $this->bindEvent('model.relation.attach', function ($relationName, $attached, $data) {
             if (!array_key_exists($relationName, $this->getSortableRelations())) {
                 return;
@@ -45,8 +49,6 @@ public function initializeSortableRelation()
                 $this->$relationName()->updateExistingPivot($id, [$column => ++$order]);
             }
         });
-
-        $this->defineSortableRelations();
     }
 
     /**

src/Database/Traits/Validation.php

@@ -193,6 +193,15 @@ protected function getRelationValidationValue($relationName)
             return $value;
         };
 
+        // Process singular
+        if ($this->isRelationTypeSingular($relationName)) {
+            if ($data instanceof \Illuminate\Support\Collection) {
+                $data = $data->last();
+            }
+
+            return $processValidationValue($data);
+        }
+
         // Cast to primitive type
         if ($data instanceof \Illuminate\Support\Collection) {
             $data = $data->all();
@@ -202,11 +211,6 @@ protected function getRelationValidationValue($relationName)
             return null;
         }
 
-        // Process singular (last item)
-        if ($this->isRelationTypeSingular($relationName)) {
-            return $processValidationValue($data[array_key_last($data)]);
-        }
-
         // Process multi
         $result = [];