Merge branch 'master' of git://github.com/yiisoft/yii2 into 196-add-popvalue-method

.gitignore

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

apps/bootstrap/index.php

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

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/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/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/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/db/ActiveRecord.php → yii/db/ActiveRecord.php

@@ -252,7 +252,7 @@ class ActiveRecord extends Model
 	 */
 	public static function tableName()
 	{
-		return 'tbl_' . StringHelper::camel2id(basename(get_called_class()), '_');
+		return 'tbl_' . StringHelper::camel2id(StringHelper::basename(get_called_class()), '_');
 	}
 
 	/**

framework/helpers/base/StringHelper.php → yii/helpers/base/StringHelper.php

@@ -44,6 +44,29 @@ class StringHelper
 	}
 
 	/**
+	 * Returns the trailing name component of a path.
+	 * This method does the same as the php function basename() except that it will
+	 * always use \ and / as directory separators, independent of the operating system.
+	 * Note: basename() operates naively on the input string, and is not aware of the
+	 * actual filesystem, or path components such as "..".
+	 * @param string $path A path string.
+	 * @param string $suffix If the name component ends in suffix this will also be cut off.
+	 * @return string the trailing name component of the given path.
+	 * @see http://www.php.net/manual/en/function.basename.php
+	 */
+	public static function basename($path, $suffix = '')
+	{
+		if (($len = mb_strlen($suffix)) > 0 && mb_substr($path, -$len) == $suffix) {
+			$path = mb_substr($path, 0, -$len);
+		}
+		$path = rtrim(str_replace('\\', '/', $path), '/\\');
+		if (($pos = mb_strrpos($path, '/')) !== false) {
+			return mb_substr($path, $pos + 1);
+		}
+		return $path;
+	}
+
+	/**
 	 * Converts a word to its plural form.
 	 * Note that this is for English only!
 	 * For example, 'apple' will become 'apples', and 'child' will become 'children'.

framework/web/Request.php → yii/web/Request.php

@@ -69,8 +69,8 @@ class Request extends \yii\base\Request
 		$result = Yii::$app->getUrlManager()->parseRequest($this);
 		if ($result !== false) {
 			list ($route, $params) = $result;
-			$params = array_merge($_GET, $params);
-			return array($route, $params);
+			$_GET = array_merge($_GET, $params);
+			return array($route, $_GET);
 		} else {
 			throw new HttpException(404, Yii::t('yii|Page not found.'));
 		}

framework/yiic.php → yii/yiic.php

@@ -12,7 +12,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 // fcgi doesn't have STDIN defined by default
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 
-require(__DIR__ . '/yii.php');
+require(__DIR__ . '/Yii.php');
 
 $application = new yii\console\Application(array(
 	'id' => 'yiic',