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

Actualize phpunit usage approach
This commit is contained in:
Carsten Brandt
2013-12-30 11:39:36 -08:00
3 changed files with 5 additions and 7 deletions

4
.gitignore vendored
View File

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

View File

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

View File

@@ -2,11 +2,6 @@
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.
*/