Commit Graph

910 Commits

Author SHA1 Message Date
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
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
8d5536ac12 yii\mongodb\file\ActiveRecord::update() fixed to save the attributes while updating file. 2014-03-08 11:49:09 +02: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
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
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
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
Carsten Brandt
5e356acbd7 exclude file support for apidocs
issue #1797
2014-03-07 16:51:18 +01:00
Qiang Xue
bbea1ab19c Fixes #2629: Module::controllerPath is now read only, and all controller classes must be namespaced under Module::controllerNamespace 2014-03-07 10:35:15 -05:00
Carsten Brandt
6d3e60f963 Merge pull request #2656 from yiisoft/apidoc-refactoring
Apidoc refactoring
2014-03-07 14:47:13 +01:00
Carsten Brandt
ca6bfdbbb5 final changes for apidoc refactoring 2014-03-07 14:40:52 +01:00
Carsten Brandt
acde64c88b finished guide command refactoring 2014-03-07 13:37:58 +01:00
Alexander Makarov
71835d977e More short syntax for arrays 2014-03-07 02:03:23 +04:00
Carsten Brandt
740a769477 improved HelpController with messages for each command 2014-03-06 22:43:57 +01:00
Carsten Brandt
62378c3b4a Merge branch 'master' into apidoc-refactoring
* master: (153 commits)
  rest doc.
  CS fix
  Add size attribute to Modal
  major features and documentation finished for REST API.
  rest WIP
  Removed U+FEFF character from pt-PT language file to fixe #2631
  Revert "Used ternary operator instead of "or" for constant definition"
  `User` here
  REST wip.
  Changelog
  reset access cache when user identity is set
  Keyboard shortcut for previous, next and refresh buttons
  reset batch query result when rewinding.
  fixed loading namespaceless controller classes.
  Fixes #1467: Added support for organizing controllers in subdirectories
  replace pjax with external resouce via composer
  fixed > 100 typos introduced by me :-)
  fixed condition for HHVM test
  fixed phpdoc
  updated phpdoc references of BaseAR to the interface
  ...

Conflicts:
	extensions/apidoc/templates/BaseRenderer.php
	extensions/apidoc/templates/html/views/constSummary.php
	extensions/apidoc/templates/html/views/propertyDetails.php
2014-03-06 22:09:58 +01:00
Christophe BOULAIN
6f49e46609 CS fix 2014-03-06 12:18:32 +01:00
Christophe BOULAIN
0ab7f1e0ae Add size attribute to Modal 2014-03-06 11:04:03 +01:00
Alexander Makarov
386979d6a3 Revert "Used ternary operator instead of "or" for constant definition"
This reverts commit 2bb6f13505.
2014-03-06 01:56:51 +04:00
Thiago Talma
bd067b02ff Changelog 2014-03-05 13:45:37 -03:00
Thiago Talma
5b648c99ff Keyboard shortcut for previous, next and refresh buttons 2014-03-05 13:09:34 -03:00
AlexGx
c906d43343 fix php5.4 array syntax 2014-03-05 00:26:40 +02:00
AlexGx
1982efbdfe many phpcs fixes 2014-03-05 00:22:55 +02:00
AlexGx
a94b2778b0 fix phpDoc LuaScriptBuilder build @throws 2014-03-04 23:13:53 +02:00
Alexander Makarov
61b64d7513 Removed unused "use" statements 2014-03-04 22:40:04 +04:00
Alexander Makarov
2bb6f13505 Used ternary operator instead of "or" for constant definition 2014-03-04 22:17:11 +04:00
Alexander Makarov
b0ef4c9084 Removed unused variables 2014-03-04 21:46:30 +04:00
Alexander Makarov
15a41eae9e Removed executable flag from asset files 2014-03-04 21:23:34 +04:00
Paul Klimov
ef12934b6b Merge pull request #2613 from mongosoft/mongodb
add findAndModify() method to the Collection class
2014-03-04 18:20:28 +02:00
Qiang Xue
4b20fdc72e typo fix. 2014-03-04 07:09:56 -05:00
Alexander Mohorev
61cacdfc81 add findAndModify() method to the Collection class 2014-03-04 12:36:05 +03:00
Alexander Makarov
0a2a5d46b7 Merge pull request #2595 from thiagotalma/master
Arrows to display the previous and next files.
2014-03-04 00:31:35 +03:00
Thiago Talma
facb546950 Changelog 2014-03-03 16:56:59 -03:00
Alexander Mohorev
426af3177c code style. WHILE 2014-03-03 21:53:26 +03:00
Alexander Mohorev
f849623359 code style. FOR 2014-03-03 21:52:21 +03:00
Alexander Mohorev
95ea1c20bb code style. FOREACH 2014-03-03 21:47:47 +03:00
Alexander Makarov
a7a1bd8da0 Merge pull request #2578 from schmunk42/feature/update-composer-keywords
replaced keyword "yii" with "yii2" in composer.json files (fixes #2557)
2014-03-03 21:39:41 +03:00
Alexander Mohorev
b2f1b00bf2 code style. operator IF 2014-03-03 21:32:34 +03:00
Alexander Mohorev
c7e8d8b900 @param, @var, @property and @return must declare types as boolean, integer, string, array or null 2014-03-03 20:50:44 +03:00
Alexander Mohorev
d8971b252c short echo tags 2014-03-03 20:33:38 +03:00
Alexander Mohorev
6e7edfdf5b short array syntax 2014-03-03 20:21:55 +03:00
Qiang Xue
6bdf02dc93 Fixes #2601 2014-03-02 17:04:40 -05:00