github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-22 08:31:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix remaining PSR-2 issues.

Browse Source
This commit is contained in:
Franz Liedke 2015-05-19 01:07:22 +02:00
parent 0ca4e1ab7b
commit 803d446bbb
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Core/CoreServiceProvider.php
View File

@ -38,7 +38,9 @@ class CoreServiceProvider extends ServiceProvider
$bus->mapUsing(function ($command) { $bus->mapUsing(function ($command) {
return Bus::simpleMapping( return Bus::simpleMapping(
$command, 'Flarum\Core\Commands', 'Flarum\Core\Handlers\Commands' $command,
'Flarum\Core\Commands',
'Flarum\Core\Handlers\Commands'
); );
}); });
} }

26
framework/core/src/Core/Support/MappedMorphToTrait.php
View File

@ -20,19 +20,29 @@ trait MappedMorphToTrait
// there are multiple types in the morph and we can't use single queries. // there are multiple types in the morph and we can't use single queries.
if (is_null($typeValue = $this->$type)) { if (is_null($typeValue = $this->$type)) {
return new MappedMorphTo( return new MappedMorphTo(
$this->newQuery(), $this, $id, null, $type, $name, $classes $this->newQuery(),
$this,
$id,
null,
$type,
$name,
$classes
); );
} } else {
// If we are not eager loading the relationship we will essentially treat this
// If we are not eager loading the relationship we will essentially treat this // as a belongs-to style relationship since morph-to extends that class and
// as a belongs-to style relationship since morph-to extends that class and // we will pass in the appropriate values so that it behaves as expected.
// we will pass in the appropriate values so that it behaves as expected.
else {
$class = $classes[$typeValue]; $class = $classes[$typeValue];
$instance = new $class; $instance = new $class;
return new MappedMorphTo( return new MappedMorphTo(
$instance->newQuery(), $this, $id, $instance->getKeyName(), $type, $name, $classes $instance->newQuery(),
$this,
$id,
$instance->getKeyName(),
$type,
$name,
$classes
); );
} }
} }