Resolved conflict of CancelOrder file

nishant04412 · nishant04412 · commit 94c6d81f878e · 2023-10-09T15:00:38.000+05:30
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php
@@ -568,8 +568,7 @@ private function getProductsCountFromCategoryTable(Category $item, string $websi
      */
     private function getProductsCountQuery(array $categoryIds, $addVisibilityFilter = true): Select
     {
-        $connections = $this->_resource->getConnection();
-        $categoryTable = $connections->getTableName('catalog_category_product_index');
+        $categoryTable = $this->_resource->getTableName('catalog_category_product_index');
         $select = $this->_conn->select()
             ->from(
                 ['cat_index' => $categoryTable],
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -92,8 +92,7 @@ public function __construct(
         $this->changeDetector = $changeDetector;
         $this->processorFacadeFactory = $processorFacadeFactory;
         $this->deploymentConfig = $deploymentConfig;
-        $this->localeEmulator = $localeEmulator ??
-            ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);
+        $this->localeEmulator = $localeEmulator;
 
         parent::__construct();
     }
diff --git a/app/code/Magento/Config/Console/Command/ConfigShowCommand.php b/app/code/Magento/Config/Console/Command/ConfigShowCommand.php
@@ -126,8 +126,7 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(PathValidatorFactory::class);
         $this->emulatedAreaProcessor = $emulatedAreaProcessor
             ?: ObjectManager::getInstance()->get(EmulatedAdminhtmlAreaProcessor::class);
-        $this->localeEmulator = $localeEmulator
-            ?: ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);
+        $this->localeEmulator = $localeEmulator;
     }
 
     /**
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
@@ -11,7 +11,7 @@
     <preference for="Magento\Framework\App\Config\ConfigResource\ConfigInterface" type="Magento\Config\Model\ResourceModel\Config" />
     <preference for="Magento\Framework\App\Config\CommentParserInterface" type="Magento\Config\Model\Config\Parser\Comment" />
     <preference for="Magento\Config\Model\Config\Structure\ElementVisibilityInterface" type="Magento\Config\Model\Config\Structure\ElementVisibilityComposite" />
-    <preference for="Magento\Config\Console\Command\LocaleEmulatorInterface" type="Magento\Config\Console\Command\LocaleEmulator\Proxy" />
+    <preference for="Magento\Config\Console\Command\LocaleEmulatorInterface" type="Magento\Config\Console\Command\LocaleEmulator" />
     <type name="Magento\Config\Model\Config\Structure\ElementVisibilityComposite">
         <arguments>
             <argument name="visibility" xsi:type="array">
@@ -310,6 +310,12 @@
     <type name="Magento\Config\Console\Command\ConfigShowCommand">
         <arguments>
             <argument name="configSource" xsi:type="object">configShowSourceAggregated</argument>
+            <argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Magento\Config\Console\Command\ConfigSetCommand">
+        <arguments>
+            <argument name="localeEmulator" xsi:type="object">Magento\Config\Console\Command\LocaleEmulatorInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\Console\CommandListInterface">
diff --git a/app/code/Magento/OrderCancellationGraphQl/Model/Resolver/CancelOrder.php b/app/code/Magento/OrderCancellationGraphQl/Model/Resolver/CancelOrder.php
@@ -107,6 +107,13 @@ public function resolve(
                 ];
             }
 
+            if ($order->hasShipments()) {
+                return [
+                    'error' => __('Order with one or more items shipped cannot be cancelled'),
+                    'order' => $this->orderFormatter->format($order)
+                ];
+            }
+
             if (!$this->config->isOrderCancellationEnabledForStore((int)$order->getStoreId())) {
                 return [
                     'error' =>  __('Order cancellation is not enabled for requested store.')
diff --git a/app/code/Magento/PageCache/Controller/Block.php b/app/code/Magento/PageCache/Controller/Block.php
@@ -4,13 +4,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\PageCache\Controller;
 
 use Magento\Framework\Serialize\Serializer\Base64Json;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Validator\RegexFactory;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\View\Layout\LayoutCacheKeyInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 abstract class Block extends \Magento\Framework\App\Action\Action
 {
@@ -51,21 +54,33 @@ abstract class Block extends \Magento\Framework\App\Action\Action
      */
     private const VALIDATION_RULE_PATTERN = '/^[a-z0-9]+[a-z0-9_]*$/i';
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $config;
+
+    /**
+     * Handle size system name
+     */
+    private const XML_HANDLES_SIZE = 'system/full_page_cache/handles_size';
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param Json $jsonSerializer
      * @param Base64Json $base64jsonSerializer
      * @param LayoutCacheKeyInterface $layoutCacheKey
      * @param RegexFactory|null $regexValidatorFactory
