!NOT WORKING!

Part of MFE-161

Author: Theodor

assets/layouts/test.tpl

@@ -0,0 +1 @@
+<?xml hello ?>

core/loader.core.php

@@ -37,20 +37,20 @@ static public function loaderInit(){
         return self::$instance;
     }
 
-    public function load($file, $PHAR = false, $returnContent = false) {
+    public function load($file, $EXT = false) {
         $FileHelper = engine::option('FileHelper');
-        $EXT = (!$PHAR) ? $FileHelper::$PHP : $FileHelper::$Phar;
+        $EXT = (!$EXT) ? $FileHelper::$PHP : $EXT;
         $paths = $this->getRealPaths($file);
         if (isset($paths['extension'])) {
             $extension = $paths['extension'];
             unset($paths['extension']);
         } else $extension = '';
         foreach ($paths as $file) {
-            #print $file . '.' . $extension . $EXT . PHP_EOL;
+            print $file . '.' . $extension . $EXT . PHP_EOL;
             if (file_exists($file . '.' . $extension . $EXT)) {
                 engine::trigger('file.load', [$file . '.' . $extension . $EXT]);
                 /** @noinspection PhpIncludeInspection */
-                return (!$returnContent) ?
+                return ($EXT == $FileHelper::$PHP || $EXT == $FileHelper::$Phar) ?
                     include_once $file . '.' . $extension . $EXT : file_get_contents($file . '.' . $extension . $EXT);
             }
         }
@@ -128,8 +128,8 @@ static public function registerAlias($aliases, $dir) {
         self::$instance->registerAliasDirectory($aliases, $dir);
     }
 
-    static public function loadFile($file, $PHAR = false, $returnContent = false) {
-        return self::$instance->load($file, $PHAR, $returnContent);
+    static public function loadFile($file, $EXT = false) {
+        return self::$instance->load($file, $EXT);
     }
 
     static public function loadPhar($file) {

core/page.core.php

@@ -53,10 +53,13 @@ public function __set($key, $value) {
     }
 
     public function __construct($layout = null, $data = [], $uid = null) {
+        if (!mfe::init()->loader->aliasDirectoryExist('@layout'))
+            mfe::init()->loader->registerAliasDirectory('@layout', 'assets/layouts');
+
         if (!is_null($layout)) {
-            //TODO:: File check, integrate with Loader
-            //$this->layout = $layout . $this->layout_extension;
+            $this->setLayout($layout);
         }
+
         if (!is_null($data)) $this->data = $data;
         if (!is_null($uid)) {
             $this->guid = 'page_' . $uid;
@@ -147,6 +150,17 @@ protected function generateScripts() {
     static public function registerComponent() {
         return new self;
     }
+
+    public function setLayout($layout) {
+        /** @var CmfeSimpleFileHelper $FileHelper**/
+        $FileHelper = mfe::option('FileHelper');
+
+        if(!($this->layout = mfe::loadFile('@engine.@layout.' . $layout, $this->layout_extension))) {
+            throw new CmfeException('Not found layout file: ' . $layout . $this->layout_extension);
+        }
+
+        return $this;
+    }
 }
 
 mfe::registerComponent('page', 'mfe\PageCore');

libs/interfaces/ImfeLoader.php

@@ -8,11 +8,13 @@
  * @package mfe
  */
 interface ImfeLoader {
-    function load($file, $PHAR = false);
+    function load($file, $EXT = '.php');
 
     function registerAliasDirectory($alias, $dir);
 
-    static function loadFile($file, $PHAR = false);
+    function aliasDirectoryExist($alias);
+
+    static function loadFile($file, $EXT = '.php');
 
     static function loadCore($file);
 

libs/traits/TmfeStandardEngineMethods.php

@@ -16,6 +16,10 @@ static public function TmfeStandardEngineMethodsInit() {
         ];
     }
 
+    /**
+     * @param callable $callback
+     * @return mfe
+     */
     static public function init(\Closure $callback = null) {
         $class = get_called_class();
         /** @var mfe $class */

libs/traits/TmfeStandardLoaderMethods.php

@@ -87,14 +87,14 @@ protected function getRealPaths($path) {
         return $result;
     }
 
-    public function load($file, $PHAR = false, $returnContent = false) {
+    public function load($file, $EXT = false) {
         if (isset($this->components->components['loader'])) {
-            return $this->loader->load($file, $PHAR);
+            return $this->loader->load($file, $EXT);
         } else {
             $class = get_called_class();
             /** @var mfe $class */
             $FileHelper = $class::option('FileHelper');
-            $EXT = (!$PHAR) ? $FileHelper::$PHP : $FileHelper::$Phar;
+            $EXT = (!$EXT) ? $FileHelper::$PHP : $EXT;
             $paths = $this->getRealPaths($file);
             if (isset($paths['extension'])) {
                 $extension = $paths['extension'];
@@ -105,7 +105,7 @@ public function load($file, $PHAR = false, $returnContent = false) {
                 if (file_exists($file . '.' . $extension . $EXT)) {
                     $class::trigger('file.load', [$file . '.' . $extension . $EXT]);
                     /** @noinspection PhpIncludeInspection */
-                    return (!$returnContent) ?
+                    return ($EXT == $FileHelper::$PHP || $EXT == $FileHelper::$Phar) ?
                         include_once $file . '.' . $extension . $EXT : file_get_contents($file . '.' . $extension . $EXT);
                 }
             }
@@ -133,13 +133,13 @@ static public function registerAlias($aliases, $dir) {
         $class::init()->registerAliasDirectory($aliases, $dir);
     }
 
-    static public function loadFile($file, $PHAR = false, $returnContent = false) {
+    static public function loadFile($file, $EXT = false) {
         $class = get_called_class();
         /** @var mfe $class */
         if (isset($class::init()->loader)) {
-            return call_user_func_array([get_class($class::init()->loader), __METHOD__], [$file, $PHAR]);
+            return call_user_func_array([get_class($class::init()->loader), __METHOD__], [$file, $EXT]);
         }
-        return $class::init()->load($file, $PHAR, $returnContent);
+        return $class::init()->load($file, $EXT);
     }
 
     static public function loadPhar($file) {

mfe.engine.php

@@ -43,8 +43,8 @@ final class mfe implements ImfeEngine, ImfeEventsManager, ImfeLoader {
     private function __construct() {
         @ini_set('display_errors', false);
 
-        set_error_handler(['mfe\CmfeRunHandler', 'errorHandler'], E_ALL);
-        set_exception_handler(['mfe\CmfeRunHandler', 'exceptionHandler']);
+        //set_error_handler(['mfe\CmfeRunHandler', 'errorHandler'], E_ALL);
+        //set_exception_handler(['mfe\CmfeRunHandler', 'exceptionHandler']);
         register_shutdown_function(['mfe\mfe', 'stopEngine']);
     }
 
@@ -98,7 +98,9 @@ final static public function stopEngine() {
  */
 (mfe::option('MFE_AUTOLOAD')) ? (mfe::init()) : false;
 
-//$page = &mfe::init()->page;
+//$page = mfe::init()->page;
+///** @var PageCore $page */
+//$page->setLayout('test');
 //
 //$page->_author = 'DeVinterX';
 //$page->_keywords = 'key,word';