Merge branch 'develop' into feature/move-nav-gen-to-plugin

hassankhan · Feb 12, 2014 · c8bb483 · c8bb483
2 parents 42945a8 + 1fe621b
commit c8bb483
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 61 deletions.
diff --git a/library/Zepto/FileLoader.php b/library/Zepto/FileLoader.php
@@ -8,7 +8,7 @@
  * @package    Zepto
  * @subpackage FileLoader
  * @author     Hassan Khan <contact@hassankhan.me>
- * @link       http://https://github.com/hassankhan/Zepto
+ * @link       https://github.com/hassankhan/Zepto
  * @license    MIT
  * @since      0.2
  */

diff --git a/library/Zepto/FileLoader/PluginLoader.php b/library/Zepto/FileLoader/PluginLoader.php
@@ -8,8 +8,8 @@
  * @package    Zepto
  * @subpackage FileLoader
  * @author     Hassan Khan <contact@hassankhan.me>
- * @link       http://https://github.com/hassankhan/Zepto
- * @license    http://opensource.org/licenses/MIT
+ * @link       https://github.com/hassankhan/Zepto
+ * @license    MIT
  * @since      0.2
  */
 class PluginLoader extends \Zepto\FileLoader {

diff --git a/library/Zepto/FileWriter.php b/library/Zepto/FileWriter.php
@@ -1,16 +1,17 @@
 <?php
 
+namespace Zepto;
+
 /**
  * FileWriter
  *
- * @author Hassan Khan
- * @link http://https://github.com/hassankhan/Zepto
- * @license http://opensource.org/licenses/MIT
- * @version 0.5
+ * @package    Zepto
+ * @subpackage FileWriter
+ * @author     Hassan Khan <contact@hassankhan.me>
+ * @link       https://github.com/hassankhan/Zepto
+ * @license    MIT
+ * @since      0.5
  */
-
-namespace Zepto;
-
 class FileWriter {
 
     /**

diff --git a/library/Zepto/FileWriter/MarkdownWriter.php b/library/Zepto/FileWriter/MarkdownWriter.php
@@ -1,16 +1,17 @@
 <?php
 
+namespace Zepto\FileWriter;
+
 /**
  * MarkdownWriter
  *
- * @author Hassan Khan
- * @link http://https://github.com/hassankhan/Zepto
- * @license http://opensource.org/licenses/MIT
- * @version 0.5
+ * @package    Zepto
+ * @subpackage MarkdownWriter
+ * @author     Hassan Khan <contact@hassankhan.me>
+ * @link       https://github.com/hassankhan/Zepto
+ * @license    MIT
+ * @since      0.5
  */
-
-namespace Zepto\FileWriter;
-
 class MarkdownWriter extends \Zepto\FileWriter {
 
     public function __construct()

diff --git a/library/Zepto/PluginInterface.php b/library/Zepto/PluginInterface.php
@@ -1,16 +1,17 @@
 <?php
 
+namespace Zepto;
+
 /**
- * Zepto
+ * PluginInterface
  *
- * @author Hassan Khan
- * @link http://https://github.com/hassankhan/Zepto
- * @license http://opensource.org/licenses/MIT
- * @version 0.2
+ * @package    Zepto
+ * @subpackage PluginInterface
+ * @author     Hassan Khan <contact@hassankhan.me>
+ * @link       https://github.com/hassankhan/Zepto
+ * @license    MIT
+ * @since      0.2
  */
-
-namespace Zepto;
-
 interface PluginInterface {
 
     public function after_plugins_load();

diff --git a/library/Zepto/Route.php b/library/Zepto/Route.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Zepto;
+
 /**
  * Route
  *
@@ -9,20 +11,10 @@
  * @package    Zepto
  * @subpackage Route
  * @author     Hassan Khan <contact@hassankhan.me>
+ * @link       https://github.com/hassankhan/Zepto
  * @license    MIT
+ * @since      0.6
  */
-
-/**
- * Zepto Route Class
- *
- * This is the Zepto URL Route, which contains the logic to respond to a request.
- * The router determines if the matched URL is for this route and executes its callback.
- *
- * @since 0.6
- */
-
-namespace Zepto;
-
 class Route
 {
 

diff --git a/library/Zepto/Router.php b/library/Zepto/Router.php
@@ -56,7 +56,7 @@
  * @subpackage Router
  * @author     Brandon Wamboldt <brandon.wamboldt@gmail.com>
  * @author     Hassan Khan <contact@hassankhan.me>
- * @link       http://https://github.com/hassankhan/Zepto
+ * @link       https://github.com/hassankhan/Zepto
  * @license    MIT
  * @since      0.2
  */

diff --git a/library/Zepto/Zepto.php b/library/Zepto/Zepto.php
@@ -1,31 +1,26 @@
 <?php
 
-/**
- * Zepto
- *
- * @author Hassan Khan
- * @link http://https://github.com/hassankhan/Zepto
- * @license http://opensource.org/licenses/MIT
- * @version 0.2
- */
-
 namespace Zepto;
 
-// Define constant for root directory
-defined('ROOT_DIR')
-    || define('ROOT_DIR', realpath(getcwd()) . '/');
-
 use Pimple;
 use Whoops;
 use Michelf\MarkdownExtra;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-
+/**
+ * Zepto
+ *
+ * @package    Zepto
+ * @subpackage Zepto
+ * @author     Hassan Khan <contact@hassankhan.me>
+ * @link       https://github.com/hassankhan/Zepto
+ * @license    MIT
+ * @since      0.2
+ */
 class Zepto {
 
     /**
-     *
      * Current application version
      */
     const VERSION = '0.6';
@@ -230,15 +225,8 @@ public function run_hooks($hook_id, $args = array())
     protected function load_plugins()
     {
         if ($this->app['plugins_enabled'] === true) {
-            $plugin_loader = $this->app['plugin_loader'];
-
             // Load plugins from 'plugins' folder
-            try {
-                $this->app['plugins'] = $plugin_loader->load_dir();
-            }
-            catch (\Exception $e) {
-                $this->app['router']->error($e);
-            }
+            $this->app['plugins'] = $this->app['plugin_loader']->load_dir();
         }
         $this->run_hooks('after_plugins_load');
     }