PhileCMS / Phile

lib/Phile/Model/Meta.php

Indentation +63 added lines, -63 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Model class
- */
+     * Model class
+     */
 namespace Phile\Model;
 use Phile\Core\Event;
 use Phile\Core\Registry;
@@ -17,69 +17,69 @@ 
  */
 class Meta extends AbstractModel {
 
-	/**
-	 * the construtor
-	 *
-	 * @param string $rawData the raw data to parse
-	 */
-	public function __construct($rawData = null) {
-		if ($rawData !== null) {
-			$this->setRawData($rawData);
-		}
-	}
+    /**
+     * the construtor
+     *
+     * @param string $rawData the raw data to parse
+     */
+    public function __construct($rawData = null) {
+        if ($rawData !== null) {
+            $this->setRawData($rawData);
+        }
+    }
 
-	/**
-	 * set the raw data to parse
-	 *
-	 * @param string $rawData the raw data
-	 */
-	public function setRawData($rawData) {
-		/**
-		 * @triggerEvent before_read_file_meta this event is triggered before the meta data readed and parsed
-		 *
-		 * @param string rawData the unparsed data
-		 * @param \Phile\Model\Meta meta   the meta model
-		 */
-		Event::triggerEvent('before_read_file_meta', array('rawData' => &$rawData, 'meta' => &$this));
-		$this->parseRawData($rawData);
-		/**
-		 * @triggerEvent after_read_file_meta this event is triggered after the meta data readed and parsed
-		 *
-		 * @param string rawData the unparsed data
-		 * @param \Phile\Model\Meta meta   the meta model
-		 */
-		Event::triggerEvent('after_read_file_meta', array('rawData' => &$rawData, 'meta' => &$this));
-	}
+    /**
+     * set the raw data to parse
+     *
+     * @param string $rawData the raw data
+     */
+    public function setRawData($rawData) {
+        /**
+         * @triggerEvent before_read_file_meta this event is triggered before the meta data readed and parsed
+         *
+         * @param string rawData the unparsed data
+         * @param \Phile\Model\Meta meta   the meta model
+         */
+        Event::triggerEvent('before_read_file_meta', array('rawData' => &$rawData, 'meta' => &$this));
+        $this->parseRawData($rawData);
+        /**
+         * @triggerEvent after_read_file_meta this event is triggered after the meta data readed and parsed
+         *
+         * @param string rawData the unparsed data
+         * @param \Phile\Model\Meta meta   the meta model
+         */
+        Event::triggerEvent('after_read_file_meta', array('rawData' => &$rawData, 'meta' => &$this));
+    }
 
-	/**
-	 * get formatted date
-	 *
-	 * @return bool|null|string
-	 */
-	public function getFormattedDate() {
-		$config = Registry::get('Phile_Settings');
-		if (!isset($this->data['date'])) {
-			return null;
-		}
-		$date = $this->data['date'];
-		if (!is_numeric($date)) {
-			$date = strtotime($date);
-		}
-		return date($config['date_format'], $date);
-	}
+    /**
+     * get formatted date
+     *
+     * @return bool|null|string
+     */
+    public function getFormattedDate() {
+        $config = Registry::get('Phile_Settings');
+        if (!isset($this->data['date'])) {
+            return null;
+        }
+        $date = $this->data['date'];
+        if (!is_numeric($date)) {
+            $date = strtotime($date);
+        }
+        return date($config['date_format'], $date);
+    }
 
-	/**
-	 * parse the raw data
-	 *
-	 * @param $rawData
-	 */
-	protected function parseRawData($rawData) {
-		/** @var \Phile\ServiceLocator\MetaInterface $metaParser */
-		$metaParser = ServiceLocator::getService('Phile_Parser_Meta');
-		$data       = $metaParser->parse($rawData);
+    /**
+     * parse the raw data
+     *
+     * @param $rawData
+     */
+    protected function parseRawData($rawData) {
+        /** @var \Phile\ServiceLocator\MetaInterface $metaParser */
+        $metaParser = ServiceLocator::getService('Phile_Parser_Meta');
+        $data       = $metaParser->parse($rawData);
 
-		foreach ($data as $key => $value) {
-			$this->set($key, $value);
-		}
-	}
+        foreach ($data as $key => $value) {
+            $this->set($key, $value);
+        }
+    }
 }

lib/Phile/Model/AbstractModel.php

