From fcbd819f48f5cd994fd579d03e746f6c70844a23 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 20 Mar 2019 16:31:19 -0600 Subject: [PATCH 1/5] Added deferred twig extension --- CHANGELOG.md | 6 ++++ composer.json | 3 +- composer.lock | 45 +++++++++++++++++++++++++++- system/src/Grav/Common/Twig/Twig.php | 2 ++ 4 files changed, 54 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b22d8dbf3..fe5871700 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.5.10 +## mm/dd/2019 + +1. [](#new) + * Added new `deferred` Twig extension + # v1.5.9 ## 03/20/2019 diff --git a/composer.json b/composer.json index 720fea677..917208812 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,8 @@ "league/climate": "^3.2", "antoligy/dom-string-iterators": "^1.0", "miljar/php-exif": "^0.6.3", - "composer/ca-bundle": "^1.0" + "composer/ca-bundle": "^1.0", + "phive/twig-extensions-deferred": "^1.0" }, "require-dev": { "codeception/codeception": "^2.1", diff --git a/composer.lock b/composer.lock index 664a38335..5653657a5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2ab76ae21295d87c6ff140947c160865", + "content-hash": "655f3e16c1c33d89e1baf6383b2efb26", "packages": [ { "name": "antoligy/dom-string-iterators", @@ -970,6 +970,49 @@ ], "time": "2018-11-05T09:00:11+00:00" }, + { + "name": "phive/twig-extensions-deferred", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/rybakit/twig-deferred-extension.git", + "reference": "5a2426d622afa74034e754ca5ea1d1ff7887627f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rybakit/twig-deferred-extension/zipball/5a2426d622afa74034e754ca5ea1d1ff7887627f", + "reference": "5a2426d622afa74034e754ca5ea1d1ff7887627f", + "shasum": "" + }, + "require": { + "twig/twig": "~1.18" + }, + "type": "library", + "autoload": { + "psr-4": { + "Phive\\Twig\\Extensions\\Deferred\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eugene Leonovich", + "email": "gen.work@gmail.com" + } + ], + "description": "An extension for Twig that allows to defer block rendering", + "homepage": "https://github.com/rybakit/twig-extensions-deferred", + "keywords": [ + "defer", + "extension", + "lazy", + "twig" + ], + "time": "2017-03-17T21:39:21+00:00" + }, { "name": "pimple/pimple", "version": "v3.2.3", diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php index 567b18cef..7d7ef5067 100644 --- a/system/src/Grav/Common/Twig/Twig.php +++ b/system/src/Grav/Common/Twig/Twig.php @@ -16,6 +16,7 @@ use Grav\Common\Page\Page; use Grav\Common\Page\Pages; use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; use RocketTheme\Toolbox\Event\Event; +use Phive\Twig\Extensions\Deferred\DeferredExtension; class Twig { @@ -181,6 +182,7 @@ class Twig $this->twig->addExtension(new \Twig_Extension_Debug()); } $this->twig->addExtension(new TwigExtension()); + $this->twig->addExtension(new DeferredExtension()); $this->grav->fireEvent('onTwigExtensions'); From 2fed02affa20ed8d8924cb9eba4f4a75b14d4c2c Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Thu, 21 Mar 2019 14:16:10 -0600 Subject: [PATCH 2/5] Prepare for release --- CHANGELOG.md | 2 +- system/defines.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe5871700..8d1acb7db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.5.10 -## mm/dd/2019 +## 03/21/2019 1. [](#new) * Added new `deferred` Twig extension diff --git a/system/defines.php b/system/defines.php index 8bbd1a363..9205f538f 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.5.9'); +define('GRAV_VERSION', '1.5.10'); define('GRAV_TESTING', false); define('DS', '/'); From f7d3299ebb97ba84b85cd335b3047ede6cfbbc92 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Thu, 21 Mar 2019 19:06:12 -0700 Subject: [PATCH 3/5] Added Awesome Grav link to the Exploring More --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b59a48205..5c7b18ec5 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ If you discover a possible security issue related to Grav or one of its plugins, * Dive into more [advanced](https://learn.getgrav.org/advanced) functions * Learn about the [Grav CLI](https://learn.getgrav.org/cli-console/grav-cli) * Review examples in the [Grav Cookbook](https://learn.getgrav.org/cookbook) +* More [Awesome Grav Stuff](https://github.com/getgrav/awesome-grav) # Backers Support Grav with a monthly donation to help us continue development. [[Become a backer](https://opencollective.com/grav#backer)] From 55aaaeed4700c295ea392bc70b6f56a16668f0ab Mon Sep 17 00:00:00 2001 From: Antoine Goutenoir Date: Mon, 25 Mar 2019 17:51:06 +0100 Subject: [PATCH 4/5] Add the page to the onMarkdownInitialized event. (#2418) This will allow plugins hooking this event to mergeConfig #2412 --- system/src/Grav/Common/Markdown/ParsedownGravTrait.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php index 59be69b0e..0d1b12f84 100644 --- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php +++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php @@ -47,7 +47,7 @@ trait ParsedownGravTrait $this->setMarkupEscaped($defaults['escape_markup']); $this->setSpecialChars($defaults['special_chars']); - $grav->fireEvent('onMarkdownInitialized', new Event(['markdown' => $this])); + $grav->fireEvent('onMarkdownInitialized', new Event(['markdown' => $this, 'page' => $page])); } From 04d3237a89e2ca6a6cef1ae7c2593a22b6656d43 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Mon, 25 Mar 2019 18:53:04 +0200 Subject: [PATCH 5/5] Changelog update --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d1acb7db..63b859a0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.5.11 +## mm/dd/2019 + +1. [](#improved) + * Add the page to onMarkdownInitialized event [#2412](https://github.com/getgrav/grav/issues/2412) + # v1.5.10 ## 03/21/2019