Merge pull request #63 from chrisastley/master

pingiun · web-flow · commit cd9457b059ae · 2025-11-13T10:31:07.000+01:00
Fix nullable is deprecated error on PHP 8.4
diff --git a/Api/Data/ProductStoreView.php b/Api/Data/ProductStoreView.php
@@ -104,7 +104,7 @@ class ProductStoreView
     /** @var CustomOptionValue[][] */
     protected $customOptionValues = [];
 
-    public function setName(string $name = null)
+    public function setName(?string $name = null)
     {
         $this->attributes[self::ATTR_NAME] = ($name === null) ? null : trim($name);
     }
@@ -137,7 +137,7 @@ public function removeStoreViewId()
      *
      * @param int|null $status
      */
-    public function setStatus(int $status = null)
+    public function setStatus(?int $status = null)
     {
         $this->attributes[self::ATTR_STATUS] = $status;
     }
@@ -147,35 +147,35 @@ public function setStatus(int $status = null)
      *
      * @param int|null $available
      */
-    public function setGiftMessageAvailable(int $available = null)
+    public function setGiftMessageAvailable(?int $available = null)
     {
         $this->attributes[self::ATTR_GIFT_MESSAGE_AVAILABLE] = $available;
     }
 
-    public function setDescription(string $description = null)
+    public function setDescription(?string $description = null)
     {
         // textarea input: not trimmed
         $this->attributes[self::ATTR_DESCRIPTION] = $description;
     }
 
-    public function setShortDescription(string $shortDescription = null)
+    public function setShortDescription(?string $shortDescription = null)
     {
         // textarea input: not trimmed
         $this->attributes[self::ATTR_SHORT_DESCRIPTION] = $shortDescription;
     }
 
-    public function setMetaTitle(string $metaTitle = null)
+    public function setMetaTitle(?string $metaTitle = null)
     {
         $this->attributes[self::ATTR_META_TITLE] = ($metaTitle === null) ? null : trim($metaTitle);
     }
 
-    public function setMetaDescription(string $metaDescription = null)
+    public function setMetaDescription(?string $metaDescription = null)
     {
         // textarea input: not trimmed
         $this->attributes[self::ATTR_META_DESCRIPTION] = $metaDescription;
     }
 
