diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index 8d4190b86..a3634a5d7 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -1,8 +1,9 @@
isRemoteLink($old_url)) {
return $matches[0];
}
diff --git a/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php b/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
index 876a0839c..740033009 100644
--- a/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/AssetUtilsTrait.php
@@ -1,8 +1,9 @@
rootUrl(true);
- // sanity check for local URLs with absolute URL's enabled
+ // Sanity check for local URLs with absolute URL's enabled
if (Utils::startsWith($link, $base)) {
return false;
}
@@ -73,7 +74,7 @@ trait AssetUtilsTrait
// No file found, skip it...
if ($file === false) {
- if (!$local) { // Assume we coudln't download this file for some reason assume it's not pipeline compatible
+ if (!$local) { // Assume we couldn't download this file for some reason assume it's not pipeline compatible
$no_pipeline[$id] = $asset;
}
continue;
@@ -125,8 +126,6 @@ trait AssetUtilsTrait
*
* Build an HTML attribute string from an array.
*
- * @param array $attributes
- *
* @return string
*/
protected function renderAttributes()
@@ -157,6 +156,7 @@ trait AssetUtilsTrait
/**
* Render Querystring
*
+ * @param string $asset
* @return string
*/
protected function renderQueryString($asset = null)
diff --git a/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php b/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
index 664d630d3..8b5954c11 100644
--- a/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
+++ b/system/src/Grav/Common/Assets/Traits/LegacyAssetsTrait.php
@@ -1,8 +1,9 @@
collections = $collections;
+
return $this;
}
diff --git a/system/src/Grav/Common/Backup/Backups.php b/system/src/Grav/Common/Backup/Backups.php
index 95a2e570c..25515c5ac 100644
--- a/system/src/Grav/Common/Backup/Backups.php
+++ b/system/src/Grav/Common/Backup/Backups.php
@@ -1,8 +1,9 @@
enabled) {
return $this->driver->delete($id);
}
+
return false;
}
@@ -341,6 +343,7 @@ class Cache extends Getters
if ($this->enabled) {
return $this->driver->deleteAll();
}
+
return false;
}
@@ -355,6 +358,7 @@ class Cache extends Getters
if ($this->enabled) {
return $this->driver->contains(($id));
}
+
return false;
}
diff --git a/system/src/Grav/Common/Composer.php b/system/src/Grav/Common/Composer.php
index 65c994564..927e91415 100644
--- a/system/src/Grav/Common/Composer.php
+++ b/system/src/Grav/Common/Composer.php
@@ -1,8 +1,9 @@
data->toArray();
}
-
}
diff --git a/system/src/Grav/Common/GPM/GPM.php b/system/src/Grav/Common/GPM/GPM.php
index 696ba657c..6319f6af2 100644
--- a/system/src/Grav/Common/GPM/GPM.php
+++ b/system/src/Grav/Common/GPM/GPM.php
@@ -1,8 +1,9 @@
addPage($page);
}
+
return $this;
}
@@ -117,6 +119,7 @@ class Collection extends Iterator
$this->items = array_uintersect($array1, $array2, function($val1, $val2) {
return strcmp($val1['slug'], $val2['slug']);
});
+
return $this;
}
@@ -130,6 +133,7 @@ class Collection extends Iterator
public function setParams(array $params)
{
$this->params = array_merge($this->params, $params);
+
return $this;
}
@@ -342,6 +346,7 @@ class Collection extends Iterator
}
$this->items = $date_range;
+
return $this;
}
diff --git a/system/src/Grav/Common/Page/Header.php b/system/src/Grav/Common/Page/Header.php
index 7df862bb1..e3854aecf 100644
--- a/system/src/Grav/Common/Page/Header.php
+++ b/system/src/Grav/Common/Page/Header.php
@@ -1,8 +1,9 @@
quality = $quality;
+
return $this;
}
@@ -445,6 +447,7 @@ class ImageMedium extends Medium
}
$this->format = $format;
+
return $this;
}
@@ -459,6 +462,7 @@ class ImageMedium extends Medium
if ($sizes) {
$this->sizes = $sizes;
+
return $this;
}
diff --git a/system/src/Grav/Common/Page/Medium/Link.php b/system/src/Grav/Common/Page/Medium/Link.php
index 15aac7b3b..62e9265cf 100644
--- a/system/src/Grav/Common/Page/Medium/Link.php
+++ b/system/src/Grav/Common/Page/Medium/Link.php
@@ -1,8 +1,9 @@
bubble('thumbnail', [$type], false);
+
return $this->bubble('getThumbnail', [], false);
}
diff --git a/system/src/Grav/Common/Page/Medium/VideoMedium.php b/system/src/Grav/Common/Page/Medium/VideoMedium.php
index a8713b377..deeb4a216 100644
--- a/system/src/Grav/Common/Page/Medium/VideoMedium.php
+++ b/system/src/Grav/Common/Page/Medium/VideoMedium.php
@@ -1,8 +1,9 @@
header->append_url_extension ?? '' , '.');
if (!empty($page_extension)) {
$this->template_format = $page_extension;
+
return $this->template_format;
}
@@ -1387,6 +1389,7 @@ class Page implements PageInterface
$uri_extension = Grav::instance()['uri']->extension();
if (is_string($uri_extension)) {
$this->template_format = $uri_extension;
+
return $this->template_format;
}
@@ -1401,6 +1404,7 @@ class Page implements PageInterface
$media_type = $negotiator->getBest($http_accept, $priorities);
$mimetype = $media_type->getValue();
$this->template_format = Utils::getExtensionByMime($mimetype);
+
return $this->template_format;
}
@@ -1755,7 +1759,6 @@ class Page implements PageInterface
$this->slug = $this->adjustRouteCase(preg_replace(PAGE_ORDER_PREFIX_REGEX, '', $this->folder)) ?: null;
}
-
return $this->slug;
}
@@ -1838,7 +1841,7 @@ class Page implements PageInterface
/** @var Config $config */
$config = $grav['config'];
- // get base route (multisite base and language)
+ // get base route (multi-site base and language)
$route = $include_base ? $pages->baseRoute() : '';
// add full route if configured to do so
@@ -2197,6 +2200,7 @@ class Page implements PageInterface
if ($var !== null) {
$this->order_dir = $var;
}
+
if (empty($this->order_dir)) {
$this->order_dir = 'asc';
}
@@ -3078,7 +3082,7 @@ class Page implements PageInterface
*
* @internal
*
- * @throws Exception
+ * @throws \Exception
*/
protected function doRelocation()
{
diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 945201a8a..1d99c176b 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -1,8 +1,9 @@
grav['locator'];
+
return $this->instances[rtrim($locator->findResource('page://'), DS)];
}
diff --git a/system/src/Grav/Common/Page/Types.php b/system/src/Grav/Common/Page/Types.php
index 10b07beda..94d7f6e9c 100644
--- a/system/src/Grav/Common/Page/Types.php
+++ b/system/src/Grav/Common/Page/Types.php
@@ -1,8 +1,9 @@
modified for Grav integration
- * @copyright Copyright (C) 2015 - 2018 Trilby Media, LLC. All rights reserved.
+ * @copyright Copyright (C) 2015 - 2019 Trilby Media, LLC. All rights reserved.
* @license MIT License; see LICENSE file for details.
*/
@@ -144,6 +145,7 @@ class Cron {
$this->getCronDaysOfWeek(),
));
}
+
/**
*
* @param string $lang 'fr' or 'en'
@@ -160,13 +162,16 @@ class Cron {
if ($type == self::TYPE_UNDEFINED) {
return $this->getCron();
}
+
// init
$elements = array();
$elements[] = sprintf($texts['text_period'], $texts['name_' . $type]);
+
// hour
if (in_array($type, array(self::TYPE_HOUR))) {
$elements[] = sprintf($texts['text_mins'], $this->getCronMinutes());
}
+
// week
if (in_array($type, array(self::TYPE_WEEK))) {
$dow = $this->getCronDaysOfWeek();
@@ -175,10 +180,12 @@ class Cron {
}
$elements[] = sprintf($texts['text_dow'], $dow);
}
+
// month + year
if (in_array($type, array(self::TYPE_MONTH, self::TYPE_YEAR))) {
$elements[] = sprintf($texts['text_dom'], $this->getCronDaysOfMonth());
}
+
// year
if (in_array($type, array(self::TYPE_YEAR))) {
$months = $this->getCronMonths();
@@ -187,12 +194,15 @@ class Cron {
}
$elements[] = sprintf($texts['text_month'], $months);
}
+
// day + week + month + year
if (in_array($type, array(self::TYPE_DAY, self::TYPE_WEEK, self::TYPE_MONTH, self::TYPE_YEAR))) {
$elements[] = sprintf($texts['text_time'], $this->getCronHours(), $this->getCronMinutes());
}
+
return str_replace('*', $texts['empty'], implode(' ', $elements));
}
+
/**
*
* @return string
@@ -219,8 +229,10 @@ class Cron {
elseif (substr($mask, -2) == '-*') {
return self::TYPE_YEAR;
}
+
return self::TYPE_UNDEFINED;
}
+
/**
*
* @param string $cron
@@ -235,14 +247,17 @@ class Cron {
if (count($elements) != 5) {
throw new Exception('Bad number of elements');
}
+
$this->cron = $cron;
$this->setMinutes($elements[0]);
$this->setHours($elements[1]);
$this->setDaysOfMonth($elements[2]);
$this->setMonths($elements[3]);
$this->setDaysOfWeek($elements[4]);
+
return $this;
}
+
/**
*
* @return string
@@ -250,6 +265,7 @@ class Cron {
public function getCronMinutes() {
return $this->arrayToCron($this->minutes);
}
+
/**
*
* @return string
@@ -257,6 +273,7 @@ class Cron {
public function getCronHours() {
return $this->arrayToCron($this->hours);
}
+
/**
*
* @return string
@@ -264,6 +281,7 @@ class Cron {
public function getCronDaysOfMonth() {
return $this->arrayToCron($this->dom);
}
+
/**
*
* @return string
@@ -271,6 +289,7 @@ class Cron {
public function getCronMonths() {
return $this->arrayToCron($this->months);
}
+
/**
*
* @return string
@@ -278,6 +297,7 @@ class Cron {
public function getCronDaysOfWeek() {
return $this->arrayToCron($this->dow);
}
+
/**
*
* @return array
@@ -285,6 +305,7 @@ class Cron {
public function getMinutes() {
return $this->minutes;
}
+
/**
*
* @return array
@@ -292,6 +313,7 @@ class Cron {
public function getHours() {
return $this->hours;
}
+
/**
*
* @return array
@@ -299,6 +321,7 @@ class Cron {
public function getDaysOfMonth() {
return $this->dom;
}
+
/**
*
* @return array
@@ -306,6 +329,7 @@ class Cron {
public function getMonths() {
return $this->months;
}
+
/**
*
* @return array
@@ -313,6 +337,7 @@ class Cron {
public function getDaysOfWeek() {
return $this->dow;
}
+
/**
*
* @param string|array $minutes
@@ -320,8 +345,10 @@ class Cron {
*/
public function setMinutes($minutes) {
$this->minutes = $this->cronToArray($minutes, 0, 59);
+
return $this;
}
+
/**
*
* @param string|array $hours
@@ -329,8 +356,10 @@ class Cron {
*/
public function setHours($hours) {
$this->hours = $this->cronToArray($hours, 0, 23);
+
return $this;
}
+
/**
*
* @param string|array $months
@@ -338,8 +367,10 @@ class Cron {
*/
public function setMonths($months) {
$this->months = $this->cronToArray($months, 1, 12);
+
return $this;
}
+
/**
*
* @param string|array $dow
@@ -347,8 +378,10 @@ class Cron {
*/
public function setDaysOfWeek($dow) {
$this->dow = $this->cronToArray($dow, 0, 7);
+
return $this;
}
+
/**
*
* @param string|array $dom
@@ -356,8 +389,10 @@ class Cron {
*/
public function setDaysOfMonth($dom) {
$this->dom = $this->cronToArray($dom, 1, 31);
+
return $this;
}
+
/**
*
* @param mixed $date
@@ -366,7 +401,7 @@ class Cron {
* @param int $day
* @param int $month
* @param int $weekday
- * @return DateTime
+ * @return \DateTime
*/
protected function parseDate($date, &$min, &$hour, &$day, &$month, &$weekday) {
if (is_numeric($date) && intval($date) == $date) {
@@ -385,14 +420,17 @@ class Cron {
else {
throw new Exception('Date format not supported');
}
+
return new \DateTime($date->format('Y-m-d H:i:sP'));
}
+
/**
*
* @param int|string|\Datetime $date
*/
public function matchExact($date) {
$date = $this->parseDate($date, $min, $hour, $day, $month, $weekday);
+
return
(empty($this->minutes) || in_array($min, $this->minutes)) &&
(empty($this->hours) || in_array($hour, $this->hours)) &&
@@ -401,6 +439,7 @@ class Cron {
(empty($this->dow) || in_array($weekday, $this->dow) || ($weekday == 0 && in_array(7, $this->dow)) || ($weekday == 7 && in_array(0, $this->dow))
);
}
+
/**
*
* @param int|string|\Datetime $date
@@ -414,6 +453,7 @@ class Cron {
if ($minuteAfter < 0) {
throw new Exception('MinuteAfter parameter cannot be negative !');
}
+
$date = $this->parseDate($date, $min, $hour, $day, $month, $weekday);
$interval = new \DateInterval('PT1M'); // 1 min
if ($minuteBefore != 0) {
@@ -426,8 +466,10 @@ class Cron {
}
$date->add($interval);
}
+
return false;
}
+
/**
*
* @param array $array
@@ -450,11 +492,13 @@ class Cron {
$cron[] = $c;
}
}
+
return implode(',', $cron);
}
+
/**
*
- * @param string $string
+ * @param array|string $string
* @param int $min
* @param int $max
* @return array
@@ -502,11 +546,13 @@ class Cron {
$string = substr($string, strlen($m[0]));
continue;
}
+
// something goes wrong in the expression
return array();
}
}
sort($array);
+
return $array;
}
}
diff --git a/system/src/Grav/Common/Scheduler/IntervalTrait.php b/system/src/Grav/Common/Scheduler/IntervalTrait.php
index 9df03699c..8ce47578e 100644
--- a/system/src/Grav/Common/Scheduler/IntervalTrait.php
+++ b/system/src/Grav/Common/Scheduler/IntervalTrait.php
@@ -1,8 +1,9 @@
at = $expression;
$this->executionTime = CronExpression::factory($expression);
+
return $this;
}
+
/**
* Set the execution time to every minute.
*
@@ -33,6 +36,7 @@ trait IntervalTrait
{
return $this->at('* * * * *');
}
+
/**
* Set the execution time to every hour.
*
@@ -42,8 +46,10 @@ trait IntervalTrait
public function hourly($minute = 0)
{
$c = $this->validateCronSequence($minute);
+
return $this->at("{$c['minute']} * * * *");
}
+
/**
* Set the execution time to once a day.
*
@@ -59,8 +65,10 @@ trait IntervalTrait
$minute = isset($parts[1]) ? $parts[1] : '0';
}
$c = $this->validateCronSequence($minute, $hour);
+
return $this->at("{$c['minute']} {$c['hour']} * * *");
}
+
/**
* Set the execution time to once a week.
*
@@ -77,8 +85,10 @@ trait IntervalTrait
$minute = isset($parts[1]) ? $parts[1] : '0';
}
$c = $this->validateCronSequence($minute, $hour, null, null, $weekday);
+
return $this->at("{$c['minute']} {$c['hour']} * * {$c['weekday']}");
}
+
/**
* Set the execution time to once a month.
*
@@ -96,8 +106,10 @@ trait IntervalTrait
$minute = isset($parts[1]) ? $parts[1] : '0';
}
$c = $this->validateCronSequence($minute, $hour, $day, $month);
+
return $this->at("{$c['minute']} {$c['hour']} {$c['day']} {$c['month']} *");
}
+
/**
* Set the execution time to every Sunday.
*
@@ -109,6 +121,7 @@ trait IntervalTrait
{
return $this->weekly(0, $hour, $minute);
}
+
/**
* Set the execution time to every Monday.
*
@@ -120,6 +133,7 @@ trait IntervalTrait
{
return $this->weekly(1, $hour, $minute);
}
+
/**
* Set the execution time to every Tuesday.
*
@@ -131,6 +145,7 @@ trait IntervalTrait
{
return $this->weekly(2, $hour, $minute);
}
+
/**
* Set the execution time to every Wednesday.
*
@@ -142,6 +157,7 @@ trait IntervalTrait
{
return $this->weekly(3, $hour, $minute);
}
+
/**
* Set the execution time to every Thursday.
*
@@ -153,6 +169,7 @@ trait IntervalTrait
{
return $this->weekly(4, $hour, $minute);
}
+
/**
* Set the execution time to every Friday.
*
@@ -164,6 +181,7 @@ trait IntervalTrait
{
return $this->weekly(5, $hour, $minute);
}
+
/**
* Set the execution time to every Saturday.
*
@@ -175,6 +193,7 @@ trait IntervalTrait
{
return $this->weekly(6, $hour, $minute);
}
+
/**
* Set the execution time to every January.
*
@@ -187,6 +206,7 @@ trait IntervalTrait
{
return $this->monthly(1, $day, $hour, $minute);
}
+
/**
* Set the execution time to every February.
*
@@ -199,6 +219,7 @@ trait IntervalTrait
{
return $this->monthly(2, $day, $hour, $minute);
}
+
/**
* Set the execution time to every March.
*
@@ -211,6 +232,7 @@ trait IntervalTrait
{
return $this->monthly(3, $day, $hour, $minute);
}
+
/**
* Set the execution time to every April.
*
@@ -223,6 +245,7 @@ trait IntervalTrait
{
return $this->monthly(4, $day, $hour, $minute);
}
+
/**
* Set the execution time to every May.
*
@@ -235,6 +258,7 @@ trait IntervalTrait
{
return $this->monthly(5, $day, $hour, $minute);
}
+
/**
* Set the execution time to every June.
*
@@ -247,6 +271,7 @@ trait IntervalTrait
{
return $this->monthly(6, $day, $hour, $minute);
}
+
/**
* Set the execution time to every July.
*
@@ -259,6 +284,7 @@ trait IntervalTrait
{
return $this->monthly(7, $day, $hour, $minute);
}
+
/**
* Set the execution time to every August.
*
@@ -271,6 +297,7 @@ trait IntervalTrait
{
return $this->monthly(8, $day, $hour, $minute);
}
+
/**
* Set the execution time to every September.
*
@@ -283,6 +310,7 @@ trait IntervalTrait
{
return $this->monthly(9, $day, $hour, $minute);
}
+
/**
* Set the execution time to every October.
*
@@ -295,6 +323,7 @@ trait IntervalTrait
{
return $this->monthly(10, $day, $hour, $minute);
}
+
/**
* Set the execution time to every November.
*
@@ -307,6 +336,7 @@ trait IntervalTrait
{
return $this->monthly(11, $day, $hour, $minute);
}
+
/**
* Set the execution time to every December.
*
@@ -319,6 +349,7 @@ trait IntervalTrait
{
return $this->monthly(12, $day, $hour, $minute);
}
+
/**
* Validate sequence of cron expression.
*
@@ -339,6 +370,7 @@ trait IntervalTrait
'weekday' => $this->validateCronRange($weekday, 0, 6),
];
}
+
/**
* Validate sequence of cron expression.
*
@@ -352,6 +384,7 @@ trait IntervalTrait
if ($value === null || $value === '*') {
return '*';
}
+
if (! is_numeric($value) ||
! ($value >= $min && $value <= $max)
) {
@@ -359,6 +392,7 @@ trait IntervalTrait
"Invalid value: it should be '*' or between {$min} and {$max}."
);
}
+
return $value;
}
}
diff --git a/system/src/Grav/Common/Scheduler/Job.php b/system/src/Grav/Common/Scheduler/Job.php
index 995e69609..b78373020 100644
--- a/system/src/Grav/Common/Scheduler/Job.php
+++ b/system/src/Grav/Common/Scheduler/Job.php
@@ -1,8 +1,9 @@
runInBackground = false;
+
return $this;
}
@@ -217,6 +219,7 @@ class Job
return false;
};
}
+
return $this;
}
@@ -232,6 +235,7 @@ class Job
if (isset($config['tempDir']) && is_dir($config['tempDir'])) {
$this->tempDir = $config['tempDir'];
}
+
return $this;
}
@@ -244,6 +248,7 @@ class Job
public function when(callable $fn)
{
$this->truthTest = $fn();
+
return $this;
}
@@ -258,10 +263,12 @@ class Job
if ($this->truthTest !== true) {
return false;
}
+
// If overlapping, don't run
if ($this->isOverlapping()) {
return false;
}
+
// Write lock file if necessary
$this->createLockFile();
@@ -269,6 +276,7 @@ class Job
if (is_callable($this->before)) {
call_user_func($this->before);
}
+
// If command is callable...
if (is_callable($this->command)) {
$this->output = $this->exec();
@@ -287,6 +295,7 @@ class Job
$this->finalize();
}
}
+
return true;
}
@@ -400,6 +409,7 @@ class Job
{
$this->outputTo = is_array($filename) ? $filename : [$filename];
$this->outputMode = $append === false ? 'overwrite' : 'append';
+
return $this;
}
@@ -426,9 +436,11 @@ class Job
if (!is_string($email) && !is_array($email)) {
throw new InvalidArgumentException('The email can be only string or array');
}
+
$this->emailTo = is_array($email) ? $email : [$email];
// Force the job to run in foreground
$this->inForeground();
+
return $this;
}
@@ -450,6 +462,7 @@ class Job
\Grav\Plugin\Email\Utils::sendEmail($subject, $content, $to);
}
+
return true;
}
@@ -463,6 +476,7 @@ class Job
public function before(callable $fn)
{
$this->before = $fn;
+
return $this;
}
@@ -485,6 +499,7 @@ class Job
if ($runInBackground === false) {
$this->inForeground();
}
+
return $this;
}
}
diff --git a/system/src/Grav/Common/Scheduler/Scheduler.php b/system/src/Grav/Common/Scheduler/Scheduler.php
index 043f2b991..134c7ca13 100644
--- a/system/src/Grav/Common/Scheduler/Scheduler.php
+++ b/system/src/Grav/Common/Scheduler/Scheduler.php
@@ -1,8 +1,9 @@
loadSavedJobs()->getQueuedJobs(true);
+
return array_merge($background, $foreground);
}
@@ -128,6 +128,7 @@ class Scheduler
{
$job = new Job($fn, $args, $id);
$this->queueJob($job->configure($this->config));
+
return $job;
}
@@ -143,6 +144,7 @@ class Scheduler
{
$job = new Job($command, $args, $id);
$this->queueJob($job->configure($this->config));
+
return $job;
}
@@ -191,6 +193,7 @@ class Scheduler
$this->executed_jobs = [];
$this->failed_jobs = [];
$this->output_schedule = [];
+
return $this;
}
@@ -220,6 +223,7 @@ class Scheduler
public function clearJobs()
{
$this->jobs = [];
+
return $this;
}
@@ -293,6 +297,7 @@ class Scheduler
$this->pushFailedJob($job);
}
}
+
$saved_states = $this->getJobStates();
$saved_states->save(array_merge($saved_states->content(), $new_states));
}
@@ -340,6 +345,7 @@ class Scheduler
$command = is_string($command) ? $command : 'Closure';
}
$this->addSchedulerVerboseOutput("Success: {$command} {$args}");
+
return $job;
}
@@ -359,6 +365,7 @@ class Scheduler
}
$output = trim($job->getOutput());
$this->addSchedulerVerboseOutput("Error: {$command} → {$output}");
+
return $job;
}
}
diff --git a/system/src/Grav/Common/Security.php b/system/src/Grav/Common/Security.php
index 0a73a6777..052e507fb 100644
--- a/system/src/Grav/Common/Security.php
+++ b/system/src/Grav/Common/Security.php
@@ -1,8 +1,9 @@
$body], [], $lineno, $tag);
diff --git a/system/src/Grav/Common/Twig/Node/TwigNodeRender.php b/system/src/Grav/Common/Twig/Node/TwigNodeRender.php
index d94f95152..07425580a 100644
--- a/system/src/Grav/Common/Twig/Node/TwigNodeRender.php
+++ b/system/src/Grav/Common/Twig/Node/TwigNodeRender.php
@@ -1,8 +1,9 @@
grav['config'];
/** @var UniformResourceLocator $locator */
$locator = $this->grav['locator'];
-
/** @var Language $language */
$language = $this->grav['language'];
diff --git a/system/src/Grav/Common/Twig/TwigEnvironment.php b/system/src/Grav/Common/Twig/TwigEnvironment.php
index 66ca8bf71..54ef24f71 100644
--- a/system/src/Grav/Common/Twig/TwigEnvironment.php
+++ b/system/src/Grav/Common/Twig/TwigEnvironment.php
@@ -1,8 +1,9 @@
createTemplate($twig);
+
return $template->render($context);
}
@@ -904,9 +906,10 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
return array($key => $val);
}
- $current_array[$key] = $val;
- return $current_array;
- }
+ $current_array[$key] = $val;
+
+ return $current_array;
+ }
/**
* Wrapper for array_intersect() method
@@ -937,8 +940,8 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
return json_encode($value);
}
- return $value;
- }
+ return $value;
+ }
/**
* Translate a string
@@ -1103,7 +1106,6 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
public function exifFunc($image, $raw = false)
{
if (isset($this->grav['exif'])) {
-
/** @var UniformResourceLocator $locator */
$locator = $this->grav['locator'];
@@ -1122,10 +1124,10 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
return $exif_data->getRawData();
}
- return $exif_data->getData();
- }
+ return $exif_data->getData();
}
}
+ }
return null;
}
diff --git a/system/src/Grav/Common/Twig/WriteCacheFileTrait.php b/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
index c413ca6fb..f521b4274 100644
--- a/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
+++ b/system/src/Grav/Common/Twig/WriteCacheFileTrait.php
@@ -1,8 +1,9 @@