+     * @param ScopeConfigInterface|null $scopeConfig
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\Translate\InlineInterface $translateInline,
         Json $jsonSerializer = null,
         Base64Json $base64jsonSerializer = null,
         LayoutCacheKeyInterface $layoutCacheKey = null,
-        ?RegexFactory $regexValidatorFactory = null
+        ?RegexFactory $regexValidatorFactory = null,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         parent::__construct($context);
         $this->translateInline = $translateInline;
@@ -77,6 +92,8 @@ public function __construct(
             ?: ObjectManager::getInstance()->get(LayoutCacheKeyInterface::class);
         $this->regexValidatorFactory = $regexValidatorFactory
             ?: ObjectManager::getInstance()->get(RegexFactory::class);
+        $this->config = $scopeConfig
+            ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -94,6 +111,11 @@ protected function _getBlocks()
         }
         $blocks = $this->jsonSerializer->unserialize($blocks);
         $handles = $this->base64jsonSerializer->unserialize($handles);
+
+        $handleSize = (int) $this->config->getValue(self::XML_HANDLES_SIZE);
+        $handles = ($handleSize && count($handles) > $handleSize)
+            ? array_splice($handles, 0, $handleSize) : $handles;
+
         if (!$this->validateHandleParam($handles)) {
             return [];
         }
diff --git a/app/code/Magento/PageCache/etc/adminhtml/system.xml b/app/code/Magento/PageCache/etc/adminhtml/system.xml
@@ -78,6 +78,10 @@
                     <comment>Public content cache lifetime in seconds. If field is empty default value 86400 will be saved. </comment>
                     <backend_model>Magento\PageCache\Model\System\Config\Backend\Ttl</backend_model>
                 </field>
+                <field id="handles_size" type="text" translate="label comment" sortOrder="5" showInDefault="1" canRestore="1">
+                    <label>Handles params size</label>
+                    <comment>Handles params size. For better performance use handles parameter size between 50 and 100. </comment>
+                </field>
             </group>
         </section>
     </system>
diff --git a/app/code/Magento/PageCache/etc/config.xml b/app/code/Magento/PageCache/etc/config.xml
@@ -24,6 +24,7 @@
                     <path>varnish4.vcl</path>
                 </varnish4>
                 <ttl>86400</ttl>
+                <handles_size>100</handles_size>
                 <caching_application>1</caching_application>
                 <default>
                     <access_list>localhost</access_list>
diff --git a/app/code/Magento/PageCache/etc/di.xml b/app/code/Magento/PageCache/etc/di.xml
@@ -35,6 +35,7 @@
     <type name="Magento\PageCache\Controller\Block">
         <arguments>
             <argument name="layoutCacheKey" xsi:type="object">Magento\Framework\View\Layout\LayoutCacheKeyInterface</argument>
+            <argument name="scopeConfig" xsi:type="object">Magento\Framework\App\Config\ScopeConfigInterface\Proxy</argument>
         </arguments>
     </type>
     <type name="Magento\Framework\App\Cache\RuntimeStaleCacheStateModifier">
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/OrderCancellation/CancelOrderTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/OrderCancellation/CancelOrderTest.php
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
diff --git a/lib/internal/Magento/Framework/App/Http/Context.php b/lib/internal/Magento/Framework/App/Http/Context.php
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Http/ContextTest.php

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,7 @@ public function __construct(`
`92`	`92`	`$this->changeDetector = $changeDetector;`
`93`	`93`	`$this->processorFacadeFactory = $processorFacadeFactory;`
`94`	`94`	`$this->deploymentConfig = $deploymentConfig;`
`95`		`- $this->localeEmulator = $localeEmulator ??`
`96`		`- ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);`
	`95`	`+ $this->localeEmulator = $localeEmulator;`
`97`	`96`
`98`	`97`	`parent::__construct();`
`99`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,8 +126,7 @@ public function __construct(`
`126`	`126`	`?: ObjectManager::getInstance()->get(PathValidatorFactory::class);`
`127`	`127`	`$this->emulatedAreaProcessor = $emulatedAreaProcessor`
`128`	`128`	`?: ObjectManager::getInstance()->get(EmulatedAdminhtmlAreaProcessor::class);`
`129`		`- $this->localeEmulator = $localeEmulator`
`130`		`- ?: ObjectManager::getInstance()->get(LocaleEmulatorInterface::class);`
	`129`	`+ $this->localeEmulator = $localeEmulator;`
`131`	`130`	`}`
`132`	`131`
`133`	`132`	`/**`