-    public function setMetaKeywords(string $metaKeywords = null)
+    public function setMetaKeywords(?string $metaKeywords = null)
     {
         // textarea input: not trimmed
         $this->attributes[self::ATTR_META_KEYWORDS] = $metaKeywords;
@@ -184,23 +184,23 @@ public function setMetaKeywords(string $metaKeywords = null)
     /**
      * @param string|null $price A 12.4 / 20.6 decimal field
      */
-    public function setPrice(string $price = null)
+    public function setPrice(?string $price = null)
     {
         $this->attributes[self::ATTR_PRICE] = Decimal::formatPrice($price);
     }
 
     /**
      * @param string|null $cost A 12.4 decimal field
      */
-    public function setCost(string $cost = null)
+    public function setCost(?string $cost = null)
     {
         $this->attributes[self::ATTR_COST] = Decimal::format($cost);
     }
 
     /**
      * @param string|null $msrp Manufacturer Suggested Retail Price. A 12.4 decimal field
      */
-    public function setMsrp(string $msrp = null)
+    public function setMsrp(?string $msrp = null)
     {
         $this->attributes[self::ATTR_MSRP] = Decimal::format($msrp);
     }
@@ -210,7 +210,7 @@ public function setMsrp(string $msrp = null)
      *
      * @param int|null $type
      */
-    public function setMsrpDisplayActualPriceType(int $type = null)
+    public function setMsrpDisplayActualPriceType(?int $type = null)
     {
         $this->attributes[self::ATTR_MSRP_DISPLAY_ACTUAL_PRICE_TYPE] = $type;
     }
@@ -220,22 +220,22 @@ public function setMsrpDisplayActualPriceType(int $type = null)
      *
      * @param int|null $visibility
      */
-    public function setVisibility(int $visibility = null)
+    public function setVisibility(?int $visibility = null)
     {
         $this->attributes[self::ATTR_VISIBILITY] = $visibility;
     }
 
-    public function setTaxClassId(int $taxClassId = null)
+    public function setTaxClassId(?int $taxClassId = null)
     {
         $this->attributes[self::ATTR_TAX_CLASS_ID] = $taxClassId;
     }
 
-    public function setTaxClassName(string $taxClassName = null)
+    public function setTaxClassName(?string $taxClassName = null)
     {
         $this->unresolvedAttributes[self::ATTR_TAX_CLASS_ID] = ($taxClassName === null) ? null : trim($taxClassName);
     }
 
-    public function setUrlKey(string $urlKey = null)
+    public function setUrlKey(?string $urlKey = null)
     {
         $this->attributes[self::ATTR_URL_KEY] = ($urlKey === null) ? null : trim($urlKey);
     }
@@ -256,71 +256,71 @@ public function generateUrlKey()
     /**
      * @param string|null $weight A 12.4 decimal field
      */
-    public function setWeight(string $weight = null)
+    public function setWeight(?string $weight = null)
     {
         $this->attributes[self::ATTR_WEIGHT] = Decimal::format($weight);
     }
 
     /**
      * @param string|null $specialPrice A 12.4 decimal field
      */
-    public function setSpecialPrice(string $specialPrice = null)
+    public function setSpecialPrice(?string $specialPrice = null)
     {
         $this->attributes[self::ATTR_SPECIAL_PRICE] = Decimal::formatPrice($specialPrice);
     }
 
     /**
      * @param string|null $specialPriceFromDate A y-m-d MySql date
      */
-    public function setSpecialFromDate(string $specialPriceFromDate = null)
+    public function setSpecialFromDate(?string $specialPriceFromDate = null)
     {
         $this->attributes[self::ATTR_SPECIAL_FROM_DATE] = ($specialPriceFromDate === null) ? null : trim($specialPriceFromDate);
     }
 
     /**
      * @param string|null $specialPriceToDate A y-m-d MySql date
      */
-    public function setSpecialToDate(string $specialPriceToDate = null)
+    public function setSpecialToDate(?string $specialPriceToDate = null)
     {
         $this->attributes[self::ATTR_SPECIAL_TO_DATE] = ($specialPriceToDate === null) ? null : trim($specialPriceToDate);
     }
 
     /**
      * @param string|null $newsFromDate A y-m-d MySql date
      */
-    public function setNewsFromDate(string $newsFromDate = null)
+    public function setNewsFromDate(?string $newsFromDate = null)
     {
         $this->attributes[self::ATTR_NEWS_FROM_DATE] = ($newsFromDate === null) ? null : trim($newsFromDate);
     }
 
     /**
      * @param string|null $newsToDate A y-m-d MySql date
      */
-    public function setNewsToDate(string $newsToDate = null)
+    public function setNewsToDate(?string $newsToDate = null)
     {
         $this->attributes[self::ATTR_NEWS_TO_DATE] = ($newsToDate === null) ? null : trim($newsToDate);
     }
 
     /**
      * @param string|null $option The admin name of the manufacturer attribute option
      */
-    public function setManufacturer(string $option = null)
+    public function setManufacturer(?string $option = null)
     {
         $this->unresolvedSelects[self::ATTR_MANUFACTURER] = ($option === null) ? null : trim($option);
     }
 
     /**
      * @param string|null $countryCode 2 characters, uppercase
      */
-    public function setCountryOfManufacture(string $countryCode = null)
+    public function setCountryOfManufacture(?string $countryCode = null)
     {
         $this->attributes[self::ATTR_COUNTRY_OF_MANUFACTURE] = ($countryCode === null) ? null : trim($countryCode);
     }
 
     /**
      * @param string|null $option The admin name of the color attribute option
      */
-    public function setColor(string $option = null)
+    public function setColor(?string $option = null)
     {
         $this->unresolvedSelects[self::ATTR_COLOR] = ($option === null) ? null : trim($option);
     }
@@ -332,7 +332,7 @@ public function setColor(string $option = null)
      * @param string $attributeCode
      * @param string|null $value
      */
-    public function setCustomAttribute(string $attributeCode, string $value = null)
+    public function setCustomAttribute(string $attributeCode, ?string $value = null)
     {
         // value is not trimmed, because it may have textarea as input, or it may be null
         $this->attributes[trim($attributeCode)] = $value;
@@ -427,7 +427,7 @@ public function getImageRoles()
      * @param string $attributeCode
      * @param string $option The admin name of the attribute option
      */
-    public function setSelectAttribute(string $attributeCode, string $option = null)
+    public function setSelectAttribute(string $attributeCode, ?string $option = null)
     {
         $this->unresolvedSelects[trim($attributeCode)] = ($option === null) ? null : trim($option);
     }
@@ -441,12 +441,12 @@ public function setSelectAttributeOptionId(string $attributeCode, $optionId = nu
      * @param string $attributeCode
      * @param array $options The admin names of the attribute options
      */
-    public function setMultipleSelectAttribute(string $attributeCode, array $options = null)
+    public function setMultipleSelectAttribute(string $attributeCode, ?array $options = null)
     {
         $this->unresolvedMultipleSelects[trim($attributeCode)] = ($options === null) ? null : array_map('trim', $options);
     }
 
-    public function setMultiSelectAttributeOptionIds(string $attributeCode, array $optionIds = null)
+    public function setMultiSelectAttributeOptionIds(string $attributeCode, ?array $optionIds = null)
     {
         $this->attributes[$attributeCode] = ($optionIds === null) ? null : implode(',', array_map('trim', $optionIds));
     }
diff --git a/Api/Data/TierPrice.php b/Api/Data/TierPrice.php
@@ -39,7 +39,7 @@ class TierPrice
      * @param string|null $websiteCode The code of the website. Null means: all websites
      * @param string $percentageValue Since Magento 2.2
      */
-    public function __construct(string $quantity, string $value, string $customerGroupName = null, string $websiteCode = null, string $percentageValue = null)
+    public function __construct(string $quantity, string $value, ?string $customerGroupName = null, ?string $websiteCode = null, ?string $percentageValue = null)
     {
         $this->quantity = Decimal::format($quantity);
         $this->value = Decimal::formatPrice($value);
diff --git a/Api/Data/Weee.php b/Api/Data/Weee.php
@@ -27,7 +27,7 @@ class Weee
      * @param string|null $websiteId
      * @param string|null $state
      */
-    public function __construct(string $country, string $value, string $websiteId = null, string $state = null)
+    public function __construct(string $country, string $value, ?string $websiteId = null, ?string $state = null)
     {
         $this->country = $country;
         $this->value = Decimal::format($value);
@@ -42,7 +42,7 @@ public function __construct(string $country, string $value, string $websiteId =
      * @param string|null $state
      * @return Weee
      */
-    public static function createWeee(string $country, string $value, string $websiteId = null, string $state = null)
+    public static function createWeee(string $country, string $value, ?string $websiteId = null, ?string $state = null)
     {
         return new Weee($country, $value, $websiteId, $state);
     }
diff --git a/Console/Command/ProductImportCommand.php b/Console/Command/ProductImportCommand.php
@@ -46,7 +46,7 @@ class ProductImportCommand extends Command
 
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $name = null)
+        ?string $name = null)
     {
         $this->objectManager = $objectManager;
 
@@ -258,7 +258,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
     }
 
-    protected function guessImageSourceDir(string $fileName, string $imageSourceDirOption = null)
+    protected function guessImageSourceDir(string $fileName, ?string $imageSourceDirOption = null)
     {
         // select specified dir
         $dirName = $imageSourceDirOption;
diff --git a/Console/Command/ProductUrlRewriteCommand.php b/Console/Command/ProductUrlRewriteCommand.php
@@ -28,7 +28,7 @@ class ProductUrlRewriteCommand extends Command
 
     public function __construct(
         ObjectManagerInterface $objectManager,
-        string $name = null
+        ?string $name = null
     )
     {
         $this->objectManager = $objectManager;
@@ -108,4 +108,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return \Magento\Framework\Console\Cli::RETURN_SUCCESS;
     }
-}
+}
diff --git a/Helper/Decimal.php b/Helper/Decimal.php
@@ -26,7 +26,7 @@ class Decimal
      * @param string|null $in
      * @return string|null
      */
-    public static function format(string $in = null)
+    public static function format(?string $in = null)
     {
         if ($in === null) {
             return $in;
@@ -49,7 +49,7 @@ public static function format(string $in = null)
      * @param string|null $in
      * @return string|null
      */
-    public static function formatPrice(string $in = null)
+    public static function formatPrice(?string $in = null)
     {
         if ($in === null) {
             return $in;
diff --git a/Model/Data/LinkInfo.php b/Model/Data/LinkInfo.php
@@ -21,11 +21,11 @@ class LinkInfo
     /** @var int */
     public $defaultQuantityAttributeId;
 
-    public function __construct(int $typeId, int $positionAttributeId, int $defaultQuantityAttributeId = null)
+    public function __construct(int $typeId, int $positionAttributeId, ?int $defaultQuantityAttributeId = null)
     {
         $this->typeId = $typeId;
         $this->positionAttributeId = $positionAttributeId;
         $this->defaultQuantityAttributeId = $defaultQuantityAttributeId;
     }
 
-}
+}
diff --git a/Model/Persistence/HttpCache.php b/Model/Persistence/HttpCache.php
@@ -135,7 +135,7 @@ public function useCache(array $headers, int $now)
         return false;
     }
 
-    public function downloadFromUrl(string $url, string $localTargetFile, array $conditions = null)
+    public function downloadFromUrl(string $url, string $localTargetFile, ?array $conditions = null)
     {
         $responseHeaders = [
             self::UNIX_TIME => time(),

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ class ProductStoreView`
`104`	`104`	`/** @var CustomOptionValue[][] */`
`105`	`105`	`protected $customOptionValues = [];`
`106`	`106`
`107`		`- public function setName(string $name = null)`
	`107`	`+ public function setName(?string $name = null)`
`108`	`108`	`{`
`109`	`109`	`$this->attributes[self::ATTR_NAME] = ($name === null) ? null : trim($name);`
`110`	`110`	`}`
`@@ -137,7 +137,7 @@ public function removeStoreViewId()`
`137`	`137`	`*`
`138`	`138`	`* @param int\|null $status`
`139`	`139`	`*/`
`140`		`- public function setStatus(int $status = null)`
	`140`	`+ public function setStatus(?int $status = null)`
`141`	`141`	`{`
`142`	`142`	`$this->attributes[self::ATTR_STATUS] = $status;`
`143`	`143`	`}`
`@@ -147,35 +147,35 @@ public function setStatus(int $status = null)`
`147`	`147`	`*`
`148`	`148`	`* @param int\|null $available`
`149`	`149`	`*/`
`150`		`- public function setGiftMessageAvailable(int $available = null)`
	`150`	`+ public function setGiftMessageAvailable(?int $available = null)`
`151`	`151`	`{`
`152`	`152`	`$this->attributes[self::ATTR_GIFT_MESSAGE_AVAILABLE] = $available;`
`153`	`153`	`}`
`154`	`154`
`155`		`- public function setDescription(string $description = null)`
	`155`	`+ public function setDescription(?string $description = null)`
`156`	`156`	`{`
`157`	`157`	`// textarea input: not trimmed`
`158`	`158`	`$this->attributes[self::ATTR_DESCRIPTION] = $description;`
`159`	`159`	`}`
`160`	`160`
`161`		`- public function setShortDescription(string $shortDescription = null)`
	`161`	`+ public function setShortDescription(?string $shortDescription = null)`
`162`	`162`	`{`
`163`	`163`	`// textarea input: not trimmed`
`164`	`164`	`$this->attributes[self::ATTR_SHORT_DESCRIPTION] = $shortDescription;`
`165`	`165`	`}`
`166`	`166`
`167`		`- public function setMetaTitle(string $metaTitle = null)`
	`167`	`+ public function setMetaTitle(?string $metaTitle = null)`
`168`	`168`	`{`
`169`	`169`	`$this->attributes[self::ATTR_META_TITLE] = ($metaTitle === null) ? null : trim($metaTitle);`
`170`	`170`	`}`
`171`	`171`
`172`		`- public function setMetaDescription(string $metaDescription = null)`
	`172`	`+ public function setMetaDescription(?string $metaDescription = null)`
`173`	`173`	`{`
`174`	`174`	`// textarea input: not trimmed`
`175`	`175`	`$this->attributes[self::ATTR_META_DESCRIPTION] = $metaDescription;`
`176`	`176`	`}`
`177`	`177`
`178`		`- public function setMetaKeywords(string $metaKeywords = null)`
	`178`	`+ public function setMetaKeywords(?string $metaKeywords = null)`
`179`	`179`	`{`
`180`	`180`	`// textarea input: not trimmed`
`181`	`181`	`$this->attributes[self::ATTR_META_KEYWORDS] = $metaKeywords;`
`@@ -184,23 +184,23 @@ public function setMetaKeywords(string $metaKeywords = null)`
`184`	`184`	`/**`
`185`	`185`	`* @param string\|null $price A 12.4 / 20.6 decimal field`
`186`	`186`	`*/`
`187`		`- public function setPrice(string $price = null)`
	`187`	`+ public function setPrice(?string $price = null)`
`188`	`188`	`{`
`189`	`189`	`$this->attributes[self::ATTR_PRICE] = Decimal::formatPrice($price);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`/**`
`193`	`193`	`* @param string\|null $cost A 12.4 decimal field`
`194`	`194`	`*/`
`195`		`- public function setCost(string $cost = null)`
	`195`	`+ public function setCost(?string $cost = null)`
`196`	`196`	`{`
`197`	`197`	`$this->attributes[self::ATTR_COST] = Decimal::format($cost);`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`/**`
`201`	`201`	`* @param string\|null $msrp Manufacturer Suggested Retail Price. A 12.4 decimal field`
`202`	`202`	`*/`
`203`		`- public function setMsrp(string $msrp = null)`
	`203`	`+ public function setMsrp(?string $msrp = null)`
`204`	`204`	`{`
`205`	`205`	`$this->attributes[self::ATTR_MSRP] = Decimal::format($msrp);`
`206`	`206`	`}`
`@@ -210,7 +210,7 @@ public function setMsrp(string $msrp = null)`
`210`	`210`	`*`
`211`	`211`	`* @param int\|null $type`
`212`	`212`	`*/`
`213`		`- public function setMsrpDisplayActualPriceType(int $type = null)`
	`213`	`+ public function setMsrpDisplayActualPriceType(?int $type = null)`
`214`	`214`	`{`
`215`	`215`	`$this->attributes[self::ATTR_MSRP_DISPLAY_ACTUAL_PRICE_TYPE] = $type;`
`216`	`216`	`}`
`@@ -220,22 +220,22 @@ public function setMsrpDisplayActualPriceType(int $type = null)`
`220`	`220`	`*`
`221`	`221`	`* @param int\|null $visibility`
`222`	`222`	`*/`
`223`		`- public function setVisibility(int $visibility = null)`
	`223`	`+ public function setVisibility(?int $visibility = null)`
`224`	`224`	`{`
`225`	`225`	`$this->attributes[self::ATTR_VISIBILITY] = $visibility;`
`226`	`226`	`}`
`227`	`227`
`228`		`- public function setTaxClassId(int $taxClassId = null)`
	`228`	`+ public function setTaxClassId(?int $taxClassId = null)`
`229`	`229`	`{`
`230`	`230`	`$this->attributes[self::ATTR_TAX_CLASS_ID] = $taxClassId;`
`231`	`231`	`}`
`232`	`232`
`233`		`- public function setTaxClassName(string $taxClassName = null)`
	`233`	`+ public function setTaxClassName(?string $taxClassName = null)`
`234`	`234`	`{`
`235`	`235`	`$this->unresolvedAttributes[self::ATTR_TAX_CLASS_ID] = ($taxClassName === null) ? null : trim($taxClassName);`
`236`	`236`	`}`
`237`	`237`
`238`		`- public function setUrlKey(string $urlKey = null)`
	`238`	`+ public function setUrlKey(?string $urlKey = null)`
`239`	`239`	`{`
`240`	`240`	`$this->attributes[self::ATTR_URL_KEY] = ($urlKey === null) ? null : trim($urlKey);`
`241`	`241`	`}`
`@@ -256,71 +256,71 @@ public function generateUrlKey()`
`256`	`256`	`/**`
`257`	`257`	`* @param string\|null $weight A 12.4 decimal field`
`258`	`258`	`*/`
`259`		`- public function setWeight(string $weight = null)`
	`259`	`+ public function setWeight(?string $weight = null)`
`260`	`260`	`{`
`261`	`261`	`$this->attributes[self::ATTR_WEIGHT] = Decimal::format($weight);`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`/**`
`265`	`265`	`* @param string\|null $specialPrice A 12.4 decimal field`
`266`	`266`	`*/`
`267`		`- public function setSpecialPrice(string $specialPrice = null)`
	`267`	`+ public function setSpecialPrice(?string $specialPrice = null)`
`268`	`268`	`{`
`269`	`269`	`$this->attributes[self::ATTR_SPECIAL_PRICE] = Decimal::formatPrice($specialPrice);`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`/**`
`273`	`273`	`* @param string\|null $specialPriceFromDate A y-m-d MySql date`
`274`	`274`	`*/`
`275`		`- public function setSpecialFromDate(string $specialPriceFromDate = null)`
	`275`	`+ public function setSpecialFromDate(?string $specialPriceFromDate = null)`
`276`	`276`	`{`
`277`	`277`	`$this->attributes[self::ATTR_SPECIAL_FROM_DATE] = ($specialPriceFromDate === null) ? null : trim($specialPriceFromDate);`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`/**`
`281`	`281`	`* @param string\|null $specialPriceToDate A y-m-d MySql date`
`282`	`282`	`*/`
`283`		`- public function setSpecialToDate(string $specialPriceToDate = null)`
	`283`	`+ public function setSpecialToDate(?string $specialPriceToDate = null)`
`284`	`284`	`{`
`285`	`285`	`$this->attributes[self::ATTR_SPECIAL_TO_DATE] = ($specialPriceToDate === null) ? null : trim($specialPriceToDate);`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`/**`
`289`	`289`	`* @param string\|null $newsFromDate A y-m-d MySql date`
`290`	`290`	`*/`
`291`		`- public function setNewsFromDate(string $newsFromDate = null)`
	`291`	`+ public function setNewsFromDate(?string $newsFromDate = null)`
`292`	`292`	`{`
`293`	`293`	`$this->attributes[self::ATTR_NEWS_FROM_DATE] = ($newsFromDate === null) ? null : trim($newsFromDate);`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`/**`
`297`	`297`	`* @param string\|null $newsToDate A y-m-d MySql date`
`298`	`298`	`*/`
`299`		`- public function setNewsToDate(string $newsToDate = null)`
	`299`	`+ public function setNewsToDate(?string $newsToDate = null)`
`300`	`300`	`{`
`301`	`301`	`$this->attributes[self::ATTR_NEWS_TO_DATE] = ($newsToDate === null) ? null : trim($newsToDate);`
`302`	`302`	`}`
`303`	`303`
`304`	`304`	`/**`
`305`	`305`	`* @param string\|null $option The admin name of the manufacturer attribute option`
`306`	`306`	`*/`
`307`		`- public function setManufacturer(string $option = null)`
	`307`	`+ public function setManufacturer(?string $option = null)`
`308`	`308`	`{`
`309`	`309`	`$this->unresolvedSelects[self::ATTR_MANUFACTURER] = ($option === null) ? null : trim($option);`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`/**`
`313`	`313`	`* @param string\|null $countryCode 2 characters, uppercase`
`314`	`314`	`*/`
`315`		`- public function setCountryOfManufacture(string $countryCode = null)`
	`315`	`+ public function setCountryOfManufacture(?string $countryCode = null)`
`316`	`316`	`{`
`317`	`317`	`$this->attributes[self::ATTR_COUNTRY_OF_MANUFACTURE] = ($countryCode === null) ? null : trim($countryCode);`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`/**`
`321`	`321`	`* @param string\|null $option The admin name of the color attribute option`
`322`	`322`	`*/`
`323`		`- public function setColor(string $option = null)`
	`323`	`+ public function setColor(?string $option = null)`
`324`	`324`	`{`
`325`	`325`	`$this->unresolvedSelects[self::ATTR_COLOR] = ($option === null) ? null : trim($option);`
`326`	`326`	`}`
`@@ -332,7 +332,7 @@ public function setColor(string $option = null)`
`332`	`332`	`* @param string $attributeCode`
`333`	`333`	`* @param string\|null $value`
`334`	`334`	`*/`
`335`		`- public function setCustomAttribute(string $attributeCode, string $value = null)`
	`335`	`+ public function setCustomAttribute(string $attributeCode, ?string $value = null)`
`336`	`336`	`{`
`337`	`337`	`// value is not trimmed, because it may have textarea as input, or it may be null`
`338`	`338`	`$this->attributes[trim($attributeCode)] = $value;`
`@@ -427,7 +427,7 @@ public function getImageRoles()`
`427`	`427`	`* @param string $attributeCode`
`428`	`428`	`* @param string $option The admin name of the attribute option`
`429`	`429`	`*/`
`430`		`- public function setSelectAttribute(string $attributeCode, string $option = null)`
	`430`	`+ public function setSelectAttribute(string $attributeCode, ?string $option = null)`
`431`	`431`	`{`
`432`	`432`	`$this->unresolvedSelects[trim($attributeCode)] = ($option === null) ? null : trim($option);`
`433`	`433`	`}`
`@@ -441,12 +441,12 @@ public function setSelectAttributeOptionId(string $attributeCode, $optionId = nu`
`441`	`441`	`* @param string $attributeCode`
`442`	`442`	`* @param array $options The admin names of the attribute options`
`443`	`443`	`*/`
`444`		`- public function setMultipleSelectAttribute(string $attributeCode, array $options = null)`
	`444`	`+ public function setMultipleSelectAttribute(string $attributeCode, ?array $options = null)`
`445`	`445`	`{`
`446`	`446`	`$this->unresolvedMultipleSelects[trim($attributeCode)] = ($options === null) ? null : array_map('trim', $options);`
`447`	`447`	`}`
`448`	`448`
`449`		`- public function setMultiSelectAttributeOptionIds(string $attributeCode, array $optionIds = null)`
	`449`	`+ public function setMultiSelectAttributeOptionIds(string $attributeCode, ?array $optionIds = null)`
`450`	`450`	`{`
`451`	`451`	`$this->attributes[$attributeCode] = ($optionIds === null) ? null : implode(',', array_map('trim', $optionIds));`
`452`	`452`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class TierPrice`
`39`	`39`	`* @param string\|null $websiteCode The code of the website. Null means: all websites`
`40`	`40`	`* @param string $percentageValue Since Magento 2.2`
`41`	`41`	`*/`
`42`		`- public function __construct(string $quantity, string $value, string $customerGroupName = null, string $websiteCode = null, string $percentageValue = null)`
	`42`	`+ public function __construct(string $quantity, string $value, ?string $customerGroupName = null, ?string $websiteCode = null, ?string $percentageValue = null)`
`43`	`43`	`{`
`44`	`44`	`$this->quantity = Decimal::format($quantity);`
`45`	`45`	`$this->value = Decimal::formatPrice($value);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class Weee`
`27`	`27`	`* @param string\|null $websiteId`
`28`	`28`	`* @param string\|null $state`
`29`	`29`	`*/`
`30`		`- public function __construct(string $country, string $value, string $websiteId = null, string $state = null)`
	`30`	`+ public function __construct(string $country, string $value, ?string $websiteId = null, ?string $state = null)`
`31`	`31`	`{`
`32`	`32`	`$this->country = $country;`
`33`	`33`	`$this->value = Decimal::format($value);`
`@@ -42,7 +42,7 @@ public function __construct(string $country, string $value, string $websiteId =`
`42`	`42`	`* @param string\|null $state`
`43`	`43`	`* @return Weee`
`44`	`44`	`*/`
`45`		`- public static function createWeee(string $country, string $value, string $websiteId = null, string $state = null)`
	`45`	`+ public static function createWeee(string $country, string $value, ?string $websiteId = null, ?string $state = null)`
`46`	`46`	`{`
`47`	`47`	`return new Weee($country, $value, $websiteId, $state);`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ProductImportCommand extends Command`
`46`	`46`
`47`	`47`	`public function __construct(`
`48`	`48`	`ObjectManagerInterface $objectManager,`
`49`		`- string $name = null)`
	`49`	`+ ?string $name = null)`
`50`	`50`	`{`
`51`	`51`	`$this->objectManager = $objectManager;`
`52`	`52`
`@@ -258,7 +258,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`258`	`258`	`}`
`259`	`259`	`}`
`260`	`260`
`261`		`- protected function guessImageSourceDir(string $fileName, string $imageSourceDirOption = null)`
	`261`	`+ protected function guessImageSourceDir(string $fileName, ?string $imageSourceDirOption = null)`
`262`	`262`	`{`
`263`	`263`	`// select specified dir`
`264`	`264`	`$dirName = $imageSourceDirOption;`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class ProductUrlRewriteCommand extends Command`
`28`	`28`
`29`	`29`	`public function __construct(`
`30`	`30`	`ObjectManagerInterface $objectManager,`
`31`		`- string $name = null`
	`31`	`+ ?string $name = null`
`32`	`32`	`)`
`33`	`33`	`{`
`34`	`34`	`$this->objectManager = $objectManager;`
`@@ -108,4 +108,4 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`108`	`108`
`109`	`109`	`return \Magento\Framework\Console\Cli::RETURN_SUCCESS;`
`110`	`110`	`}`
`111`		`-}`
	`111`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ class LinkInfo`
`21`	`21`	`/** @var int */`
`22`	`22`	`public $defaultQuantityAttributeId;`
`23`	`23`
`24`		`- public function __construct(int $typeId, int $positionAttributeId, int $defaultQuantityAttributeId = null)`
	`24`	`+ public function __construct(int $typeId, int $positionAttributeId, ?int $defaultQuantityAttributeId = null)`
`25`	`25`	`{`
`26`	`26`	`$this->typeId = $typeId;`
`27`	`27`	`$this->positionAttributeId = $positionAttributeId;`
`28`	`28`	`$this->defaultQuantityAttributeId = $defaultQuantityAttributeId;`
`29`	`29`	`}`
`30`	`30`
`31`		`-}`
	`31`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ public function useCache(array $headers, int $now)`
`135`	`135`	`return false;`
`136`	`136`	`}`
`137`	`137`
`138`		`- public function downloadFromUrl(string $url, string $localTargetFile, array $conditions = null)`
	`138`	`+ public function downloadFromUrl(string $url, string $localTargetFile, ?array $conditions = null)`
`139`	`139`	`{`
`140`	`140`	`$responseHeaders = [`
`141`	`141`	`self::UNIX_TIME => time(),`