Commit Graph

7316 Commits

Author SHA1 Message Date
Christian Nadolle
05f7df3091 console/Controller support local options per action 2014-03-09 00:43:11 +01:00
Alexander Makarov
80cb3e71e9 added example of using try-catch to hanle errors 2014-03-09 03:30:57 +04:00
Alexander Makarov
150d5152b2 more grid docs 2014-03-09 03:21:42 +04:00
Johnny Theill
4fa7646ba8 fix scrutinizer path 2014-03-08 22:53:57 +01:00
Johnny Theill
6a193f3846 Merge branch 'master' of https://github.com/yiisoft/yii2 into travis-advanced-app 2014-03-08 22:21:35 +01:00
Qiang Xue
bd3dd038ab Fixed user status check. 2014-03-08 15:36:07 -05:00
Qiang Xue
b751211dae fixed implementation of Session::getHasSessionId(). 2014-03-08 15:29:00 -05:00
Carsten Brandt
168b37eb9b minor apidoc style 2014-03-08 21:04:47 +01:00
Carsten Brandt
f7148c2d80 callback -> callable
this term is resolveable by the php docs when linking types in apidoc
2014-03-08 21:04:47 +01:00
Alexander Makarov
05e79d4f76 Added upgrade note about extensions 2014-03-08 21:55:07 +04:00
Alexander Makarov
ccaad468be Merge pull request #2668 from dizews/patch-1
Update HttpBearerAuth.php
2014-03-08 20:12:51 +03:00
Vladimir
66315a2cb6 Update HttpBearerAuth.php
typo fix
2014-03-08 17:41:11 +03:00
AlexGx
183819abfd fix phpDoc method signature 2014-03-08 15:37:06 +02:00
AlexGx
c9edea3d11 merge 2014-03-08 15:36:12 +02:00
Qiang Xue
10f1283de8 Fixes #2666 2014-03-08 08:22:42 -05:00
Paul Klimov
c01fdc5ec9 Merge branch 'master' of github.com:yiisoft/yii2 2014-03-08 15:20:45 +02:00
Carsten Brandt
595f55c504 api doc improvements 2014-03-08 14:20:19 +01:00
Carsten Brandt
c815d0cef7 Merge branch 'master' of github.com:yiisoft/yii2
* 'master' of github.com:yiisoft/yii2:
  Make code coverage work
  Note about  embedded documents added to mongodb extension readme
  yii\mongodb\file\Collection::ensureMongoId() fixed to suppress exception on invalid _id format.
  yii\mongodb\file\ActiveRecord::update() fixed to save the attributes while updating file.
  Fixes #2661: Added boolean column type support for SQLite
  Refactored controller creation process.
  Added back some toArray() implementations.
  Fixed test break.
  Update console-migrate.md
  Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions.
  Fixes #2659
  Minor code style fixes for apidoc
  Changed assertions
  fix tests
