framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Array manipulation in FileViewFinder::getPossibleViewFiles() should be a separate method

Browse Source
This commit is contained in:
QWp6t
2016-12-10 06:11:11 -08:00
parent 354c32e0de
commit fb6f01bac8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/lib/Sage/Template/FileViewFinder.php
View File

@@ -7,7 +7,7 @@ class FileViewFinder extends \Illuminate\View\FileViewFinder
const FALLBACK_PARTS_DELIMITER = '-'; const FALLBACK_PARTS_DELIMITER = '-';
/** /**
* Get an array of possible view files. * Get an array of possible view files from a single file name.
* *
* @param string $name * @param string $name
* @return array * @return array
@@ -20,6 +20,17 @@ class FileViewFinder extends \Illuminate\View\FileViewFinder
$templates[] = $templates[$i].self::FALLBACK_PARTS_DELIMITER.$part; $templates[] = $templates[$i].self::FALLBACK_PARTS_DELIMITER.$part;
} }
rsort($templates); rsort($templates);
return $this->getPossibleViewFilesFromTemplates($templates);
}
/**
* Get an array of possible view files from an array of templates
*
* @param array $templates
* @return array
*/
public function getPossibleViewFilesFromTemplates($templates)
{
return call_user_func_array('array_merge', array_map(function ($template) { return call_user_func_array('array_merge', array_map(function ($template) {
return array_map(function ($extension) use ($template) { return array_map(function ($extension) use ($template) {
return str_replace('.', '/', $template).'.'.$extension; return str_replace('.', '/', $template).'.'.$extension;