From ad26b7d3d12ee16ad3b68444a639a21d1138615e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 9 May 2013 14:26:14 +0400
Subject: [PATCH] Use Composer autoload to handle dependency class loading

---
 apps/bootstrap/index.php                   | 9 +++++++--
 framework/helpers/base/Markdown.php        | 1 -
 framework/helpers/base/Purifier.php        | 4 ----
 framework/renderers/SmartyViewRenderer.php | 6 ------
 framework/renderers/TwigViewRenderer.php   | 9 ---------
 5 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php
index e3188c1..d9aca6f 100644
--- a/apps/bootstrap/index.php
+++ b/apps/bootstrap/index.php
@@ -1,9 +1,14 @@
 <?php
-
+// Set to false to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../../framework/yii.php');
+$frameworkPath = __DIR__ . '/../../framework/';
+require($frameworkPath . 'yii.php');
 
 $config = require(__DIR__ . '/protected/config/main.php');
 $application = new yii\web\Application($config);
+
+// Register Composer autoloader
+@include $frameworkPath . '/vendor/autoload.php';
+
 $application->run();
diff --git a/framework/helpers/base/Markdown.php b/framework/helpers/base/Markdown.php
index 342c56b..1efdccb 100644
--- a/framework/helpers/base/Markdown.php
+++ b/framework/helpers/base/Markdown.php
@@ -7,7 +7,6 @@
 
 namespace yii\helpers\base;
 
-\Yii::setAlias('@Michelf', \Yii::getAlias('@yii/vendor/michelf/php-markdown/Michelf'));
 use Michelf\MarkdownExtra;
 
 /**
diff --git a/framework/helpers/base/Purifier.php b/framework/helpers/base/Purifier.php
index 1342374..2c5d334 100644
--- a/framework/helpers/base/Purifier.php
+++ b/framework/helpers/base/Purifier.php
@@ -6,10 +6,6 @@
  */
 namespace yii\helpers\base;
 
-if (!class_exists('HTMLPurifier_Bootstrap', false)) {
-	require_once(\Yii::getAlias('@yii/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php'));
-}
-
 /**
  * Purifier provides an ability to clean up HTML from any harmful code.
  *
diff --git a/framework/renderers/SmartyViewRenderer.php b/framework/renderers/SmartyViewRenderer.php
index cb82438..c6147c0 100644
--- a/framework/renderers/SmartyViewRenderer.php
+++ b/framework/renderers/SmartyViewRenderer.php
@@ -24,11 +24,6 @@ use yii\helpers\Html;
 class SmartyViewRenderer extends ViewRenderer
 {
 	/**
-	 * @var string the directory or path alias pointing to where Smarty code is located.
-	 */
-	public $smartyPath = '@yii/vendor/smarty/smarty/distribution/libs';
-
-	/**
 	 * @var string the directory or path alias pointing to where Smarty cache will be stored.
 	 */
 	public $cachePath = '@app/runtime/Smarty/cache';
@@ -45,7 +40,6 @@ class SmartyViewRenderer extends ViewRenderer
 
 	public function init()
 	{
-		require_once(Yii::getAlias($this->smartyPath) . '/Smarty.class.php');
 		$this->smarty = new Smarty();
 		$this->smarty->setCompileDir(Yii::getAlias($this->compilePath));
 		$this->smarty->setCacheDir(Yii::getAlias($this->cachePath));
diff --git a/framework/renderers/TwigViewRenderer.php b/framework/renderers/TwigViewRenderer.php
index d48dc5b..de561d3 100644
--- a/framework/renderers/TwigViewRenderer.php
+++ b/framework/renderers/TwigViewRenderer.php
@@ -23,11 +23,6 @@ use yii\helpers\Html;
 class TwigViewRenderer extends ViewRenderer
 {
 	/**
-	 * @var string the directory or path alias pointing to where Twig code is located.
-	 */
-	public $twigPath = '@yii/vendor/twig/twig/lib/Twig';
-
-	/**
 	 * @var string the directory or path alias pointing to where Twig cache will be stored.
 	 */
 	public $cachePath = '@app/runtime/Twig/cache';
@@ -45,10 +40,6 @@ class TwigViewRenderer extends ViewRenderer
 
 	public function init()
 	{
-		if (!isset(Yii::$aliases['@Twig'])) {
-			Yii::setAlias('@Twig', $this->twigPath);
-		}
-
 		$loader = new \Twig_Loader_String();
 
 		$this->twig = new \Twig_Environment($loader, array_merge(array(