Dev Updated to Yii Framework 1.1.14

jlpoolen · Oct 22, 2013 · 77f2eea · 77f2eea
1 parent b60b74b
commit 77f2eea
Show file tree

Hide file tree

Showing 1,094 changed files with 13,527 additions and 5,914 deletions.
diff --git a/framework/CHANGELOG b/framework/CHANGELOG
diff --git a/framework/LICENSE b/framework/LICENSE
@@ -1,7 +1,7 @@
 The Yii framework is free software. It is released under the terms of
 the following BSD License.
 
-Copyright © 2008-2011 by Yii Software LLC (http://www.yiisoft.com)
+Copyright (c) 2008-2013 by Yii Software LLC (http://www.yiisoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/framework/UPGRADE b/framework/UPGRADE
diff --git a/framework/YiiBase.php b/framework/YiiBase.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  * @package system
  * @since 1.0
@@ -80,7 +80,7 @@ class YiiBase
 	 */
 	public static function getVersion()
 	{
-		return '1.1.13';
+		return '1.1.14';
 	}
 
 	/**
@@ -287,8 +287,14 @@ public static function import($alias,$forceInclude=false)
 				return $alias;
 			}
 			else
-				throw new CException(Yii::t('yii','Alias "{alias}" is invalid. Make sure it points to an existing directory.',
-					array('{alias}'=>$namespace)));
+			{
+				// try to autoload the class with an autoloader
+				if (class_exists($alias,true))
+					return self::$_imports[$alias]=$alias;
+				else
+					throw new CException(Yii::t('yii','Alias "{alias}" is invalid. Make sure it points to an existing directory or file.',
+						array('{alias}'=>$namespace)));
+			}
 		}
 
 		if(($pos=strrpos($alias,'.'))===false)  // a simple class name
@@ -612,6 +618,9 @@ public static function t($category,$message,$params=array(),$source=null,$langua
 	 * any other existing autoloaders.
 	 * @param callback $callback a valid PHP callback (function name or array($className,$methodName)).
 	 * @param boolean $append whether to append the new autoloader after the default Yii autoloader.
+	 * Be careful using this option as it will disable {@link enableIncludePath autoloading via include path}
+	 * when set to true. After this the Yii autoloader can not rely on loading classes via simple include anymore
+	 * and you have to {@link import} all classes explicitly.
 	 */
 	public static function registerAutoloader($callback, $append=false)
 	{
@@ -656,6 +665,7 @@ public static function registerAutoloader($callback, $append=false)
 		'CEAcceleratorCache' => '/caching/CEAcceleratorCache.php',
 		'CFileCache' => '/caching/CFileCache.php',
 		'CMemCache' => '/caching/CMemCache.php',
+		'CRedisCache' => '/caching/CRedisCache.php',
 		'CWinCache' => '/caching/CWinCache.php',
 		'CXCache' => '/caching/CXCache.php',
 		'CZendDataCache' => '/caching/CZendDataCache.php',
@@ -714,6 +724,7 @@ public static function registerAutoloader($callback, $append=false)
 		'COciSchema' => '/db/schema/oci/COciSchema.php',
 		'COciTableSchema' => '/db/schema/oci/COciTableSchema.php',
 		'CPgsqlColumnSchema' => '/db/schema/pgsql/CPgsqlColumnSchema.php',
+		'CPgsqlCommandBuilder' => '/db/schema/pgsql/CPgsqlCommandBuilder.php',
 		'CPgsqlSchema' => '/db/schema/pgsql/CPgsqlSchema.php',
 		'CPgsqlTableSchema' => '/db/schema/pgsql/CPgsqlTableSchema.php',
 		'CSqliteColumnSchema' => '/db/schema/sqlite/CSqliteColumnSchema.php',
@@ -743,7 +754,9 @@ public static function registerAutoloader($callback, $append=false)
 		'CDateTimeParser' => '/utils/CDateTimeParser.php',
 		'CFileHelper' => '/utils/CFileHelper.php',
 		'CFormatter' => '/utils/CFormatter.php',
+		'CLocalizedFormatter' => '/utils/CLocalizedFormatter.php',
 		'CMarkdownParser' => '/utils/CMarkdownParser.php',
+		'CPasswordHelper' => '/utils/CPasswordHelper.php',
 		'CPropertyValue' => '/utils/CPropertyValue.php',
 		'CTimestamp' => '/utils/CTimestamp.php',
 		'CVarDumper' => '/utils/CVarDumper.php',

diff --git a/framework/base/CApplication.php b/framework/base/CApplication.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
@@ -140,7 +140,18 @@ public function __construct($config=null)
 			$this->setBasePath('protected');
 		Yii::setPathOfAlias('application',$this->getBasePath());
 		Yii::setPathOfAlias('webroot',dirname($_SERVER['SCRIPT_FILENAME']));
-		Yii::setPathOfAlias('ext',$this->getBasePath().DIRECTORY_SEPARATOR.'extensions');
+		if(isset($config['extensionPath']))
+		{
+			$this->setExtensionPath($config['extensionPath']);
+			unset($config['extensionPath']);
+		}
+		else
+			Yii::setPathOfAlias('ext',$this->getBasePath().DIRECTORY_SEPARATOR.'extensions');
+		if(isset($config['aliases']))
+		{
+			$this->setAliases($config['aliases']);
+			unset($config['aliases']);
+		}
 
 		$this->preinit();
 
@@ -292,6 +303,7 @@ public function getExtensionPath()
 	/**
 	 * Sets the root directory that holds all third-party extensions.
 	 * @param string $path the directory that contains all third-party extensions.
+	 * @throws CException if the directory does not exist
 	 */
 	public function setExtensionPath($path)
 	{

diff --git a/framework/base/CApplicationComponent.php b/framework/base/CApplicationComponent.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
@@ -47,7 +47,7 @@ public function init()
 	}
 
 	/**
-	 * Checks if this application component bas been initialized.
+	 * Checks if this application component has been initialized.
 	 * @return boolean whether this application component has been initialized (ie, {@link init()} is invoked).
 	 */
 	public function getIsInitialized()

diff --git a/framework/base/CBehavior.php b/framework/base/CBehavior.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CComponent.php b/framework/base/CComponent.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
@@ -248,6 +248,7 @@ public function __unset($name)
 	 * to implement the behavior feature.
 	 * @param string $name the method name
 	 * @param array $parameters method parameters
+	 * @throws CException if current class and its behaviors do not have a method or closure with the given name
 	 * @return mixed the method return value
 	 */
 	public function __call($name,$parameters)
@@ -318,6 +319,8 @@ public function detachBehaviors()
 	 * @param string $name the behavior's name. It should uniquely identify this behavior.
 	 * @param mixed $behavior the behavior configuration. This is passed as the first
 	 * parameter to {@link YiiBase::createComponent} to create the behavior object.
+	 * You can also pass an already created behavior instance (the new behavior will replace an already created
+	 * behavior with the same name, if it exists).
 	 * @return IBehavior the behavior object
 	 */
 	public function attachBehavior($name,$behavior)
@@ -593,6 +596,9 @@ public function raiseEvent($name,$event)
 	 * that can be directly accessed in the expression. See {@link http://us.php.net/manual/en/function.extract.php PHP extract}
 	 * for more details. In the expression, the component object can be accessed using $this.
 	 *
+	 * A PHP expression can be any PHP code that has a value. To learn more about what an expression is,
+	 * please refer to the {@link http://www.php.net/manual/en/language.expressions.php php manual}.
+	 *
 	 * @param mixed $_expression_ a PHP expression or PHP callback to be evaluated.
 	 * @param array $_data_ additional parameters to be passed to the above expression/callback.
 	 * @return mixed the expression result

diff --git a/framework/base/CErrorEvent.php b/framework/base/CErrorEvent.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CErrorHandler.php b/framework/base/CErrorHandler.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CException.php b/framework/base/CException.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CExceptionEvent.php b/framework/base/CExceptionEvent.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CHttpException.php b/framework/base/CHttpException.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CModel.php b/framework/base/CModel.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 
@@ -275,6 +275,7 @@ public function getValidators($attribute=null)
 	/**
 	 * Creates validator objects based on the specification in {@link rules}.
 	 * This method is mainly used internally.
+	 * @throws CException if current class has an invalid validation rule
 	 * @return CList validators built based on {@link rules()}.
 	 */
 	public function createValidators()

diff --git a/framework/base/CModelBehavior.php b/framework/base/CModelBehavior.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CModelEvent.php b/framework/base/CModelEvent.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */
 

diff --git a/framework/base/CModule.php b/framework/base/CModule.php
@@ -4,7 +4,7 @@
  *
  * @author Qiang Xue <[email protected]>
  * @link http://www.yiiframework.com/
- * @copyright Copyright &copy; 2008-2011 Yii Software LLC
+ * @copyright 2008-2013 Yii Software LLC
  * @license http://www.yiiframework.com/license/
  */