Indentation +129 added lines, -129 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * the abstract base model
- */
+     * the abstract base model
+     */
 namespace Phile\Model;
 
 /**
@@ -13,144 +13,144 @@ 
  * @package Phile\Model
  */
 class AbstractModel implements \ArrayAccess {
-	/** @var array the storage */
-	protected $data = array();
+    /** @var array the storage */
+    protected $data = array();
 
-	/**
-	 * get value for given key
-	 *
-	 * @param $key
-	 *
-	 * @return null|mixed
-	 */
-	public function get($key) {
-		return (isset($this->data[$key])) ? $this->data[$key] : null;
-	}
+    /**
+     * get value for given key
+     *
+     * @param $key
+     *
+     * @return null|mixed
+     */
+    public function get($key) {
+        return (isset($this->data[$key])) ? $this->data[$key] : null;
+    }
 
-	/**
-	 * get all entries
-	 *
-	 * @return array
-	 */
-	public function getAll() {
-		return $this->data;
-	}
+    /**
+     * get all entries
+     *
+     * @return array
+     */
+    public function getAll() {
+        return $this->data;
+    }
 
-	/**
-	 * set value for given key
-	 *
-	 * @param string $key   the key
-	 * @param mixed  $value the value
-	 */
-	public function set($key, $value) {
-		$this->data[$key] = $value;
-	}
+    /**
+     * set value for given key
+     *
+     * @param string $key   the key
+     * @param mixed  $value the value
+     */
+    public function set($key, $value) {
+        $this->data[$key] = $value;
+    }
 
-	/**
-	 * magic method to get value
-	 *
-	 * @param $name
-	 *
-	 * @return null|mixed
-	 */
-	public function __get($name) {
-		return $this->get($name);
-	}
+    /**
+     * magic method to get value
+     *
+     * @param $name
+     *
+     * @return null|mixed
+     */
+    public function __get($name) {
+        return $this->get($name);
+    }
 
-	/**
-	 * magic method to set value
-	 *
-	 * @param string $name
-	 * @param mixed  $value
-	 */
-	public function __set($name, $value) {
-		$this->set($name, $value);
-	}
+    /**
+     * magic method to set value
+     *
+     * @param string $name
+     * @param mixed  $value
+     */
+    public function __set($name, $value) {
+        $this->set($name, $value);
+    }
 
-	/**
-	 * magic method to access properties by getter / setter
-	 *
-	 * @param string $name the name of method
-	 * @param array  $args the arguments of the method
-	 *
-	 * @return mixed|null|void
-	 */
-	public function __call($name, $args) {
-		if (strpos($name, 'get') !== false) {
-			$name = substr($name, 3);
+    /**
+     * magic method to access properties by getter / setter
+     *
+     * @param string $name the name of method
+     * @param array  $args the arguments of the method
+     *
+     * @return mixed|null|void
+     */
+    public function __call($name, $args) {
+        if (strpos($name, 'get') !== false) {
+            $name = substr($name, 3);
 
-			return $this->get($name);
-		}
-		if (strpos($name, 'set') !== false) {
-			$name = substr($name, 3);
+            return $this->get($name);
+        }
+        if (strpos($name, 'set') !== false) {
+            $name = substr($name, 3);
 
-			return $this->set($name, $args[0]);
-		}
+            return $this->set($name, $args[0]);
+        }
 
-	}
+    }
 
-	/**
-	 * (PHP 5 >= 5.0.0)
-	 * Whether a offset exists
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetexists.php
-	 *
-	 * @param mixed $offset
-	 *                      An offset to check for.
-	 *
-	 * @return boolean true on success or false on failure.
-	 *                      The return value will be casted to boolean if non-boolean was returned.
-	 */
-	public function offsetExists($offset) {
-		return (isset($this->data[$offset]));
-	}
+    /**
+     * (PHP 5 >= 5.0.0)
+     * Whether a offset exists
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetexists.php
+     *
+     * @param mixed $offset
+     *                      An offset to check for.
+     *
+     * @return boolean true on success or false on failure.
+     *                      The return value will be casted to boolean if non-boolean was returned.
+     */
+    public function offsetExists($offset) {
+        return (isset($this->data[$offset]));
+    }
 
-	/**
-	 * (PHP 5 >= 5.0.0)
-	 * Offset to retrieve
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetget.php
-	 *
-	 * @param mixed $offset
-	 *                      The offset to retrieve.
-	 *
-	 * @return mixed Can return all value types.
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    /**
+     * (PHP 5 >= 5.0.0)
+     * Offset to retrieve
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetget.php
+     *
+     * @param mixed $offset
+     *                      The offset to retrieve.
+     *
+     * @return mixed Can return all value types.
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	/**
-	 * (PHP 5 >= 5.0.0)
-	 * Offset to set
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetset.php
-	 *
-	 * @param mixed $offset
-	 *                      The offset to assign the value to.
-	 * @param mixed $value
-	 *                      The value to set.
-	 *
-	 * @return void
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    /**
+     * (PHP 5 >= 5.0.0)
+     * Offset to set
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetset.php
+     *
+     * @param mixed $offset
+     *                      The offset to assign the value to.
+     * @param mixed $value
+     *                      The value to set.
+     *
+     * @return void
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	/**
-	 * (PHP 5 >= 5.0.0)
-	 * Offset to unset
-	 *
-	 * @link http://php.net/manual/en/arrayaccess.offsetunset.php
-	 *
-	 * @param mixed $offset
-	 *                      The offset to unset.
-	 *
-	 * @return void
-	 */
-	public function offsetUnset($offset) {
-		if ($this->offsetExists($offset)) {
-			unset($this->data[$offset]);
-		}
-	}
+    /**
+     * (PHP 5 >= 5.0.0)
+     * Offset to unset
+     *
+     * @link http://php.net/manual/en/arrayaccess.offsetunset.php
+     *
+     * @param mixed $offset
+     *                      The offset to unset.
+     *
+     * @return void
+     */
+    public function offsetUnset($offset) {
+        if ($this->offsetExists($offset)) {
+            unset($this->data[$offset]);
+        }
+    }
 }