2014-03-08 14:19:55 +01:00
Paul Klimov
bc73a2481c MongoDB log fixed to handle Mongo objects correctly 2014-03-08 15:19:46 +02:00
AlexGx
32d0768919 style fixes with phpcs:yii2 2014-03-08 14:55:58 +02:00
Carsten Brandt
d9ea81dc74 Make code coverage work 2014-03-08 13:44:29 +01:00
Paul Klimov
f56616394e Note about embedded documents added to mongodb extension readme 2014-03-08 14:34:35 +02:00
Paul Klimov
866ba85010 yii\mongodb\file\Collection::ensureMongoId() fixed to suppress exception on invalid _id format. 2014-03-08 14:12:08 +02:00
Paul Klimov
0019f130cb Merge branch 'master' of github.com:yiisoft/yii2 2014-03-08 13:53:03 +02:00
Paul Klimov
8d5536ac12 yii\mongodb\file\ActiveRecord::update() fixed to save the attributes while updating file. 2014-03-08 11:49:09 +02:00
Alexander Makarov
34db2d2082 Merge pull request #2652 from Theill11/fix-test-breaks
Update advanced app tests
2014-03-08 12:41:06 +03:00
Johnny Theill
af8f1e254e Added advanced app tests to travis 2014-03-08 07:09:04 +01:00
Qiang Xue
1af04e1e1b Fixes #2661: Added boolean column type support for SQLite 2014-03-07 22:38:30 -05:00
Qiang Xue
35018bfb21 Refactored controller creation process. 2014-03-07 22:34:03 -05:00
Qiang Xue
ad19e332f4 Added back some toArray() implementations. 2014-03-07 22:05:45 -05:00
Qiang Xue
b3b515b9d1 Merge pull request #2660 from EmilHaukeland/patch-2
Corrected 'class' parameter
2014-03-07 20:00:32 -05:00
Qiang Xue
203bc5ea05 Fixed test break. 2014-03-07 19:58:30 -05:00
Emil Haukeland
5836d479bd Update console-migrate.md
Corrected 'class' parameter
2014-03-08 01:21:01 +01:00
Qiang Xue
fad635440b Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions. 2014-03-07 19:08:27 -05:00
Alexander Makarov
6d97ded6c6 Fixes #2659 2014-03-08 03:01:14 +04:00
Alexander Makarov
24b0de63d5 Minor code style fixes for apidoc 2014-03-08 02:50:59 +04:00
Carsten Brandt
cf9597a7aa code style 2014-03-07 22:17:03 +01:00
Carsten Brandt
a8ef7bab9e Merge branch 'code-style'
* code-style:
  fix php5.4 array syntax
  many phpcs fixes
  fix phpDoc LuaScriptBuilder build @throws
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax
2014-03-07 21:56:40 +01:00
Alexander Makarov
fe48ae0d98 Merge pull request #2657 from Theill11/fix-validation
Advanced app: Username should be unique
2014-03-07 23:55:19 +03:00
Carsten Brandt
1b7e1cd027 Merge pull request #2605 branch 'feature' of https://github.com/mongosoft/yii2 into code-style
* 'feature' of https://github.com/mongosoft/yii2:
  returned back formatting language files
  code style. WHILE
  code style. FOR
  code style. FOREACH
  code style. operator IF
  @param, @var, @property and @return must declare types as boolean, integer, string, array or null
  short echo tags
  short array syntax

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/models/Context.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/bootstrap/views/index.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/views/index.php
	extensions/apidoc/templates/offline/views/offline.php
	extensions/apidoc/templates/online/views/index.php
	extensions/elasticsearch/Connection.php
	extensions/redis/ActiveQuery.php
	framework/base/ErrorException.php
	framework/helpers/BaseFileHelper.php
	tests/unit/framework/helpers/FileHelperTest.php
2014-03-07 21:54:44 +01:00
Johnny Theill
a5e6e2d43b username should be unique 2014-03-07 21:50:04 +01:00
Carsten Brandt
668dacbab6 Merge pull request #2622 branch 'ext-codestyle-fix' of https://github.com/AlexGx/yii2 into code-style
* 'ext-codestyle-fix' of https://github.com/AlexGx/yii2:
  fix php5.4 array syntax
  many phpcs fixes
  fix phpDoc LuaScriptBuilder build @throws

Conflicts:
	extensions/apidoc/commands/RenderController.php
	extensions/apidoc/models/BaseDoc.php
	extensions/apidoc/templates/BaseRenderer.php
	extensions/apidoc/templates/bootstrap/Renderer.php
	extensions/apidoc/templates/bootstrap/layouts/guide.php
	extensions/apidoc/templates/bootstrap/layouts/main.php
	extensions/apidoc/templates/html/Renderer.php
	extensions/apidoc/templates/offline/Renderer.php
	extensions/apidoc/templates/offline/assets/AssetBundle.php
	extensions/apidoc/templates/offline/views/index.php
2014-03-07 21:34:23 +01:00
Johnny Theill
95e01899c7 Changed assertions 2014-03-07 21:26:01 +01:00
Carsten Brandt
e2aacad8aa Added links to PHP.net to apidoc 2014-03-07 19:41:43 +01:00
Carsten Brandt
f279719196 be consistent, use singular inheritdoc 2014-03-07 18:46:26 +01:00
Carsten Brandt
adb28deeff added support for basic @inheritDoc tags 2014-03-07 18:43:50 +01:00
Carsten Brandt
31a1eca556 add source code links to api docs 2014-03-07 17:52:12 +01:00
Larry Ullman
6df4802e12 Edited whole document 2014-03-07 11:16:26 -05:00
Larry Ullman
db222533e3 Edited
Really not sure what this is. It seems incomplete as is.
2014-03-07 11:16:26 -05:00
Carsten Brandt
5e356acbd7 exclude file support for apidocs
issue #1797
2014-03-07 16:51:18 +01:00