techdivision /
import-product-media
| @@ 177-184 (lines=8) @@ | ||
| 174 | * @return array The merged entity |
|
| 175 | * @todo https://github.com/techdivision/import/issues/179 |
|
| 176 | */ |
|
| 177 | protected function mergeEntity(array $entity, array $attr, $changeSetName = null) |
|
| 178 | { |
|
| 179 | return array_merge( |
|
| 180 | $entity, |
|
| 181 | $this->entityMerger ? $this->entityMerger->merge($this, $entity, $attr) : $attr, |
|
| 182 | array(EntityStatus::MEMBER_NAME => $this->detectState($entity, $attr, $changeSetName)) |
|
| 183 | ); |
|
| 184 | } |
|
| 185 | ||
| 186 | /** |
|
| 187 | * Appends the dynamic attributes to the static ones and returns them. |
|
| @@ 137-144 (lines=8) @@ | ||
| 134 | * @return array The merged entity |
|
| 135 | * @todo https://github.com/techdivision/import/issues/179 |
|
| 136 | */ |
|
| 137 | protected function mergeEntity(array $entity, array $attr, $changeSetName = null) |
|
| 138 | { |
|
| 139 | return array_merge( |
|
| 140 | $entity, |
|
| 141 | $this->entityMerger ? $this->entityMerger->merge($this, $entity, $attr) : $attr, |
|
| 142 | array(EntityStatus::MEMBER_NAME => $this->detectState($entity, $attr, $changeSetName)) |
|
| 143 | ); |
|
| 144 | } |
|
| 145 | ||
| 146 | /** |
|
| 147 | * Appends the dynamic to the static attributes for the media type |
|
