Skip to content

Commit

Permalink
Merge pull request #3181 from z-song/analysis-8KvnwD
Browse files Browse the repository at this point in the history
Apply fixes from StyleCI
  • Loading branch information
z-song committed Apr 9, 2019
2 parents ec2ab0d + 5dd1364 commit 88b2842
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/Grid/Model.php
Expand Up @@ -588,6 +588,7 @@ protected function joinParameters(Relation $relation)

if ($relation instanceof BelongsTo) {
$foreignKeyMethod = (app()->version() < '5.8.0') ? 'getForeignKey' : 'getForeignKeyName';

return [
$relatedTable,
$relation->{$foreignKeyMethod}(),
Expand Down
4 changes: 2 additions & 2 deletions src/Show/AbstractField.php
Expand Up @@ -62,5 +62,5 @@ public function setModel($model)
/**
* @return mixed
*/
public abstract function render();
}
abstract public function render();
}
5 changes: 2 additions & 3 deletions src/Show/Field.php
Expand Up @@ -441,7 +441,7 @@ public function setRelation($relation)
* Call extended field.
*
* @param string|AbstractField|\Closure $abstract
* @param array $arguments
* @param array $arguments
*
* @return Field
*/
Expand All @@ -453,7 +453,7 @@ protected function callExtendedField($abstract, $arguments = [])

if (is_string($abstract) && class_exists($abstract)) {
/** @var AbstractField $extend */
$extend = new $abstract;
$extend = new $abstract();
}

if ($abstract instanceof AbstractField) {
Expand All @@ -474,7 +474,6 @@ protected function callExtendedField($abstract, $arguments = [])
$field = $this;

return $this->as(function ($value) use ($extend, $field, $arguments) {

if (!$extend->border) {
$field->border = false;
}
Expand Down

0 comments on commit 88b2842

Please sign in to comment.