Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved Framework File classes

Browse Source
This commit is contained in:
Matias Griese 2021-12-07 13:08:05 +02:00
parent 3ad68d6d5a
commit 5b84213fce
7 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
system/src/Grav/Framework/File/CsvFile.php
View File

@ -28,4 +28,13 @@ class CsvFile extends DataFile
{
parent::__construct($filepath, $formatter);
}
/**
* @return array
*/
public function load(): array
{
/** @var array */
return parent::load();
}
}

9
system/src/Grav/Framework/File/File.php
View File

@ -20,15 +20,6 @@ use function is_string;
*/
class File extends AbstractFile
{
/**
* {@inheritdoc}
* @see FileInterface::load()
*/
public function load()
{
return parent::load();
}
/**
* {@inheritdoc}
* @see FileInterface::save()

16
system/src/Grav/Framework/File/Formatter/JsonFormatter.php
View File

@ -75,9 +75,11 @@ class JsonFormatter extends AbstractFormatter
if (is_string($options)) {
$list = preg_split('/[\s,|]+/', $options);
$options = 0;
foreach ($list as $option) {
if (isset($this->encodeOptions[$option])) {
$options += $this->encodeOptions[$option];
if ($list) {
foreach ($list as $option) {
if (isset($this->encodeOptions[$option])) {
$options += $this->encodeOptions[$option];
}
}
}
} else {
@ -100,9 +102,11 @@ class JsonFormatter extends AbstractFormatter
if (is_string($options)) {
$list = preg_split('/[\s,|]+/', $options);
$options = 0;
foreach ($list as $option) {
if (isset($this->decodeOptions[$option])) {
$options += $this->decodeOptions[$option];
if ($list) {
foreach ($list as $option) {
if (isset($this->decodeOptions[$option])) {
$options += $this->decodeOptions[$option];
}
}
}
} else {

9
system/src/Grav/Framework/File/IniFile.php
View File

@ -28,4 +28,13 @@ class IniFile extends DataFile
{
parent::__construct($filepath, $formatter);
}
/**
* @return array
*/
public function load(): array
{
/** @var array */
return parent::load();
}
}

9
system/src/Grav/Framework/File/MarkdownFile.php
View File

@ -28,4 +28,13 @@ class MarkdownFile extends DataFile
{
parent::__construct($filepath, $formatter);
}
/**
* @return array
*/
public function load(): array
{
/** @var array */
return parent::load();
}
}

9
system/src/Grav/Framework/File/YamlFile.php
View File

@ -28,4 +28,13 @@ class YamlFile extends DataFile
{
parent::__construct($filepath, $formatter);
}
/**
* @return array
*/
public function load(): array
{
/** @var array */
return parent::load();
}
}

2
system/src/Grav/Framework/Filesystem/Filesystem.php
View File

@ -239,7 +239,7 @@ class Filesystem implements FilesystemInterface
if (null !== $scheme) {
$info['scheme'] = $scheme;
$dirname = isset($info['dirname']) && $info['dirname'] !== '.' ? $info['dirname'] : null;
$dirname = $info['dirname'] !== '.' ? $info['dirname'] : null;
if (null !== $dirname) {
// In Windows dirname may be using backslashes, fix that.