Mirrors/yii
2
0
Fork 0
mirror of https://github.com/yiisoft/yii.git synced 2026-03-25 01:16:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,487 Commits 3 Branches 54 Tags
615dbd9802c19ec31244741edc23aa7ea233da75
Commit Graph

371 Commits

Author SHA1 Message Date
Alexander Makarov
03fb457d9c fixed test 2013-06-12 14:41:56 +04:00
Alexander Makarov
e0a45a0ffa more tests 2013-06-12 14:33:16 +04:00
Alexander Makarov
6546a641f4 added tests 2013-06-12 13:32:37 +04:00
Alexander Makarov
245d7fa1f7 fixed class name 2013-06-12 13:31:59 +04:00
resurtm
6e632c74b4 Fixes #1990. Wrong week number returned by CDateFormatter::formatWeekInMonth(). 2013-06-08 01:38:44 +06:00
Alexander Kochetov
cd30acdecc Unit tests 2013-06-04 04:58:19 +04:00
Carsten Brandt
f8de04a066 Added unit test for #2530 2013-06-03 08:14:03 +02:00
Carsten Brandt
da290bad73 Merge PR #2514 branch '2508-chtml-active-label-tabular' of https://github.com/klimov-paul/yii 
* '2508-chtml-active-label-tabular' of https://github.com/klimov-paul/yii:
  Issue #2508 has been added to CHANGELOG.
  "CHtml::activeLabel()" has been fixed to resolve attribute label for tabular input in case custom "for" has been specified.

Conflicts:
	CHANGELOG
 2013-06-01 21:55:52 +02:00
resurtm
7b72148d43 Fixes #1725: CFileHelper::removeDirectory() has been added. 2013-05-30 20:01:25 +06:00
Paul Klimov
e9e929aa09 "CHtml::activeLabel()" has been fixed to resolve attribute label for tabular input in case custom "for" has been specified. 2013-05-29 12:40:46 +03:00
resurtm
0bb122f92d Merge pull request #2444 from resurtm/fixes-2435-CFileCache-enhancements 
Fixes #2435: CFileCache entry expiration time could now be embedded into the cache file.
 2013-05-28 09:45:05 -07:00
resurtm
c1161ad73e Merge branch 'master' of github.com:yiisoft/yii into fixes-2336 
Conflicts:
	CHANGELOG
	tests/framework/db/ar/CActiveRecord2Test.php
 2013-05-28 21:06:37 +06:00
resurtm
d749ecff97 Fix unit test. 2013-05-28 20:31:26 +06:00
resurtm
3fa125ce3c Merge branch 'master' of github.com:yiisoft/yii into fixes-2435-CFileCache-enhancements 
Conflicts:
	CHANGELOG
 2013-05-28 19:44:29 +06:00
Alexander Makarov
072a1745ab Merge branch 'master' of github.com:lubosdz/yii into lubosdz-master 
Conflicts:
	CHANGELOG
 2013-05-27 21:32:41 +04:00
Alexander Makarov
92fff54053 Merge branch 'master' of github.com:yiisoft/yii 
Conflicts:
	CHANGELOG
 2013-05-27 13:22:02 +04:00
Alexander Makarov
c9d72adff3 Merge branch '159-upload-file-get-instance-by-name' of github.com:klimov-paul/yii into klimov-paul-159-upload-file-get-instance-by-name 2013-05-27 13:20:13 +04:00
Carsten Brandt
aebaff34c5 Merge pull request #2346 branch '662-lazy-load-through-relation' of https://github.com/klimov-paul/yii 
* '662-lazy-load-through-relation' of https://github.com/klimov-paul/yii:
  Issue #662 has been added to CHANGELOG.
  "CActiveFinder::applyLazyCondition()" has been updated to use last relation in the join chain, while composing where condition.
  Test case for issue #662 has been improved.
  Test case "CActiveRecordTest::testHasOneThroughLazy()" has been added to expose issue #662

Conflicts:
	tests/framework/db/ar/CActiveRecordTest.php
 2013-05-27 05:06:23 +02:00
Carsten Brandt
3fe3338091 Unit tests for #2311 2013-05-27 04:11:21 +02:00
Carsten Brandt
ffe6b94f7b Merge pull request #2350 branch '139-has-many-through-with-condition' of https://github.com/klimov-paul/yii into klimov-paul-139-has-many-through-with-condition 
* '139-has-many-through-with-condition' of https://github.com/klimov-paul/yii:
  Test relation condition for "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been adjusted to be type aware.
  "CJoinElement::applyLazyCondition()" and "CActiveRecordTest" have been updated to match PHP 5.2.
  Issue #139 has been added to CHANGELOG.
  "CJoinElement::applyLazyCondition()" has been updated allowing to respect relation condition and params.
  Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been improved to cover relation params as well.
  Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been created to expose issue #139

Conflicts:
	tests/framework/db/ar/CActiveRecordTest.php
 2013-05-27 03:50:05 +02:00
Carsten Brandt
e7b7cd0291 Support for MySQL BIT(M) data type default values 
replaces pull request #1842

CMysqlColumnSchema: support for MySQL BIT(M) data type proper default
values.
For example, MySQL (MariaDB) return default value as "b'1'" string, not
as "1", so, this case should be considered especially. See also
http://dev.mysql.com/doc/refman/5.0/en/bit-type.html
 2013-05-27 02:45:25 +02:00
Carsten Brandt
24dd2792f7 Merge pull request #2054 branch '1818-localized-formatter' 
* 1818-localized-formatter:
  documentation and changelog for localized formatter
  Created a LocalizedFormatter class