lib/Phile/Gateway/EventObserverInterface.php

Indentation +9 added lines, -9 removed lines

@@ -13,13 +13,13 @@
  * @package Phile\Gateway
  */
 interface EventObserverInterface {
-	/**
-	 * event method
-	 *
-	 * @param string $eventKey
-	 * @param mixed  $data
-	 *
-	 * @return mixed
-	 */
-	public function on($eventKey, $data = null);
+    /**
+     * event method
+     *
+     * @param string $eventKey
+     * @param mixed  $data
+     *
+     * @return mixed
+     */
+    public function on($eventKey, $data = null);
 }

lib/Phile/FilterIterator/ContentFileFilterIterator.php

Indentation +10 added lines, -10 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * the filter class for content files
- */
+     * the filter class for content files
+     */
 namespace Phile\FilterIterator;
 
 /**
@@ -10,13 +10,13 @@ 
  * @package Phile\FilterIterator
  */
 class ContentFileFilterIterator extends \FilterIterator {
-	/**
-	 * method to decide if file is filterd or not
-	 * @return bool
-	 */
-	public function accept() {
-		/** @var \SplFileInfo $this */
-		return (preg_match('/^[^\.]{1}.*'.CONTENT_EXT.'/', $this->getFilename()) > 0);
-	}
+    /**
+     * method to decide if file is filterd or not
+     * @return bool
+     */
+    public function accept() {
+        /** @var \SplFileInfo $this */
+        return (preg_match('/^[^\.]{1}.*'.CONTENT_EXT.'/', $this->getFilename()) > 0);
+    }
 
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
 	 */
 	public function accept() {
 		/** @var \SplFileInfo $this */
-		return (preg_match('/^[^\.]{1}.*'.CONTENT_EXT.'/', $this->getFilename()) > 0);
+		return (preg_match('/^[^\.]{1}.*' . CONTENT_EXT . '/', $this->getFilename()) > 0);
 	}
 
 }
\ No newline at end of file

lib/Phile/FilterIterator/GeneralFileFilterIterator.php

Indentation +8 added lines, -8 removed lines

@@ -9,13 +9,13 @@
  * @package Phile\FilterIterator
  */
 class GeneralFileFilterIterator extends \FilterIterator {
-	/**
-	 * method to decide if file is filterd or not
-	 * @return bool
-	 */
-	public function accept() {
-		// accept all kind of files, no filter
-		return true;
-	}
+    /**
+     * method to decide if file is filterd or not
+     * @return bool
+     */
+    public function accept() {
+        // accept all kind of files, no filter
+        return true;
+    }
 
 }
\ No newline at end of file

lib/Phile/Core/Registry.php

