PhileCMS / Phile

plugins/phile/errorHandler/Classes/Development.php

Indentation +277 added lines, -277 removed lines

@@ -18,281 +18,281 @@
  */
 class Development implements ErrorHandlerInterface {
 
-	/** @var array settings */
-	protected $settings;
-
-	/**
-	 * constructor
-	 *
-	 * @param array $settings
-	 */
-	public function __construct(array $settings = []) {
-		$this->settings = $settings;
-	}
-
-	/**
-	 * handle the error
-	 *
-	 * @param int    $errno
-	 * @param string $errstr
-	 * @param string $errfile
-	 * @param int    $errline
-	 * @param array  $errcontext
-	 *
-	 * @return boolean
-	 */
-	public function handleError($errno, $errstr, $errfile, $errline, array $errcontext) {
-		$backtrace = debug_backtrace();
-		$backtrace = array_slice($backtrace, 2);
-		$this->displayDeveloperOutput(
-			$errno,
-			$errstr,
-			$errfile,
-			$errline,
-			$backtrace
-		);
-	}
-
-	/**
-	 * handle PHP errors which can't be caught by error-handler
-	 */
-	public function handleShutdown() {
-		$error = error_get_last();
-		if ($error === null) {
-			return;
-		}
-		$this->displayDeveloperOutput(
-			$error['type'],
-			$error['message'],
-			$error['file'],
-			$error['line']
-		);
-	}
-
-	/**
-	 * handle all exceptions
-	 *
-	 * @param \Exception $exception
-	 *
-	 * @return mixed
-	 */
-	public function handleException(\Exception $exception) {
-		$this->displayDeveloperOutput(
-			$exception->getCode(),
-			$exception->getMessage(),
-			$exception->getFile(),
-			$exception->getLine(),
-			null,
-			$exception
-		);
-	}
-
-	/**
-	 * show a nice looking and human readable developer output
-	 *
-	 * @param $code
-	 * @param $message
-	 * @param $file
-	 * @param $line
-	 * @param \Exception $exception
-	 */
-	protected function displayDeveloperOutput($code, $message, $file, $line, array $backtrace = null, \Exception $exception = null) {
-		header('HTTP/1.1 500 Internal Server Error');
-		$fragment = $this->receiveCodeFragment($file,
-			$line, 5, 5);
-		$marker = [
-			'base_url' => $this->settings['base_url'],
-			'type' => $exception ? 'Exception' : 'Error',
-			'exception_message' => htmlspecialchars($message),
-			'exception_code' => htmlspecialchars($code),
-			'exception_file' => htmlspecialchars($file),
-			'exception_line' => htmlspecialchars($line),
-			'exception_fragment' => $fragment,
-			'exception_class' => '',
-			'wiki_link' => ''
-		];
-
-		if ($exception) {
-			$marker['exception_class'] = $this->linkClass(get_class($exception));
-			$marker['wiki_link'] = ($code > 0) ? '(<a href="https://github.com/PhileCMS/Phile/wiki/Exception_' . $code . '" target="_blank">Exception-Wiki</a>)' : '';
-			$backtrace = $exception->getTrace();
-		}
-
-		if ($backtrace) {
-			$marker['exception_backtrace'] = $this->createBacktrace($backtrace);
-		}
-
-		$DS = DIRECTORY_SEPARATOR;
-		$pluginPath = realpath(dirname(__FILE__) . $DS . '..') . $DS;
-		$tplPath = $pluginPath . 'template.php';
-
-		ob_start();
-		extract($marker);
-		include $tplPath;
-		ob_end_flush();
-		die();
-	}
-
-	/**
-	 * creates a human readable backtrace
-	 *
-	 * @param array $traces
-	 * @return string
-	 */
-	protected function createBacktrace(array $traces) {
-		if (!count($traces)) {
-			return '';
-		}
-		$backtraceCodes = [];
-
-		foreach ($traces as $index => $step) {
-			$backtrace = $this->tag('span', count($traces) - $index, ['class' => 'index']);
-			$backtrace .= ' ';
-
-			if (isset($step['class'])) {
-				$class = $this->linkClass($step['class']) . '<span class="divider">::</span>';
-				$backtrace .= $class . $this->linkClass($step['class'], $step['function']);
-			} elseif (isset($step['function'])) {
-				$backtrace .= $this->tag('span', $step['function'], ['class' => 'function']);
-			}
-
-			$arguments = $this->getBacktraceStepArguments($step);
-			if ($arguments) {
-				$backtrace .= $this->tag('span', "($arguments)", ['class' => 'funcArguments']);
-			}
-
-			if (isset($step['file'])) {
-				$backtrace .= $this->receiveCodeFragment($step['file'], $step['line'], 3, 3);
-			}
-
-			$backtraceCodes[] = $this->tag('pre', $backtrace, ['class' => 'entry']);
-		}
-
-		return implode('', $backtraceCodes);
-	}
-
-
-	/**
-	 * render arguments for backtrace step
-	 *
-	 * @param $step
-	 * @return string
-	 */
-	protected function getBacktraceStepArguments($step) {
-		if (empty($step['args'])) {
-			return '';
-		}
-		$arguments = '';
-		foreach ($step['args'] as $argument) {
-			$arguments .= strlen($arguments) === 0 ? '' : $this->tag('span', ', ', ['class' => 'separator']);
-			if (is_object($argument)) {
-				$class = 'class';
-				$content = $this->linkClass(get_class($argument));
-			} else {
-				$class = 'others';
-				$content = gettype($argument);
-			}
-			$arguments .= $this->tag(
-				'span',
-				$content,
-				[
-					'class' => $class,
-					'title' => print_r($argument, true)
-				]
-			);
-		}
-		return $arguments;
-	}
-
-	/**
-	 * receive a code fragment from file
-	 *
-	 * @param $filename
-	 * @param $lineNumber
-	 * @param $linesBefore
-	 * @param $linesAfter
-	 *
-	 * @return string
-	 */
-	protected function receiveCodeFragment($filename, $lineNumber, $linesBefore = 3, $linesAfter = 3) {
-		if (!file_exists($filename)) {
-			return '';
-		}
-		$html = $this->tag('span', $filename . ':<br/>', ['class' => 'filename']);
-
-		$code = file_get_contents($filename);
-		$lines = explode("\n", $code);
-
-		$firstLine = $lineNumber - $linesBefore - 1;
-		if ($firstLine < 0) {
-			$firstLine = 0;
-		}
-
-		$lastLine = $lineNumber + $linesAfter;
-		if ($lastLine > count($lines)) {
-			$lastLine = count($lines);
-		}
-
-		$line = $firstLine;
-		$fragment = '';
-		while ($line < $lastLine) {
-			$line++;
-
-			$lineText = htmlspecialchars($lines[$line - 1]);
-			$lineText = str_replace("\t", '&nbsp;&nbsp;', $lineText);
-			$tmp = sprintf('%05d: %s <br/>', $line, $lineText);
-
-			$class = 'row';
-			if ($line === $lineNumber) {
-				$class .= ' currentRow';
-			}
-			$fragment .= $this->tag('span', $tmp, ['class' => $class]);
-		}
-
-
-		$html .= $fragment;
-		return $this->tag('pre', $html);
-	}
-
-	/**
-	 * link the class or method to the API or return the method name
-	 * @param $class
-	 * @param $method
-	 *
-	 * @return string
-	 */
-	protected function linkClass($class, $method = null) {
-		$title = $method ? $method : $class;
-		if (strpos($class, 'Phile\\') === 0) {
-			return $title;
-		}
-
-		$filename = 'docs/classes/' . str_replace('\\', '.', $class) . '.html';
-		if (file_exists(Utility::resolveFilePath($filename))) {
-			return $title;
-		}
-
-		$href = $this->settings['base_url'] . '/' . $filename;
-		if ($method) {
-			$href .= '#method_' . $method;
-		}
-		return $this->tag('a', $title, ['href' =>  $href, 'target' => '_blank']);
-	}
-
-	/**
-	 * create HTML-tag
-	 *
-	 * @param string $tag
-	 * @param string $content
-	 * @param array $attributes
-	 * @return string
-	 */
-	protected function tag($tag, $content = '', array $attributes = []) {
-		$html = '<' . $tag;
-		foreach ($attributes as $key => $value) {
-			$html .= ' ' . $key . '="' . htmlspecialchars($value) . '"';
-		}
-		$html .= '>' . $content . '</' . $tag . '>';
-		return $html;
-	}
+    /** @var array settings */
+    protected $settings;
+
+    /**
+     * constructor
+     *
+     * @param array $settings
+     */
+    public function __construct(array $settings = []) {
+        $this->settings = $settings;
+    }
+
+    /**
+     * handle the error
+     *
+     * @param int    $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param int    $errline
+     * @param array  $errcontext
+     *
+     * @return boolean
+     */
+    public function handleError($errno, $errstr, $errfile, $errline, array $errcontext) {
+        $backtrace = debug_backtrace();
+        $backtrace = array_slice($backtrace, 2);
+        $this->displayDeveloperOutput(
+            $errno,
+            $errstr,
+            $errfile,
+            $errline,
+            $backtrace
+        );
+    }
+
+    /**
+     * handle PHP errors which can't be caught by error-handler
+     */
+    public function handleShutdown() {
+        $error = error_get_last();
+        if ($error === null) {
+            return;
+        }
+        $this->displayDeveloperOutput(
+            $error['type'],
+            $error['message'],
+            $error['file'],
+            $error['line']
+        );
+    }
+
+    /**
+     * handle all exceptions
+     *
+     * @param \Exception $exception
+     *
+     * @return mixed
+     */
+    public function handleException(\Exception $exception) {
+        $this->displayDeveloperOutput(
+            $exception->getCode(),
+            $exception->getMessage(),
+            $exception->getFile(),
+            $exception->getLine(),
+            null,
+            $exception
+        );
+    }
+
+    /**
+     * show a nice looking and human readable developer output
+     *
+     * @param $code
+     * @param $message
+     * @param $file
+     * @param $line
+     * @param \Exception $exception
+     */
+    protected function displayDeveloperOutput($code, $message, $file, $line, array $backtrace = null, \Exception $exception = null) {
+        header('HTTP/1.1 500 Internal Server Error');
+        $fragment = $this->receiveCodeFragment($file,
+            $line, 5, 5);
+        $marker = [
+            'base_url' => $this->settings['base_url'],
+            'type' => $exception ? 'Exception' : 'Error',
+            'exception_message' => htmlspecialchars($message),
+            'exception_code' => htmlspecialchars($code),
+            'exception_file' => htmlspecialchars($file),
+            'exception_line' => htmlspecialchars($line),
+            'exception_fragment' => $fragment,
+            'exception_class' => '',
+            'wiki_link' => ''
+        ];
+
+        if ($exception) {
+            $marker['exception_class'] = $this->linkClass(get_class($exception));
+            $marker['wiki_link'] = ($code > 0) ? '(<a href="https://github.com/PhileCMS/Phile/wiki/Exception_' . $code . '" target="_blank">Exception-Wiki</a>)' : '';
+            $backtrace = $exception->getTrace();
+        }
+
+        if ($backtrace) {
+            $marker['exception_backtrace'] = $this->createBacktrace($backtrace);
+        }
+
+        $DS = DIRECTORY_SEPARATOR;
+        $pluginPath = realpath(dirname(__FILE__) . $DS . '..') . $DS;
+        $tplPath = $pluginPath . 'template.php';
+
+        ob_start();
+        extract($marker);
+        include $tplPath;
+        ob_end_flush();
+        die();
+    }
+
+    /**
+     * creates a human readable backtrace
+     *
+     * @param array $traces
+     * @return string
+     */
+    protected function createBacktrace(array $traces) {
+        if (!count($traces)) {
+            return '';
+        }
+        $backtraceCodes = [];
+
+        foreach ($traces as $index => $step) {
+            $backtrace = $this->tag('span', count($traces) - $index, ['class' => 'index']);
+            $backtrace .= ' ';
+
+            if (isset($step['class'])) {
+                $class = $this->linkClass($step['class']) . '<span class="divider">::</span>';
+                $backtrace .= $class . $this->linkClass($step['class'], $step['function']);
+            } elseif (isset($step['function'])) {
+                $backtrace .= $this->tag('span', $step['function'], ['class' => 'function']);
+            }
+
+            $arguments = $this->getBacktraceStepArguments($step);
+            if ($arguments) {
+                $backtrace .= $this->tag('span', "($arguments)", ['class' => 'funcArguments']);
+            }
+
+            if (isset($step['file'])) {
+                $backtrace .= $this->receiveCodeFragment($step['file'], $step['line'], 3, 3);
+            }
+
+            $backtraceCodes[] = $this->tag('pre', $backtrace, ['class' => 'entry']);
+        }
+
+        return implode('', $backtraceCodes);
+    }
+
+
+    /**
+     * render arguments for backtrace step
+     *
+     * @param $step
+     * @return string
+     */
+    protected function getBacktraceStepArguments($step) {
+        if (empty($step['args'])) {
+            return '';
+        }
+        $arguments = '';
+        foreach ($step['args'] as $argument) {
+            $arguments .= strlen($arguments) === 0 ? '' : $this->tag('span', ', ', ['class' => 'separator']);
+            if (is_object($argument)) {
+                $class = 'class';
+                $content = $this->linkClass(get_class($argument));
+            } else {
+                $class = 'others';
+                $content = gettype($argument);
+            }
+            $arguments .= $this->tag(
+                'span',
+                $content,
+                [
+                    'class' => $class,
+                    'title' => print_r($argument, true)
+                ]
+            );
+        }
+        return $arguments;
+    }
+
+    /**
+     * receive a code fragment from file
+     *
+     * @param $filename
+     * @param $lineNumber
+     * @param $linesBefore
+     * @param $linesAfter
+     *
+     * @return string
+     */
+    protected function receiveCodeFragment($filename, $lineNumber, $linesBefore = 3, $linesAfter = 3) {
+        if (!file_exists($filename)) {
+            return '';
+        }
+        $html = $this->tag('span', $filename . ':<br/>', ['class' => 'filename']);
+
+        $code = file_get_contents($filename);
+        $lines = explode("\n", $code);
+
+        $firstLine = $lineNumber - $linesBefore - 1;
+        if ($firstLine < 0) {
+            $firstLine = 0;
+        }
+
+        $lastLine = $lineNumber + $linesAfter;
+        if ($lastLine > count($lines)) {
+            $lastLine = count($lines);
+        }
+
+        $line = $firstLine;
+        $fragment = '';
+        while ($line < $lastLine) {
+            $line++;
+
+            $lineText = htmlspecialchars($lines[$line - 1]);
+            $lineText = str_replace("\t", '&nbsp;&nbsp;', $lineText);
+            $tmp = sprintf('%05d: %s <br/>', $line, $lineText);
+
+            $class = 'row';
+            if ($line === $lineNumber) {
+                $class .= ' currentRow';
+            }
+            $fragment .= $this->tag('span', $tmp, ['class' => $class]);
+        }
+
+
+        $html .= $fragment;
+        return $this->tag('pre', $html);
+    }
+
+    /**
+     * link the class or method to the API or return the method name
+     * @param $class
+     * @param $method
+     *
+     * @return string
+     */
+    protected function linkClass($class, $method = null) {
+        $title = $method ? $method : $class;
+        if (strpos($class, 'Phile\\') === 0) {
+            return $title;
+        }
+
+        $filename = 'docs/classes/' . str_replace('\\', '.', $class) . '.html';
+        if (file_exists(Utility::resolveFilePath($filename))) {
+            return $title;
+        }
+
+        $href = $this->settings['base_url'] . '/' . $filename;
+        if ($method) {
+            $href .= '#method_' . $method;
+        }
+        return $this->tag('a', $title, ['href' =>  $href, 'target' => '_blank']);
+    }
+
+    /**
+     * create HTML-tag
+     *
+     * @param string $tag
+     * @param string $content
+     * @param array $attributes
+     * @return string
+     */
+    protected function tag($tag, $content = '', array $attributes = []) {
+        $html = '<' . $tag;
+        foreach ($attributes as $key => $value) {
+            $html .= ' ' . $key . '="' . htmlspecialchars($value) . '"';
+        }
+        $html .= '>' . $content . '</' . $tag . '>';
+        return $html;
+    }
 }

