MAGETWO-33060: Refactor __() to return Phrase object

Yurii Torbyk · Yurii Torbyk · commit 0fdef6821ed6 · 2015-02-02T16:28:51.000+02:00
diff --git a/app/code/Magento/Customer/Model/Resource/GroupRepository.php b/app/code/Magento/Customer/Model/Resource/GroupRepository.php
@@ -124,7 +124,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
              * Would like a better way to determine this error condition but
              *  difficult to do without imposing more database calls
              */
-            if ($e->getMessage() === __('Customer Group already exists.')) {
+            if ($e->getMessage() == (string)__('Customer Group already exists.')) {
                 throw new InvalidTransitionException('Customer Group already exists.');
             }
             throw $e;

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)`
`124`	`124`	`* Would like a better way to determine this error condition but`
`125`	`125`	`* difficult to do without imposing more database calls`
`126`	`126`	`*/`
`127`		`- if ($e->getMessage() === __('Customer Group already exists.')) {`
	`127`	`+ if ($e->getMessage() == (string)__('Customer Group already exists.')) {`
`128`	`128`	`throw new InvalidTransitionException('Customer Group already exists.');`
`129`	`129`	`}`
`130`	`130`	`throw $e;`