Merge branch '2.4.4-develop' into cia-2.4.4-develop-bugfixes-04112021

Author: admanesachin

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

@@ -135,7 +135,7 @@ public function checkQuoteItemQty(StockItemInterface $stockItem, $qty, $summaryQ
         $result->addData($this->checkQtyIncrements($stockItem, $qty)->getData());
 
         $result->setItemIsQtyDecimal($stockItem->getIsQtyDecimal());
-        if (!$stockItem->getIsQtyDecimal() && (floor($qty) !== $qty)) {
+        if (!$stockItem->getIsQtyDecimal() && (floor($qty) !== (float) $qty)) {
             $result->setHasError(true)
                 ->setMessage(__('You cannot use decimal quantity for this product.'))
                 ->setErrorCode('qty_decimal')

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

@@ -77,8 +77,6 @@ class Storage extends \Magento\Framework\DataObject
     protected $_coreFileStorageDb = null;
 
     /**
-     * Cms wysiwyg images
-     *
      * @var \Magento\Cms\Helper\Wysiwyg\Images
      */
     protected $_cmsWysiwygImages = null;
@@ -109,36 +107,26 @@ class Storage extends \Magento\Framework\DataObject
     protected $_session;
 
     /**
-     * Directory database factory
-     *
      * @var \Magento\MediaStorage\Model\File\Storage\Directory\DatabaseFactory
      */
     protected $_directoryDatabaseFactory;
 
     /**
-     * Storage database factory
-     *
      * @var \Magento\MediaStorage\Model\File\Storage\DatabaseFactory
      */
     protected $_storageDatabaseFactory;
 
     /**
-     * Storage file factory
-     *
      * @var \Magento\MediaStorage\Model\File\Storage\FileFactory
      */
     protected $_storageFileFactory;
 
     /**
-     * Storage collection factory
-     *
      * @var \Magento\Cms\Model\Wysiwyg\Images\Storage\CollectionFactory
      */
     protected $_storageCollectionFactory;
 
     /**
-     * Uploader factory
-     *
      * @var \Magento\MediaStorage\Model\File\UploaderFactory
      */
     protected $_uploaderFactory;
@@ -745,8 +733,8 @@ private function getResizedParams(string $source): array
         $configWidth = $this->_resizeParameters['width'];
         $configHeight = $this->_resizeParameters['height'];
 
-        //phpcs:ignore Generic.PHP.NoSilencedErrors
-        [$imageWidth, $imageHeight] = @getimagesize($source);
+        $driver = $this->_directory->getDriver();
+        [$imageWidth, $imageHeight] = getimagesizefromstring($driver->fileGetContents($source));
 
         if ($imageWidth && $imageHeight) {
             $imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
@@ -999,7 +987,7 @@ private function getAllowedPathPattern()
             );
             $regExp = '/^(';
             $or = '';
-            foreach($mediaGalleryImageFolders as $folder) {
+            foreach ($mediaGalleryImageFolders as $folder) {
                 $folderPattern = str_replace('/', '[\/]+', $folder);
                 $regExp .= $or . $folderPattern . '\b(?!-)(?:\/?[a-zA-Z0-9\-\_]+)*\/?$';
                 $or = '|';
@@ -1013,7 +1001,7 @@ private function getAllowedPathPattern()
     /**
      * Get allowed media gallery image folders
      *
-     * example:
+     * Example:
      *   [
      *     [0 => 'wysiwyg'],
      *     [0 => 'catalog', 1 => 'category']

app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php

@@ -141,6 +141,9 @@ class StorageTest extends TestCase
      */
     private $fileMock;
 
+    /**
+     * @var array
+     */
     private $allowedImageExtensions = [
         'jpg' => 'image/jpg',
         'jpeg' => 'image/jpeg',
@@ -366,13 +369,13 @@ public function testGetDirsCollectionCreateSubDirectories()
     }
 
     /**
-     * @param array $exclude
-     * @param array $include
-     * @param array $fileNames
-     * @param array $expectedRemoveKeys
+     * @param $path
+     * @param $callNum
+     * @param string $dirsFilter
+     * @throws \Exception
      * @dataProvider dirsCollectionDataProvider
      */
-    public function testGetDirsCollection($path, $callNum, $dirsFilter='')
+    public function testGetDirsCollection($path, $callNum, $dirsFilter = '')
     {
         $this->generalTestGetDirsCollection($path, $callNum, $dirsFilter);
     }
@@ -517,6 +520,9 @@ public function testUploadFile()
                     [$thumbnailTargetPath, true],
                 ]
             );
+        $this->driverMock->expects(self::once())
+            ->method('fileGetContents')
+            ->willReturn('some content');
 
         $image = $this->getMockBuilder(Image::class)
             ->disableOriginalConstructor()

app/code/Magento/Paypal/Block/PayLater/Banner.php

@@ -11,6 +11,8 @@
 use Magento\Framework\View\Element\Template;
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
+use Magento\Paypal\Model\Config as PaypalConfig;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * PayPal PayLater component block
@@ -38,23 +40,32 @@ class Banner extends Template
      */
     private $position = '';
 
+    /**
+     * @var PaypalConfig
+     */
+    private $paypalConfig;
+
     /**
      * @param Template\Context $context
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
      * @param array $data
+     * @param PaypalConfig $paypalConfig
      */
     public function __construct(
         Template\Context $context,
         PayLaterConfig $payLaterConfig,
         SdkUrl $sdkUrl,
-        array $data = []
+        array $data = [],
+        PaypalConfig $paypalConfig = null
     ) {
         parent::__construct($context, $data);
         $this->payLaterConfig = $payLaterConfig;
         $this->sdkUrl = $sdkUrl;
         $this->placement = $data['placement'] ??  '';
         $this->position = $data['position'] ??  '';
+        $this->paypalConfig = $paypalConfig ?: ObjectManager::getInstance()
+            ->get(PaypalConfig::class);
     }
 
     /**
@@ -85,6 +96,9 @@ public function getJsLayout()
         $displayAmount = $config['displayAmount'] ?? false;
         $config['displayAmount'] = !$displayAmount || $this->payLaterConfig->isPPBillingAgreementEnabled()
             ? false : true;
+        $config['dataAttributes'] = [
+            'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
+        ];
 
         //Extend block component attributes with defaults
         $componentAttributes = $this->jsLayout['components']['payLater']['config']['attributes'] ?? [];

app/code/Magento/Paypal/Block/PayLater/LayoutProcessor.php

@@ -9,8 +9,10 @@
 namespace Magento\Paypal\Block\PayLater;
 
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Paypal\Model\PayLaterConfig;
 use Magento\Paypal\Model\SdkUrl;
+use Magento\Paypal\Model\Config as PaypalConfig;
 
 /**
  * PayLater Layout Processor
@@ -32,25 +34,35 @@ class LayoutProcessor implements LayoutProcessorInterface
      */
     private $sdkUrl;
 
+    /**
+     * @var PaypalConfig
+     */
+    private $paypalConfig;
+
     /**
      * @param PayLaterConfig $payLaterConfig
      * @param SdkUrl $sdkUrl
+     * @param PaypalConfig $paypalConfig
      */
-    public function __construct(PayLaterConfig $payLaterConfig, SdkUrl $sdkUrl)
-    {
+    public function __construct(
+        PayLaterConfig $payLaterConfig,
+        SdkUrl $sdkUrl,
+        PaypalConfig $paypalConfig
+    ) {
         $this->payLaterConfig = $payLaterConfig;
         $this->sdkUrl = $sdkUrl;
+        $this->paypalConfig = $paypalConfig;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function process($jsLayout)
     {
         if (!$this->payLaterConfig->isEnabled(PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT)) {
             unset($jsLayout['components']['checkout']['children']['steps']['children']['billing-step']
-                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']['children']
-                ['paylater-place-order']);
+                ['children']['payment']['children']['payments-list']['children']['paypal-method-extra-content']
+                ['children']['paylater-place-order']);
 
             return $jsLayout;
         }
@@ -75,6 +87,9 @@ public function process($jsLayout)
             $displayAmount = $config['displayAmount'] ?? false;
             $config['displayAmount'] = !$displayAmount || $this->payLaterConfig->isPPBillingAgreementEnabled()
                 ? false : true;
+            $config['dataAttributes'] = [
+                'data-partner-attribution-id' => $this->paypalConfig->getBuildNotationCode()
+            ];
 
             $attributes = $this->payLaterConfig->getSectionConfig(
                 PayLaterConfig::CHECKOUT_PAYMENT_PLACEMENT,

app/code/Magento/Paypal/Model/Config.php

@@ -12,7 +12,6 @@
  * Config model that is aware of all \Magento\Paypal payment methods
  *
  * Works with PayPal-specific system configuration
-
  * @SuppressWarnings(PHPMD.ExcessivePublicCount)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
@@ -180,7 +179,6 @@ class Config extends AbstractConfig
     const PAYLATER = 'paypal_paylater';
 
     /**
-     * Instructions for generating proper BN code
      *
      * @var array
      */
@@ -191,7 +189,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Style system config map (Express Checkout)
      *
      * @var array
      */
@@ -204,7 +201,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Currency codes supported by PayPal methods
      *
      * @var string[]
      */
@@ -234,7 +230,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Merchant country supported by PayPal
      *
      * @var string[]
      */
@@ -310,7 +305,6 @@ class Config extends AbstractConfig
     ];
 
     /**
-     * Buyer country supported by PayPal
      *
      * @var string[]
      */
@@ -837,10 +831,10 @@ public function getCountryMethods($countryCode = null)
      * @param string $token
      * @return string
      */
-    public function getPayPalBasicStartUrl($token)
+    public function getPayPalBasicStartUrl($token): string
     {
         $params = [
-            'cmd'   => '_express-checkout',
+            'cmd' => '_express-checkout',
             'token' => $token,
         ];
 
@@ -1519,6 +1513,7 @@ protected function _mapExpressFieldset($fieldName)
             case 'merchant_id':
             case 'client_id':
             case 'sandbox_client_id':
+            case 'buyer_country':
             case 'supported_locales':
             case 'smart_buttons_supported_locales':
                 return "payment/{$this->_methodCode}/{$fieldName}";
@@ -1591,6 +1586,7 @@ protected function _mapWppFieldset($fieldName)
             case 'api_signature':
             case 'api_cert':
             case 'sandbox_flag':
+            case 'buyer_country':
             case 'use_proxy':
             case 'proxy_host':
             case 'proxy_port':
@@ -1631,6 +1627,7 @@ protected function _mapWpukFieldset($fieldName)
             case 'vendor':
             case 'pwd':
             case 'sandbox_flag':
+            case 'buyer_country':
             case 'use_proxy':
             case 'proxy_host':
             case 'proxy_port':