php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-16 06:17:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,066 Commits 10 Branches 79 Tags
e69afe32b5150d8afba993dec645d2de9341a2f9
Commit Graph

201 Commits

Author SHA1 Message Date
Klimov Paul
14228f8615 Merge branch 'asset-command' 2013-05-17 11:57:00 +03:00
Qiang Xue
9e948ccd43 Added UrlRule::host. 2013-05-16 23:54:06 -04:00
Qiang Xue
b6fffeb0e4 Removed trailing slash in created URLs. 2013-05-16 23:21:08 -04:00
Qiang Xue
e6b52b8523 Fixes issue #268: added support for subdomain matching of URL rules. 2013-05-16 23:15:30 -04:00
Klimov Paul
c676e92d74 Merge branch 'master' of github.com:yiisoft/yii2 into asset-command 2013-05-16 20:55:22 +03:00
Klimov Paul
d3beeb7ddc Usage of "yii\console\controllers\AssetController::actionCompress()" has been clarified. 2013-05-16 20:38:02 +03:00
Klimov Paul
06752ae9e7 Doc comments for "yii\console\controllers\AssetController" has been updated. 2013-05-16 20:13:49 +03:00
Klimov Paul
563f992bec Unit test for "yii\console\controllers\AssetController" has been refactored. 2013-05-16 19:49:15 +03:00
Klimov Paul
8d17fcccaa Error "yii\console\controllers\AssetController::combineCssFiles()" has been fixed. 2013-05-16 16:42:06 +03:00
Klimov Paul
0ecdcae54a Method "yii\console\controllers\AssetController::buildTarget()" has been fixed to compose input file name correctly. 2013-05-16 16:31:29 +03:00
Klimov Paul
f9b06e1e6d Unknown property "yii\console\controllers\AssetController::publishOptions" error has been fixed. 2013-05-16 15:38:46 +03:00
Klimov Paul
98b3cc07cd Test case "AssetControllerTest::testActionCompress()" has been created as draft. 2013-05-16 15:17:42 +03:00
Klimov Paul
5092612217 Method "console\controllers\AssetController::actionTemplate()" has been updated to be more verbose. 2013-05-16 14:34:27 +03:00
Qiang Xue
986bfccd34 Fixes issue #294. 2013-05-16 07:25:55 -04:00
Klimov Paul
f4cb1e4a0a Unit test for "console\controllers\AssetController" has been created. 2013-05-16 14:21:49 +03:00
Qiang Xue
0005b07d29 Removed Vector and Dictionary. 2013-05-15 20:27:41 -04:00
Carsten Brandt
01b478f48c Merge branch 'Ragazzo-partial-response-enh' 
* Ragazzo-partial-response-enh:
  refactored web/Response::sendFile()
  Display Name of HttpException instead of classname
  string helper fixed, mime-type reverted
  code style fix
  partial response added, new code-style applied
 2013-05-15 20:42:25 +02:00
Carsten Brandt
a2c6d22124 refactored web/Response::sendFile() 
- better throw http exception on not satisfiable range request
- constitent header names
- fixed range end when range request is to the end
- added unit test

related to #275, fixes #148
 2013-05-15 20:39:23 +02:00
slavcopost
59cb5d1199 Add unit test 2013-05-15 15:59:47 +03:00
Alexander Makarov
a021fbe54d Skipped ApcCacheTest expire 2013-05-12 18:24:01 +04:00
Qiang Xue
23e820e6bd Merge pull request #229 from creocoder/rbac-item-assignment-improve 
RBAC: Item and Assignment optimized save approach
 2013-05-11 16:38:12 -07:00
Klimov Paul
8ab1d837a6 Merge branch 'master' of github.com:yiisoft/yii2 2013-05-11 20:17:29 +03:00
Klimov Paul
43a04d237a Doc comments for "YiiRequirementChecker" have been updated. 2013-05-11 20:04:12 +03:00
Klimov Paul
9a461edd07 Check helper methods have been added to "YiiRequirementChecker". 2013-05-11 19:07:14 +03:00
Carsten Brandt
48f388442f mocking time in test only usefull when using time() once 
e2513de6c6 (commitcomment-3192244)
 2013-05-11 16:09:40 +02:00
Klimov Paul
f82a01e4dd "YiiRequirementChecker::check()" has been updated to be able to collect different requirements set in the chained call. 2013-05-11 17:01:54 +03:00
Carsten Brandt
e2513de6c6 better testing: time()-function-mock 
as discussed in #203
https://github.com/yiisoft/yii2/issues/203#issuecomment-17759631
 2013-05-11 15:41:00 +02:00
