Skip to content

Commit d0aa9b2

Browse files
committed
ACPT-1135: GraphQl scenarios fixes for Application server
-- pr stabilization
1 parent d7cd49f commit d0aa9b2

File tree

7 files changed

+12
-10
lines changed

7 files changed

+12
-10
lines changed

app/code/Magento/CatalogInventory/Model/Configuration.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
use Magento\Store\Model\ScopeInterface;
1414
use Magento\Store\Model\StoreManagerInterface;
1515

16-
/**
17-
* Class Configuration
18-
*/
1916
class Configuration implements StockConfigurationInterface, ResetAfterRequestInterface
2017
{
2118
/**

app/code/Magento/CatalogSearch/Model/ResourceModel/Fulltext/Collection.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ private function getSearch()
249249
/**
250250
* Test search.
251251
*
252-
* @deprecated 100.1.0 @see __construct
252+
* @deprecated 100.1.0
253+
* @see __construct
253254
* @param \Magento\Search\Api\SearchInterface $object
254255
* @return void
255256
* @since 100.1.0
@@ -276,7 +277,8 @@ private function getSearchCriteriaBuilder()
276277
/**
277278
* Set search criteria builder.
278279
*
279-
* @deprecated 100.1.0 @see __construct
280+
* @deprecated 100.1.0
281+
* @see __construct
280282
* @param \Magento\Framework\Api\Search\SearchCriteriaBuilder $object
281283
* @return void
282284
* @since 100.1.0
@@ -302,7 +304,8 @@ private function getFilterBuilder()
302304
/**
303305
* Set filter builder.
304306
*
305-
* @deprecated 100.1.0 @see __construct
307+
* @deprecated 100.1.0
308+
* @see __construct
306309
* @param \Magento\Framework\Api\FilterBuilder $object
307310
* @return void
308311
* @since 100.1.0

app/code/Magento/Eav/Model/ResourceModel/Attribute/Collection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/**
1111
* EAV additional attribute resource collection (Using Forms)
1212
*
13+
* phpcs:disable Magento2.Classes.AbstractApi.AbstractApi
1314
* @api
1415
* @since 100.0.2
1516
*/
@@ -67,7 +68,7 @@ public function __construct(
6768
/**
6869
* @inheritDoc
6970
*/
70-
public function _resetState(): void
71+
public function _resetState(): void //phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedFunction
7172
{
7273
/* Note: because Eav attribute loading takes significant performance,
7374
we are not resetting it like other collections. */

app/code/Magento/Eav/Model/ResourceModel/Form/Attribute/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@ public function setSortOrder($direction = self::SORT_ORDER_ASC)
203203
*/
204204
protected function _beforeLoad()
205205
{
206+
$store = $this->getStore();
206207
$select = $this->getSelect();
207208
$connection = $this->getConnection();
208209
$entityType = $this->getEntityType();
@@ -264,7 +265,6 @@ protected function _beforeLoad()
264265
}
265266
}
266267

267-
$store = $this->getStore();
268268
$joinWebsiteExpression = $connection->quoteInto(
269269
'sa.attribute_id = main_table.attribute_id AND sa.website_id = ?',
270270
(int)$store->getWebsiteId()

app/code/Magento/Newsletter/Model/ResourceModel/Subscriber/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
3232
protected $_storeTable;
3333

3434
/**
35-
* Queue joined flag
35+
* Flag for joined queue
3636
*
3737
* @var boolean
3838
*/

app/code/Magento/Store/Model/StoreManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,6 @@ public function __debugInfo()
335335
*/
336336
public function _resetState(): void
337337
{
338-
$this->reinitStores();
338+
$this->currentStoreId = null;
339339
}
340340
}

dev/tests/integration/framework/Magento/TestFramework/Event/Transaction.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ protected function _processTransactionRequests($eventName, \PHPUnit\Framework\Te
8787
*
8888
* @param \PHPUnit\Framework\TestCase $test
8989
* @SuppressWarnings(PHPMD.UnusedLocalVariable)
90+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
9091
*/
9192
protected function _startTransaction(\PHPUnit\Framework\TestCase $test)
9293
{

0 commit comments

Comments
 (0)