Skip to content

Commit ab47d58

Browse files
qiangxueqiangxue
committed
path fixes.
1 parent 0c38655 commit ab47d58

File tree

32 files changed

+50
-50
lines changed

32 files changed

+50
-50
lines changed

Diff for: ‎apps/advanced/environments/dev/backend/web/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
defined('YII_ENV') or define('YII_ENV', 'dev');
44

55
require(__DIR__ . '/../../vendor/autoload.php');
6-
require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
6+
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
77

88
$config = yii\helpers\ArrayHelper::merge(
99
require(__DIR__ . '/../config/main.php'),

Diff for: ‎apps/advanced/environments/dev/frontend/web/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
defined('YII_ENV') or define('YII_ENV', 'dev');
44

55
require(__DIR__ . '/../../vendor/autoload.php');
6-
require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
6+
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
77

88
$config = yii\helpers\ArrayHelper::merge(
99
require(__DIR__ . '/../config/main.php'),

Diff for: ‎apps/advanced/environments/dev/yii

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defined('YII_ENV') or define('YII_ENV', 'dev');
1515
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
1616

1717
require(__DIR__ . '/vendor/autoload.php');
18-
require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php');
18+
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
1919

2020
$config = yii\helpers\ArrayHelper::merge(
2121
require(__DIR__ . '/console/config/main.php'),

Diff for: ‎apps/advanced/environments/prod/backend/web/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
defined('YII_ENV') or define('YII_ENV', 'prod');
44

55
require(__DIR__ . '/../../vendor/autoload.php');
6-
require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
6+
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
77

88
$config = yii\helpers\ArrayHelper::merge(
99
require(__DIR__ . '/../config/main.php'),

Diff for: ‎apps/advanced/environments/prod/frontend/web/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
defined('YII_ENV') or define('YII_ENV', 'prod');
44

55
require(__DIR__ . '/../../vendor/autoload.php');
6-
require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
6+
require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
77

88
$config = yii\helpers\ArrayHelper::merge(
99
require(__DIR__ . '/../config/main.php'),

Diff for: ‎apps/advanced/environments/prod/yii

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defined('YII_ENV') or define('YII_ENV', 'prod');
1515
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
1616

1717
require(__DIR__ . '/vendor/autoload.php');
18-
require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php');
18+
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
1919

2020
$config = yii\helpers\ArrayHelper::merge(
2121
require(__DIR__ . '/console/config/main.php'),

Diff for: ‎apps/basic/tests/_bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
require_once(__DIR__ . '/../vendor/autoload.php');
1515

16-
require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
16+
require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
1717

1818
// set correct script paths
1919
$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;

Diff for: ‎apps/basic/web/index-test.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
defined('YII_ENV') or define('YII_ENV', 'test');
1010

1111
require(__DIR__ . '/../vendor/autoload.php');
12-
require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
12+
require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
1313

1414
$config = require(__DIR__ . '/../tests/acceptance/_config.php');
1515

Diff for: ‎apps/basic/web/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
defined('YII_ENV') or define('YII_ENV', 'dev');
66

77
require(__DIR__ . '/../vendor/autoload.php');
8-
require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
8+
require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
99

1010
$config = require(__DIR__ . '/../config/web.php');
1111

Diff for: ‎apps/basic/yii

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
1414
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
1515

1616
require(__DIR__ . '/vendor/autoload.php');
17-
require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php');
17+
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
1818

1919
$config = require(__DIR__ . '/config/console.php');
2020

Diff for: ‎apps/benchmark/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
defined('YII_DEBUG') or define('YII_DEBUG', false);
44

5-
require(__DIR__ . '/protected/vendor/yiisoft/yii2/yii/Yii.php');
5+
require(__DIR__ . '/protected/vendor/yiisoft/yii2/Yii.php');
66

77
$config = [
88
'id' => 'benchmark',

Diff for: ‎build/build

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
1313

1414
define('YII_DEBUG', true);
1515

16-
require(__DIR__ . '/../framework/yii/Yii.php');
16+
require(__DIR__ . '/../framework/Yii.php');
1717

1818
$application = new yii\console\Application([
1919
'id' => 'yii-build',

Diff for: ‎build/controllers/PhpDocController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function actionProperty($root = null)
4444
$except = [];
4545
if ($root === null) {
4646
$root = dirname(dirname(YII_PATH));
47-
$extensionPath = "$root/extensions/yii";
47+
$extensionPath = "$root/extensions";
4848
foreach (scandir($extensionPath) as $extension) {
4949
if (ctype_alpha($extension) && is_dir($extensionPath . '/' . $extension)) {
5050
Yii::setAlias("@yii/$extension", "$extensionPath/$extension");
@@ -55,7 +55,7 @@ public function actionProperty($root = null)
5555
'/apps/',
5656
'/build/',
5757
'/docs/',
58-
'/extensions/yii/composer/',
58+
'/extensions/composer/',
5959
'/tests/',
6060
'/vendor/',
6161
];

Diff for: ‎docs/guide/authorization.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Storing RBAC hierarchy in database is less efficient performancewise but is much
206206
a good management UI for it so in case you need permissions structure that is managed by end user DB is your choice.
207207

208208
In order to get started you need to configure database connection in `db` component. After it is done [get `schema-*.sql`
209-
file for your database](https://github.com/yiisoft/yii2/tree/master/framework/yii/rbac) and execute it.
209+
file for your database](https://github.com/yiisoft/yii2/tree/master/framework/rbac) and execute it.
210210

211211
Next step is to configure `authManager` application component in application config file (`web.php` or `main.php`
212212
depending on template you've used):

Diff for: ‎docs/guide/console-fixture.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ Auto-generating fixtures
112112

113113
Yii also can auto-generate fixtures for you based on some template. You can generate your fixtures with different data on different languages and formats.
114114
These feature is done by [Faker](https://github.com/fzaninotto/Faker) library and `yii2-faker` extension.
115-
See extension [guide](https://github.com/yiisoft/yii2/tree/master/extensions/yii/faker) for more docs.
115+
See extension [guide](https://github.com/yiisoft/yii2/tree/master/extensions/faker) for more docs.

Diff for: ‎docs/guide/console.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
4545
defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
4646

4747
require(__DIR__ . '/vendor/autoload.php');
48-
require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php');
48+
require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
4949

5050
$config = require(__DIR__ . '/config/console.php');
5151

Diff for: ‎docs/internals/translations.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ that are actually visible to end user such as validation errors.
1212

1313
In order to start with message translation:
1414

15-
1. Check `framework/yii/messages/config.php` and make sure your language is listed in `languages`.
16-
2. Go to `framework/yii` and run `yii message/extract messages/config.php`.
17-
3. Translate messages in `framework/yii/messages/your_language/yii.php`. Make sure file is saved using UTF-8 encoding.
15+
1. Check `framework/messages/config.php` and make sure your language is listed in `languages`.
16+
2. Go to `framework` and run `yii message/extract messages/config.php`.
17+
3. Translate messages in `framework/messages/your_language/yii.php`. Make sure file is saved using UTF-8 encoding.
1818
4. [Make a pull request](https://github.com/yiisoft/yii2/blob/master/docs/internals/git-workflow.md).
1919

2020
In order to keep your translation up to date you may run `yii message/extract messages/config.php` again. It will

Diff for: ‎extensions/apidoc/apidoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ $yiiDirs = [
2626
__DIR__ . '/../../../../yiisoft/yii2', // script is installed as a composer binary
2727
];
2828
foreach($yiiDirs as $dir) {
29-
if (file_exists($dir . '/yii/Yii.php')) {
30-
require($dir . '/yii/Yii.php');
29+
if (file_exists($dir . '/Yii.php')) {
30+
require($dir . '/Yii.php');
3131
break;
3232
}
3333
}

Diff for: ‎extensions/composer/Installer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ protected function linkBaseYiiFiles()
203203
* @license http://www.yiiframework.com/license/
204204
*/
205205
206-
return require(__DIR__ . '/../../yii2-dev/framework/yii/$file');
206+
return require(__DIR__ . '/../../yii2-dev/framework/$file');
207207
208208
EOF
209209
);

Diff for: ‎phpunit.xml.dist

+14-14
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
</testsuites>
1313
<filter>
1414
<blacklist>
15-
<file>framework/yii/helpers/Json.php</file>
16-
<file>framework/yii/helpers/StringHelper.php</file>
17-
<file>framework/yii/helpers/VarDumper.php</file>
18-
<file>framework/yii/helpers/Html.php</file>
19-
<file>framework/yii/helpers/Inflector.php</file>
20-
<file>framework/yii/helpers/FileHelper.php</file>
21-
<file>framework/yii/helpers/ArrayHelper.php</file>
22-
<file>framework/yii/helpers/Console.php</file>
23-
<file>framework/yii/i18n/GettextFile.php</file>
24-
<file>framework/yii/web/ResponseFormatterInterface.php</file>
25-
<directory suffix="Exception.php">framework/yii/base</directory>
26-
<directory suffix=".php">framework/yii/db/mssql</directory>
27-
<directory suffix=".php">framework/yii/bootstrap</directory>
15+
<file>framework/helpers/Json.php</file>
16+
<file>framework/helpers/StringHelper.php</file>
17+
<file>framework/helpers/VarDumper.php</file>
18+
<file>framework/helpers/Html.php</file>
19+
<file>framework/helpers/Inflector.php</file>
20+
<file>framework/helpers/FileHelper.php</file>
21+
<file>framework/helpers/ArrayHelper.php</file>
22+
<file>framework/helpers/Console.php</file>
23+
<file>framework/i18n/GettextFile.php</file>
24+
<file>framework/web/ResponseFormatterInterface.php</file>
25+
<directory suffix="Exception.php">framework/base</directory>
26+
<directory suffix=".php">framework/db/mssql</directory>
27+
<directory suffix=".php">framework/bootstrap</directory>
2828
</blacklist>
2929
</filter>
30-
</phpunit>
30+
</phpunit>

Diff for: ‎tests/unit/bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
if (is_file($composerAutoload)) {
1414
require_once($composerAutoload);
1515
}
16-
require_once(__DIR__ . '/../../framework/yii/Yii.php');
16+
require_once(__DIR__ . '/../../framework/Yii.php');
1717

1818
Yii::setAlias('@yiiunit', __DIR__);
1919

Diff for: ‎tests/unit/extensions/authclient/TestCase.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class TestCase extends \yiiunit\TestCase
1717
public static function loadClassMap()
1818
{
1919
$baseNameSpace = 'yii/authclient';
20-
$basePath = realpath(__DIR__. '/../../../../extensions/yii/authclient');
20+
$basePath = realpath(__DIR__. '/../../../../extensions/authclient');
2121
$files = FileHelper::findFiles($basePath);
2222
foreach ($files as $file) {
2323
$classRelativePath = str_replace($basePath, '', $file);
@@ -27,4 +27,4 @@ public static function loadClassMap()
2727
}
2828
}
2929

30-
TestCase::loadClassMap();
30+
TestCase::loadClassMap();

Diff for: ‎tests/unit/extensions/elasticsearch/ElasticSearchTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use yii\elasticsearch\Connection;
77
use yiiunit\TestCase;
88

9-
Yii::setAlias('@yii/elasticsearch', __DIR__ . '/../../../../extensions/yii/elasticsearch');
9+
Yii::setAlias('@yii/elasticsearch', __DIR__ . '/../../../../extensions/elasticsearch');
1010

1111
/**
1212
* ElasticSearchTestCase is the base class for all elasticsearch related test cases

Diff for: ‎tests/unit/extensions/imagine/AbstractImageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Imagine\Image\Point;
77
use yiiunit\VendorTestCase;
88

9-
Yii::setAlias('@yii/imagine', __DIR__ . '/../../../../extensions/yii/imagine');
9+
Yii::setAlias('@yii/imagine', __DIR__ . '/../../../../extensions/imagine');
1010

1111
abstract class AbstractImageTest extends VendorTestCase
1212
{

Diff for: ‎tests/unit/extensions/mongodb/MongoDbTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function tearDown()
5757
protected static function loadClassMap()
5858
{
5959
$baseNameSpace = 'yii/mongodb';
60-
$basePath = realpath(__DIR__. '/../../../../extensions/yii/mongodb');
60+
$basePath = realpath(__DIR__. '/../../../../extensions/mongodb');
6161
$files = FileHelper::findFiles($basePath);
6262
foreach ($files as $file) {
6363
$classRelativePath = str_replace($basePath, '', $file);

Diff for: ‎tests/unit/extensions/redis/RedisCacheTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use yii\redis\Connection;
77
use yiiunit\framework\caching\CacheTestCase;
88

9-
Yii::setAlias('@yii/redis', __DIR__ . '/../../../../extensions/yii/redis');
9+
Yii::setAlias('@yii/redis', __DIR__ . '/../../../../extensions/redis');
1010

1111
/**
1212
* Class for testing redis cache backend

Diff for: ‎tests/unit/extensions/redis/RedisTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use yii\redis\Connection;
77
use yiiunit\TestCase;
88

9-
Yii::setAlias('@yii/redis', __DIR__ . '/../../../../extensions/yii/redis');
9+
Yii::setAlias('@yii/redis', __DIR__ . '/../../../../extensions/redis');
1010

1111
/**
1212
* RedisTestCase is the base class for all redis related test cases

Diff for: ‎tests/unit/extensions/sphinx/SphinxTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ protected function tearDown()
7272
protected static function loadClassMap()
7373
{
7474
$baseNameSpace = 'yii/sphinx';
75-
$basePath = realpath(__DIR__. '/../../../../extensions/yii/sphinx');
75+
$basePath = realpath(__DIR__. '/../../../../extensions/sphinx');
7676
$files = FileHelper::findFiles($basePath);
7777
foreach ($files as $file) {
7878
$classRelativePath = str_replace($basePath, '', $file);

Diff for: ‎tests/unit/extensions/swiftmailer/MailerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use yii\swiftmailer\Mailer;
77
use yiiunit\VendorTestCase;
88

9-
Yii::setAlias('@yii/swiftmailer', __DIR__ . '/../../../../extensions/yii/swiftmailer');
9+
Yii::setAlias('@yii/swiftmailer', __DIR__ . '/../../../../extensions/swiftmailer');
1010

1111
/**
1212
* @group vendor

Diff for: ‎tests/unit/extensions/swiftmailer/MessageTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use yii\swiftmailer\Message;
99
use yiiunit\VendorTestCase;
1010

11-
Yii::setAlias('@yii/swiftmailer', __DIR__ . '/../../../../extensions/yii/swiftmailer');
11+
Yii::setAlias('@yii/swiftmailer', __DIR__ . '/../../../../extensions/swiftmailer');
1212

1313
/**
1414
* @group vendor

Diff for: ‎tests/unit/framework/requirements/YiiRequirementCheckerTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
require_once(__DIR__.'/../../../../framework/yii/requirements/YiiRequirementChecker.php');
3+
require_once(__DIR__.'/../../../../framework/requirements/YiiRequirementChecker.php');
44

55
use yiiunit\TestCase;
66

Diff for: ‎tests/web/app/index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
require(__DIR__ . '/../../../framework/yii/Yii.php');
3+
require(__DIR__ . '/../../../framework/Yii.php');
44

55
$application = new yii\web\Application('test', __DIR__ . '/protected');
66
$application->run();

0 commit comments

Comments
 (0)