From 2387e59c4e49cf8e3ab2b963002cf5268e360985 Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Thu, 9 May 2013 13:31:43 +0200 Subject: [PATCH] Renamed yii.php -> Yii.php for class, filename consitency See https://github.com/yiisoft/yii2/issues/123#issuecomment-17657374 Issue #123 --- apps/bootstrap/index.php | 2 +- build/build | 2 +- framework/Yii.php | 25 +++++++++++++++++++++++++ framework/yii.php | 25 ------------------------- framework/yiic.php | 2 +- tests/unit/bootstrap.php | 2 +- tests/web/app/index.php | 2 +- 7 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 framework/Yii.php delete mode 100644 framework/yii.php diff --git a/apps/bootstrap/index.php b/apps/bootstrap/index.php index d9aca6f..d4b447a 100644 --- a/apps/bootstrap/index.php +++ b/apps/bootstrap/index.php @@ -3,7 +3,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true); $frameworkPath = __DIR__ . '/../../framework/'; -require($frameworkPath . 'yii.php'); +require($frameworkPath . 'Yii.php'); $config = require(__DIR__ . '/protected/config/main.php'); $application = new yii\web\Application($config); diff --git a/build/build b/build/build index 691eba9..95b51e4 100755 --- a/build/build +++ b/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__; diff --git a/framework/Yii.php b/framework/Yii.php new file mode 100644 index 0000000..109e2fd --- /dev/null +++ b/framework/Yii.php @@ -0,0 +1,25 @@ + + * @since 2.0 + */ +class Yii extends \yii\YiiBase +{ +} + +spl_autoload_register(array('Yii', 'autoload')); diff --git a/framework/yii.php b/framework/yii.php deleted file mode 100644 index 109e2fd..0000000 --- a/framework/yii.php +++ /dev/null @@ -1,25 +0,0 @@ - - * @since 2.0 - */ -class Yii extends \yii\YiiBase -{ -} - -spl_autoload_register(array('Yii', 'autoload')); diff --git a/framework/yiic.php b/framework/yiic.php index 3872e2f..7cd0c40 100644 --- a/framework/yiic.php +++ b/framework/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', diff --git a/tests/unit/bootstrap.php b/tests/unit/bootstrap.php index 8290bbe..58a931b 100644 --- a/tests/unit/bootstrap.php +++ b/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__ . '/../../framework/Yii.php'); Yii::setAlias('@yiiunit', __DIR__); diff --git a/tests/web/app/index.php b/tests/web/app/index.php index 4cfa1ab..72d3189 100644 --- a/tests/web/app/index.php +++ b/tests/web/app/index.php @@ -1,6 +1,6 @@ run();