Indentation +123 added lines, -123 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * Registry class
- */
+     * Registry class
+     */
 namespace Phile\Core;
 
 /**
@@ -13,137 +13,137 @@ 
  * @package Phile\Core
  */
 class Registry extends \ArrayObject {
-	/**
-	 * Registry object provides storage for shared objects.
-	 *
-	 * @var Registry
-	 */
-	private static $_registry = null;
+    /**
+     * Registry object provides storage for shared objects.
+     *
+     * @var Registry
+     */
+    private static $_registry = null;
 
-	/**
-	 * Retrieves the default registry instance.
-	 *
-	 * @return Registry
-	 */
-	public static function getInstance() {
-		if (self::$_registry === null) {
-			self::init();
-		}
+    /**
+     * Retrieves the default registry instance.
+     *
+     * @return Registry
+     */
+    public static function getInstance() {
+        if (self::$_registry === null) {
+            self::init();
+        }
 
-		return self::$_registry;
-	}
+        return self::$_registry;
+    }
 
-	/**
-	 * Set the default registry instance to a specified instance.
-	 *
-	 * @param Registry $registry An object instance of type Registry,
-	 *                           or a subclass.
-	 *
-	 * @param Registry $registry
-	 *
-	 * @throws \Exception
-	 */
-	public static function setInstance(Registry $registry) {
-		if (self::$_registry !== null) {
-			throw new \Exception('Registry is already initialized', 1398536572);
-		}
-		self::$_registry = $registry;
-	}
+    /**
+     * Set the default registry instance to a specified instance.
+     *
+     * @param Registry $registry An object instance of type Registry,
+     *                           or a subclass.
+     *
+     * @param Registry $registry
+     *
+     * @throws \Exception
+     */
+    public static function setInstance(Registry $registry) {
+        if (self::$_registry !== null) {
+            throw new \Exception('Registry is already initialized', 1398536572);
+        }
+        self::$_registry = $registry;
+    }
 
-	/**
-	 * Initialize the default registry instance.
-	 *
-	 * @return void
-	 */
-	protected static function init() {
-		self::setInstance(new Registry());
-	}
+    /**
+     * Initialize the default registry instance.
+     *
+     * @return void
+     */
+    protected static function init() {
+        self::setInstance(new Registry());
+    }
 
-	/**
-	 * Unset the default registry instance.
-	 * Primarily used in tearDown() in unit tests.
-	 *
-	 * @returns void
-	 */
-	public static function _unsetInstance() {
-		self::$_registry = null;
-	}
+    /**
+     * Unset the default registry instance.
+     * Primarily used in tearDown() in unit tests.
+     *
+     * @returns void
+     */
+    public static function _unsetInstance() {
+        self::$_registry = null;
+    }
 
-	/**
-	 * getter method, basically same as offsetGet().
-	 *
-	 * This method can be called from an object of type Registry, or it
-	 * can be called statically.  In the latter case, it uses the default
-	 * static instance stored in the class.
-	 *
-	 * @param string $index - get the value associated with $index
-	 *
-	 * @return mixed
-	 * @throws \Exception if no entry is registerd for $index.
-	 */
-	public static function get($index) {
-		$instance = self::getInstance();
-		if (!$instance->offsetExists($index)) {
-			throw new \Exception("No entry is registered for key '$index'", 1398536594);
-		}
+    /**
+     * getter method, basically same as offsetGet().
+     *
+     * This method can be called from an object of type Registry, or it
+     * can be called statically.  In the latter case, it uses the default
+     * static instance stored in the class.
+     *
+     * @param string $index - get the value associated with $index
+     *
+     * @return mixed
+     * @throws \Exception if no entry is registerd for $index.
+     */
+    public static function get($index) {
+        $instance = self::getInstance();
+        if (!$instance->offsetExists($index)) {
+            throw new \Exception("No entry is registered for key '$index'", 1398536594);
+        }
 
-		return $instance->offsetGet($index);
-	}
+        return $instance->offsetGet($index);
+    }
 
-	/**
-	 * setter method, basically same as offsetSet().
-	 *
-	 * This method can be called from an object of type Registry, or it
-	 * can be called statically.  In the latter case, it uses the default
-	 * static instance stored in the class.
-	 *
-	 * @param string $index The location in the ArrayObject in which to store
-	 *                      the value.
-	 * @param mixed  $value The object to store in the ArrayObject.
-	 *
-	 * @return void
-	 */
-	public static function set($index, $value) {
-		$instance = self::getInstance();
-		$instance->offsetSet($index, $value);
-	}
+    /**
+     * setter method, basically same as offsetSet().
+     *
+     * This method can be called from an object of type Registry, or it
+     * can be called statically.  In the latter case, it uses the default
+     * static instance stored in the class.
+     *
+     * @param string $index The location in the ArrayObject in which to store
+     *                      the value.
+     * @param mixed  $value The object to store in the ArrayObject.
+     *
+     * @return void
+     */
+    public static function set($index, $value) {
+        $instance = self::getInstance();
+        $instance->offsetSet($index, $value);
+    }
 
-	/**
-	 * Returns TRUE if the $index is a named value in the registry,
-	 * or FALSE if $index was not found in the registry.
-	 *
-	 * @param  string $index
-	 *
-	 * @return boolean
-	 */
-	public static function isRegistered($index) {
-		if (self::$_registry === null) {
-			return false;
-		}
+    /**
+     * Returns TRUE if the $index is a named value in the registry,
+     * or FALSE if $index was not found in the registry.
+     *
+     * @param  string $index
+     *
+     * @return boolean
+     */
+    public static function isRegistered($index) {
+        if (self::$_registry === null) {
+            return false;
+        }
 
-		return self::$_registry->offsetExists($index);
-	}
+        return self::$_registry->offsetExists($index);
+    }
 
-	/**
-	 * the constructor
-	 *
-	 * @param array   $array data array
-	 * @param integer $flags ArrayObject flags
-	 */
-	public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS) {
-		parent::__construct($array, $flags);
-	}
+    /**
+     * the constructor
+     *
+     * @param array   $array data array
+     * @param integer $flags ArrayObject flags
+     */
+    public function __construct($array = array(), $flags = parent::ARRAY_AS_PROPS) {
+        parent::__construct($array, $flags);
+    }
 
