From dacbcdbe730ef6a4b8c3b9a95cfff5be7f7b5589 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Fri, 23 Mar 2018 00:34:16 +0300
Subject: [PATCH] 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 @@
-<?php namespace Flextype;
+<?php
 
 /**
  * @package Flextype
@@ -9,6 +9,8 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+ 
+namespace Flextype;
 
 class Cache
 {
diff --git a/flextype/Config.php b/flextype/Config.php
index ae493e28..29ae9164 100755
--- a/flextype/Config.php
+++ b/flextype/Config.php
@@ -1,7 +1,4 @@
-<?php namespace Flextype;
-
-use Arr;
-use Symfony\Component\Yaml\Yaml;
+<?php
 
 /**
  * @package Flextype
@@ -12,6 +9,11 @@ use Symfony\Component\Yaml\Yaml;
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+ 
+namespace Flextype;
+
+use Arr;
+use Symfony\Component\Yaml\Yaml;
 
 class Config
 {
diff --git a/flextype/Events.php b/flextype/Events.php
index b2949c1d..6457660b 100644
--- a/flextype/Events.php
+++ b/flextype/Events.php
@@ -1,6 +1,4 @@
-<?php namespace Flextype;
-
-use Arr;
+<?php
 
 /**
  * @package Flextype
@@ -11,6 +9,10 @@ use Arr;
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+ 
+namespace Flextype;
+
+use Arr;
 
 class Events
 {
diff --git a/flextype/Filters.php b/flextype/Filters.php
index 2f78c37d..10825113 100755
--- a/flextype/Filters.php
+++ b/flextype/Filters.php
@@ -1,4 +1,4 @@
-<?php namespace Flextype;
+<?php
 
 /**
  * @package Flextype
@@ -10,6 +10,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
 class Filters
 {
 
diff --git a/flextype/Flextype.php b/flextype/Flextype.php
index 925338f3..75426b6b 100755
--- a/flextype/Flextype.php
+++ b/flextype/Flextype.php
@@ -1,20 +1,22 @@
-<?php namespace Flextype;
+<?php
+
+/**
+ * @package Flextype
+ *
+ * @author Romanenko Sergey / Awilum <awilum@yandex.ru>
+ * @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 <awilum@yandex.ru>
-  * @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
       *
-      *  <code>
-      *      Rawium::init();
-      *  </code>
-      *
       * @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 @@
-<?php namespace Flextype;
-
-use Symfony\Component\Yaml\Yaml;
+<?php
 
 /**
  * @package Flextype
@@ -12,6 +10,10 @@ use Symfony\Component\Yaml\Yaml;
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
+use Symfony\Component\Yaml\Yaml;
+
 class I18n
 {
     /**
diff --git a/flextype/Markdown.php b/flextype/Markdown.php
index 4b7165ea..afcd2192 100644
--- a/flextype/Markdown.php
+++ b/flextype/Markdown.php
@@ -1,6 +1,4 @@
-<?php namespace Flextype;
-
-use ParsedownExtra;
+<?php
 
 /**
  * @package Flextype
@@ -12,6 +10,10 @@ use ParsedownExtra;
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
+use ParsedownExtra;
+
 class Markdown
 {
     /**
diff --git a/flextype/Pages.php b/flextype/Pages.php
index 0e98f271..2c8b8bed 100755
--- a/flextype/Pages.php
+++ b/flextype/Pages.php
@@ -1,9 +1,4 @@
-<?php namespace Flextype;
-
-use Arr;
-use Url;
-use Response;
-use Symfony\Component\Yaml\Yaml;
+<?php
 
 /**
  * @package Flextype
@@ -14,6 +9,13 @@ use Symfony\Component\Yaml\Yaml;
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
+ 
+namespace Flextype;
+
+use Arr;
+use Url;
+use Response;
+use Symfony\Component\Yaml\Yaml;
 
 class Pages
 {
diff --git a/flextype/Plugins.php b/flextype/Plugins.php
index e5b9f0c2..6db6662e 100755
--- a/flextype/Plugins.php
+++ b/flextype/Plugins.php
@@ -1,6 +1,4 @@
-<?php namespace Flextype;
-
-use Symfony\Component\Yaml\Yaml;
+<?php
 
 /**
  * @package Flextype
@@ -11,6 +9,10 @@ use Symfony\Component\Yaml\Yaml;
  * 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;
 
 class Plugins
 {
diff --git a/flextype/Shortcodes.php b/flextype/Shortcodes.php
index 19d98136..295e58d9 100644
--- a/flextype/Shortcodes.php
+++ b/flextype/Shortcodes.php
@@ -1,7 +1,4 @@
-<?php namespace Flextype;
-
-use Thunder\Shortcode\ShortcodeFacade;
-use Url;
+<?php
 
 /**
  * @package Flextype
@@ -13,6 +10,11 @@ use Url;
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
+use Thunder\Shortcode\ShortcodeFacade;
+use Url;
+
 class Shortcodes
 {
 
diff --git a/flextype/Templates.php b/flextype/Templates.php
index 4ddfbc68..35a154ca 100644
--- a/flextype/Templates.php
+++ b/flextype/Templates.php
@@ -1,4 +1,4 @@
-<?php namespace Flextype;
+<?php
 
 /**
  * @package Flextype
@@ -10,6 +10,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
 class Templates
 {
 
@@ -38,7 +40,7 @@ class Templates
 
         $template_path = THEMES_PATH . '/' . Config::get('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.");
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 @@
-<?php namespace Flextype;
-
-use Symfony\Component\Yaml\Yaml;
+<?php
 
 /**
  * @package Flextype
@@ -12,6 +10,10 @@ use Symfony\Component\Yaml\Yaml;
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
+use Symfony\Component\Yaml\Yaml;
+
 class Themes
 {
     /**
@@ -44,10 +46,6 @@ class Themes
     /**
      * Initialize Flextype Themes
      *
-     *  <code>
-     *      Themes::init();
-     *  </code>
-     *
      * @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 @@
-<?php namespace Flextype;
+<?php
 
 /**
  * @package Flextype
@@ -10,6 +10,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
 // Define the path to the root directory (without trailing slash).
 define('ROOT_DIR', str_replace(DIRECTORY_SEPARATOR, '/', getcwd()));
 
diff --git a/index.php b/index.php
index e441a51f..b4acda43 100755
--- a/index.php
+++ b/index.php
@@ -1,4 +1,4 @@
-<?php namespace Flextype;
+<?php
 
 /**
  * @package Flextype
@@ -10,6 +10,8 @@
  * file that was distributed with this source code.
  */
 
+namespace Flextype;
+
 // Define the application minimum supported PHP version.
 define('FLEXTYPE_MINIMUM_PHP', '7.1.3');