php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 22:39:52 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,297 Commits 10 Branches 79 Tags
0d3e85caffb51b5b4160951b977bbb0f881deae6
Commit Graph

34 Commits

Author SHA1 Message Date
Carsten Brandt
bf3c75147d reverted breaking PHPdoc codestyle changes 
issue #2852
 2014-03-23 20:51:09 +01:00
SonicGD
b5f8a4dc22 Reformat code te be PSR-2 compatible 2014-03-16 10:46:21 +06:00
Carsten Brandt
6fff5662df better use @see for See in phpdoc 2014-03-11 05:38:35 +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
Qiang Xue
4f8c037a21 fixed unset. 2014-03-06 21:18:28 -05:00
Qiang Xue
9b8ffdfacc Fixes #2653: Fixed the bug that unsetting an unpopulated AR relation would trigger exception (qiangxue) 2014-03-06 20:38:55 -05:00
Qiang Xue
11baf61977 Fixed unsetting relation bug. 2014-03-06 19:19:23 -05:00
Qiang Xue
e38c4225b2 Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi 
Conflicts:
	framework/db/BaseActiveRecord.php
 2014-03-06 00:00:33 -05:00
Qiang Xue
3f42d5826a REST wip. 2014-03-05 13:29:24 -05:00
Carsten Brandt
f34a0c63a1 fixed phpdoc 2014-03-05 02:35:01 +01:00
Carsten Brandt
80cc310895 updated phpdoc references of BaseAR to the interface 
fixes #2623
 2014-03-05 02:32:45 +01: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
Qiang Xue
6c88183be0 Merge commit 'd3ff343e5ee02a14dd17d6cf947aa7f52857474a' into feature-restapi 
Conflicts:
	framework/helpers/BaseArrayHelper.php
 2014-02-28 18:22:10 -05:00
Qiang Xue
9beba31fc0 rest WIP 2014-02-28 08:34:51 -05:00
Carsten Brandt
f9024dbec1 fixed Migration::execute() to use params correctly 2014-02-24 17:37:43 +01:00
Carsten Brandt
5ee50a8454 Merge pull request #2497 from yiisoft/merge-query-and-relation2 
WIP merge ActiveRelation into ActiveQuery
 2014-02-21 19:00:45 +01:00
Carsten Brandt
8f491f2836 moved @include tags of api docs directly into the class 2014-02-20 21:30:47 +01:00
Carsten Brandt
cb8237c1b7 merged ActiveQueryInterface and ActiveRelatioInterface 2014-02-20 16:15:10 +01:00
Carsten Brandt
1708a36d95 WIP merge ActiveRelation into ActiveQuery 
allow extending only one class to add scopes, fixes #2146

TODO:

- [ ] adjust guide docs
- [ ] adjust README files of extensions
- [ ] finish work and fix test breaks
 2014-02-20 05:53:36 +01:00
Qiang Xue
c92a260a3d Fixes #2415: Added support for inverse relations 2014-02-18 19:43:05 -05:00
Qiang Xue
abb2a0db97 minor improvement of label generation. 2014-02-15 14:25:32 -05:00
djagya
da16f508c2 #2436 override the function getAttributeLabel in BaseActiveRecord to receive label of the attribute, which looks like relatedMode.attribute, from the related model 2014-02-15 12:19:27 +01:00
djagya
44f5c73111 #2436 override the function getAttributeLabel in BaseActiveRecord to receive label of the attribute, which looks like relatedMode.attribute, from the related model 2014-02-15 12:08:10 +01:00
Qiang Xue
e79af9117e ensure populateRelation() is called for lazy loading. 2014-02-14 10:07:19 -05:00
Carsten Brandt
8af941fb53 added note about usage to AR::instantiate() 
fixes #2370
 2014-02-10 10:51:16 +01:00
Carsten Brandt
16e1aff41b renamed ActiveRecord::create() to populateRecord() 
- refactored elasticsearch AR to make type and index available in
  instantiate(), issue #1313

fixes #2281
 2014-02-03 14:07:12 +01:00
Carsten Brandt
262189533a huge amount of documentation link fixes 2014-01-28 17:54:40 +01:00
Alexander Makarov
ee8c0404bf minor code style and phpdoc fix 2014-01-25 14:07:07 +04:00
Qiang Xue
f6dd6fa2e9 Renamed ActiveRecordInterface::createActiveRelation() to createRelation() 2014-01-24 14:46:53 -05:00
Alexander Makarov
f21d2ce757 Better phpdoc 2014-01-19 03:44:33 +04:00
Carsten Brandt
796284cba1 reworked fix for #1993 2014-01-16 11:05:26 +01:00
Carsten Brandt
81d23332df afterFind event in AR is now called after relations have been populated 
fixes #1993
 2014-01-16 10:28:58 +01:00
Alexander Makarov
5d23a066ca Removed unused imports 2014-01-12 23:42:55 +04:00
Qiang Xue
0c38655217 psr-4 move 2014-01-10 21:41:43 -05:00