Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixes #1212.

  • Loading branch information...
commit b37498daeb7e47969ec7fce9de84333d43aaccae 1 parent ddd5cf8
@resurtm authored
Showing with 12 additions and 7 deletions.
  1. +2 −1  build/tasks/YiiInitTask.php
  2. +2 −1  framework/YiiBase.php
  3. +5 −5 framework/cli/commands/WebAppCommand.php
  4. 0  framework/cli/views/webapp/{protected/runtime/git.gitignore → assets/git-gitignore}
  5. 0  framework/cli/views/webapp/{themes/classic/views/system/hg.hgkeep → assets/hg-hgkeep}
  6. 0  framework/cli/views/webapp/assets/hg.hgkeep
  7. +1 −0  framework/cli/views/webapp/{hg.hgignore → hg-hgignore}
  8. 0  framework/cli/views/webapp/{themes/classic/views/system/git.gitkeep → images/git-gitkeep}
  9. 0  framework/cli/views/webapp/{themes/classic/views/site/hg.hgkeep → images/hg-hgkeep}
  10. 0  framework/cli/views/webapp/{themes/classic/views/site/git.gitkeep → protected/commands/shell/git-gitkeep}
  11. 0  framework/cli/views/webapp/{themes/classic/views/layouts/hg.hgkeep → protected/commands/shell/hg-hgkeep}
  12. 0  framework/cli/views/webapp/{themes/classic/views/layouts/git.gitkeep → protected/extensions/git-gitkeep}
  13. 0  framework/cli/views/webapp/protected/{tests/unit/hg.hgkeep → extensions/hg-hgkeep}
  14. 0  framework/cli/views/webapp/protected/{tests/unit/git.gitkeep → messages/git-gitkeep}
  15. 0  framework/cli/views/webapp/protected/{tests/report/hg.hgkeep → messages/hg-hgkeep}
  16. 0  framework/cli/views/webapp/protected/{tests/report/git.gitkeep → migrations/git-gitkeep}
  17. 0  framework/cli/views/webapp/protected/{tests/fixtures/hg.hgkeep → migrations/hg-hgkeep}
  18. 0  framework/cli/views/webapp/{assets/git.gitignore → protected/runtime/git-gitignore}
  19. 0  framework/cli/views/webapp/protected/{tests/fixtures/git.gitkeep → runtime/hg-hgkeep}
  20. 0  framework/cli/views/webapp/protected/{runtime/hg.hgkeep → tests/fixtures/git-gitkeep}
  21. 0  framework/cli/views/webapp/protected/{migrations/hg.hgkeep → tests/fixtures/hg-hgkeep}
  22. +2 −0  framework/cli/views/webapp/protected/tests/report/git-gitignore
  23. 0  framework/cli/views/webapp/protected/{migrations/git.gitkeep → tests/report/hg-hgkeep}
  24. 0  framework/cli/views/webapp/protected/{messages/hg.hgkeep → tests/unit/git-gitkeep}
  25. 0  framework/cli/views/webapp/protected/{messages/git.gitkeep → tests/unit/hg-hgkeep}
  26. 0  framework/cli/views/webapp/{protected/extensions/hg.hgkeep → themes/classic/views/layouts/git-gitkeep}
  27. 0  framework/cli/views/webapp/{protected/extensions/git.gitkeep → themes/classic/views/layouts/hg-hgkeep}
  28. 0  framework/cli/views/webapp/{protected/commands/shell/hg.hgkeep → themes/classic/views/site/git-gitkeep}
  29. 0  framework/cli/views/webapp/{protected/commands/shell/git.gitkeep → themes/classic/views/site/hg-hgkeep}
  30. 0  framework/cli/views/webapp/{images/hg.hgkeep → themes/classic/views/system/git-gitkeep}
  31. 0  framework/cli/views/webapp/{images/git.gitkeep → themes/classic/views/system/hg-hgkeep}
