techdivision /
import-product-bundle
| @@ 194-201 (lines=8) @@ | ||
| 191 | * @return array The merged entity |
|
| 192 | * @todo https://github.com/techdivision/import/issues/179 |
|
| 193 | */ |
|
| 194 | protected function mergeEntity(array $entity, array $attr, $changeSetName = null) |
|
| 195 | { |
|
| 196 | return array_merge( |
|
| 197 | $entity, |
|
| 198 | $this->entityMerger ? $this->entityMerger->merge($this, $entity, $attr) : $attr, |
|
| 199 | array(EntityStatus::MEMBER_NAME => $this->detectState($entity, $attr, $changeSetName)) |
|
| 200 | ); |
|
| 201 | } |
|
| 202 | ||
| 203 | /** |
|
| 204 | * Load's and return's a raw entity without primary key but the mandatory members only and nulled values. |
|
| @@ 209-216 (lines=8) @@ | ||
| 206 | * @return array The merged entity |
|
| 207 | * @todo https://github.com/techdivision/import/issues/179 |
|
| 208 | */ |
|
| 209 | protected function mergeEntity(array $entity, array $attr, $changeSetName = null) |
|
| 210 | { |
|
| 211 | return array_merge( |
|
| 212 | $entity, |
|
| 213 | $this->entityMerger ? $this->entityMerger->merge($this, $entity, $attr) : $attr, |
|
| 214 | array(EntityStatus::MEMBER_NAME => $this->detectState($entity, $attr, $changeSetName)) |
|
| 215 | ); |
|
| 216 | } |
|
| 217 | ||
| 218 | /** |
|
| 219 | * Load's and return's a raw entity without primary key but the mandatory members only and nulled values. |
|
