Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 13:26:26 +02:00
Code Issues Packages Projects Releases Activity

Fixed phpdoc generation

Browse Source
This commit is contained in:
Matias Griese
2019-03-13 16:00:00 +02:00
parent c80a3f5568
commit b4a4b60871
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.5.9
## mm/dd/2019
1. [](#improved)
* Fixed phpdoc generation
# v1.5.8
## 02/07/2019

12
system/src/Grav/Framework/Cache/Adapter/FileCache.php
View File

@@ -27,9 +27,11 @@ class FileCache extends AbstractCache
/**
* @inheritdoc
*/
public function __construct($namespace = '', $defaultLifetime = null)
public function __construct($namespace = '', $defaultLifetime = null, $folder = null)
{
parent::__construct($namespace, $defaultLifetime ?: 31557600); // = 1 year
$this->initFileCache($namespace, $folder ?? '');
}
/**
@@ -136,9 +138,9 @@ class FileCache extends AbstractCache
/**
* @param string $namespace
* @param string $directory
* @throws \Psr\SimpleCache\InvalidArgumentException
* @throws \Psr\SimpleCache\InvalidArgumentException|InvalidArgumentException
*/
private function init($namespace, $directory)
protected function initFileCache($namespace, $directory)
{
if (!isset($directory[0])) {
$directory = sys_get_temp_dir() . '/grav-cache';
@@ -153,9 +155,7 @@ class FileCache extends AbstractCache
$directory .= DIRECTORY_SEPARATOR . $namespace;
}
if (!file_exists($directory)) {
@mkdir($directory, 0777, true);
}
$this->mkdir($directory);
$directory .= DIRECTORY_SEPARATOR;
// On Windows the whole path is limited to 258 chars

3
system/src/Grav/Framework/Session/Session.php
View File

@@ -38,9 +38,6 @@ class Session implements SessionInterface
return self::$instance;
}
/**
* @inheritdoc
*/
public function __construct(array $options = [])
{
// Session is a singleton.