Klimov Paul
3b7ac70c69 Test case "YiiRequirementCheckerTest::testCheckEval()" has been added. 2013-05-11 16:27:58 +03:00
Klimov Paul
00d04a1c30 Method "YiiRequirementChecker::check()" has been refactored to be used in method chain. 
Methods "YiiRequirementChecker::getResults()" and "YiiRequirementChecker::render()" have been added.
 2013-05-11 16:26:16 +03:00
Klimov Paul
07fabfd6fc Method "YiiRequirementChecker::check()" has been implemented. 2013-05-11 16:18:14 +03:00
Klimov Paul
3374c78233 "YiiRequirementChecker" has been created as blank. 2013-05-11 16:06:34 +03:00
Carsten Brandt
71a9efdd55 changed cache test to wait more than expirytime 
change is to avoid random test failure on race condition.
fixes #203 #231
 2013-05-11 13:33:05 +02:00
Carsten Brandt
6a7529505e cache tests refactoring cherry picked from redis branch 2013-05-11 13:16:47 +02:00
Carsten Brandt
3bdb6c3110 fixed indentation in test files 2013-05-11 12:54:13 +02:00
Carsten Brandt
cb8f5d702f cleanup tests 2013-05-11 12:51:24 +02:00
Carsten Brandt
e0ad712527 Merge pull request #204 branch 'unittest-app-dependency' of https://github.com/bwoester/yii2 into bwoester-unittest-app-dependency 
* 'unittest-app-dependency' of https://github.com/bwoester/yii2:
  mod: incorporate suggestions - rename requireApp() to mockApplication() - always destroy app on tearDown()   - eliminates need for constant YII_DESTROY_APP_ON_TEARDOWN   - mockApplication() becomes a lot easier. Destroying app on each tearDown     means creating it on every call is fine. No more checking if it already     exists and if it has been created from the same config. - \yii::$app should have been \Yii::$app
  add: new key for unit tests config named "className". Allows to run the tests      using different Application instances (consoleApp/ webApp) mod: TestCase::getParam accepts second param $default=null
  mod: don't create app in bootstrap script, unit tests do it themselves add: option to destroy app after each test to find unit tests that fail      to require an app
  allow unit tests to requireApp() on setUp()

Conflicts:
	tests/unit/data/config.php
 2013-05-11 12:22:49 +02:00
resurtm
ea68bd3a55 CS fixes. 2013-05-11 15:58:27 +06:00
resurtm
35562bfada Merge branch 'master' of github.com:yiisoft/yii2 
Conflicts:
	apps/bootstrap/index.php
	yii/yiic.php
 2013-05-11 15:39:51 +06:00
resurtm
5575f53657 CS fixes. 2013-05-11 15:38:07 +06:00
Alexander Kochetov
af3f5af3be RBAC: Item and Assignment optimized save approach 2013-05-11 09:24:02 +04:00
resurtm
124b153350 Initial Gettext support. 2013-05-10 23:57:24 +06:00
Alexander Kochetov
4b8bcd43e0 Unit tests fix 2013-05-10 16:18:01 +04:00
Alexander Kochetov
bea449f8a0 Unit tests 2013-05-10 16:11:04 +04:00
Benjamin Wöster
f23a677bdf mod: incorporate suggestions 
- rename requireApp() to mockApplication()
- always destroy app on tearDown()
  - eliminates need for constant YII_DESTROY_APP_ON_TEARDOWN
  - mockApplication() becomes a lot easier. Destroying app on each tearDown
    means creating it on every call is fine. No more checking if it already
    exists and if it has been created from the same config.
- \yii::$app should have been \Yii::$app
 2013-05-10 02:01:08 +02:00
Qiang Xue
ecbae28700 Merge pull request #197 from tonydspaniard/196-add-popvalue-method 
Enhance ArrayHelper with popValue method
 2013-05-09 16:20:59 -07:00
Benjamin Wöster
c30ee60e9c add: new key for unit tests config named "className". Allows to run the tests 
using different Application instances (consoleApp/ webApp)
mod: TestCase::getParam accepts second param $default=null
 2013-05-09 22:06:58 +02:00
Benjamin Wöster
5e0f6604e8 mod: don't create app in bootstrap script, unit tests do it themselves 
add: option to destroy app after each test to find unit tests that fail
     to require an app
 2013-05-09 21:56:36 +02:00
Benjamin Wöster
d4b30e26c2 allow unit tests to requireApp() on setUp() 2013-05-09 20:41:57 +02:00
Rusinov Maxim
0ad55efba9 Merge branch 'master' of git://github.com/yiisoft/yii2 into 15-unit-tests-of-sqlite-driver 2013-05-09 23:37:39 +06:00
Rusinov Maxim
452be102c6 Added newline at end files. 2013-05-09 23:27:19 +06:00