diff --git a/CHANGELOG.md b/CHANGELOG.md index 5884aa9..d893194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v1.4.2 +## 12/02/2020 + +1. [](#improved) + * User return typehints in plugin.php + * Add proper twig escapes into a new theme + # v1.4.1 ## 05/20/2020 diff --git a/blueprints.yaml b/blueprints.yaml index 0ce77d3..d94c8bf 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,7 +1,7 @@ name: DevTools slug: devtools type: plugin -version: 1.4.1 +version: 1.4.2 description: Plugin and Theme scaffolding utilities icon: cogs author: diff --git a/components/plugin/blank/plugin.php.twig b/components/plugin/blank/plugin.php.twig index 99ae2bf..284110b 100644 --- a/components/plugin/blank/plugin.php.twig +++ b/components/plugin/blank/plugin.php.twig @@ -20,7 +20,7 @@ class {{ component.name|camelize }}Plugin extends Plugin * callable (or function) as well as the priority. The * higher the number the higher the priority. */ - public static function getSubscribedEvents() + public static function getSubscribedEvents(): array { return [ 'onPluginsInitialized' => [ @@ -43,7 +43,7 @@ class {{ component.name|camelize }}Plugin extends Plugin /** * Initialize the plugin */ - public function onPluginsInitialized() + public function onPluginsInitialized(): void { // Don't proceed if we are in the admin plugin if ($this->isAdmin()) { diff --git a/components/theme/pure-blank/templates/default.html.twig b/components/theme/pure-blank/templates/default.html.twig index 4dd67b6..1e97738 100644 --- a/components/theme/pure-blank/templates/default.html.twig +++ b/components/theme/pure-blank/templates/default.html.twig @@ -1,5 +1,5 @@ {% extends 'partials/base.html.twig' %} {% block content %} - {{ page.content }} + {{ page.content|raw }} {% endblock %} diff --git a/components/theme/pure-blank/templates/error.html.twig b/components/theme/pure-blank/templates/error.html.twig index f23aa78..c945464 100644 --- a/components/theme/pure-blank/templates/error.html.twig +++ b/components/theme/pure-blank/templates/error.html.twig @@ -3,6 +3,6 @@ {% block content %}

Error!

- {{ page.content }} + {{ page.content|raw }}
{% endblock %} diff --git a/components/theme/pure-blank/templates/partials/base.html.twig b/components/theme/pure-blank/templates/partials/base.html.twig index f7d9ee3..d31a436 100644 --- a/components/theme/pure-blank/templates/partials/base.html.twig +++ b/components/theme/pure-blank/templates/partials/base.html.twig @@ -1,17 +1,17 @@ {% set theme_config = attribute(config.themes, config.system.pages.theme) %} - + {% block head %} - {% if header.title %}{{ header.title|e('html') }} | {% endif %}{{ site.title|e('html') }} + {% if header.title %}{{ header.title|e }} | {% endif %}{{ site.title|e }} {% include 'partials/metadata.html.twig' %} - - + + {% endblock head %} {% block stylesheets %} @@ -29,14 +29,14 @@ {{ assets.js()|raw }} {% endblock %} - + {% block header %}
- {% block header_navigation %}