MAGETWO-41900: Merge Branches and Stabilize Builds

Hayder Sharhan · Hayder Sharhan · commit 8da99cf8186d · 2016-02-22T09:20:05.000-06:00
- static test fixes.
diff --git a/app/code/Magento/Translation/Model/Inline/Parser.php b/app/code/Magento/Translation/Model/Inline/Parser.php
@@ -9,6 +9,8 @@
 /**
  * This class is responsible for parsing content and applying necessary html element
  * wrapping and client scripts for inline translation.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Parser implements \Magento\Framework\Translate\Inline\ParserInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@`
`9`	`9`	`/**`
`10`	`10`	`* This class is responsible for parsing content and applying necessary html element`
`11`	`11`	`* wrapping and client scripts for inline translation.`
	`12`	`+ *`
	`13`	`+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)`
`12`	`14`	`*/`
`13`	`15`	`class Parser implements \Magento\Framework\Translate\Inline\ParserInterface`
`14`	`16`	`{`