Commit f09bf4ea by Carsten Brandt

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

Actualize phpunit usage approach
parents fbb9918a 32ea48c7
...@@ -16,12 +16,14 @@ Thumbs.db ...@@ -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
...@@ -83,7 +83,8 @@ ...@@ -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",
......
...@@ -2,11 +2,6 @@ ...@@ -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.
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment