From 5187e9afe747d6a1f3df1595da9247c263e55342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=87=8E=E9=BE=8D=E5=8F=B8?= Date: Fri, 21 Aug 2015 10:25:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A6=AA=E3=82=B3=E3=83=B3=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=83=A9=E3=82=AF=E3=82=BF=E5=91=BC=E3=81=B3=E5=87=BA?= =?UTF-8?q?=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestSuite/YAControllerTestCase.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TestSuite/YAControllerTestCase.php b/TestSuite/YAControllerTestCase.php index ddaa9d9f..fb024bd1 100644 --- a/TestSuite/YAControllerTestCase.php +++ b/TestSuite/YAControllerTestCase.php @@ -61,10 +61,13 @@ class YAControllerTestCase extends ControllerTestCase { /** * Fixtures load - * + * @param string $name The name parameter on PHPUnit_Framework_TestCase::__construct() + * @param array $data The date parameter on PHPUnit_Framework_TestCase::__construct() + * @param string $dataName The dataName parameter on PHPUnit_Framework_TestCase::__construct() * @return void */ - public function __construct() { + public function __construct($name = null, array $data = array(), $dataName = '') { + parent::__construct($name, $data, $dataName); if ($this->_isFixtureMerged) { $this->fixtures = array_merge($this->fixtures, $this->_fixtures); } From 36ddda67d67682d16322d14061e0da6f5ee60a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E9=87=8E=E9=BE=8D=E5=8F=B8?= Date: Tue, 25 Aug 2015 10:47:00 +0900 Subject: [PATCH 2/2] Update YAControllerTestCase.php --- TestSuite/YAControllerTestCase.php | 1 + 1 file changed, 1 insertion(+) diff --git a/TestSuite/YAControllerTestCase.php b/TestSuite/YAControllerTestCase.php index fb024bd1..f4b8be6c 100644 --- a/TestSuite/YAControllerTestCase.php +++ b/TestSuite/YAControllerTestCase.php @@ -61,6 +61,7 @@ class YAControllerTestCase extends ControllerTestCase { /** * Fixtures load + * * @param string $name The name parameter on PHPUnit_Framework_TestCase::__construct() * @param array $data The date parameter on PHPUnit_Framework_TestCase::__construct() * @param string $dataName The dataName parameter on PHPUnit_Framework_TestCase::__construct()