View
3  build/tasks/YiiInitTask.php
@@ -33,7 +33,8 @@ class YiiInitTask extends PropertyTask
public function main()
{
$this->addProperty('yii.version',$this->getYiiVersion());
- $this->addProperty('yii.revision',$this->getYiiRevision());
+// $this->addProperty('yii.revision',$this->getYiiRevision());
+ $this->addProperty('yii.revision','unknown');
$this->addProperty('yii.winbuild', substr(PHP_OS, 0, 3) == 'WIN' ? 'true' : 'false');
$this->addProperty('yii.release',$this->getYiiRelease());
$this->addProperty('yii.date',date('M j, Y'));
View
3  framework/YiiBase.php
@@ -702,8 +702,8 @@ public static function registerAutoloader($callback, $append=false)
'CMssqlColumnSchema' => '/db/schema/mssql/CMssqlColumnSchema.php',
'CMssqlCommandBuilder' => '/db/schema/mssql/CMssqlCommandBuilder.php',
'CMssqlPdoAdapter' => '/db/schema/mssql/CMssqlPdoAdapter.php',
- 'CMssqlSqlsrvPdoAdapter' => '/db/schema/mssql/CMssqlSqlsrvPdoAdapter.php',
'CMssqlSchema' => '/db/schema/mssql/CMssqlSchema.php',
+ 'CMssqlSqlsrvPdoAdapter' => '/db/schema/mssql/CMssqlSqlsrvPdoAdapter.php',
'CMssqlTableSchema' => '/db/schema/mssql/CMssqlTableSchema.php',
'CMysqlColumnSchema' => '/db/schema/mysql/CMysqlColumnSchema.php',
'CMysqlCommandBuilder' => '/db/schema/mysql/CMysqlCommandBuilder.php',
@@ -730,6 +730,7 @@ public static function registerAutoloader($callback, $append=false)
'CGettextFile' => '/i18n/gettext/CGettextFile.php',
'CGettextMoFile' => '/i18n/gettext/CGettextMoFile.php',
'CGettextPoFile' => '/i18n/gettext/CGettextPoFile.php',
+ 'CCombinedLogFilter' => '/logging/CCombinedLogFilter.php',
'CDbLogRoute' => '/logging/CDbLogRoute.php',
'CEmailLogRoute' => '/logging/CEmailLogRoute.php',
'CFileLogRoute' => '/logging/CFileLogRoute.php',
View
10 framework/cli/commands/WebAppCommand.php
@@ -77,16 +77,16 @@ public function run($args)
switch($vcs)
{
case 'git':
- $renameMap=array('git.gitignore'=>'.gitignore','git.gitkeep'=>'.gitkeep'); // move with rename git files
- $ignoreFiles=array('hg.hgignore','hg.hgkeep'); // ignore only hg files
+ $renameMap=array('git-gitignore'=>'.gitignore','git-gitkeep'=>'.gitkeep'); // move with rename git files
+ $ignoreFiles=array('hg-hgignore','hg-hgkeep'); // ignore only hg files
break;
case 'hg':
- $renameMap=array('hg.hgignore'=>'.hgignore','hg.hgkeep'=>'.hgkeep'); // move with rename hg files
- $ignoreFiles=array('git.gitignore','git.gitkeep'); // ignore only git files
+ $renameMap=array('hg-hgignore'=>'.hgignore','hg-hgkeep'=>'.hgkeep'); // move with rename hg files
+ $ignoreFiles=array('git-gitignore','git-gitkeep'); // ignore only git files
break;
default:
// no files for renaming
- $ignoreFiles=array('git.gitignore','git.gitkeep','hg.hgignore','hg.hgkeep'); // ignore both git and hg files
+ $ignoreFiles=array('git-gitignore','git-gitkeep','hg-hgignore','hg-hgkeep'); // ignore both git and hg files
break;
}
$list=$this->buildFileList($sourceDir,$path,'',$ignoreFiles,$renameMap);
View
0  .../cli/views/webapp/protected/runtime/git.gitignore → framework/cli/views/webapp/assets/git-gitignore
File renamed without changes
View
0  ...iews/webapp/themes/classic/views/system/hg.hgkeep → framework/cli/views/webapp/assets/hg-hgkeep
File renamed without changes
View
0  framework/cli/views/webapp/assets/hg.hgkeep
No changes.
View
1  framework/cli/views/webapp/hg.hgignore → framework/cli/views/webapp/hg-hgignore
@@ -4,3 +4,4 @@ syntax: regexp
# ignore all except .hgkeep
assets/(?!.*\.hgkeep$).+
protected/runtime/(?!.*\.hgkeep$).+
+protected/tests/report/(?!.*\.hgkeep$).+
View
0  ...ws/webapp/themes/classic/views/system/git.gitkeep → framework/cli/views/webapp/images/git-gitkeep
File renamed without changes
View
0  .../views/webapp/themes/classic/views/site/hg.hgkeep → framework/cli/views/webapp/images/hg-hgkeep
File renamed without changes
View
0  ...iews/webapp/themes/classic/views/site/git.gitkeep → ...views/webapp/protected/commands/shell/git-gitkeep
File renamed without changes
View
0  ...ews/webapp/themes/classic/views/layouts/hg.hgkeep → ...i/views/webapp/protected/commands/shell/hg-hgkeep
File renamed without changes
View
0  ...s/webapp/themes/classic/views/layouts/git.gitkeep → ...cli/views/webapp/protected/extensions/git-gitkeep
File renamed without changes
View
0  ...k/cli/views/webapp/protected/tests/unit/hg.hgkeep → ...k/cli/views/webapp/protected/extensions/hg-hgkeep
File renamed without changes
View
0  ...cli/views/webapp/protected/tests/unit/git.gitkeep → ...k/cli/views/webapp/protected/messages/git-gitkeep
File renamed without changes
View
0  ...cli/views/webapp/protected/tests/report/hg.hgkeep → ...ork/cli/views/webapp/protected/messages/hg-hgkeep
File renamed without changes
View
0  ...i/views/webapp/protected/tests/report/git.gitkeep → ...cli/views/webapp/protected/migrations/git-gitkeep
File renamed without changes
View
0  ...i/views/webapp/protected/tests/fixtures/hg.hgkeep → ...k/cli/views/webapp/protected/migrations/hg-hgkeep
File renamed without changes
View
0  framework/cli/views/webapp/assets/git.gitignore → .../cli/views/webapp/protected/runtime/git-gitignore
File renamed without changes
View
0  ...views/webapp/protected/tests/fixtures/git.gitkeep → ...work/cli/views/webapp/protected/runtime/hg-hgkeep
File renamed without changes
View
0  ...work/cli/views/webapp/protected/runtime/hg.hgkeep → ...views/webapp/protected/tests/fixtures/git-gitkeep
File renamed without changes
View
0  ...k/cli/views/webapp/protected/migrations/hg.hgkeep → ...i/views/webapp/protected/tests/fixtures/hg-hgkeep
File renamed without changes
View
2  framework/cli/views/webapp/protected/tests/report/git-gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
View
0  ...cli/views/webapp/protected/migrations/git.gitkeep → ...cli/views/webapp/protected/tests/report/hg-hgkeep
File renamed without changes
View
0  ...ork/cli/views/webapp/protected/messages/hg.hgkeep → ...cli/views/webapp/protected/tests/unit/git-gitkeep
File renamed without changes
View
0  ...k/cli/views/webapp/protected/messages/git.gitkeep → ...k/cli/views/webapp/protected/tests/unit/hg-hgkeep
File renamed without changes
View
0  ...k/cli/views/webapp/protected/extensions/hg.hgkeep → ...s/webapp/themes/classic/views/layouts/git-gitkeep
File renamed without changes
View
0  ...cli/views/webapp/protected/extensions/git.gitkeep → ...ews/webapp/themes/classic/views/layouts/hg-hgkeep
File renamed without changes
View
0  ...i/views/webapp/protected/commands/shell/hg.hgkeep → ...iews/webapp/themes/classic/views/site/git-gitkeep
File renamed without changes
View
0  ...views/webapp/protected/commands/shell/git.gitkeep → .../views/webapp/themes/classic/views/site/hg-hgkeep
File renamed without changes
View
0  framework/cli/views/webapp/images/hg.hgkeep → ...ws/webapp/themes/classic/views/system/git-gitkeep
File renamed without changes
View
0  framework/cli/views/webapp/images/git.gitkeep → ...iews/webapp/themes/classic/views/system/hg-hgkeep
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.