Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2015-03-12 14:50:03 +0300
committerdiosmosis <benaka@piwik.pro>2015-03-12 14:50:03 +0300
commit665e84bb698bf9fa1666e55d6e0380fe2fda783d (patch)
treea4367443bc48375f06742a6249ea04920e6c9069 /tests/PHPUnit/Framework/TestCase
parentd2a2d2b58bfc2ffc6d17cd5b5ea982b07a5c263a (diff)
parent484935ce69c19e94d4b2a95aca33e75b0802abbe (diff)
Merge branch 'master' into geo-attribution-task
Diffstat (limited to 'tests/PHPUnit/Framework/TestCase')
-rwxr-xr-xtests/PHPUnit/Framework/TestCase/UnitTestCase.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
index f08eaa1953..8e07c39cc7 100755
--- a/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/UnitTestCase.php
@@ -18,7 +18,7 @@ use Piwik\Tests\Framework\Mock\File;
*/
abstract class UnitTestCase extends \PHPUnit_Framework_TestCase
{
- public function setup()
+ public function setUp()
{
parent::setUp();
File::reset();