diff --git a/CHANGELOG.md b/CHANGELOG.md index 09e79c88..2fcb2d97 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Flextype 0.7.4, 2018-12-14 +* Content: new frontMatterParser() - added +* Config: set error reporting - false +* Update theme simple according to the php template syntax guidelines +* Super heavy "imagine/imagine": "1.2.0" - removed +* Flextype Component - Errorhandler updated to 1.0.5 + # Flextype 0.7.3, 2018-12-13 * Content: visibility hidden for pages - added * Settings merged into one settings.yaml file diff --git a/README.md b/README.md index d32305e6..74317731 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Flextype [![Discord](https://img.shields.io/discord/423097982498635778.svg?logo=discord&colorB=728ADA&label=Discord%20Chat&style=flat-square)](https://discordapp.com/invite/CCKPKVG) -![Version](https://img.shields.io/badge/version-0.7.3-brightgreen.svg?style=flat-square) +![Version](https://img.shields.io/badge/version-0.7.4-brightgreen.svg?style=flat-square) ![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square) Flextype is Open Source, fast and flexible file-based Content Management System. diff --git a/composer.json b/composer.json index 6ade4a2e..248edd37 100755 --- a/composer.json +++ b/composer.json @@ -20,14 +20,13 @@ "doctrine/cache": "1.8.0", "symfony/yaml": "4.2.1", "thunderer/shortcode": "0.6.5", - "imagine/imagine": "1.2.0", "flextype-components/arr" : "1.2.3", "flextype-components/assets" : "1.0.1", "flextype-components/cookie" : "1.2.0", "flextype-components/date" : "1.0.0", "flextype-components/debug" : "1.0.0", "flextype-components/event" : "1.0.4", - "flextype-components/errorhandler" : "1.0.4", + "flextype-components/errorhandler" : "1.0.5", "flextype-components/filesystem" : "1.1.3", "flextype-components/form" : "1.0.1", "flextype-components/i18n" : "1.2.0", diff --git a/flextype/Content.php b/flextype/Content.php index 3fa685b2..c2a36a34 100755 --- a/flextype/Content.php +++ b/flextype/Content.php @@ -313,6 +313,22 @@ class Content return Content::$shortcode; } + /** + * Front matter parser + * + * @param string $content Content to parse + * @access public + * @return array + */ + public static function frontMatterParser(string $content) : array + { + $parts = preg_split('/^[\s\r\n]?---[\s\r\n]?$/sm', PHP_EOL.ltrim($content)); + + if (count($parts) < 3) return ['matter' => [], 'body' => $content]; + + return ['matter' => trim($parts[1]), 'body' => implode(PHP_EOL.'---'.PHP_EOL, array_slice($parts, 2))]; + } + /** * Process page * @@ -335,9 +351,9 @@ class Content } else { // Create $page_frontmatter and $page_content - $page = explode('---', $page, 3); - $page_frontmatter = $page[1]; - $page_content = $page[2]; + $page = Content::frontMatterParser($page); + $page_frontmatter = $page['matter']; + $page_content = $page['body']; // Create empty $_page $_page = []; diff --git a/flextype/Flextype.php b/flextype/Flextype.php index cff843af..b22ebd1a 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -26,7 +26,7 @@ class Flextype * * @var string */ - const VERSION = '0.7.3'; + const VERSION = '0.7.4'; /** * An instance of the Flextype class diff --git a/site/config/settings.yaml b/site/config/settings.yaml index 2bd4c329..baf80709 100644 --- a/site/config/settings.yaml +++ b/site/config/settings.yaml @@ -13,7 +13,7 @@ locale: en pages: main: home errors: - display: true + display: false cache: enabled: true prefix: flextype diff --git a/site/themes/simple/views/partials/head.php b/site/themes/simple/views/partials/head.php index c12e4b39..a90528d5 100755 --- a/site/themes/simple/views/partials/head.php +++ b/site/themes/simple/views/partials/head.php @@ -3,26 +3,28 @@ use Flextype\Component\{Event\Event, Http\Http, Registry\Registry, Assets\Assets, Text\Text, Html\Html}; ?> - + - + - - - - + + + + - <?php echo Html::toText($page['title']); ?> | <?php echo Html::toText(Registry::get('settings.title')); ?> + <?= Html::toText($page['title']); ?> | <?= Html::toText(Registry::get('settings.title')); ?> - - - + + + + + diff --git a/site/themes/simple/views/partials/navigation.php b/site/themes/simple/views/partials/navigation.php index 53309223..99f65f90 100755 --- a/site/themes/simple/views/partials/navigation.php +++ b/site/themes/simple/views/partials/navigation.php @@ -4,14 +4,14 @@ ?>