Skip to content

Commit 9596d76

Browse files
ACPT-987: Evaluate State check testing from PR
1 parent d414521 commit 9596d76

File tree

15 files changed

+981
-23
lines changed

15 files changed

+981
-23
lines changed

app/code/Magento/Eav/Model/ResourceModel/AttributePersistor.php

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@
66

77
namespace Magento\Eav\Model\ResourceModel;
88

9-
use Magento\Catalog\Model\Product;
109
use Magento\Eav\Api\AttributeRepositoryInterface;
11-
use Magento\Catalog\Api\ProductRepositoryInterface;
1210
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
1311
use Magento\Framework\EntityManager\EntityMetadataInterface;
14-
use Magento\Store\Model\StoreManagerInterface;
12+
use Magento\Framework\EntityManager\MetadataPool;
1513
use Magento\Framework\Locale\FormatInterface;
1614
use Magento\Framework\Model\Entity\ScopeInterface;
17-
use Magento\Framework\EntityManager\MetadataPool;
1815

1916
/**
20-
* Class AttributePersistor
17+
* Class AttributePersistor persists attributes
2118
*/
2219
class AttributePersistor
2320
{
@@ -67,6 +64,8 @@ public function __construct(
6764
}
6865

6966
/**
67+
* Registers delete
68+
*
7069
* @param string $entityType
7170
* @param int $link
7271
* @param string $attributeCode
@@ -78,6 +77,8 @@ public function registerDelete($entityType, $link, $attributeCode)
7877
}
7978

8079
/**
80+
* Registers update
81+
*
8182
* @param string $entityType
8283
* @param int $link
8384
* @param string $attributeCode
@@ -90,6 +91,8 @@ public function registerUpdate($entityType, $link, $attributeCode, $value)
9091
}
9192

9293
/**
94+
* Registers Insert
95+
*
9396
* @param string $entityType
9497
* @param int $link
9598
* @param string $attributeCode
@@ -102,6 +105,8 @@ public function registerInsert($entityType, $link, $attributeCode, $value)
102105
}
103106

104107
/**
108+
* Process deletes
109+
*
105110
* @param string $entityType
106111
* @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
107112
* @return void
@@ -132,6 +137,8 @@ public function processDeletes($entityType, $context)
132137
}
133138

134139
/**
140+
* Process inserts
141+
*
135142
* @param string $entityType
136143
* @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
137144
* @return void
@@ -194,6 +201,8 @@ private function prepareInsertDataForMultipleSave($entityType, $context)
194201
}
195202

196203
/**
204+
* Process updates
205+
*
197206
* @param string $entityType
198207
* @param \Magento\Framework\Model\Entity\ScopeInterface[] $context
199208
* @return void
@@ -329,10 +338,14 @@ public function flush($entityType, $context)
329338
$this->processDeletes($entityType, $context);
330339
$this->processInserts($entityType, $context);
331340
$this->processUpdates($entityType, $context);
332-
unset($this->delete, $this->insert, $this->update);
341+
$this->delete = [];
342+
$this->insert = [];
343+
$this->update = [];
333344
}
334345

335346
/**
347+
* Prepares value
348+
*
336349
* @param string $entityType
337350
* @param string $value
338351
* @param AbstractAttribute $attribute
@@ -355,6 +368,8 @@ protected function prepareValue($entityType, $value, AbstractAttribute $attribut
355368
}
356369

357370
/**
371+
* Gets scope value
372+
*
358373
* @param ScopeInterface $scope
359374
* @param AbstractAttribute $attribute
360375
* @param bool $useDefault

app/code/Magento/GraphQl/etc/schema.graphqls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ input FilterRangeTypeInput @doc(description: "Defines a filter that matches a ra
7676
}
7777

7878
input FilterMatchTypeInput @doc(description: "Defines a filter that performs a fuzzy search.") {
79-
match: String @doc(description: "Use this attribute to exactly match the specified string. For example, to filter on a specific SKU, specify a value such as `24-MB01`.")
79+
match: String @doc(description: "Use this attribute to fuzzy match the specified string. For example, to filter on a specific SKU, specify a value such as `24-MB01`.")
8080
}
8181

8282
input FilterStringTypeInput @doc(description: "Defines a filter for an input string.") {

dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function endTest(TestCase $test)
9090
$values = $this->parse($test);
9191
} catch (\Throwable $exception) {
9292
ExceptionHandler::handle(
93-
'Unable to parse fixtures',
93+
'Unable to parse annotations',
9494
get_class($test),
9595
$test->getName(false),
9696
$exception

dev/tests/integration/testsuite/Magento/Framework/Code/_expected/SourceClassWithNamespaceProxy.php.sample

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,17 @@ class Proxy extends \Magento\Framework\Code\GeneratorTest\SourceClassWithNamespa
7272
*/
7373
public function __clone()
7474
{
75-
$this->_subject = clone $this->_getSubject();
75+
if ($this->_subject) {
76+
$this->_subject = clone $this->_getSubject();
77+
}
78+
}
79+
80+
/**
81+
* Debug proxied instance
82+
*/
83+
public function __debugInfo()
84+
{
85+
return ['i' => $this->_subject];
7686
}
7787

7888
/**

0 commit comments

Comments
 (0)