MAGETWO-34457: Merge and Fix Tests

Alexander Paliarush · Alexander Paliarush · commit b23292c623e4 · 2015-02-25T14:14:35.000+02:00
diff --git a/lib/internal/Magento/Framework/Api/Config/MetadataConfig.php b/lib/internal/Magento/Framework/Api/Config/MetadataConfig.php
@@ -69,6 +69,7 @@ protected function getAttributesMetadata($dataObjectClassName)
     {
         $attributes = [];
         $allAttributes = $this->serviceConfigReader->read();
+        $dataObjectClassName = ltrim($dataObjectClassName, '\\');
         if (isset($allAttributes[$dataObjectClassName])
             && is_array($allAttributes[$dataObjectClassName])
         ) {

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ protected function getAttributesMetadata($dataObjectClassName)`
`69`	`69`	`{`
`70`	`70`	`$attributes = [];`
`71`	`71`	`$allAttributes = $this->serviceConfigReader->read();`
	`72`	`+ $dataObjectClassName = ltrim($dataObjectClassName, '\\');`
`72`	`73`	`if (isset($allAttributes[$dataObjectClassName])`
`73`	`74`	`&& is_array($allAttributes[$dataObjectClassName])`
`74`	`75`	`) {`