mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-08 01:16:52 +02:00
Code Issues Releases Wiki Activity

Model extender: Fix inheritance (#2132)

Browse Source 
This ensures that default values, date attributes and relationships are properly inherited, when we have deeper model class hierarchies.

This also adds test cases to ensure that inheritance order is honored for relationship and default attribute extender. As there's no way to remove date attributes, the order of evaluation there doesn't matter.
This commit is contained in:
Alexander Skvortsov
2020-04-24 15:17:31 -04:00
committed by GitHub
parent c43cc874ee
commit 7794546845
2 changed files with 107 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Database/AbstractModel.php
View File

@@ -78,7 +78,11 @@ abstract class AbstractModel extends Eloquent
*/
public function __construct(array $attributes = [])
{
$this->attributes = Arr::get(static::$defaults, static::class, []);
$this->attributes = [];
foreach (array_merge(array_reverse(class_parents($this)), [static::class]) as $class) {
$this->attributes = array_merge($this->attributes, Arr::get(static::$defaults, $class, []));
}
// Deprecated in beta 13, remove in beta 14.
static::$dispatcher->dispatch(
@@ -103,7 +107,13 @@ abstract class AbstractModel extends Eloquent
new ConfigureModelDates($this, $this->dates)
);
return array_merge($this->dates, Arr::get(static::$dateAttributes, static::class, []));
$dates = $this->dates;
foreach (array_merge(array_reverse(class_parents($this)), [static::class]) as $class) {
$dates = array_merge($dates, Arr::get(static::$dateAttributes, $class, []));
}
return $dates;
}
/**
@@ -141,10 +151,11 @@ abstract class AbstractModel extends Eloquent
*/
protected function getCustomRelation($name)
{
$relation = Arr::get(static::$customRelations, static::class.".$name", null);
if (! is_null($relation)) {
return $relation($this);
foreach (array_merge([static::class], class_parents($this)) as $class) {
$relation = Arr::get(static::$customRelations, $class.".$name", null);
if (! is_null($relation)) {
return $relation($this);
}
}
// Deprecated, remove in beta 14