plugins/phile/errorHandler/Classes/ErrorLog.php

Indentation +26 added lines, -26 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * The Error Handler
- */
+     * The Error Handler
+     */
 
 namespace Phile\Plugin\Phile\ErrorHandler;
 use Phile\ServiceLocator\ErrorHandlerInterface;
@@ -10,29 +10,29 @@ 
  * Class ErrorLog
  */
 class ErrorLog implements ErrorHandlerInterface {
-	/**
-	 * handle the error
-	 *
-	 * @param int    $errno
-	 * @param string $errstr
-	 * @param string $errfile
-	 * @param int    $errline
-	 * @param array  $errcontext
-	 *
-	 * @return boolean
-	 */
-	public function handleError($errno, $errstr, $errfile, $errline, array $errcontext) {
-		error_log("[{$errno}] {$errstr} in {$errfile} on line {$errline}");
-	}
+    /**
+     * handle the error
+     *
+     * @param int    $errno
+     * @param string $errstr
+     * @param string $errfile
+     * @param int    $errline
+     * @param array  $errcontext
+     *
+     * @return boolean
+     */
+    public function handleError($errno, $errstr, $errfile, $errline, array $errcontext) {
+        error_log("[{$errno}] {$errstr} in {$errfile} on line {$errline}");
+    }
 
-	/**
-	 * handle all exceptions
-	 *
-	 * @param \Exception $exception
-	 *
-	 * @return mixed
-	 */
-	public function handleException(\Exception $exception) {
-		error_log("[{$exception->getCode()}] {$exception->getMessage()} in {$exception->getFile()} on line {$exception->getLine()}");
-	}
+    /**
+     * handle all exceptions
+     *
+     * @param \Exception $exception
+     *
+     * @return mixed
+     */
+    public function handleException(\Exception $exception) {
+        error_log("[{$exception->getCode()}] {$exception->getMessage()} in {$exception->getFile()} on line {$exception->getLine()}");
+    }
 }