-	/**
-	 * method to check if offset exists
-	 *
-	 * @param string $index
-	 *
-	 * @returns mixed
-	 *
-	 * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
-	 */
-	public function offsetExists($index) {
-		return array_key_exists($index, $this);
-	}
+    /**
+     * method to check if offset exists
+     *
+     * @param string $index
+     *
+     * @returns mixed
+     *
+     * Workaround for http://bugs.php.net/bug.php?id=40442 (ZF-960).
+     */
+    public function offsetExists($index) {
+        return array_key_exists($index, $this);
+    }
 }

lib/Phile/Core/Router.php

Indentation +136 added lines, -136 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 /**
- * the Router class
- */
+     * the Router class
+     */
 
 namespace Phile\Core;
 
@@ -15,138 +15,138 @@ 
  */
 class Router {
 
-	/**
-	 * @var array with $_SERVER environment
-	 */
-	protected $server;
-
-	/**
-	 * @param array $server $_SERVER environment
-	 */
-	public function __construct(array $server = []) {
-		if (empty($server)) {
-			$server = $_SERVER;
-		}
-		$this->server = $server;
-	}
-
-	/**
-	 * get request-URL relative to Phile base-URL
-	 *
-	 * @return string relative URL e.g. `index`, `sub/`, `sub/page`
-	 */
-	public function getCurrentUrl() {
-		$url = $this->server['REQUEST_URI'];
-
-		// remove query string
-		$queryPosition = strpos($url, '?');
-		if ($queryPosition) {
-			$url = substr($url, 0, $queryPosition);
-		}
-
-		// resolve root-relative URL-path
-		$baseUrl = $this->getBaseUrl();
-		$basePath = $this->getUrlPath($baseUrl);
-		if (!empty($basePath) && strpos($url, $basePath) === 0) {
-			$url = substr($url, strlen($basePath));
-		}
-		$url = ltrim($url, '/');
-
-		$url = urldecode($url);
-
-		return $url;
-	}
-
-	/**
-	 * Get base-URL of the Phile installation
-	 *
-	 * @return string `scheme://host/path/phile-root`
-	 */
-	public function getBaseUrl() {
-		if (Registry::isRegistered('Phile_Settings')) {
-			$config = Registry::get('Phile_Settings');
-			if (!empty($config['base_url'])) {
-				return $config['base_url'];
-			}
-		}
-
-		$url = '';
-
-		if (isset($this->server['PHP_SELF'])) {
-			$url = preg_replace('/index\.php(.*)?$/', '', $this->server['PHP_SELF']);
-		}
-
-		if (isset($this->server['HTTP_HOST'])) {
-			$host = $this->server['HTTP_HOST'];
-			$protocol = $this->getProtocol();
-			$url = $protocol . '://' . $host . $url;
-		}
-
-		$url = rtrim($url, '/');
-		return $url;
-	}
-
-	/**
-	 * get the URL for a page-Id
-	 *
-	 * e.g. `sub/index` --> `http://host/phile-root/sub`
-	 *
-	 * @param string $pageId
-	 * @param bool $base return a full or root-relative URL
-	 * @return string URL
-	 */
-	public function urlForPage($pageId, $base = true) {
-		$url = $pageId;
-		if ($base) {
-			$url = $this->url($url);
-		}
-		return $url;
-	}
-
-	/**
-	 * converts Phile-root relative URL to full URL
-	 *
-	 * e.g. `foo/bar.ext` --> `http://host/phile-root/foo/bar.ext`
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	public function url($url) {
-		return $this->getBaseUrl() . '/' . ltrim($url, '/');
-	}
-
-	/**
-	 * get the HTTP-protocol
-	 *
-	 * @return string
-	 */
-	public function getProtocol() {
-		if (empty($this->server['HTTP_HOST'])) {
-			return null;
-		}
-		$protocol = 'http';
-		if (isset($this->server['HTTPS']) && strtolower($this->server['HTTPS']) !== 'off') {
-			$protocol = 'https';
-		}
-		return $protocol;
-	}
-
-	/**
-	 * get path of an URL
-	 *
-	 * `scheme://host/path/sub` --> `/path/sub`
-	 *
-	 * @param string $url
-	 * @return string
-	 */
-	protected function getUrlPath($url) {
-		$path = '';
-		if (strpos($url, '://') !== false) {
-			$parsed = parse_url($url);
-			if (isset($parsed['path'])) {
-				$path = $parsed['path'];
-			}
-		}
-		return $path;
-	}
+    /**
+     * @var array with $_SERVER environment
+     */
+    protected $server;
+
+    /**
+     * @param array $server $_SERVER environment
+     */
+    public function __construct(array $server = []) {
+        if (empty($server)) {
+            $server = $_SERVER;
+        }
+        $this->server = $server;
+    }
+
+    /**
+     * get request-URL relative to Phile base-URL
+     *
+     * @return string relative URL e.g. `index`, `sub/`, `sub/page`
+     */
+    public function getCurrentUrl() {
+        $url = $this->server['REQUEST_URI'];
+
+        // remove query string
+        $queryPosition = strpos($url, '?');
+        if ($queryPosition) {
+            $url = substr($url, 0, $queryPosition);
+        }
+
+        // resolve root-relative URL-path
+        $baseUrl = $this->getBaseUrl();
+        $basePath = $this->getUrlPath($baseUrl);
+        if (!empty($basePath) && strpos($url, $basePath) === 0) {
+            $url = substr($url, strlen($basePath));
+        }
+        $url = ltrim($url, '/');
+
+        $url = urldecode($url);
+
+        return $url;
+    }
+
+    /**
+     * Get base-URL of the Phile installation
+     *
+     * @return string `scheme://host/path/phile-root`
+     */
+    public function getBaseUrl() {
+        if (Registry::isRegistered('Phile_Settings')) {
+            $config = Registry::get('Phile_Settings');
+            if (!empty($config['base_url'])) {
+                return $config['base_url'];
+            }
+        }
+
+        $url = '';
+
+        if (isset($this->server['PHP_SELF'])) {
+            $url = preg_replace('/index\.php(.*)?$/', '', $this->server['PHP_SELF']);
+        }
+
+        if (isset($this->server['HTTP_HOST'])) {
+            $host = $this->server['HTTP_HOST'];
+            $protocol = $this->getProtocol();
+            $url = $protocol . '://' . $host . $url;
+        }
+
+        $url = rtrim($url, '/');
+        return $url;
+    }
+
+    /**
+     * get the URL for a page-Id
+     *
+     * e.g. `sub/index` --> `http://host/phile-root/sub`
+     *
+     * @param string $pageId
+     * @param bool $base return a full or root-relative URL
+     * @return string URL
+     */
+    public function urlForPage($pageId, $base = true) {
+        $url = $pageId;
+        if ($base) {
+            $url = $this->url($url);
+        }
+        return $url;
+    }
+
+    /**
+     * converts Phile-root relative URL to full URL
+     *
+     * e.g. `foo/bar.ext` --> `http://host/phile-root/foo/bar.ext`
+     *
+     * @param string $url
+     * @return string
+     */
+    public function url($url) {
+        return $this->getBaseUrl() . '/' . ltrim($url, '/');
+    }
+
+    /**
+     * get the HTTP-protocol
+     *
+     * @return string
+     */
+    public function getProtocol() {
+        if (empty($this->server['HTTP_HOST'])) {
+            return null;
+        }
+        $protocol = 'http';
+        if (isset($this->server['HTTPS']) && strtolower($this->server['HTTPS']) !== 'off') {
+            $protocol = 'https';
+        }
+        return $protocol;
+    }
+
+    /**
+     * get path of an URL
+     *
+     * `scheme://host/path/sub` --> `/path/sub`
+     *
+     * @param string $url
+     * @return string
+     */
+    protected function getUrlPath($url) {
+        $path = '';
+        if (strpos($url, '://') !== false) {
+            $parsed = parse_url($url);
+            if (isset($parsed['path'])) {
+                $path = $parsed['path'];
+            }
+        }
+        return $path;
+    }
 }

