From 2c5098860f4a6d79be9838c622318f6d6a18aedd Mon Sep 17 00:00:00 2001 From: Carsten Brandt Date: Sun, 18 Aug 2013 19:40:51 +0200 Subject: [PATCH] sort classmap alphabetically to avoid producing different results on different file systems -> better diffs --- build/controllers/ClassmapController.php | 3 ++- framework/yii/classes.php | 39 ++++++++++++-------------------- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/build/controllers/ClassmapController.php b/build/controllers/ClassmapController.php index a0599a3..2a0483c 100644 --- a/build/controllers/ClassmapController.php +++ b/build/controllers/ClassmapController.php @@ -59,8 +59,9 @@ class ClassmapController extends Controller die("Something wrong: $file\n"); } $path = str_replace('\\', '/', substr($file, strlen($root))); - $map[] = "\t'yii" . substr(str_replace('/', '\\', $path), 0, -4) . "' => YII_PATH . '$path',"; + $map[$path] = "\t'yii" . substr(str_replace('/', '\\', $path), 0, -4) . "' => YII_PATH . '$path',"; } + ksort($map); $map = implode("\n", $map); $output = << YII_PATH . '/base/Request.php', 'yii\base\Response' => YII_PATH . '/base/Response.php', 'yii\base\Theme' => YII_PATH . '/base/Theme.php', + 'yii\base\UnknownClassException' => YII_PATH . '/base/UnknownClassException.php', 'yii\base\UnknownMethodException' => YII_PATH . '/base/UnknownMethodException.php', 'yii\base\UnknownPropertyException' => YII_PATH . '/base/UnknownPropertyException.php', 'yii\base\UserException' => YII_PATH . '/base/UserException.php', @@ -45,34 +46,21 @@ return array( 'yii\base\ViewRenderer' => YII_PATH . '/base/ViewRenderer.php', 'yii\base\Widget' => YII_PATH . '/base/Widget.php', 'yii\behaviors\AutoTimestamp' => YII_PATH . '/behaviors/AutoTimestamp.php', - 'yii\bootstrap\AffixAsset' => YII_PATH . '/bootstrap/AffixAsset.php', 'yii\bootstrap\Alert' => YII_PATH . '/bootstrap/Alert.php', - 'yii\bootstrap\AlertAsset' => YII_PATH . '/bootstrap/AlertAsset.php', 'yii\bootstrap\BootstrapAsset' => YII_PATH . '/bootstrap/BootstrapAsset.php', + 'yii\bootstrap\BootstrapPluginAsset' => YII_PATH . '/bootstrap/BootstrapPluginAsset.php', 'yii\bootstrap\Button' => YII_PATH . '/bootstrap/Button.php', - 'yii\bootstrap\ButtonAsset' => YII_PATH . '/bootstrap/ButtonAsset.php', 'yii\bootstrap\ButtonDropdown' => YII_PATH . '/bootstrap/ButtonDropdown.php', 'yii\bootstrap\ButtonGroup' => YII_PATH . '/bootstrap/ButtonGroup.php', 'yii\bootstrap\Carousel' => YII_PATH . '/bootstrap/Carousel.php', - 'yii\bootstrap\CarouselAsset' => YII_PATH . '/bootstrap/CarouselAsset.php', 'yii\bootstrap\Collapse' => YII_PATH . '/bootstrap/Collapse.php', - 'yii\bootstrap\CollapseAsset' => YII_PATH . '/bootstrap/CollapseAsset.php', 'yii\bootstrap\Dropdown' => YII_PATH . '/bootstrap/Dropdown.php', - 'yii\bootstrap\DropdownAsset' => YII_PATH . '/bootstrap/DropdownAsset.php', 'yii\bootstrap\Modal' => YII_PATH . '/bootstrap/Modal.php', - 'yii\bootstrap\ModalAsset' => YII_PATH . '/bootstrap/ModalAsset.php', 'yii\bootstrap\Nav' => YII_PATH . '/bootstrap/Nav.php', 'yii\bootstrap\NavBar' => YII_PATH . '/bootstrap/NavBar.php', - 'yii\bootstrap\PopoverAsset' => YII_PATH . '/bootstrap/PopoverAsset.php', 'yii\bootstrap\Progress' => YII_PATH . '/bootstrap/Progress.php', - 'yii\bootstrap\ResponsiveAsset' => YII_PATH . '/bootstrap/ResponsiveAsset.php', - 'yii\bootstrap\ScrollspyAsset' => YII_PATH . '/bootstrap/ScrollspyAsset.php', - 'yii\bootstrap\TabAsset' => YII_PATH . '/bootstrap/TabAsset.php', 'yii\bootstrap\Tabs' => YII_PATH . '/bootstrap/Tabs.php', - 'yii\bootstrap\TooltipAsset' => YII_PATH . '/bootstrap/TooltipAsset.php', - 'yii\bootstrap\TransitionAsset' => YII_PATH . '/bootstrap/TransitionAsset.php', 'yii\bootstrap\Typeahead' => YII_PATH . '/bootstrap/Typeahead.php', - 'yii\bootstrap\TypeaheadAsset' => YII_PATH . '/bootstrap/TypeaheadAsset.php', 'yii\bootstrap\Widget' => YII_PATH . '/bootstrap/Widget.php', 'yii\caching\ApcCache' => YII_PATH . '/caching/ApcCache.php', 'yii\caching\Cache' => YII_PATH . '/caching/Cache.php', @@ -110,6 +98,12 @@ return array( 'yii\db\Exception' => YII_PATH . '/db/Exception.php', 'yii\db\Expression' => YII_PATH . '/db/Expression.php', 'yii\db\Migration' => YII_PATH . '/db/Migration.php', + 'yii\db\Query' => YII_PATH . '/db/Query.php', + 'yii\db\QueryBuilder' => YII_PATH . '/db/QueryBuilder.php', + 'yii\db\Schema' => YII_PATH . '/db/Schema.php', + 'yii\db\StaleObjectException' => YII_PATH . '/db/StaleObjectException.php', + 'yii\db\TableSchema' => YII_PATH . '/db/TableSchema.php', + 'yii\db\Transaction' => YII_PATH . '/db/Transaction.php', 'yii\db\mssql\PDO' => YII_PATH . '/db/mssql/PDO.php', 'yii\db\mssql\QueryBuilder' => YII_PATH . '/db/mssql/QueryBuilder.php', 'yii\db\mssql\Schema' => YII_PATH . '/db/mssql/Schema.php', @@ -118,14 +112,14 @@ return array( 'yii\db\mysql\Schema' => YII_PATH . '/db/mysql/Schema.php', 'yii\db\pgsql\QueryBuilder' => YII_PATH . '/db/pgsql/QueryBuilder.php', 'yii\db\pgsql\Schema' => YII_PATH . '/db/pgsql/Schema.php', - 'yii\db\Query' => YII_PATH . '/db/Query.php', - 'yii\db\QueryBuilder' => YII_PATH . '/db/QueryBuilder.php', - 'yii\db\Schema' => YII_PATH . '/db/Schema.php', 'yii\db\sqlite\QueryBuilder' => YII_PATH . '/db/sqlite/QueryBuilder.php', 'yii\db\sqlite\Schema' => YII_PATH . '/db/sqlite/Schema.php', - 'yii\db\StaleObjectException' => YII_PATH . '/db/StaleObjectException.php', - 'yii\db\TableSchema' => YII_PATH . '/db/TableSchema.php', - 'yii\db\Transaction' => YII_PATH . '/db/Transaction.php', + 'yii\grid\CheckboxColumn' => YII_PATH . '/grid/CheckboxColumn.php', + 'yii\grid\Column' => YII_PATH . '/grid/Column.php', + 'yii\grid\DataColumn' => YII_PATH . '/grid/DataColumn.php', + 'yii\grid\GridView' => YII_PATH . '/grid/GridView.php', + 'yii\grid\GridViewAsset' => YII_PATH . '/grid/GridViewAsset.php', + 'yii\grid\SerialColumn' => YII_PATH . '/grid/SerialColumn.php', 'yii\helpers\ArrayHelper' => YII_PATH . '/helpers/ArrayHelper.php', 'yii\helpers\ArrayHelperBase' => YII_PATH . '/helpers/ArrayHelperBase.php', 'yii\helpers\Console' => YII_PATH . '/helpers/Console.php', @@ -199,6 +193,7 @@ return array( 'yii\web\Cookie' => YII_PATH . '/web/Cookie.php', 'yii\web\CookieCollection' => YII_PATH . '/web/CookieCollection.php', 'yii\web\DbSession' => YII_PATH . '/web/DbSession.php', + 'yii\web\ErrorAction' => YII_PATH . '/web/ErrorAction.php', 'yii\web\HeaderCollection' => YII_PATH . '/web/HeaderCollection.php', 'yii\web\HttpCache' => YII_PATH . '/web/HttpCache.php', 'yii\web\HttpException' => YII_PATH . '/web/HttpException.php', @@ -229,10 +224,6 @@ return array( 'yii\widgets\ContentDecorator' => YII_PATH . '/widgets/ContentDecorator.php', 'yii\widgets\DetailView' => YII_PATH . '/widgets/DetailView.php', 'yii\widgets\FragmentCache' => YII_PATH . '/widgets/FragmentCache.php', - 'yii\grid\CheckboxColumn' => YII_PATH . '/grid/CheckboxColumn.php', - 'yii\grid\Column' => YII_PATH . '/grid/Column.php', - 'yii\grid\DataColumn' => YII_PATH . '/grid/DataColumn.php', - 'yii\grid\GridView' => YII_PATH . '/grid/GridView.php', 'yii\widgets\InputWidget' => YII_PATH . '/widgets/InputWidget.php', 'yii\widgets\LinkPager' => YII_PATH . '/widgets/LinkPager.php', 'yii\widgets\LinkSorter' => YII_PATH . '/widgets/LinkSorter.php',