diff options
| author | Greg Roach <fisharebest@gmail.com> | 2019-01-15 14:20:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-15 14:20:05 +0000 |
| commit | fb7adfecd20739494a982965a67a06d53e6ce012 (patch) | |
| tree | 8bda376ca1ec91cc452b1c95252f7a732782333e | |
| parent | 9ee8cdae88d7d69ce2e20928a950aa88e76671f2 (diff) | |
| download | webtrees-fb7adfecd20739494a982965a67a06d53e6ce012.tar.gz webtrees-fb7adfecd20739494a982965a67a06d53e6ce012.tar.bz2 webtrees-fb7adfecd20739494a982965a67a06d53e6ce012.zip | |
Apply fixes from StyleCI (#2117)
| -rw-r--r-- | app/Http/Controllers/AdminMediaController.php | 8 | ||||
| -rw-r--r-- | app/Http/Controllers/AdminTreesController.php | 8 | ||||
| -rw-r--r-- | app/Media.php | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/Http/Controllers/AdminMediaController.php b/app/Http/Controllers/AdminMediaController.php index 67264a538d..97276d9a84 100644 --- a/app/Http/Controllers/AdminMediaController.php +++ b/app/Http/Controllers/AdminMediaController.php @@ -159,7 +159,7 @@ class AdminMediaController extends AbstractBaseController $media = Media::rowMapper()($row); $media_files = $media->mediaFiles() - ->filter(function(MediaFile $media_file) use ($row): bool { + ->filter(function (MediaFile $media_file) use ($row): bool { return $media_file->filename() == $row->multimedia_file_refn; }) ->map(function (MediaFile $media_file): string { @@ -180,7 +180,7 @@ class AdminMediaController extends AbstractBaseController $join ->on('media.m_file', '=', 'media_file.m_file') ->on('media.m_id', '=', 'media_file.m_id'); - }) + }) ->where(function (Builder $query): void { $query ->where('multimedia_file_refn', 'LIKE', 'http://%') @@ -193,7 +193,7 @@ class AdminMediaController extends AbstractBaseController $media = Media::rowMapper()($row); $media_files = $media->mediaFiles() - ->filter(function(MediaFile $media_file) use ($row): bool { + ->filter(function (MediaFile $media_file) use ($row): bool { return $media_file->filename() == $row->multimedia_file_refn; }) ->map(function (MediaFile $media_file): string { @@ -414,7 +414,7 @@ class AdminMediaController extends AbstractBaseController ->select(DB::raw('setting_value || multimedia_file_refn AS path')) ->union($base_folders) ->pluck('path') - ->map(function(string $path): string { + ->map(function (string $path): string { return dirname($path) . '/'; }) ->unique() diff --git a/app/Http/Controllers/AdminTreesController.php b/app/Http/Controllers/AdminTreesController.php index 312ab428ea..8c23a81e33 100644 --- a/app/Http/Controllers/AdminTreesController.php +++ b/app/Http/Controllers/AdminTreesController.php @@ -1983,7 +1983,7 @@ class AdminTreesController extends AbstractBaseController $sources = DB::table('sources') ->where('s_file', '=', $tree->id()) ->groupBy('s_name') - ->having(DB::raw('COUNT(s_id)'), '>', 1) + ->having(DB::raw('COUNT(s_id)'), '>', 1) ->select([DB::raw('GROUP_CONCAT(s_id) AS xrefs')]) ->pluck('xrefs') ->map(function (string $xrefs) use ($tree): array { @@ -2008,7 +2008,7 @@ class AdminTreesController extends AbstractBaseController ->groupBy('d_fact') ->groupBy('n_type') ->groupBy('n_full') - ->having(DB::raw('COUNT(DISTINCT d_gid)'), '>', 1) + ->having(DB::raw('COUNT(DISTINCT d_gid)'), '>', 1) ->select([DB::raw('GROUP_CONCAT(d_gid) AS xrefs')]) ->pluck('xrefs') ->map(function (string $xrefs) use ($tree): array { @@ -2022,7 +2022,7 @@ class AdminTreesController extends AbstractBaseController ->where('f_file', '=', $tree->id()) ->groupBy(DB::raw('LEAST(f_husb, f_wife)')) ->groupBy(DB::raw('GREATEST(f_husb, f_wife)')) - ->having(DB::raw('COUNT(f_id)'), '>', 1) + ->having(DB::raw('COUNT(f_id)'), '>', 1) ->select([DB::raw('GROUP_CONCAT(f_id) AS xrefs')]) ->pluck('xrefs') ->map(function (string $xrefs) use ($tree): array { @@ -2036,7 +2036,7 @@ class AdminTreesController extends AbstractBaseController ->where('m_file', '=', $tree->id()) ->where('descriptive_title', '<>', '') ->groupBy('descriptive_title') - ->having(DB::raw('COUNT(m_id)'), '>', 1) + ->having(DB::raw('COUNT(m_id)'), '>', 1) ->select([DB::raw('GROUP_CONCAT(m_id) AS xrefs')]) ->pluck('xrefs') ->map(function (string $xrefs) use ($tree): array { diff --git a/app/Media.php b/app/Media.php index 42739dc95c..a773808c00 100644 --- a/app/Media.php +++ b/app/Media.php @@ -119,7 +119,7 @@ class Media extends GedcomRecord { return (new Collection($this->facts(['FILE']))) ->map(function (Fact $fact): MediaFile { - return new MediaFile($fact->gedcom(), $this); + return new MediaFile($fact->gedcom(), $this); }); } |