lib/Phile/Core/Response.php

Indentation +113 added lines, -113 removed lines

@@ -22,119 +22,119 @@
  */
 class Response {
 
-	/**
-	 * @var string HTTP body
-	 */
-	protected $body = '';
-
-	/**
-	 * @var string charset
-	 */
-	protected $charset = 'utf-8';
-
-	/**
-	 * @var array HTTP-headers
-	 */
-	protected $headers = [];
-
-	/**
-	 * @var int HTTP status code
-	 */
-	protected $statusCode = 200;
-
-	/**
-	 * redirect to another URL
-	 *
-	 * @param string $url URL
-	 * @param int $statusCode
-	 */
-	public function redirect($url, $statusCode = 302) {
-		$this->setStatusCode($statusCode)
-			->setHeader('Location', $url, true)
-			->setBody('')
-			->send()
-			->stop();
-	}
-
-	/**
-	 * set the response body
-	 *
-	 * @param $body
-	 * @return $this
-	 */
-	public function setBody($body) {
-		$this->body = $body;
-		return $this;
-	}
-
-	/**
-	 * set the response character-set
-	 *
-	 * @param $charset
-	 * @return $this
-	 */
-	public function setCharset($charset) {
-		$this->charset = $charset;
-		return $this;
-	}
-
-	/**
-	 * set a response HTTP-header
-	 *
-	 * @param string $key
-	 * @param string $value
-	 * @param bool $clear clear out any existing headers
-	 * @return $this
-	 */
-	public function setHeader($key, $value, $clear = false) {
-		if ($clear) {
-			$this->headers = [];
-		}
-		$this->headers[$key] = "$key: $value";
-		return $this;
-	}
-
-	/**
-	 * set the response HTTP status code
-	 *
-	 * @param $code
-	 * @return $this
-	 */
-	public function setStatusCode($code) {
-		$this->statusCode = $code;
-		return $this;
-	}
-
-	/**
-	 * sends the HTTP response
-	 *
-	 * @return $this
-	 */
-	public function send() {
-		if (!isset($this->headers['Content-Type'])) {
-			$this->setHeader('Content-Type', 'text/html; charset=' . $this->charset);
-		}
-		$this->outputHeader();
-		http_response_code($this->statusCode);
-		echo $this->body;
-		return $this;
-	}
-
-	/**
-	 * helper for easy testing
-	 */
-	public function stop() {
-		die();
-	}
-
-	/**
-	 * output all set response headers
-	 */
-	protected function outputHeader() {
-		foreach ($this->headers as $header) {
-			header($header);
-		}
-	}
+    /**
+     * @var string HTTP body
+     */
+    protected $body = '';
+
+    /**
+     * @var string charset
+     */
+    protected $charset = 'utf-8';
+
+    /**
+     * @var array HTTP-headers
+     */
+    protected $headers = [];
+
+    /**
+     * @var int HTTP status code
+     */
+    protected $statusCode = 200;
+
+    /**
+     * redirect to another URL
+     *
+     * @param string $url URL
+     * @param int $statusCode
+     */
+    public function redirect($url, $statusCode = 302) {
+        $this->setStatusCode($statusCode)
+            ->setHeader('Location', $url, true)
+            ->setBody('')
+            ->send()
+            ->stop();
+    }
+
+    /**
+     * set the response body
+     *
+     * @param $body
+     * @return $this
+     */
+    public function setBody($body) {
+        $this->body = $body;
+        return $this;
+    }
+
+    /**
+     * set the response character-set
+     *
+     * @param $charset
+     * @return $this
+     */
+    public function setCharset($charset) {
+        $this->charset = $charset;
+        return $this;
+    }
+
+    /**
+     * set a response HTTP-header
+     *
+     * @param string $key
+     * @param string $value
+     * @param bool $clear clear out any existing headers
+     * @return $this
+     */
+    public function setHeader($key, $value, $clear = false) {
+        if ($clear) {
+            $this->headers = [];
+        }
+        $this->headers[$key] = "$key: $value";
+        return $this;
+    }
+
+    /**
+     * set the response HTTP status code
+     *
+     * @param $code
+     * @return $this
+     */
+    public function setStatusCode($code) {
+        $this->statusCode = $code;
+        return $this;
+    }
+
+    /**
+     * sends the HTTP response
+     *
+     * @return $this
+     */
+    public function send() {
+        if (!isset($this->headers['Content-Type'])) {
+            $this->setHeader('Content-Type', 'text/html; charset=' . $this->charset);
+        }
+        $this->outputHeader();
+        http_response_code($this->statusCode);
+        echo $this->body;
+        return $this;
+    }
+
+    /**
+     * helper for easy testing
+     */
+    public function stop() {
+        die();
+    }
+
+    /**
+     * output all set response headers
+     */
+    protected function outputHeader() {
+        foreach ($this->headers as $header) {
+            header($header);
+        }
+    }
 
 }
 