Conflicts:
	CHANGELOG
 2013-05-27 01:22:30 +02:00
Paul Klimov
da49c8812b Merge pull request #2295 from klimov-paul/101-active-record-relation-merge-with 
Issue 101: Active Record find through with custom select
 2013-05-22 10:07:42 -07:00
Carsten Brandt
980d5615fb Added missing 'class' config to CRedisTest 
https://github.com/yiisoft/yii/pull/2436#issuecomment-18287533
 2013-05-22 17:54:57 +02:00
Alexander Makarov
65702b6b03 Merge pull request #2436 from cebe/redis-cache 
Created CRedisCache (backport from yii2)
 2013-05-22 06:02:38 -07:00
Carsten Brandt
a7f8d74d33 enabled redis on travis-ci 2013-05-22 12:41:29 +02:00
Carsten Brandt
59ed54a446 redis drop millisecond support to not require latest redis verion 
yii2 will have this feature.
 2013-05-22 12:33:54 +02:00
lubosdz
9a6267ef27 Merge branch 'master' of https://github.com/lubosdz/yii 
Fixed code styling and few typos in documentation.
 2013-05-09 13:06:47 +02:00
Alexander Makarov
44079380ef Merge pull request #2450 from resurtm/fixes-2321 
Fixes #2321: CGettextPoFile is now able to parse multiline msgid and msgstr declarations.
 2013-05-07 08:03:40 -07:00
resurtm
7ad3a3ac8c Fixes #2449: CSqlDataProvider causes an error when CDbCommand with enabled PDO::FETCH_OBJ mode used as SQL source. 2013-05-06 21:19:39 +06:00
resurtm
f76c1bbaf4 Remove superfluous and erroneous imports. 2013-05-06 21:01:10 +06:00
resurtm
12adfdefbb Fixes #2321: CGettextPoFile is now able to parse multiline msgid and msgstr declarations. 2013-05-06 20:27:17 +06:00
Klimov Paul
c40a11c07f Merge branch '2426-CDbCriteria-wakeup' of https://github.com/resurtm/yii into resurtm-2426-CDbCriteria-wakeup 
Conflicts:
	CHANGELOG
 2013-05-05 15:15:43 +03:00
resurtm
0f54eb0dee Fixes #2426: CDbCriteria::__wakeup() used to issue an error in case SQL containing fields were arrays and criteria parameters were specified. 2013-05-04 22:37:14 +06:00
resurtm
b0753a8e7d Fixes #2435: CFileCache entry expiration time could now be embedded into the cache file. 2013-05-04 21:58:24 +06:00
Carsten Brandt
f076a9e81e Created CRedisCache (backport from yii2) 
redis cache uses http://redis.io/ as storage backend.
Feature was requested in discussion in #1302
 2013-05-01 20:08:35 +02:00
Paul Klimov
9532a46280 Unit test "CHtmlTest" has been updated exposing issue #2423 2013-04-29 16:07:51 +03:00
resurtm
49598e9f4c Merge pull request #2306 from resurtm/fixes-2122 
Fixes #2122: CActiveRecord, lazy load: 'params' from relations used in 'through' option were not applied to the final SQL statement.
 2013-04-25 20:18:57 -07:00
resurtm
853a6a4d51 Fixes #1796: separate count criteria in CActiveDataProvider. 2013-04-23 23:29:59 +06:00
Paul Klimov
72313fdf18 Test relation condition for "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been adjusted to be type aware. 2013-04-23 16:44:58 +03:00
Carsten Brandt
a2aa6ee648 Merge pull request #2354 branch '2343-required-validator-trim' of https://github.com/AnatolyRugalev/yii into AnatolyRugalev-2343-required-validator-trim 
* '2343-required-validator-trim' of https://github.com/AnatolyRugalev/yii:
  changed changelog line
  Added @since for $trim property
  Modified changelog line
  Added changelog line
  Added CRequiredValidator test case for $trim => true
  Added CRequiredValidator test
  Added $trim property to CRequiredValidator

Conflicts:
	tests/framework/validators/ValidatorTestModel.php
 2013-04-17 19:17:08 +02:00
AnatolyRugalev
b12d505171 Added CRequiredValidator test case for $trim => true 2013-04-17 20:36:49 +06:00
Anatoly Rugalev
c9d2e4f5c8 Added CRequiredValidator test 2013-04-17 00:01:25 +06:00
Paul Klimov
b2b9c3fcd2 "CJoinElement::applyLazyCondition()" and "CActiveRecordTest" have been updated to match PHP 5.2. 2013-04-16 10:51:40 +03:00
Paul Klimov
a99a93769d Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been improved to cover relation params as well. 2013-04-15 17:03:42 +03:00
Paul Klimov
9a3e956d3a Test case "CActiveRecordTest::testLazyLoadThroughRelationWithCondition()" has been created to expose issue #139 2013-04-15 16:14:52 +03:00
resurtm
1ac4b0a2b3 Removed debugging group declaration. 2013-04-15 18:50:01 +06:00
resurtm
bd0483cfc5 Fixes #2336: PostgreSQL: CDbCommandBuilder uses NULL instead of DEFAULT as default value for the primary keys of serial type. 2013-04-15 18:42:41 +06:00
Paul Klimov
3bfb6a0246 Test case for issue #662 has been improved. 2013-04-15 12:46:00 +03:00
Paul Klimov
1721f026f3 Test case "CActiveRecordTest::testHasOneThroughLazy()" has been added to expose issue #662 2013-04-15 11:30:46 +03:00