php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-12 03:30:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,581 Commits 10 Branches 79 Tags
a2bc50920cf531dd907ac32b53ab94bd1a0c9448
Commit Graph

79 Commits

Author SHA1 Message Date
Qiang Xue
586f5b87b0 Removed Application::preload in favor of Application::bootstrap 2014-04-09 10:47:10 -04:00
Qiang Xue
0e143338d7 Finished refactoring find() . 2014-04-07 16:29:12 -04:00
Alexander Makarov
75154d351d Refactored AR find 2014-04-07 09:43:03 +04:00
Carsten Brandt
865b71ef5e cleanup CHANGELOGs 2014-04-03 20:28:08 +02:00
Carsten Brandt
44dbb2235a cleanup docs 2014-04-03 20:13:32 +02:00
Qiang Xue
54e08f3f01 fixed build break. 2014-04-03 11:57:49 -04:00
Qiang Xue
8b4dfcc876 Fixes #2955: Changed the signature of ActiveQuery constructors and ActiveRecord::createQuery() to simplify customizing ActiveQuery classes 2014-04-03 10:36:52 -04:00
Carsten Brandt
ff83bd1bb5 removed todo 
fixes #2887
 2014-04-02 19:37:59 +02:00
Carsten Brandt
745c20538c Merge pull request #2885 branch 'query-filter' 
* query-filter:
  added CHANGELOG lines
  added tests for redis
  added proper tests for elasticsearch
  removed unnecessary code duplication
  adjusted tests
  typo
  renamed Query::filter() to Query::filterWhere()
  reverted elasticsearch rename of filter
  Adjusted search model code generated by Gii CRUD generator
  Added support for arbitrary number of parameters for NOT, AND, OR in filter methods of Query
  Gii CRUD generator now uses new addFilter method
  Query::filter() adjustments
  fixes #2002
  Added tests for Query::filter()

Conflicts:
	framework/db/QueryTrait.php
 2014-04-02 19:33:40 +02:00
Carsten Brandt
cc0d5b6f94 added CHANGELOG lines 2014-04-02 19:22:43 +02:00
Carsten Brandt
e5ba8c8715 reverted elasticsearch rename of filter 2014-04-02 18:47:30 +02:00
Qiang Xue
338b6aa7d3 Refactored ActiveRecord::find() so that find(null) will also return an ActiveRecord instance instead of ActiveQuery. 2014-03-30 19:01:02 -04:00
Alexander Makarov
8cd247730a Query::filter() adjustments 2014-03-29 23:26:02 +04:00
Alexander Makarov
a884c80fe3 Merge branch 'master' 2014-03-29 22:55:59 +04:00
Carsten Brandt
f4395206b7 reset dirty attributes after afterSave 
so information about changed values is available in `afterSave`-event.

fixes #2892
 2014-03-27 12:14:03 +01:00
Alexander Makarov
372220450b Merge branch 'master' 2014-03-27 12:56:01 +04:00
Alexander Makarov
3c1a8141fd fixes #2002 2014-03-27 12:41:16 +04:00
Carsten Brandt
dbf733bf60 added TODO message 2014-03-26 16:23:26 +01:00
Carsten Brandt
f93d871cd6 fixed wrong method calls in elasticsearch Command 2014-03-26 16:18:28 +01:00
Qiang Xue
8c2e39235f Turn module and application into DI containers. 2014-03-17 23:57:01 -04:00
SonicGD
b5f8a4dc22 Reformat code te be PSR-2 compatible 2014-03-16 10:46:21 +06:00
Alexander Makarov
348dfa78eb Merge pull request #2676 from yiisoft/url-helper 
#2630: `yii\heplers\Html::url` moved to new `yii\helpers\Url::create`
 2014-03-11 01:36:05 +03:00
Alexander Makarov
5d6c314d4e Adjusted URL helper, fixed usage 2014-03-10 15:25:15 +04:00
JacekK
edc3d2b11a fixed some urls in guide; moved elasticsearch png file to proper location, to be seen by apidoc generator 2014-03-09 23:28:11 +01:00
Alexander Makarov
92b381795b Adjusted Url helper methods 2014-03-10 01:34:05 +04:00
Alexander Makarov
3400eb5215 #2630: yii\heplers\Html::url moved to new yii\helpers\Url::create 2014-03-09 16:41:55 +04:00
Luciano Baraglia
269d1303a9 Code style fixes 2014-03-08 20:47:04 -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
AlexGx
1982efbdfe many phpcs fixes 2014-03-05 00:22:55 +02: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
c7e8d8b900 @param, @var, @property and @return must declare types as boolean, integer, string, array or null 2014-03-03 20:50:44 +03:00
Carsten Brandt
8c7eb97175 apidoc style and typo 2014-02-28 18:36:27 +01:00
Carsten Brandt
ebe972f36d fixed links in elasticsearch README 2014-02-28 18:17:28 +01:00
Tobias Munk
825a71c6df replaced keyword "yii" with "yii2" in composer.json files (fixes #2557) 2014-02-27 17:37:08 +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
505762d49c updated docs about active relation 2014-02-21 18:53:28 +01:00
Carsten Brandt
cb8237c1b7 merged ActiveQueryInterface and ActiveRelatioInterface 2014-02-20 16:15:10 +01:00
Carsten Brandt
098567ce16 fixed phpdoc errors and updated properties 2014-02-20 13:42:30 +01:00
Carsten Brandt
3b40d44909 made createQuery() config param optional 2014-02-20 05:54:47 +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
Carsten Brandt
8af941fb53 added note about usage to AR::instantiate() 
fixes #2370
 2014-02-10 10:51:16 +01:00
Qiang Xue
bad9c0cccc Merge branch 'master' of github.com:mintao/yii2 into mintao-master 
Conflicts:
	extensions/yii/elasticsearch/CHANGELOG.md
 2014-02-06 13:20:48 -05: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
Alexander Makarov
9fb8843130 Removed unnecessary variable 2014-02-01 01:11:59 +04:00
Carsten Brandt
21ae27b306 updated phpdoc properties 2014-01-28 00:11:18 +01:00
Qiang Xue
f6dd6fa2e9 Renamed ActiveRecordInterface::createActiveRelation() to createRelation() 2014-01-24 14:46:53 -05:00
Carsten Brandt
48712c71f2 added notes about default limit set by elasticsearch 
fixes #1864
 2014-01-22 15:11:11 +01:00
Luciano Baraglia
7d33a5d3b5 Some Code style fixes 2014-01-19 13:35:36 -03:00
Carsten Brandt
796284cba1 reworked fix for #1993 2014-01-16 11:05:26 +01:00