\ No newline at end of file

plugins/phile/errorHandler/Classes/Plugin.php

Indentation +24 added lines, -24 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Plugin class
- */
+     * Plugin class
+     */
 namespace Phile\Plugin\Phile\ErrorHandler;
 
 use Phile\Core\Router;
@@ -20,28 +20,28 @@ 
  * @package Phile\Plugin\Phile\ParserMarkdown
  */
 class Plugin extends AbstractPlugin {
-	const HANDLER_ERROR_LOG		= 'error_log';
-	const HANDLER_DEVELOPMENT	= 'development';
+    const HANDLER_ERROR_LOG		= 'error_log';
+    const HANDLER_DEVELOPMENT	= 'development';
 
-	protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
+    protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
 
-	/**
-	 * called on 'plugins_loaded' event
-	 *
-	 * @param null $data
-	 * @throws \Phile\Exception\ServiceLocatorException
-	 */
-	public function onPluginsLoaded($data = null) {
-		$this->settings['base_url'] = (new Router)->getBaseUrl();
-		switch ($this->settings['handler']) {
-			case Plugin::HANDLER_ERROR_LOG:
-				ServiceLocator::registerService('Phile_ErrorHandler',
-					new ErrorLog($this->settings));
-				break;
-			case Plugin::HANDLER_DEVELOPMENT:
-				ServiceLocator::registerService('Phile_ErrorHandler',
-					new Development($this->settings));
-				break;
-		}
-	}
+    /**
+     * called on 'plugins_loaded' event
+     *
+     * @param null $data
+     * @throws \Phile\Exception\ServiceLocatorException
+     */
+    public function onPluginsLoaded($data = null) {
+        $this->settings['base_url'] = (new Router)->getBaseUrl();
+        switch ($this->settings['handler']) {
+            case Plugin::HANDLER_ERROR_LOG:
+                ServiceLocator::registerService('Phile_ErrorHandler',
+                    new ErrorLog($this->settings));
+                break;
+            case Plugin::HANDLER_DEVELOPMENT:
+                ServiceLocator::registerService('Phile_ErrorHandler',
+                    new Development($this->settings));
+                break;
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
  * @package Phile\Plugin\Phile\ParserMarkdown
  */
 class Plugin extends AbstractPlugin {
-	const HANDLER_ERROR_LOG		= 'error_log';
-	const HANDLER_DEVELOPMENT	= 'development';
+	const HANDLER_ERROR_LOG = 'error_log';
+	const HANDLER_DEVELOPMENT = 'development';
 
 	protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
 

plugins/phile/errorHandler/config.php

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * the configuration file
- */
+     * the configuration file
+     */
 
 return array(
-	'handler' 			=> \Phile\Plugin\Phile\ErrorHandler\Plugin::HANDLER_ERROR_LOG
+    'handler' 			=> \Phile\Plugin\Phile\ErrorHandler\Plugin::HANDLER_ERROR_LOG
 );

plugins/phile/parserMeta/Classes/Plugin.php

Indentation +14 added lines, -14 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Plugin class
- */
+     * Plugin class
+     */
 namespace Phile\Plugin\Phile\ParserMeta;
 
 use Phile\Core\ServiceLocator;
@@ -19,18 +19,18 @@ 
  */
 class Plugin extends AbstractPlugin {
 
-	protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
+    protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
 
-	/**
-	 * onPluginsLoaded method
-	 *
-	 * @param null   $data
-	 *
-	 * @return mixed|void
-	 */
-	public function onPluginsLoaded($data = null) {
-		ServiceLocator::registerService('Phile_Parser_Meta',
-			new Meta($this->settings));
-	}
+    /**
+     * onPluginsLoaded method
+     *
+     * @param null   $data
+     *
+     * @return mixed|void
+     */
+    public function onPluginsLoaded($data = null) {
+        ServiceLocator::registerService('Phile_Parser_Meta',
+            new Meta($this->settings));
+    }
 
 }

plugins/phile/parserMeta/Classes/Parser/Meta.php

Indentation +87 added lines, -87 removed lines

@@ -16,97 +16,97 @@
  * @package Phile\Plugin\Phile\ParserMeta\Parser
  */
 class Meta implements MetaInterface {
-	/** @var array $config the configuration for this parser */
-	private $config;
+    /** @var array $config the configuration for this parser */
+    private $config;
 
-	/**
-	 * the constructor
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config = null) {
-		if (!is_null($config)) {
-			$this->config = $config;
-		}
-	}
+    /**
+     * the constructor
+     *
+     * @param array $config
+     */
+    public function __construct(array $config = null) {
+        if (!is_null($config)) {
+            $this->config = $config;
+        }
+    }
 
-	/**
-	 * parse the content and extract meta information
-	 *
-	 * @param string $rawData raw page data
-	 * @return array with key/value store
-	 */
-	public function parse($rawData) {
-		$rawData = trim($rawData);
+    /**
+     * parse the content and extract meta information
+     *
+     * @param string $rawData raw page data
+     * @return array with key/value store
+     */
+    public function parse($rawData) {
+        $rawData = trim($rawData);
 
-		$start = substr($rawData, 0, 4);
-		if ($start === '<!--') {
-			$stop = '-->';
-		} elseif (substr($start, 0, 2) === '/*') {
-			$start = '/*';
-			$stop = '*/';
-		} else {
-			return [];
-		}
+        $start = substr($rawData, 0, 4);
+        if ($start === '<!--') {
+            $stop = '-->';
+        } elseif (substr($start, 0, 2) === '/*') {
+            $start = '/*';
+            $stop = '*/';
+        } else {
+            return [];
+        }
 
-		$meta = trim(substr($rawData, strlen($start), strpos($rawData, $stop) - (strlen($stop) + 1)));
-		if (strtolower($this->config['format']) === 'yaml') {
-			$meta = Yaml::parse($meta);
-		} else {
-			$meta = $this->parsePhileFormat($meta);
-		}
-		$meta = ($meta === null) ? [] : $this->convertKeys($meta);
-		return $meta;
-	}
+        $meta = trim(substr($rawData, strlen($start), strpos($rawData, $stop) - (strlen($stop) + 1)));
+        if (strtolower($this->config['format']) === 'yaml') {
+            $meta = Yaml::parse($meta);
+        } else {
+            $meta = $this->parsePhileFormat($meta);
+        }
+        $meta = ($meta === null) ? [] : $this->convertKeys($meta);
+        return $meta;
+    }
 
-	/**
-	 * convert meta data keys
-	 *
-	 * Creates "compatible" keys allowing easy access e.g. as template var.
-	 *
-	 * Conversions applied:
-	 *
-	 * - lowercase all chars
-	 * - replace special chars and whitespace with underscore
-	 *
-	 * @param array $meta meta-data
-	 * @return array
-	 */
-	protected function convertKeys(array $meta) {
-		$return = [];
-		foreach ($meta as $key => $value) {
-			if (is_array($value)) {
-				$value = $this->convertKeys($value);
-			}
-			$newKey = strtolower($key);
-			$newKey = preg_replace('/[^\w+]/', '_', $newKey);
-			$return[$newKey] = $value;
-		}
-		return $return;
-	}
+    /**
+     * convert meta data keys
+     *
+     * Creates "compatible" keys allowing easy access e.g. as template var.
+     *
+     * Conversions applied:
+     *
+     * - lowercase all chars
+     * - replace special chars and whitespace with underscore
+     *
+     * @param array $meta meta-data
+     * @return array
+     */
+    protected function convertKeys(array $meta) {
+        $return = [];
+        foreach ($meta as $key => $value) {
+            if (is_array($value)) {
+                $value = $this->convertKeys($value);
+            }
+            $newKey = strtolower($key);
+            $newKey = preg_replace('/[^\w+]/', '_', $newKey);
+            $return[$newKey] = $value;
+        }
+        return $return;
+    }
 
-	/**
-	 * Phile meta format parser.
-	 *
-	 * @param string $string unparsed meta-data
-	 * @return array|null array with meta-tags; null: on meta-data found
-	 *
-	 * @deprecated since 1.6.0 Phile is going to switch to YAML
-	 */
-	protected function parsePhileFormat($string) {
-		if (empty($string)) {
-			return null;
-		}
-		$meta = [];
-		$lines = explode("\n", $string);
-		foreach ($lines as $line) {
-			$parts = explode(':', $line, 2);
-			if (count($parts) !== 2) {
-				continue;
-			}
-			$parts = array_map('trim', $parts);
-			$meta[$parts[0]] = $parts[1];
-		}
-		return $meta;
-	}
+    /**
+     * Phile meta format parser.
+     *
+     * @param string $string unparsed meta-data
+     * @return array|null array with meta-tags; null: on meta-data found
+     *
+     * @deprecated since 1.6.0 Phile is going to switch to YAML
+     */
+    protected function parsePhileFormat($string) {
+        if (empty($string)) {
+            return null;
+        }
+        $meta = [];
+        $lines = explode("\n", $string);
+        foreach ($lines as $line) {
+            $parts = explode(':', $line, 2);
+            if (count($parts) !== 2) {
+                continue;
+            }
+            $parts = array_map('trim', $parts);
+            $meta[$parts[0]] = $parts[1];
+        }
+        return $meta;
+    }
 }

plugins/phile/parserMarkdown/Classes/Plugin.php

Indentation +13 added lines, -13 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Plugin class
- */
+     * Plugin class
+     */
 namespace Phile\Plugin\Phile\ParserMarkdown;
 
 use Phile\Core\ServiceLocator;
@@ -19,16 +19,16 @@ 
  */
 class Plugin extends AbstractPlugin {
 
-	protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
+    protected $events = ['plugins_loaded' => 'onPluginsLoaded'];
 
-	/**
-	 * onPluginsLoaded method
-	 *
-	 * @param null   $data
-	 *
-	 * @return mixed|void
-	 */
-	public function onPluginsLoaded($data = null) {
-		ServiceLocator::registerService('Phile_Parser', new Markdown($this->settings));
-	}
+    /**
+     * onPluginsLoaded method
+     *
+     * @param null   $data
+     *
+     * @return mixed|void
+     */
+    public function onPluginsLoaded($data = null) {
+        ServiceLocator::registerService('Phile_Parser', new Markdown($this->settings));
+    }
 }

plugins/phile/parserMarkdown/Classes/Parser/Markdown.php

Indentation +28 added lines, -28 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * The Mardown parser class
- */
+     * The Mardown parser class
+     */
 namespace Phile\Plugin\Phile\ParserMarkdown\Parser;
 
 use Michelf\MarkdownExtra;
@@ -16,33 +16,33 @@ 
  * @package Phile\Plugin\Phile\ParserMarkdown\Parser
  */
 class Markdown implements ParserInterface {
-	/** @var mixed the configuration */
-	private $config;
+    /** @var mixed the configuration */
+    private $config;
 
-	/**
-	 * the constructor
-	 *
-	 * @param null $config
-	 */
-	public function __construct($config = null) {
-		if (!is_null($config)) {
-			$this->config = $config;
-		}
-	}
+    /**
+     * the constructor
+     *
+     * @param null $config
+     */
+    public function __construct($config = null) {
+        if (!is_null($config)) {
+            $this->config = $config;
+        }
+    }
 
-	/**
-	 * overload parse with the MarkdownExtra parser
-	 *
-	 * @param $data
-	 *
-	 * @return string
-	 */
-	public function parse($data) {
-		$parser = new MarkdownExtra;
-		foreach ($this->config as $key => $value) {
-			$parser->{$key} = $value;
-		}
+    /**
+     * overload parse with the MarkdownExtra parser
+     *
+     * @param $data
+     *
+     * @return string
+     */
+    public function parse($data) {
+        $parser = new MarkdownExtra;
+        foreach ($this->config as $key => $value) {
+            $parser->{$key} = $value;
+        }
 
-		return $parser->transform($data);
-	}
+        return $parser->transform($data);
+    }
 }

plugins/phile/parserMarkdown/config.php

Indentation +20 added lines, -20 removed lines

@@ -1,25 +1,25 @@
 <?php
 /**
- * the configuration file
- *
- * @see https://michelf.ca/projects/php-markdown/configuration/
- */
+     * the configuration file
+     *
+     * @see https://michelf.ca/projects/php-markdown/configuration/
+     */
 
 return array(
-	'empty_element_suffix' => ' />',
-	'tab_width'            => 4,
-	'no_markup'            => false,
-	'no_entities'          => false,
-	'predef_urls'          => array(
-		'base_url' => \Phile\Core\Utility::getBaseUrl() // base_url is a good reference to have
-	),
-	'predef_titles'        => array(),
-	'fn_id_prefix'         => "",
-	'fn_link_title'        => "",
-	'fn_backlink_title'    => "",
-	'fn_link_class'        => "footnote-ref",
-	'fn_backlink_class'    => "footnote-backref",
-	'code_class_prefix'    => "",
-	'code_attr_on_pre'     => false,
-	'predef_abbr'          => array()
+    'empty_element_suffix' => ' />',
+    'tab_width'            => 4,
+    'no_markup'            => false,
+    'no_entities'          => false,
+    'predef_urls'          => array(
+        'base_url' => \Phile\Core\Utility::getBaseUrl() // base_url is a good reference to have
+    ),
+    'predef_titles'        => array(),
+    'fn_id_prefix'         => "",
+    'fn_link_title'        => "",
+    'fn_backlink_title'    => "",
+    'fn_link_class'        => "footnote-ref",
+    'fn_backlink_class'    => "footnote-backref",
+    'code_class_prefix'    => "",
+    'code_attr_on_pre'     => false,
+    'predef_abbr'          => array()
 );