lib/Phile/Core/ServiceLocator.php

Indentation +55 added lines, -55 removed lines

@@ -14,64 +14,64 @@
  * @package Phile\Core
  */
 class ServiceLocator {
-	/**
-	 * @var array of services
-	 */
-	protected static $services;
+    /**
+     * @var array of services
+     */
+    protected static $services;
 
-	/**
-	 * @var array $serviceMap for mapping speaking names/keys to the interfaces
-	 */
-	protected static $serviceMap = array(
-		'Phile_Cache'            => 'Phile\ServiceLocator\CacheInterface',
-		'Phile_Template'         => 'Phile\ServiceLocator\TemplateInterface',
-		'Phile_Parser'           => 'Phile\ServiceLocator\ParserInterface',
-		'Phile_Data_Persistence' => 'Phile\ServiceLocator\PersistenceInterface',
-		'Phile_Parser_Meta'      => 'Phile\ServiceLocator\MetaInterface',
-		'Phile_ErrorHandler'	 => 'Phile\ServiceLocator\ErrorHandlerInterface',
-	);
+    /**
+     * @var array $serviceMap for mapping speaking names/keys to the interfaces
+     */
+    protected static $serviceMap = array(
+        'Phile_Cache'            => 'Phile\ServiceLocator\CacheInterface',
+        'Phile_Template'         => 'Phile\ServiceLocator\TemplateInterface',
+        'Phile_Parser'           => 'Phile\ServiceLocator\ParserInterface',
+        'Phile_Data_Persistence' => 'Phile\ServiceLocator\PersistenceInterface',
+        'Phile_Parser_Meta'      => 'Phile\ServiceLocator\MetaInterface',
+        'Phile_ErrorHandler'	 => 'Phile\ServiceLocator\ErrorHandlerInterface',
+    );
 
-	/**
-	 * method to register a service
-	 *
-	 * @param string $serviceKey the key for the service
-	 * @param mixed  $object
-	 *
-	 * @throws ServiceLocatorException
-	 */
-	public static function registerService($serviceKey, $object) {
-		$interfaces = class_implements($object);
-		$interface  = self::$serviceMap[$serviceKey];
-		if ($interfaces === false || !in_array($interface, $interfaces)) {
-			throw new ServiceLocatorException("the object must implement the interface: '{$interface}'", 1398536617);
-		}
-		self::$services[$serviceKey] = $object;
-	}
+    /**
+     * method to register a service
+     *
+     * @param string $serviceKey the key for the service
+     * @param mixed  $object
+     *
+     * @throws ServiceLocatorException
+     */
+    public static function registerService($serviceKey, $object) {
+        $interfaces = class_implements($object);
+        $interface  = self::$serviceMap[$serviceKey];
+        if ($interfaces === false || !in_array($interface, $interfaces)) {
+            throw new ServiceLocatorException("the object must implement the interface: '{$interface}'", 1398536617);
+        }
+        self::$services[$serviceKey] = $object;
+    }
 
-	/**
-	 * checks if a service is registered
-	 *
-	 * @param string $serviceKey
-	 *
-	 * @return bool
-	 */
-	public static function hasService($serviceKey) {
-		return (isset(self::$services[$serviceKey]));
-	}
+    /**
+     * checks if a service is registered
+     *
+     * @param string $serviceKey
+     *
+     * @return bool
+     */
+    public static function hasService($serviceKey) {
+        return (isset(self::$services[$serviceKey]));
+    }
 
-	/**
-	 * returns a service
-	 *
-	 * @param string $serviceKey the service key
-	 *
-	 * @return mixed
-	 * @throws ServiceLocatorException
-	 */
-	public static function getService($serviceKey) {
-		if (!isset(self::$services[$serviceKey])) {
-			throw new ServiceLocatorException("the service '{$serviceKey}' is not registered", 1398536637);
-		}
+    /**
+     * returns a service
+     *
+     * @param string $serviceKey the service key
+     *
+     * @return mixed
+     * @throws ServiceLocatorException
+     */
+    public static function getService($serviceKey) {
+        if (!isset(self::$services[$serviceKey])) {
+            throw new ServiceLocatorException("the service '{$serviceKey}' is not registered", 1398536637);
+        }
 
-		return self::$services[$serviceKey];
-	}
+        return self::$services[$serviceKey];
+    }
 }