Skip to content

Standardize the array structure for the getAttributes result #23818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 30, 2019
Merged

Standardize the array structure for the getAttributes result #23818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b43511
standardize the array structure in getAttributes result
thomas-kl1 Jul 22, 2019
5f014be
magento/magento2#23818: Static test fix.
engcom-Foxtrot Aug 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/code/Magento/Eav/Model/AttributeProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Eav\Model;

Expand Down Expand Up @@ -52,7 +53,7 @@ public function __construct(
* Returns array of fields
*
* @param string $entityType
* @return array
* @return string[]
* @throws \Exception
*/
public function getAttributes($entityType)
Expand All @@ -66,6 +67,7 @@ public function getAttributes($entityType)
foreach ($searchResult->getItems() as $attribute) {
$attributes[] = $attribute->getAttributeCode();
}

return $attributes;
}
}
5 changes: 4 additions & 1 deletion lib/internal/Magento/Framework/Model/EntitySnapshot.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Framework\Model;

Expand Down Expand Up @@ -44,6 +45,8 @@ public function __construct(
}

/**
* Register snapshot of entity data.
*
* @param string $entityType
* @param object $entity
* @return void
Expand All @@ -55,7 +58,7 @@ public function registerSnapshot($entityType, $entity)
$entityData = $hydrator->extract($entity);
$attributes = $this->attributeProvider->getAttributes($entityType);
$this->snapshotData[$entityType][$entityData[$metadata->getIdentifierField()]]
= array_intersect_key($entityData, $attributes);
= array_intersect(\array_keys($entityData), $attributes);
}

/**
Expand Down
27 changes: 13 additions & 14 deletions lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Framework\Model\EntitySnapshot;

Expand Down Expand Up @@ -53,31 +54,29 @@ public function __construct(
* Returns array of fields
*
* @param string $entityType
* @return array
* @return string[]
* @throws \Exception
*/
public function getAttributes($entityType)
{
if (!isset($this->registry[$entityType])) {
$metadata = $this->metadataPool->getMetadata($entityType);
$this->registry[$entityType] = $metadata->getEntityConnection()->describeTable($metadata->getEntityTable());
if ($metadata->getLinkField() != $metadata->getIdentifierField()) {
unset($this->registry[$entityType][$metadata->getLinkField()]);
}
$providers = [];
if (isset($this->providers[$entityType])) {
$providers = $this->providers[$entityType];
} elseif (isset($this->providers['default'])) {
$providers = $this->providers['default'];
$entityDescription = $metadata->getEntityConnection()->describeTable($metadata->getEntityTable());
if ($metadata->getLinkField() !== $metadata->getIdentifierField()) {
unset($entityDescription[$metadata->getLinkField()]);
}
$attributes = [];
$attributes[] = \array_keys($entityDescription);

$providers = $this->providers[$entityType] ?? $this->providers['default'] ?? [];
foreach ($providers as $providerClass) {
$provider = $this->objectManager->get($providerClass);
$this->registry[$entityType] = array_merge(
$this->registry[$entityType],
$provider->getAttributes($entityType)
);
$attributes[] = $provider->getAttributes($entityType);
}

$this->registry[$entityType] = \array_merge(...$attributes);
}

return $this->registry[$entityType];
}
}
5 changes: 4 additions & 1 deletion lib/internal/Magento/Framework/Model/EntitySnapshot/AttributeProviderInterface.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
declare(strict_types=1);

namespace Magento\Framework\Model\EntitySnapshot;

Expand All @@ -12,8 +13,10 @@
interface AttributeProviderInterface
{
/**
* Returns array of fields
*
* @param string $entityType
* @return array
* @return string[]
*/
public function getAttributes($entityType);
}