php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-20 00:20:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,940 Commits 10 Branches 79 Tags
0019f130cb00594aeac09cfa8c5bb04828dd8b0a
Commit Graph

666 Commits

Author SHA1 Message Date
Qiang Xue
203bc5ea05 Fixed test break. 2014-03-07 19:58:30 -05:00
Qiang Xue
fad635440b Fixes #2655: Arrayable and ArrayableTrait are incompatible for some PHP versions. 2014-03-07 19:08:27 -05: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
65bfd1633b Fixes #2646: Added support for specifying hostinfo in the pattern of a URL rule 2014-03-07 09:53:55 -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
Alexander Makarov
71835d977e More short syntax for arrays 2014-03-07 02:03:23 +04:00
Qiang Xue
e38c4225b2 Merge commit 'bdce87b242abbff800020deba0a5c2031fc2efe7' into feature-restapi 
Conflicts:
	framework/db/BaseActiveRecord.php
 2014-03-06 00:00:33 -05:00
Carsten Brandt
ecc066ac34 fixed condition for HHVM test 2014-03-05 02:35:37 +01:00
Alexander Makarov
fc4098b89a Code style 2014-03-04 00:56:27 +04:00
Alexander Mohorev
95ea1c20bb code style. FOREACH 2014-03-03 21:47:47 +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
6e7edfdf5b short array syntax 2014-03-03 20:21:55 +03:00
Qiang Xue
f22d409e8b test break fix. 2014-03-02 00:34:33 -05:00
Qiang Xue
b9743ef65b fixed test break. 2014-03-01 19:35:00 -05:00
Qiang Xue
a2edf01c85 Delay joinWith till createCommand to correctly combine relation condition with primary condition. 2014-03-01 18:39:22 -05:00
Qiang Xue
24e086deaf Added yii\web\UrlRuleInterface and yii\web\CompositeUrlRule 2014-02-28 14:40:25 -05:00
Qiang Xue
6659919ad7 Fixed test break. 2014-02-27 11:29:32 -05:00
Carsten Brandt
c21e01930e added unit test for #2568 2014-02-27 15:13:51 +01:00
Qiang Xue
ad06b80e6e Enhanced parsing the accept header. 2014-02-26 23:11:59 -05:00
Carsten Brandt
683a46d9ee test for deeply nested relation 
close #2543
 2014-02-25 15:03:54 +01:00
Qiang Xue
04bf51b01a Fixes #2392: Added addCssStyle(), removeCssStyle(), cssStyleFromArray() and cssStyleToArray() to Html 2014-02-23 19:12:33 -05:00
Qiang Xue
9f37e133e3 Fixed test break. 2014-02-23 14:02:39 -05:00
Carsten Brandt
c229ba729a fixed a bug in MessageSource and missingtranslation event 
fixes #2519: MessageSource removed translation messages when event handler
was bound to `missingTranslation`-event
 2014-02-23 14:26:47 +01:00
Alexander Makarov
d8d44b6127 Merge pull request #2501 from yiisoft/unify-urls 
Fixes #2426: Changed URL creation method signatures to be consistent
 2014-02-21 23:53:15 +03: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
Alexander Makarov
43c17d99cc Fixes #2426: Changed URL creation method signatures to be consistent 2014-02-20 20:10:33 +04:00
Qiang Xue
ddb7141ea6 doc update about behavior. 2014-02-20 08:21:37 -05:00
Qiang Xue
02d5b20bda Fixes #2360: Added AttributeBehavior and BlameableBehavior, and renamed AutoTimestamp to TimestampBehavior 2014-02-19 21:47:25 -05:00
Qiang Xue
c92a260a3d Fixes #2415: Added support for inverse relations 2014-02-18 19:43:05 -05:00
Qiang Xue
26cb7b2a3c Renamed fooVar to fooParam for various classes. 2014-02-15 18:18:27 -05:00
Qiang Xue
c0bac44f10 Fixes #1186: Changed Sort to use comma to separate multiple sort fields and use negative sign to indicate descending sort 2014-02-15 17:54:33 -05:00
Qiang Xue
9a068f50f4 Refactored batch query. 2014-02-15 11:22:48 -05:00
Qiang Xue
3a930bd675 Finished batch query feature. 2014-02-14 18:13:42 -05:00
Qiang Xue
1571c72251 Fixes #2409: Added support for fetching data from database in batches 2014-02-14 16:45:46 -05:00
Carsten Brandt
7950b7930b Merge pull request #2374 from mintao/master 
Some missing base unit tests
 2014-02-09 14:43:29 +01:00
Qiang Xue
89fe354921 Merge pull request #2285 from yiisoft/missing-translation-formatting 
When translation is missing source language should be used for formatting
 2014-02-08 19:05:40 -05:00
Alexander Makarov
83a459cc67 Merge branch 'master' 2014-02-09 02:17:01 +04:00
Florian Fackler
6e1ec30906 Added missing Object.php unit tests for 100% code coverage 2014-02-08 21:42:27 +01:00
Florian Fackler
c600572f34 The missing Component.php tests 2014-02-08 21:11:03 +01:00
Carsten Brandt
614ac19c5c exclude test with invalid PHP code from HHVM 2014-02-08 10:50:21 +01:00
Carsten Brandt
77fec9c25b fixed BaseMailer test to work on APC and HHVM 2014-02-08 10:45:06 +01:00
Alexander Makarov
4a201c7ad5 Removed unused variables 2014-02-07 13:39:35 +04:00
Alexander Makarov
dd26d39dd8 Removed unused namespace imports 2014-02-07 13:26:00 +04:00
Qiang Xue
11bc899bc1 Refactored fixtures and fixed test break. 2014-02-03 21:16:57 -05:00
Qiang Xue
ccae78ef33 Fixed test break. 2014-02-03 16:56:34 -05:00
Qiang Xue
2773828611 fixed test break. 2014-02-03 15:28:01 -05:00
Alexander Makarov
e539482d88 Added failing test for #2209 2014-02-03 05:02:43 +04:00
Qiang Xue
b64f618545 refactored file validator. 2014-02-01 09:15:40 -05:00
Qiang Xue
baa78bc213 fixed test break. 2014-01-31 18:33:28 -05:00