Skip to content

Commit 1ad0251

Browse files
committed
Fix-up some probelms with test suite
- Mark AbstractController to ignore CouplingBetweenObjects - Set the same json_decode default that Zend_Json uses
1 parent db624ff commit 1ad0251

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

dev/tests/integration/framework/Magento/TestFramework/TestCase/AbstractController.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
/**
1717
* @SuppressWarnings(PHPMD.NumberOfChildren)
18+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1819
*/
1920
abstract class AbstractController extends \PHPUnit_Framework_TestCase
2021
{

dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public function testLoadDefault()
108108
$this->assertNotEmpty($this->model->getTemplateText());
109109
$this->assertNotEmpty($this->model->getTemplateSubject());
110110
$this->assertNotEmpty($this->model->getOrigTemplateVariables());
111-
$this->assertInternalType('array', json_decode($this->model->getOrigTemplateVariables()));
111+
$this->assertInternalType('array', json_decode($this->model->getOrigTemplateVariables(), true));
112112
}
113113

114114
/**

0 commit comments

Comments
 (0)