MAGETWO-32923: Creating Invoice

Viktor Tymchynskyi · Viktor Tymchynskyi · commit edd2e6aaad65 · 2015-06-26T15:02:46.000+03:00
- Fix SubjectReader
diff --git a/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php b/app/code/Magento/Payment/Gateway/Helper/SubjectReader.php
@@ -34,8 +34,7 @@ public static function readPayment(array $subject)
      */
     public static function readAmount(array $subject)
     {
-        if (!isset($subject['amount'])
-            || $subject['amount'] && !is_numeric($subject['amount'])) {
+        if (!isset($subject['amount']) || !is_numeric($subject['amount'])) {
             throw new \InvalidArgumentException('Amount should be provided');
         }
 
@@ -50,7 +49,7 @@ public static function readAmount(array $subject)
      */
     public static function readField(array $subject)
     {
-        if (!isset($subject['field']) && !is_string($subject['field'])) {
+        if (!isset($subject['field']) || !is_string($subject['field'])) {
             throw new \InvalidArgumentException();
         }
 

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,7 @@ public static function readPayment(array $subject)`
`34`	`34`	`*/`
`35`	`35`	`public static function readAmount(array $subject)`
`36`	`36`	`{`
`37`		`- if (!isset($subject['amount'])`
`38`		`- \|\| $subject['amount'] && !is_numeric($subject['amount'])) {`
	`37`	`+ if (!isset($subject['amount']) \|\| !is_numeric($subject['amount'])) {`
`39`	`38`	`throw new \InvalidArgumentException('Amount should be provided');`
`40`	`39`	`}`
`41`	`40`
`@@ -50,7 +49,7 @@ public static function readAmount(array $subject)`
`50`	`49`	`*/`
`51`	`50`	`public static function readField(array $subject)`
`52`	`51`	`{`
`53`		`- if (!isset($subject['field']) && !is_string($subject['field'])) {`
	`52`	`+ if (!isset($subject['field']) \|\| !is_string($subject['field'])) {`
`54`	`53`	`throw new \InvalidArgumentException();`
`55`	`54`	`}`
`56`	`55`