updated grav to 1.7.14

This commit is contained in:
2021-05-12 10:33:19 +02:00
parent 3d5bc71a7c
commit bd4137e00d
553 changed files with 53214 additions and 18091 deletions
+36 -12
View File
@@ -3,7 +3,7 @@
/**
* @package Grav\Common\Config
*
* @copyright Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
* @copyright Copyright (c) 2015 - 2021 Trilby Media, LLC. All rights reserved.
* @license MIT License; see LICENSE file for details.
*/
@@ -12,24 +12,25 @@ namespace Grav\Common\Config;
use Grav\Common\Data\Data;
use Grav\Common\Utils;
/**
* Class Languages
* @package Grav\Common\Config
*/
class Languages extends Data
{
/**
* @var string|null
*/
/** @var string|null */
protected $checksum;
/**
* @var string|null
*/
protected $modified;
/** @var bool */
protected $modified = false;
/** @var int */
protected $timestamp = 0;
/**
* @var string|null
* @param string|null $checksum
* @return string|null
*/
protected $timestamp;
public function checksum($checksum = null)
{
if ($checksum !== null) {
@@ -39,6 +40,10 @@ class Languages extends Data
return $this->checksum;
}
/**
* @param bool|null $modified
* @return bool
*/
public function modified($modified = null)
{
if ($modified !== null) {
@@ -48,6 +53,10 @@ class Languages extends Data
return $this->modified;
}
/**
* @param int|null $timestamp
* @return int
*/
public function timestamp($timestamp = null)
{
if ($timestamp !== null) {
@@ -57,6 +66,9 @@ class Languages extends Data
return $this->timestamp;
}
/**
* @return void
*/
public function reformat()
{
if (isset($this->items['plugins'])) {
@@ -65,17 +77,29 @@ class Languages extends Data
}
}
/**
* @param array $data
* @return void
*/
public function mergeRecursive(array $data)
{
$this->items = Utils::arrayMergeRecursiveUnique($this->items, $data);
}
/**
* @param string $lang
* @return array
*/
public function flattenByLang($lang)
{
$language = $this->items[$lang];
return Utils::arrayFlattenDotNotation($language);
}
/**
* @param array $array
* @return array
*/
public function unflatten($array)
{
return Utils::arrayUnflattenDotNotation($array);