Merge branch 'master' of https://github.com/yiisoft/yii2 into auth-manager

.gitignore

@@ -13,4 +13,4 @@ nbproject
 Thumbs.db
 
 # composer vendor dir
-/framework/vendor
\ No newline at end of file
+/yii/vendor
\ No newline at end of file

apps/bootstrap/index.php

 <?php
-
+// comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../../framework/yii.php');
+$frameworkPath = __DIR__ . '/../../yii';
+
+require($frameworkPath . '/Yii.php');
+// Register Composer autoloader
+@include($frameworkPath . '/vendor/autoload.php');
 
 $config = require(__DIR__ . '/protected/config/main.php');
 $application = new yii\web\Application($config);

apps/bootstrap/protected/config/main.php

@@ -4,6 +4,11 @@ return array(
 	'id' => 'hello',
 	'basePath' => dirname(__DIR__),
 	'preload' => array('log'),
+	'modules' => array(
+		'debug' => array(
+			'class' => 'yii\debug\Module',
+		)
+	),
 	'components' => array(
 		'cache' => array(
 			'class' => 'yii\caching\FileCache',

apps/bootstrap/protected/controllers/SiteController.php

@@ -6,6 +6,15 @@ use app\models\ContactForm;
 
 class SiteController extends Controller
 {
+	public function actions()
+	{
+		return array(
+			'captcha' => array(
+				'class' => 'yii\web\CaptchaAction',
+			),
+		);
+	}
+
 	public function actionIndex()
 	{
 		echo $this->render('index');

apps/bootstrap/protected/models/ContactForm.php

@@ -26,7 +26,7 @@ class ContactForm extends Model
 			// email has to be a valid email address
 			array('email', 'email'),
 			// verifyCode needs to be entered correctly
-			//array('verifyCode', 'captcha', 'allowEmpty' => !Captcha::checkRequirements()),
+			array('verifyCode', 'captcha'),
 		);
 	}
 

apps/bootstrap/protected/views/layouts/main.php

@@ -58,6 +58,7 @@ $this->registerAssetBundle('app');
 	</div>
 	<?php $this->endBody(); ?>
 </div>
+<?php $this->widget('yii\debug\Toolbar'); ?>
 </body>
 </html>
 <?php $this->endPage(); ?>

apps/bootstrap/protected/views/site/contact.php

 <?php
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\widgets\Captcha;
 
 /**
  * @var yii\base\View $this
@@ -30,6 +31,15 @@ $this->params['breadcrumbs'][] = $this->title;
 	<?php echo $form->field($model, 'email')->textInput(); ?>
 	<?php echo $form->field($model, 'subject')->textInput(); ?>
 	<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
+	<?php
+		$field = $form->field($model, 'verifyCode');
+		echo $field->begin();
+		echo $field->label();
+		$this->widget(Captcha::className());
+		echo Html::activeTextInput($model, 'verifyCode', array('class' => 'input-medium'));
+		echo $field->error();
+		echo $field->end();
+	?>
 	<div class="form-actions">
 		<?php echo Html::submitButton('Submit', null, null, array('class' => 'btn btn-primary')); ?>
 	</div>

build/build

@@ -11,7 +11,7 @@
 // fcgi doesn't have STDIN defined by default
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 
-require(__DIR__ . '/../framework/yii.php');
+require(__DIR__ . '/../framework/Yii.php');
 
 $id = 'yiic-build';
 $basePath = __DIR__;

composer.json

@@ -64,10 +64,10 @@
 		"source": "https://github.com/yiisoft/yii2"
 	},
 	"config": {
-		"vendor-dir": "framework/vendor"
+		"vendor-dir": "yii/vendor"
 	},
 	"bin": [
-		"framework/yiic"
+		"yii/yiic"
 	],
 	"require": {
 		"php": ">=5.3.0",

tests/unit/DatabaseTestCase.php

+<?php
+
+namespace yiiunit;
+
+class DatabaseTestCase extends TestCase
+{
+    protected $database;
+    protected $driverName = 'mysql';
+    protected $db;
+
+    protected function setUp()
+    {
+        $databases = $this->getParam('databases');
+        $this->database = $databases[$this->driverName];
+        $pdo_database = 'pdo_'.$this->driverName;
+
+        if (!extension_loaded('pdo') || !extension_loaded($pdo_database)) {
+            $this->markTestSkipped('pdo and pdo_'.$pdo_database.' extension are required.');
+        }
+    }
+
+    /**
+     * @param bool $reset whether to clean up the test database
+     * @param bool $open whether to open and populate test database
+     * @return \yii\db\Connection
+     */
+    public function getConnection($reset = true, $open = true)
+    {
+        if (!$reset && $this->db) {
+            return $this->db;
+        }
+        $db = new \yii\db\Connection;
+        $db->dsn = $this->database['dsn'];
+        if (isset($this->database['username'])) {
+            $db->username = $this->database['username'];
+            $db->password = $this->database['password'];
+        }
+        if ($open) {
+            $db->open();
+            $lines = explode(';', file_get_contents($this->database['fixture']));
+            foreach ($lines as $line) {
+                if (trim($line) !== '') {
+                    $db->pdo->exec($line);
+                }
+            }
+        }
+        $this->db = $db;
+        return $db;
+    }
+}

tests/unit/bootstrap.php

@@ -5,7 +5,7 @@ define('YII_DEBUG', true);
 $_SERVER['SCRIPT_NAME'] = '/' . __DIR__;
 $_SERVER['SCRIPT_FILENAME'] = __FILE__;
 
-require_once(__DIR__ . '/../../framework/yii.php');
+require_once(__DIR__ . '/../../yii/Yii.php');
 
 Yii::setAlias('@yiiunit', __DIR__);
 

tests/unit/data/config.php

 <?php
 
 return array(
-	'mysql' => array(
-		'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
-		'username' => 'travis',
-		'password' => '',
-		'fixture' => __DIR__ . '/mysql.sql',
-	),
+    'databases' => array(
+        'mysql' => array(
+            'dsn' => 'mysql:host=127.0.0.1;dbname=yiitest',
+            'username' => 'travis',
+            'password' => '',
+            'fixture' => __DIR__ . '/mysql.sql',
+        ),
+        'sqlite' => array(
+            'dsn' => 'sqlite::memory:',
+            'fixture' => __DIR__ . '/sqlite.sql',
+        ),
+    )
 );

tests/unit/data/mysql.sql

 /**
  * This is the database schema for testing MySQL support of Yii DAO and Active Record.
- * The following database setup is required to perform then relevant tests:
- * Database name: yiitest
- * username: test
- * password: test
- * charset: utf8
+ * The database setup in config.php is required to perform then relevant tests:
  */
 
 DROP TABLE IF EXISTS tbl_order_item CASCADE;

tests/unit/framework/YiiBaseTest.php

@@ -47,7 +47,6 @@ class YiiBaseTest extends TestCase
 
 	public function testGetVersion()
 	{
-		echo Yii::getVersion();
 		$this->assertTrue((boolean)preg_match('~\d+\.\d+(?:\.\d+)?(?:-\w+)?~', \Yii::getVersion()));
 	}
 

tests/unit/framework/caching/DbCacheTest.php

@@ -35,7 +35,8 @@ class DbCacheTest extends CacheTest
 	function getConnection($reset = true)
 	{
 		if($this->_connection === null) {
-			$params = $this->getParam('mysql');
+			$databases = $this->getParam('databases');
+            $params = $databases['mysql'];
 			$db = new \yii\db\Connection;
 			$db->dsn = $params['dsn'];
 			$db->username = $params['username'];

tests/unit/framework/db/ActiveRecordTest.php

@@ -10,10 +10,11 @@ use yiiunit\data\ar\OrderItem;
 use yiiunit\data\ar\Order;
 use yiiunit\data\ar\Item;
 
-class ActiveRecordTest extends \yiiunit\MysqlTestCase
+class ActiveRecordTest extends \yiiunit\DatabaseTestCase
 {
 	public function setUp()
 	{
+        parent::setUp();
 		ActiveRecord::$db = $this->getConnection();
 	}
 

tests/unit/framework/db/CommandTest.php

@@ -7,7 +7,7 @@ use yii\db\Command;
 use yii\db\Query;
 use yii\db\DataReader;
 
-class CommandTest extends \yiiunit\MysqlTestCase
+class CommandTest extends \yiiunit\DatabaseTestCase
 {
 	function testConstruct()
 	{

tests/unit/framework/db/ConnectionTest.php

@@ -4,12 +4,12 @@ namespace yiiunit\framework\db;
 
 use yii\db\Connection;
 
-class ConnectionTest extends \yiiunit\MysqlTestCase
+class ConnectionTest extends \yiiunit\DatabaseTestCase
 {
 	function testConstruct()
 	{
 		$connection = $this->getConnection(false);
-		$params = $this->getParam('mysql');
+		$params = $this->database;
 
 		$this->assertEquals($params['dsn'], $connection->dsn);
 		$this->assertEquals($params['username'], $connection->username);
@@ -18,7 +18,7 @@ class ConnectionTest extends \yiiunit\MysqlTestCase
 
 	function testOpenClose()
 	{
-		$connection = $this->getConnection(false);
+		$connection = $this->getConnection(false, false);
 
 		$this->assertFalse($connection->isActive);
 		$this->assertEquals(null, $connection->pdo);
@@ -39,9 +39,8 @@ class ConnectionTest extends \yiiunit\MysqlTestCase
 
 	function testGetDriverName()
 	{
-		$connection = $this->getConnection(false);
-		$this->assertEquals('mysql', $connection->driverName);
-		$this->assertFalse($connection->isActive);
+		$connection = $this->getConnection(false, false);
+		$this->assertEquals($this->driverName, $connection->driverName);
 	}
 
 	function testQuoteValue()

tests/unit/framework/db/QueryTest.php

@@ -7,7 +7,7 @@ use yii\db\Command;
 use yii\db\Query;
 use yii\db\DataReader;
 
-class QueryTest extends \yiiunit\MysqlTestCase
+class QueryTest extends \yiiunit\DatabaseTestCase
 {
 	function testSelect()
 	{

tests/unit/framework/db/sqlite/SqliteActiveRecordTest.php

+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+class SqliteActiveRecordTest extends \yiiunit\framework\db\ActiveRecordTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+}

tests/unit/framework/db/sqlite/SqliteCommandTest.php

+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+class SqliteCommandTest extends \yiiunit\framework\db\CommandTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+
+    function testAutoQuoting()
+    {
+        $db = $this->getConnection(false);
+
+        $sql = 'SELECT [[id]], [[t.name]] FROM {{tbl_customer}} t';
+        $command = $db->createCommand($sql);
+        $this->assertEquals("SELECT \"id\", 't'.\"name\" FROM 'tbl_customer' t", $command->sql);
+    }
+}

tests/unit/framework/db/sqlite/SqliteConnectionTest.php

+<?php
+
+namespace yiiunit\framework\db\sqlite;
+
+class SqliteConnectionTest extends \yiiunit\framework\db\ConnectionTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+
+    function testConstruct()
+    {
+        $connection = $this->getConnection(false);
+        $params = $this->database;
+
+        $this->assertEquals($params['dsn'], $connection->dsn);
+    }
+
+    function testQuoteValue()
+    {
+        $connection = $this->getConnection(false);
+        $this->assertEquals(123, $connection->quoteValue(123));
+        $this->assertEquals("'string'", $connection->quoteValue('string'));
+        $this->assertEquals("'It''s interesting'", $connection->quoteValue("It's interesting"));
+    }
+
+    function testQuoteTableName()
+    {
+        $connection = $this->getConnection(false);
+        $this->assertEquals("'table'", $connection->quoteTableName('table'));
+        $this->assertEquals("'schema'.'table'", $connection->quoteTableName('schema.table'));
+        $this->assertEquals('{{table}}', $connection->quoteTableName('{{table}}'));
+        $this->assertEquals('(table)', $connection->quoteTableName('(table)'));
+    }
+
+    function testQuoteColumnName()
+    {
+        $connection = $this->getConnection(false);
+        $this->assertEquals('"column"', $connection->quoteColumnName('column'));
+        $this->assertEquals("'table'.\"column\"", $connection->quoteColumnName('table.column'));
+        $this->assertEquals('[[column]]', $connection->quoteColumnName('[[column]]'));
+        $this->assertEquals('{{column}}', $connection->quoteColumnName('{{column}}'));
+        $this->assertEquals('(column)', $connection->quoteColumnName('(column)'));
+    }
+}

tests/unit/framework/db/sqlite/SqliteQueryTest.php

+<?php
+/**
+ * Created by JetBrains PhpStorm.
+ * User: RusMaxim
+ * Date: 09.05.13
+ * Time: 21:41
+ * To change this template use File | Settings | File Templates.
+ */
+
+namespace yiiunit\framework\db\sqlite;
+
+
+class SqliteQueryTest extends \yiiunit\framework\db\QueryTest
+{
+    public function setUp()
+    {
+        $this->driverName = 'sqlite';
+        parent::setUp();
+    }
+}

tests/unit/framework/helpers/ArrayHelperTest.php

@@ -12,6 +12,16 @@ class ArrayHelperTest extends \yii\test\TestCase
 
 	}
 
+	public function testRemove()
+	{
+		$array = array('name' => 'b', 'age' => 3);
+		$name = ArrayHelper::remove($array, 'name');
+
+		$this->assertEquals($name, 'b');
+		$this->assertEquals($array, array('age' => 3));
+	}
+
+
 	public function testMultisort()
 	{
 		// single key

tests/unit/framework/helpers/StringHelperTest.php

@@ -70,4 +70,48 @@ class StringHelperTest extends \yii\test\TestCase
 		$this->assertEquals('PostTag', StringHelper::id2camel('post-tag'));
 		$this->assertEquals('PostTag', StringHelper::id2camel('post_tag', '_'));
 	}
+
+	public function testBasename()
+	{
+		$this->assertEquals('', StringHelper::basename(''));
+
+		$this->assertEquals('file', StringHelper::basename('file'));
+		$this->assertEquals('file.test', StringHelper::basename('file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('/file'));
+		$this->assertEquals('file.test', StringHelper::basename('/file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('/file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('/path/to/file'));
+		$this->assertEquals('file.test', StringHelper::basename('/path/to/file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('/path/to/file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('\file'));
+		$this->assertEquals('file.test', StringHelper::basename('\file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('\file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('C:\file'));
+		$this->assertEquals('file.test', StringHelper::basename('C:\file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('C:\file.test', '.test'));
+
+		$this->assertEquals('file', StringHelper::basename('C:\path\to\file'));
+		$this->assertEquals('file.test', StringHelper::basename('C:\path\to\file.test', '.test2'));
+		$this->assertEquals('file', StringHelper::basename('C:\path\to\file.test', '.test'));
+
+		// mixed paths
+		$this->assertEquals('file.test', StringHelper::basename('/path\to/file.test'));
+		$this->assertEquals('file.test', StringHelper::basename('/path/to\file.test'));
+		$this->assertEquals('file.test', StringHelper::basename('\path/to\file.test'));
+
+		// \ and / in suffix
+		$this->assertEquals('file', StringHelper::basename('/path/to/filete/st', 'te/st'));
+		$this->assertEquals('st', StringHelper::basename('/path/to/filete/st', 'te\st'));
+		$this->assertEquals('file', StringHelper::basename('/path/to/filete\st', 'te\st'));
+		$this->assertEquals('st', StringHelper::basename('/path/to/filete\st', 'te/st'));
+
+		// http://www.php.net/manual/en/function.basename.php#72254
+		$this->assertEquals('foo', StringHelper::basename('/bar/foo/'));
+		$this->assertEquals('foo', StringHelper::basename('\\bar\\foo\\'));
+	}
 }

tests/web/app/index.php

 <?php
 
-require(__DIR__ . '/../../../framework/yii.php');
+require(__DIR__ . '/../../../yii/Yii.php');
 
 $application = new yii\web\Application('test', __DIR__ . '/protected');
 $application->run();

framework/YiiBase.php → yii/YiiBase.php

@@ -158,8 +158,8 @@ class YiiBase
 	{
 		foreach ($namespaces as $name => $path) {
 			if ($name !== '') {
-				$name = '@' . str_replace('\\', '/', $name);
-				static::setAlias($name, $path);
+				$name = trim(strtr($name, array('\\' => '/', '_' => '/')), '/');
+				static::setAlias('@' . $name, rtrim($path, '/\\') . '/' . $name);
 			}
 		}
 	}
@@ -370,7 +370,8 @@ class YiiBase
 
 		include($classFile);
 
-		if (class_exists($className, false) || interface_exists($className, false)) {
+		if (class_exists($className, false) || interface_exists($className, false) ||
+			function_exists('trait_exists') && trait_exists($className, false)) {
 			return true;
 		} else {
 			throw new UnknownClassException("Unable to find '$className' in file: $classFile");

framework/assets.php → yii/assets.php

@@ -28,4 +28,18 @@ return array(
 		),
 		'depends' => array('yii', 'yii/validation'),
 	),
+	'yii/captcha' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.captcha.js',
+		),
+		'depends' => array('yii'),
+	),
+	'yii/debug' => array(
+		'sourcePath' => __DIR__ . '/assets',
+		'js' => array(
+			'yii.debug.js',
+		),
+		'depends' => array('yii'),
+	),
 );

framework/assets/yii.activeForm.js → yii/assets/yii.activeForm.js

@@ -116,8 +116,8 @@
 			});
 		},
 
-		options: function() {
-			return this.data('yiiActiveForm').settings;
+		data: function() {
+			return this.data('yiiActiveForm');
 		},
 
 		submitForm: function () {
@@ -384,4 +384,4 @@
 		}
 	};
 
-})(window.jQuery);
\ No newline at end of file
+})(window.jQuery);

yii/assets/yii.captcha.js

+/**
+ * Yii Captcha widget.
+ *
+ * This is the JavaScript widget used by the yii\widgets\Captcha widget.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+(function ($) {
+	$.fn.yiiCaptcha = function (method) {
+		if (methods[method]) {
+			return methods[method].apply(this, Array.prototype.slice.call(arguments, 1));
+		} else if (typeof method === 'object' || !method) {
+			return methods.init.apply(this, arguments);
+		} else {
+			$.error('Method ' + method + ' does not exist on jQuery.yiiCaptcha');
+			return false;
+		}
+	};
+
+	var defaults = {
+		refreshUrl: undefined,
+		hashKey: undefined
+	};
+
+	var methods = {
+		init: function (options) {
+			return this.each(function () {
+				var $e = $(this);
+				var settings = $.extend({}, defaults, options || {});
+				$e.data('yiiCaptcha', {
+					settings: settings
+				});
+
+				$e.on('click.yiiCaptcha', function() {
+					methods.refresh.apply($e);
+					return false;
+				});
+
+			});
+		},
+
+		refresh: function () {
+			var $e = this,
+				settings = this.data('yiiCaptcha').settings;
+			$.ajax({
+				url: $e.data('yiiCaptcha').settings.refreshUrl,
+				dataType: 'json',
+				cache: false,
+				success: function(data) {
+					$e.attr('src', data['url']);
+					$('body').data(settings.hashKey, [data['hash1'], data['hash2']]);
+				}
+			});
+		},
+
+		destroy: function () {
+			return this.each(function () {
+				$(window).unbind('.yiiCaptcha');
+				$(this).removeData('yiiCaptcha');
+			});
+		},
+
+		data: function() {
+			return this.data('yiiCaptcha');
+		}
+	};
+})(window.jQuery);
+

yii/assets/yii.debug.js

+/**
+ * Yii debug module.
+ *
+ * This JavaScript module provides the functions needed by the Yii debug toolbar.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ * @author Qiang Xue <qiang.xue@gmail.com>
+ * @since 2.0
+ */
+
+yii.debug = (function ($) {
+	return {
+		load: function (id, url) {
+			$.ajax({
+				url: url,
+				//dataType: 'json',
+				success: function(data) {
+					var $e = $('#' + id);
+					$e.html(data);
+				}
+			});
+		}
+	};
+})(jQuery);

framework/assets/yii.validation.js → yii/assets/yii.validation.js

 /**
  * Yii validation module.
  *
- * This JavaScript module provides the validation methods for the built-in validaotrs.
+ * This JavaScript module provides the validation methods for the built-in validators.
  *
  * @link http://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC

framework/base/Controller.php → yii/base/Controller.php

@@ -203,7 +203,7 @@ class Controller extends Component
 	public function forward($route, $params = array())
 	{
 		$status = $this->run($route, $params);
-		exit($status);
+		Yii::$app->end($status);
 	}
 
 	/**

framework/base/View.php → yii/base/View.php

@@ -23,6 +23,14 @@ use yii\helpers\Html;
 class View extends Component
 {
 	/**
+	 * @event ViewEvent an event that is triggered by [[beginPage()]].
+	 */
+	const EVENT_BEGIN_PAGE = 'beginPage';
+	/**
+	 * @event ViewEvent an event that is triggered by [[endPage()]].
+	 */
+	const EVENT_END_PAGE = 'endPage';
+	/**
 	 * @event ViewEvent an event that is triggered by [[renderFile()]] right before it renders a view file.
 	 */
 	const EVENT_BEFORE_RENDER = 'beforeRender';
@@ -555,6 +563,8 @@ class View extends Component
 	{
 		ob_start();
 		ob_implicit_flush(false);
+
+		$this->trigger(self::EVENT_BEGIN_PAGE);
 	}
 
 	/**
@@ -562,6 +572,8 @@ class View extends Component
 	 */
 	public function endPage()
 	{
+		$this->trigger(self::EVENT_END_PAGE);
+
 		$content = ob_get_clean();
 		echo strtr($content, array(
 			self::PL_HEAD => $this->renderHeadHtml(),