php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 05:45:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1711 from creocoder/phpunit-usage-fix

Browse Source 
Actualize phpunit usage approach
This commit is contained in:
Carsten Brandt
2013-12-30 11:39:36 -08:00
parent fbb9918a46 32ea48c7ba
commit f09bf4ea1d
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -16,12 +16,14 @@ Thumbs.db
/vendor /vendor
# composer itself is not needed # composer itself is not needed
composer.phar /composer.phar
# composer.lock should not be committed as we always want the latest versions # composer.lock should not be committed as we always want the latest versions
/composer.lock /composer.lock
# Mac DS_Store Files # Mac DS_Store Files
.DS_Store .DS_Store
# phpunit itself is not needed
/phpunit.phar
# local phpunit config # local phpunit config
/phpunit.xml /phpunit.xml

3
composer.json
View File

@@ -83,7 +83,8 @@
"ext-pdo_mysql": "*", "ext-pdo_mysql": "*",
"smarty/smarty": "*", "smarty/smarty": "*",
"swiftmailer/swiftmailer": "*", "swiftmailer/swiftmailer": "*",
"twig/twig": "*" "twig/twig": "*",
"phpunit/phpunit": "3.7.*"
}, },
"suggest": { "suggest": {
"twbs/bootstrap": "required by yii2-bootstrap, yii2-debug, yii2-gii extension", "twbs/bootstrap": "required by yii2-bootstrap, yii2-debug, yii2-gii extension",

5
tests/unit/TestCase.php
View File

@@ -2,11 +2,6 @@
namespace yiiunit; namespace yiiunit;
require_once('PHPUnit/Runner/Version.php');
spl_autoload_unregister(['Yii', 'autoload']);
require_once('PHPUnit/Autoload.php');
spl_autoload_register(['Yii', 'autoload']); // put yii's autoloader at the end
/** /**
* This is the base class for all yii framework unit tests. * This is the base class for all yii framework unit tests.
*/ */