From 47cf7f537845d9d511199c892b9a31bec14345f2 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 22 Mar 2018 23:22:15 +0300 Subject: [PATCH 01/11] code refactoring --- flextype/Cache.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 78952a23..83fe7d94 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -18,30 +18,35 @@ class Cache * @var object */ protected static $instance = null; + /** * Unique cache key * * @var string Cache key. */ protected static $key; + /** * Lifetime * * @var int Lifetime. */ protected static $lifetime; + /** * Current time * * @var int Current time. */ protected static $now; + /** * Cache Driver * * @var DoctrineCache */ protected static $driver; + /** * Protected clone method to enforce singleton behavior. * @@ -182,7 +187,7 @@ class Cache static::$driver->save($id, $data, $lifetime); } } - + /** * Clear Cache */ From ec8f5e2a171a4c027da5c984423622bd05bb93f9 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 22 Mar 2018 23:40:37 +0300 Subject: [PATCH 02/11] Implement Thunderer Shortcode Framework #7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7b8bc640..e3062a17 100755 --- a/composer.json +++ b/composer.json @@ -23,6 +23,7 @@ "symfony/yaml": "4.0.4", "symfony/filesystem": "4.0.4", "symfony/finder": "4.0.4", + "thunderer/shortcode": "0.6.5", "force/session" : "*", "force/arr" : "*", "force/http" : "*", @@ -36,7 +37,6 @@ ], "files": [ "flextype/boot/defines.php", - "flextype/boot/shortcodes.php", "flextype/boot/events.php" ] } From 567ebf715e79ddfecf4e1b416bbc4ecd501602e1 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 22 Mar 2018 23:43:08 +0300 Subject: [PATCH 03/11] Implement Thunderer Shortcode Framework #7 --- flextype/Flextype.php | 3 + flextype/Pages.php | 5 +- flextype/Shortcodes.php | 119 ++++++++++------------------------- flextype/boot/shortcodes.php | 18 ------ 4 files changed, 39 insertions(+), 106 deletions(-) delete mode 100644 flextype/boot/shortcodes.php diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 3b229e1f..925338f3 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -106,6 +106,9 @@ class Flextype // Init I18n I18n::init(); + // Init Shortcodes + Shortcodes::init(); + // Init Themes Themes::init(); diff --git a/flextype/Pages.php b/flextype/Pages.php index f17d12ed..0e98f271 100755 --- a/flextype/Pages.php +++ b/flextype/Pages.php @@ -3,7 +3,6 @@ use Arr; use Url; use Response; -use Shortcode; use Symfony\Component\Yaml\Yaml; /** @@ -109,7 +108,7 @@ class Pages $page = trim(file_get_contents($file)); $page = explode('---', $page, 3); - $frontmatter = Shortcodes::parse($page[1]); + $frontmatter = Shortcodes::driver()->process($page[1]); $result_page = Yaml::parse($frontmatter); // Get page url @@ -158,7 +157,7 @@ class Pages */ public static function parseContent(string $content) : string { - $content = Shortcodes::parse($content); + $content = Shortcodes::driver()->process($content); $content = Markdown::parse($content); return $content; diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 746f3269..19d98136 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -1,5 +1,8 @@ addHandler('site_url', function() { + return Url::getBase(); + }); } /** - * Remove all registered shortcodes. - * - * - * Shortcode::clear(); - * + * Initialize Flextype Shortcodes * + * @access public + * @return object */ - public static function clear() + public static function init() { - static::$shortcode_tags = array(); - } - - /** - * Check if a shortcode has been registered. - * - * @param string $shortcode Shortcode tag. - */ - public static function exists(string $shortcode) - { - // Check shortcode - return array_key_exists($shortcode, static::$shortcode_tags); - } - - /** - * Parse a string, and replace any registered shortcodes within it with the result of the mapped callback. - * - * @param string $content Content - * @return string - */ - public static function parse(string $content) - { - if (! static::$shortcode_tags) { - return $content; - } - - $shortcodes = implode('|', array_map('preg_quote', array_keys(static::$shortcode_tags))); - $pattern = "/(.?)\{([$shortcodes]+)(.*?)(\/)?\}(?(4)|(?:(.+?)\{\/\s*\\2\s*\}))?(.?)/s"; - - return preg_replace_callback($pattern, 'static::_handle', $content); - } - - /** - * _handle() - */ - protected static function _handle($matches) - { - $prefix = $matches[1]; - $suffix = $matches[6]; - $shortcode = $matches[2]; - - // Allow for escaping shortcodes by enclosing them in {{shortcode}} - if ($prefix == '{' && $suffix == '}') { - return substr($matches[0], 1, -1); - } - - $attributes = array(); // Parse attributes into into this array. - - if (preg_match_all('/(\w+) *= *(?:([\'"])(.*?)\\2|([^ "\'>]+))/', $matches[3], $match, PREG_SET_ORDER)) { - foreach ($match as $attribute) { - if (! empty($attribute[4])) { - $attributes[strtolower($attribute[1])] = $attribute[4]; - } elseif (! empty($attribute[3])) { - $attributes[strtolower($attribute[1])] = $attribute[3]; - } - } - } - - // Check if this shortcode realy exists then call user function else return empty string - return (isset(static::$shortcode_tags[$shortcode])) ? $prefix . call_user_func(static::$shortcode_tags[$shortcode], $attributes, $matches[5], $shortcode) . $suffix : ''; + return !isset(self::$instance) and self::$instance = new Shortcodes(); } } diff --git a/flextype/boot/shortcodes.php b/flextype/boot/shortcodes.php deleted file mode 100644 index 89bf6521..00000000 --- a/flextype/boot/shortcodes.php +++ /dev/null @@ -1,18 +0,0 @@ - - * @link http://flextype.org - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -// Add {site_url} shortcode -Shortcodes::add('site_url', function () { - return Url::getBase(); -}); From 1732a7693e59a94f89f534f4dc1acf0445f32576 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 22 Mar 2018 23:43:43 +0300 Subject: [PATCH 04/11] Implement Thunderer Shortcode Framework #7 --- site/pages/home/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site/pages/home/index.md b/site/pages/home/index.md index fd0dfa48..f06c5911 100755 --- a/site/pages/home/index.md +++ b/site/pages/home/index.md @@ -24,6 +24,6 @@ Creating a new page is very simple in Flextype. This is the body of **My New Page** ``` -2. Save this file in the `/site/pages/my-new-page/` folder as `index.md` and its will be available by this url: {site_url}/my-new-page +2. Save this file in the `/site/pages/my-new-page/` folder as `index.md` and its will be available by this url: [site_url]/my-new-page That is it! From 4e8753421687bfa137042ba891a66837231d4d28 Mon Sep 17 00:00:00 2001 From: Awilum Date: Thu, 22 Mar 2018 23:53:33 +0300 Subject: [PATCH 05/11] Remove events.php --- composer.json | 3 +-- flextype/boot/events.php | 16 ---------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 flextype/boot/events.php diff --git a/composer.json b/composer.json index e3062a17..11835136 100755 --- a/composer.json +++ b/composer.json @@ -36,8 +36,7 @@ "flextype" ], "files": [ - "flextype/boot/defines.php", - "flextype/boot/events.php" + "flextype/boot/defines.php" ] } } diff --git a/flextype/boot/events.php b/flextype/boot/events.php deleted file mode 100644 index 4ef04fda..00000000 --- a/flextype/boot/events.php +++ /dev/null @@ -1,16 +0,0 @@ - - * @link http://flextype.org - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -// Set Flextype Meta Generator -Events::addListener('onThemeMeta', function () { - echo(''); -}); From 423882a5a444cb146ea73e29cb865c5d7bebaae3 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 23 Mar 2018 00:15:59 +0300 Subject: [PATCH 06/11] Cache Flextype::VERSION for cache key - added --- flextype/Cache.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 83fe7d94..03be9e78 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -68,7 +68,7 @@ class Cache static::$now = time(); // Cache key allows us to invalidate all cache on configuration changes. - static::$key = (Config::get('site.cache.prefix') ? Config::get('site.cache.prefix') : 'flextype') . '-' . md5(ROOT_DIR); + static::$key = (Config::get('site.cache.prefix') ? Config::get('site.cache.prefix') : 'flextype') . '-' . md5(ROOT_DIR . Flextype::VERSION); // Get Cache Driver static::$driver = static::getCacheDriver(); From dacbcdbe730ef6a4b8c3b9a95cfff5be7f7b5589 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 23 Mar 2018 00:34:16 +0300 Subject: [PATCH 07/11] Code cleanup and refactoring #5 --- flextype/Cache.php | 4 ++- flextype/Config.php | 10 +++--- flextype/Events.php | 8 +++-- flextype/Filters.php | 4 ++- flextype/Flextype.php | 68 ++++++++++++++++++++++++++++----------- flextype/I18n.php | 8 +++-- flextype/Markdown.php | 8 +++-- flextype/Pages.php | 14 ++++---- flextype/Plugins.php | 8 +++-- flextype/Shortcodes.php | 10 +++--- flextype/Templates.php | 6 ++-- flextype/Themes.php | 12 +++---- flextype/boot/defines.php | 4 ++- index.php | 4 ++- 14 files changed, 111 insertions(+), 57 deletions(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 03be9e78..0446b278 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -1,4 +1,4 @@ - + * @link http://flextype.org + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flextype; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Finder\Finder; use Url; use Session; - /** - * @package Flextype - * - * @author Romanenko Sergey / Awilum - * @link http://flextype.org - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - class Flextype { /** @@ -26,7 +28,7 @@ class Flextype protected static $instance = null; /** - * Filesystem + * Filesystem object * * @var object * @access public @@ -34,7 +36,7 @@ class Flextype public static $filesystem = null; /** - * Finder + * Finder object * * @var object * @access public @@ -65,8 +67,20 @@ class Flextype */ protected function __construct() { + static::app(); + } + /** + * Application. + * + * @access protected + */ + protected static function app() + { + // Init Finder static::$finder = new Finder(); + + // Init Filesystem static::$filesystem = new Filesystem(); // Init Config @@ -115,20 +129,38 @@ class Flextype // Init Plugins Plugins::init(); - // Render current page + // Init Pages Pages::init(); // Flush (send) the output buffer and turn off output buffering ob_end_flush(); } + /** + * Returns filesystem object + * + * @access public + * @return object + */ + public static function filesystem() + { + return static::$filesystem; + } + + /** + * Returns finder object + * + * @access public + * @return object + */ + public static function finder() + { + return static::$finder; + } + /** * Initialize Flextype Application * - * - * Rawium::init(); - * - * * @access public * @return object */ diff --git a/flextype/I18n.php b/flextype/I18n.php index e1fc26a6..840d909a 100644 --- a/flextype/I18n.php +++ b/flextype/I18n.php @@ -1,6 +1,4 @@ -exists($template_path)) { + if (Flextype::filesystem()->exists($template_path)) { include $template_path; } else { throw new RuntimeException("Template {$template_name} does not exist."); diff --git a/flextype/Themes.php b/flextype/Themes.php index 7b01da29..2211ef33 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -1,6 +1,4 @@ - - * Themes::init(); - * - * * @access public * @return object */ diff --git a/flextype/boot/defines.php b/flextype/boot/defines.php index 6de5b395..b76a107c 100755 --- a/flextype/boot/defines.php +++ b/flextype/boot/defines.php @@ -1,4 +1,4 @@ - Date: Fri, 23 Mar 2018 00:37:30 +0300 Subject: [PATCH 08/11] Code cleanup and refactoring #5 --- flextype/Cache.php | 4 ++-- flextype/Config.php | 2 +- flextype/Pages.php | 8 ++++---- flextype/Plugins.php | 6 +++--- flextype/Themes.php | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flextype/Cache.php b/flextype/Cache.php index 0446b278..a390a6df 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -125,7 +125,7 @@ class Cache break; default: // Create doctrine cache directory if its not exists - !Flextype::$filesystem->exists($cache_directory = CACHE_PATH . '/doctrine/') and Flextype::$filesystem->mkdir($cache_directory); + !Flextype::filesystem()->exists($cache_directory = CACHE_PATH . '/doctrine/') and Flextype::filesystem()->mkdir($cache_directory); $driver = new \Doctrine\Common\Cache\FilesystemCache($cache_directory); break; } @@ -195,7 +195,7 @@ class Cache */ public static function clear() { - Flextype::$filesystem->remove(CACHE_PATH . '/doctrine/'); + Flextype::filesystem()->remove(CACHE_PATH . '/doctrine/'); } /** diff --git a/flextype/Config.php b/flextype/Config.php index 29ae9164..4c71e3d3 100755 --- a/flextype/Config.php +++ b/flextype/Config.php @@ -51,7 +51,7 @@ class Config */ protected function __construct() { - if (Flextype::$filesystem->exists($site_config = CONFIG_PATH . '/' . 'site.yml')) { + if (Flextype::filesystem()->exists($site_config = CONFIG_PATH . '/' . 'site.yml')) { static::$config['site'] = Yaml::parse(file_get_contents($site_config)); } else { throw new RuntimeException("Flextype site config file does not exist."); diff --git a/flextype/Pages.php b/flextype/Pages.php index 2c8b8bed..2b193001 100755 --- a/flextype/Pages.php +++ b/flextype/Pages.php @@ -9,7 +9,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ - + namespace Flextype; use Arr; @@ -75,7 +75,7 @@ class Pages } // Get 404 page if file not exists - if (Flextype::$filesystem->exists($file)) { + if (Flextype::filesystem()->exists($file)) { $file = $file; } else { $file = PAGES_PATH . '/404/index.md'; @@ -95,7 +95,7 @@ class Pages $site_theme = Config::get('site.theme'); $template_path = THEMES_PATH . '/' . $site_theme . '/' . $template_name . $template_ext; - if (Flextype::$filesystem->exists($template_path)) { + if (Flextype::filesystem()->exists($template_path)) { include $template_path; } else { throw new RuntimeException("Template {$template_name} does not exist."); @@ -171,7 +171,7 @@ class Pages public static function getPages($url = '', $raw = false, $order_by = 'title', $order_type = 'DESC', $limit = null) { // Get pages list for current $url - $pages_list = Flextype::$finder->files()->name('*.md')->in(PAGES_PATH . '/' . $url); + $pages_list = Flextype::finder()->files()->name('*.md')->in(PAGES_PATH . '/' . $url); // Go trough pages list foreach ($pages_list as $key => $page) { diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 6db6662e..53b3fc07 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -9,7 +9,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ - + namespace Flextype; use Symfony\Component\Yaml\Yaml; @@ -45,7 +45,7 @@ class Plugins // Go through... foreach ($plugins_list as $plugin) { - if (Flextype::$filesystem->exists($_plugin = PLUGINS_PATH . '/' . $plugin . '/' . $plugin . '.yml')) { + if (Flextype::filesystem()->exists($_plugin = PLUGINS_PATH . '/' . $plugin . '/' . $plugin . '.yml')) { $plugins_cache_id .= filemtime($_plugin); } } @@ -65,7 +65,7 @@ class Plugins // Go through... foreach ($plugins_list as $plugin) { - if (Flextype::$filesystem->exists($_plugin_manifest = PLUGINS_PATH . '/' . $plugin . '/' . $plugin . '.yml')) { + if (Flextype::filesystem()->exists($_plugin_manifest = PLUGINS_PATH . '/' . $plugin . '/' . $plugin . '.yml')) { $plugin_manifest = Yaml::parseFile($_plugin_manifest); } diff --git a/flextype/Themes.php b/flextype/Themes.php index 2211ef33..5478ab8e 100644 --- a/flextype/Themes.php +++ b/flextype/Themes.php @@ -37,7 +37,7 @@ class Themes // Get current theme $theme = Config::get('site.theme'); - if (Flextype::$filesystem->exists($theme_manifest_file = THEMES_PATH . '/' . $theme . '/' . $theme . '.yml')) { + if (Flextype::filesystem()->exists($theme_manifest_file = THEMES_PATH . '/' . $theme . '/' . $theme . '.yml')) { $theme_manifest = Yaml::parseFile($theme_manifest_file); Config::set('themes.'.Config::get('site.theme'), $theme_manifest); } From f09283f2ff2322c35446faab9f65f9fcf1928365 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 23 Mar 2018 01:21:15 +0300 Subject: [PATCH 09/11] Code cleanup and refactoring #5 --- CHANGELOG.md | 7 +++++++ LICENSE.txt | 2 +- composer.json | 4 ++-- flextype/Cache.php | 6 +----- flextype/Config.php | 10 +--------- flextype/Filters.php | 12 ------------ flextype/I18n.php | 4 ---- flextype/Markdown.php | 4 ---- flextype/Pages.php | 4 ---- flextype/Plugins.php | 4 ---- flextype/Shortcodes.php | 2 +- 11 files changed, 13 insertions(+), 46 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a05b253f..6a375e97 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,9 @@ +# Flextype 0.2.0, 2018-03-XX +* Thunderer Shortcode Framework - added +* Cache Flextype::VERSION for cache key - added +* flextype/boot/shortcodes.php - removed +* flextype/boot/events.php - removed +* Code cleanup and refactoring #5 + # Flextype 0.1.0, 2018-03-21 * Initial Release diff --git a/LICENSE.txt b/LICENSE.txt index a34d214f..3f865be1 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 Flextype Content Management +Copyright (c) 2018 Flextype Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/composer.json b/composer.json index 11835136..3171b847 100755 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { "name": "flextype/flextype", - "type": "library", + "type": "project", "description": "Flextype is Modern Open Source Flat-File Content Management System", - "keywords": ["Flextype", "php", "cms", "flat-file", "markdown"], + "keywords": ["Flextype", "php", "cms", "flat-file cms", "flat cms", "flatfile cms", "markdown"], "homepage": "http://flextype.org", "license": "MIT", "authors": [ diff --git a/flextype/Cache.php b/flextype/Cache.php index a390a6df..184157f6 100755 --- a/flextype/Cache.php +++ b/flextype/Cache.php @@ -9,7 +9,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ - + namespace Flextype; class Cache @@ -232,10 +232,6 @@ class Cache /** * Initialize Flextype Cache * - * - * Cache::init(); - * - * * @access public * @return object */ diff --git a/flextype/Config.php b/flextype/Config.php index 4c71e3d3..bc59abaf 100755 --- a/flextype/Config.php +++ b/flextype/Config.php @@ -9,7 +9,7 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ - + namespace Flextype; use Arr; @@ -86,10 +86,6 @@ class Config /** * Get config array * - * - * $config = Config::getConfig(); - * - * * @access public * @return array */ @@ -101,10 +97,6 @@ class Config /** * Initialize Flextype Config * - * - * Config::init(); - * - * * @access public */ public static function init() diff --git a/flextype/Filters.php b/flextype/Filters.php index 10825113..3f05e863 100755 --- a/flextype/Filters.php +++ b/flextype/Filters.php @@ -42,10 +42,6 @@ class Filters /** * Dispatch filters * - * - * Filter::dispatch('content', $content); - * - * * @access public * @param string $filter_name The name of the filter hook. * @param mixed $value The value on which the filters hooked. @@ -85,14 +81,6 @@ class Filters /** * Add filter * - * - * Filter::add('content', 'replacer'); - * - * function replacer($content) { - * return preg_replace(array('/\[b\](.*?)\[\/b\]/ms'), array('\1'), $content); - * } - * - * * @access public * @param string $filter_name The name of the filter to hook the $function_to_add to. * @param string $function_to_add The name of the function to be called when the filter is applied. diff --git a/flextype/I18n.php b/flextype/I18n.php index 840d909a..bc29e985 100644 --- a/flextype/I18n.php +++ b/flextype/I18n.php @@ -133,10 +133,6 @@ class I18n /** * Initialize Flextype I18n * - * - * I18n::init(); - * - * * @access public * @return object */ diff --git a/flextype/Markdown.php b/flextype/Markdown.php index afcd2192..ad4a6c27 100644 --- a/flextype/Markdown.php +++ b/flextype/Markdown.php @@ -27,10 +27,6 @@ class Markdown /** * Markdown parser * - * - * $content = Markdown::parse($content); - * - * * @access public * @param string $content Content to parse * @return string Formatted content diff --git a/flextype/Pages.php b/flextype/Pages.php index 2b193001..ae479b54 100755 --- a/flextype/Pages.php +++ b/flextype/Pages.php @@ -197,10 +197,6 @@ class Pages /** * Initialize Flextype Pages * - * - * Pages::init(); - * - * * @access public * @return object */ diff --git a/flextype/Plugins.php b/flextype/Plugins.php index 53b3fc07..34e89c6e 100755 --- a/flextype/Plugins.php +++ b/flextype/Plugins.php @@ -92,10 +92,6 @@ class Plugins /** * Initialize Flextype Plugins * - * - * Plugins::init(); - * - * * @access public * @return object */ diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php index 295e58d9..1d12ddb5 100644 --- a/flextype/Shortcodes.php +++ b/flextype/Shortcodes.php @@ -60,7 +60,7 @@ class Shortcodes /** * Register default shortcodes * - * @access public + * @access protected */ protected static function registerDefaultShortcodes() { From f0f3c7f56b733132b5f5b0e9689a0d06d4831b93 Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 23 Mar 2018 01:26:38 +0300 Subject: [PATCH 10/11] Code cleanup and refactoring #5 --- flextype/Pages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flextype/Pages.php b/flextype/Pages.php index ae479b54..6bb6d7ea 100755 --- a/flextype/Pages.php +++ b/flextype/Pages.php @@ -155,7 +155,7 @@ class Pages } /** - * Parse Cntent + * Parse Content */ public static function parseContent(string $content) : string { From e4c947fcc1b2974cc59247387b04800542ebe5db Mon Sep 17 00:00:00 2001 From: Awilum Date: Fri, 23 Mar 2018 02:19:32 +0300 Subject: [PATCH 11/11] Flextype 0.2.0 --- CHANGELOG.md | 2 +- flextype/Flextype.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a375e97..401beac3 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Flextype 0.2.0, 2018-03-XX +# Flextype 0.2.0, 2018-03-23 * Thunderer Shortcode Framework - added * Cache Flextype::VERSION for cache key - added * flextype/boot/shortcodes.php - removed diff --git a/flextype/Flextype.php b/flextype/Flextype.php index 75426b6b..76838c33 100755 --- a/flextype/Flextype.php +++ b/flextype/Flextype.php @@ -58,7 +58,7 @@ class Flextype * * @var string */ - const VERSION = '0.1.0'; + const VERSION = '0.2.0'; /** * Constructor.