From c14a6b47a59dfd8865cb9909db89d49f4e530137 Mon Sep 17 00:00:00 2001 From: Shane Auckland Date: Mon, 6 Apr 2015 22:53:30 +0100 Subject: [PATCH 1/3] Rename presenter property --- src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php b/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php index 3f375cf..809a916 100644 --- a/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php +++ b/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php @@ -37,7 +37,7 @@ */ class BeInArea extends BasicMatcher { - private $representer; + private $presenter; public function __construct(PresenterInterface $presenter) { From 79cbff9b6f865161521bd441649a371b9a0b8718 Mon Sep 17 00:00:00 2001 From: Shane Auckland Date: Mon, 6 Apr 2015 22:53:58 +0100 Subject: [PATCH 2/3] Ensure matches methods returns something --- src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php b/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php index 809a916..3732f31 100644 --- a/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php +++ b/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php @@ -54,7 +54,7 @@ public function supports($alias, $subject, array $arguments) protected function matches($subject, array $arguments) { - $subject->get('mage')->app()->getArea() === $arguments[0]; + return $subject->get('mage')->app()->getArea() === $arguments[0]; } protected function getFailureException($name, $subject, array $arguments) From 3deb1c6cb410b6fd99b2654d6792d22ed2d3857a Mon Sep 17 00:00:00 2001 From: Shane Auckland Date: Mon, 6 Apr 2015 22:54:17 +0100 Subject: [PATCH 3/3] Remove unused assignment --- src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php | 1 - 1 file changed, 1 deletion(-) diff --git a/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php b/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php index 3732f31..ae0ff0a 100644 --- a/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php +++ b/src/MageTest/PhpSpec/MagentoExtension/Matcher/BeInArea.php @@ -70,7 +70,6 @@ protected function getFailureException($name, $subject, array $arguments) protected function getNegativeFailureException($name, $subject, array $arguments) { - $area = $subject->get('mage')->app()->getArea(); return new FailureException(sprintf( 'Expected %s not to be in area %s.', $this->presenter->presentValue($subject),