mirror/php-flextype
1
0
Fork 0
mirror of https://github.com/flextype/flextype.git synced 2025-08-08 14:16:46 +02:00
Code Issues Releases Wiki Activity

feat(entries): fix issues with root collection path #552

Browse Source
This commit is contained in:
Awilum
2021-07-17 12:46:06 +03:00
parent 6ecba6b077
commit 74947580a1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/flextype/Foundation/Entries.php
View File

@@ -100,6 +100,7 @@ class Entries
$this->registry()->set('fetch.options', $options);
$this->registry()->set('fetch.data', []);
// Run event
flextype('emitter')->emit('on' . strings($this->options['collection'])->capitalize()->toString() . 'Fetch');
@@ -126,16 +127,16 @@ class Entries
// Run event
flextype('emitter')->emit('on' . strings($this->options['collection'])->capitalize()->toString() . 'FetchSingleCacheHasResult');
// Return entry from cache
return arrays($this->registry()->get('fetch.data'));
}
// 2. Try to get current requested entry from filesystem
if ($this->has($this->registry()->get('fetch.id'))) {
// Get entry file location
$entryFile = $this->getFileLocation($this->registry()->get('fetch.id'));
// Try to get requested entry from the filesystem
$entryFileContent = filesystem()->file($entryFile)->get();
@@ -163,7 +164,7 @@ class Entries
if ($cache) {
flextype('cache')->set($entryCacheID, $this->registry()->get('fetch.data'));
}
// Return entry data
return arrays($this->registry()->get('fetch.data'));
}
@@ -207,7 +208,7 @@ class Entries
$currentEntryID = strings($currenEntry->getPath())
->replace('\\', '/')
->replace(PATH['project'] . '/entries/', '')
->replace(PATH['project'] . '/entries/' . $this->options['collection'] . '/', '')
->trim('/')
->toString();
@@ -228,10 +229,11 @@ class Entries
// Run event:
flextype('emitter')->emit('on' . strings($this->options['collection'])->capitalize()->toString() . 'FetchCollectionNoResult');
// Return entries array
return arrays($this->registry()->get('fetch.data'));
} else {
return $single($this->registry['fetch']['id'],
$this->registry['fetch']['options']);
}
@@ -411,7 +413,7 @@ class Entries
*/
public function getFileLocation(string $id): string
{
return PATH['project'] . '/entries/' . $id . '/entry.yaml';
return PATH['project'] . '/entries/' . $this->options['collection'] . '/' . $id . '/entry.yaml';
}
/**