Merge remote-tracking branch 'origin/MAGETWO-49425' into BUGS

slavvka · slavvka · commit 45937358a814 · 2016-05-13T16:30:29.000+03:00
diff --git a/app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php b/app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php
@@ -91,11 +91,11 @@ public function setType(\Magento\Framework\DataObject $type)
     }
 
     /**
-     * @param AbstractAddress|null $address
+     * @param AddressModelInterface|null $address
      * @return string
      * All new code should use renderArray based on Metadata service
      */
-    public function getFormat(AbstractAddress $address = null)
+    public function getFormat(AddressModelInterface $address = null)
     {
         $countryFormat = $address === null
         ? false : $address->getCountryModel()->getFormat(

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,11 @@ public function setType(\Magento\Framework\DataObject $type)`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`/**`
`94`		`- * @param AbstractAddress\|null $address`
	`94`	`+ * @param AddressModelInterface\|null $address`
`95`	`95`	`* @return string`
`96`	`96`	`* All new code should use renderArray based on Metadata service`
`97`	`97`	`*/`
`98`		`- public function getFormat(AbstractAddress $address = null)`
	`98`	`+ public function getFormat(AddressModelInterface $address = null)`
`99`	`99`	`{`
`100`	`100`	`$countryFormat = $address === null`
`101`	`101`	`? false : $address->getCountryModel()->getFormat(`