Merge branch 'develop' into FearlessKiwis-MAGETWO-28256-bundle-integration

Yu Tang · Yu Tang · commit ad5dee3af34f · 2015-04-10T08:53:31.000-05:00
diff --git a/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php b/app/code/Magento/Weee/Model/Attribute/Backend/Weee/Tax.php
@@ -118,6 +118,8 @@ public function afterLoad($object)
 
     /**
      * {@inheritdoc}
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function afterSave($object)
     {

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,8 @@ public function afterLoad($object)`
`118`	`118`
`119`	`119`	`/**`
`120`	`120`	`* {@inheritdoc}`
	`121`	`+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)`
	`122`	`+ * @SuppressWarnings(PHPMD.NPathComplexity)`
`121`	`123`	`*/`
`122`	`124`	`public function afterSave($object)`
`123`	`125`	`{`