Merge remote-tracking branch 'origin/AC-3108-fix-deprecation-issues-part4' into delivery-bunch-w21

andrewbess · andrewbess · commit eca2d2b22b77 · 2022-05-26T15:20:25.000+02:00
diff --git a/app/code/Magento/Directory/Model/Currency.php b/app/code/Magento/Directory/Model/Currency.php
@@ -509,7 +509,7 @@ public function getOutputFormat()
     {
         $formatted = $this->formatTxt(0);
         $number = $this->formatTxt(0, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);
-        return str_replace($this->trimUnicodeDirectionMark($number), '%s', $formatted);
+        return $formatted !== null ? str_replace($this->trimUnicodeDirectionMark($number), '%s', $formatted) : '';
     }
 
     /**
diff --git a/app/code/Magento/Directory/Model/CurrencyConfig.php b/app/code/Magento/Directory/Model/CurrencyConfig.php
@@ -75,10 +75,8 @@ private function getConfigForAllStores(string $path)
     {
         $storesResult = [];
         foreach ($this->storeManager->getStores() as $store) {
-            $storesResult[] = explode(
-                ',',
-                $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode())
-            );
+            $value = $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode());
+            $storesResult[] = $value !== null ? explode(',', $value) : [];
         }
 
         return array_merge([], ...$storesResult);
@@ -94,6 +92,7 @@ private function getConfigForCurrentStore(string $path)
     {
         $store = $this->storeManager->getStore();
 
-        return explode(',', $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode()));
+        $value = $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode());
+        return $value !== null ? explode(',', $value) : [];
     }
 }
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
@@ -638,7 +638,7 @@ public function transDirective($construction)
      */
     protected function getTransParameters($value)
     {
-        if (preg_match(self::TRANS_DIRECTIVE_REGEX, $value, $matches) !== 1) {
+        if ($value === null || preg_match(self::TRANS_DIRECTIVE_REGEX, $value, $matches) !== 1) {
             return ['', []];  // malformed directive body; return without breaking list
         }
         // phpcs:disable Magento2.Functions.DiscouragedFunction
@@ -691,7 +691,7 @@ public function varDirective($construction)
      */
     protected function explodeModifiers($value, $default = null)
     {
-        $parts = explode('|', $value, 2);
+        $parts = $value !== null ? explode('|', $value, 2) : [];
         if (2 === count($parts)) {
             return $parts;
         }
@@ -710,7 +710,8 @@ protected function explodeModifiers($value, $default = null)
      */
     protected function applyModifiers($value, $modifiers)
     {
-        foreach (explode('|', $modifiers) as $part) {
+        $modifiersParts = $modifiers !== null ? explode('|', $modifiers) : [];
+        foreach ($modifiersParts as $part) {
             if (empty($part)) {
                 continue;
             }
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -358,7 +358,8 @@ public function isMessagesAvailable()
      */
     public function isItemMessagesAvailable($item)
     {
-        $type = substr($this->getType(), 0, 5) == 'multi' ? 'address_item' : 'item';
+        $type = $this->getType() !== null && substr($this->getType(), 0, 5) === 'multi' ?
+            'address_item' : 'item';
         return $this->_giftMessageMessage->isMessagesAllowed($type, $item);
     }
 
diff --git a/app/code/Magento/GiftMessage/Model/Message.php b/app/code/Magento/GiftMessage/Model/Message.php
@@ -55,6 +55,8 @@ public function __construct(
     }
 
     /**
+     * Model construct that should be used for object initialization
+     *
      * @return void
      */
     protected function _construct()
@@ -80,85 +82,85 @@ public function getEntityModelByType($type)
      */
     public function isMessageEmpty()
     {
-        return trim($this->getMessage()) == '';
+        return $this->getMessage() === null || trim($this->getMessage()) == '';
     }
 
     //@codeCoverageIgnoreStart
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getGiftMessageId()
     {
         return $this->getData(self::GIFT_MESSAGE_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setGiftMessageId($id)
     {
         return $this->setData(self::GIFT_MESSAGE_ID, $id);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerId()
     {
         return $this->getData(self::CUSTOMER_ID);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($id)
     {
         return $this->setData(self::CUSTOMER_ID, $id);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSender()
     {
         return $this->getData(self::SENDER);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSender($sender)
     {
         return $this->setData(self::SENDER, $sender);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getRecipient()
     {
         return $this->getData(self::RECIPIENT);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRecipient($recipient)
     {
         return $this->setData(self::RECIPIENT, $recipient);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMessage()
     {
         return $this->getData(self::MESSAGE);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMessage($message)
     {
diff --git a/app/code/Magento/GraphQl/Controller/GraphQl.php b/app/code/Magento/GraphQl/Controller/GraphQl.php
@@ -205,7 +205,7 @@ public function dispatch(RequestInterface $request): ResponseInterface
         $jsonResult->renderResult($this->httpResponse);
 
         // log information about the query, unless it is an introspection query
-        if (strpos($data['query'], 'IntrospectionQuery') === false) {
+        if (!isset($data['query']) || strpos($data['query'], 'IntrospectionQuery') === false) {
             $queryInformation = $this->logDataHelper->getLogData($request, $data, $schema, $this->httpResponse);
             $this->loggerPool->execute($queryInformation);
         }
diff --git a/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php b/app/code/Magento/GraphQl/Controller/HttpRequestValidator/HttpVerbValidator.php
@@ -49,7 +49,7 @@ public function validate(HttpRequestInterface $request): void
                     ]
                 );
 
-                if (strtolower($operationType) === 'mutation') {
+                if ($operationType !== null && strtolower($operationType) === 'mutation') {
                     throw new GraphQlInputException(
                         new Phrase('Mutation requests allowed only for POST requests')
                     );
diff --git a/app/code/Magento/GraphQl/Model/Query/Logger/NewRelic.php b/app/code/Magento/GraphQl/Model/Query/Logger/NewRelic.php
@@ -50,7 +50,7 @@ public function execute(array $queryDetails)
         }
 
         $transactionName = $queryDetails[LoggerInterface::OPERATION_NAMES] ?: '';
-        if (strpos($queryDetails[LoggerInterface::OPERATION_NAMES], ',') !== false) {
+        if (strpos($transactionName, ',') !== false) {
             $transactionName = 'multipleQueries';
         }
         $this->newRelicWrapper->setTransactionName('GraphQL-' . $transactionName);
diff --git a/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php b/app/code/Magento/ImportExport/Controller/Adminhtml/Import/Download.php
@@ -26,7 +26,7 @@
  */
 class Download extends ImportController implements HttpGetActionInterface
 {
-    const SAMPLE_FILES_MODULE = 'Magento_ImportExport';
+    public const SAMPLE_FILES_MODULE = 'Magento_ImportExport';
 
     /**
      * @var RawFactory
@@ -88,7 +88,7 @@ public function __construct(
      */
     public function execute()
     {
-        $entityName = $this->getRequest()->getParam('filename');
+        $entityName = $this->getRequest()->getParam('filename', '');
 
         if (preg_match('/^\w+$/', $entityName) == 0) {
             $this->messageManager->addErrorMessage(__('Incorrect entity name.'));
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php
@@ -14,6 +14,7 @@
 /**
  * Export EAV entity abstract model
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -37,8 +38,6 @@ abstract class AbstractEav extends \Magento\ImportExport\Model\Export\AbstractEn
     protected $attributeTypes = [];
 
     /**
-     * Entity type id.
-     *
      * @var int
      */
     protected $_entityTypeId;
@@ -131,6 +130,7 @@ protected function _prepareEntityCollection(AbstractCollection $collection)
      * @param AbstractCollection $collection
      * @return AbstractCollection
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * phpcs:disable Generic.Metrics.NestingLevel
      */
     public function filterEntityCollection(AbstractCollection $collection)
     {
@@ -158,7 +158,7 @@ public function filterEntityCollection(AbstractCollection $collection)
                             $attributeCode,
                             ['eq' => $exportFilter[$attributeCode]]
                         );
-                    } else if (is_array($exportFilter[$attributeCode])) {
+                    } elseif (is_array($exportFilter[$attributeCode])) {
                         $collection->addAttributeToFilter(
                             $attributeCode,
                             ['in' => $exportFilter[$attributeCode]]
@@ -214,6 +214,7 @@ public function filterEntityCollection(AbstractCollection $collection)
         }
         return $collection;
     }
+    // phpcs:enable Generic.Metrics.NestingLevel
 
     /**
      * Add not skipped attributes to select
@@ -249,12 +250,13 @@ public function getAttributeOptions(AbstractAttribute $attribute)
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
                     $optionValues = is_array($option['value']) ? $option['value'] : [$option];
                     foreach ($optionValues as $innerOption) {
-                        if (strlen($innerOption['value'])) {
+                        if (isset($innerOption['value']) && strlen($innerOption['value'])) {
                             // skip ' -- Please Select -- ' option
                             $options[$innerOption['value']] = $innerOption[$index];
                         }
                     }
                 }
+                // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\Exception $e) {
                 // ignore exceptions connected with source models
             }
diff --git a/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Export/Entity/AbstractEntity.php
@@ -437,7 +437,7 @@ public function getAttributeOptions(\Magento\Eav\Model\Entity\Attribute\Abstract
             try {
                 foreach ($attribute->getSource()->getAllOptions(false) as $option) {
                     foreach (is_array($option['value']) ? $option['value'] : [$option] as $innerOption) {
-                        if (strlen($innerOption['value'])) {
+                        if (isset($innerOption['value']) && strlen($innerOption['value'])) {
                             // skip ' -- Please Select -- ' option
                             $options[$innerOption['value']] = (string)$innerOption[$index];
                         }
diff --git a/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/AbstractEntity.php
@@ -32,46 +32,46 @@ abstract class AbstractEntity
     /**
      * Custom row import behavior column name
      */
-    const COLUMN_ACTION = '_action';
+    public const COLUMN_ACTION = '_action';
 
     /**
      * Value in custom column for delete behaviour
      */
-    const COLUMN_ACTION_VALUE_DELETE = 'delete';
+    public const COLUMN_ACTION_VALUE_DELETE = 'delete';
 
     /**
      * Path to bunch size configuration
      */
-    const XML_PATH_BUNCH_SIZE = 'import/format_v2/bunch_size';
+    public const XML_PATH_BUNCH_SIZE = 'import/format_v2/bunch_size';
 
     /**
      * Path to page size configuration
      */
-    const XML_PATH_PAGE_SIZE = 'import/format_v2/page_size';
+    public const XML_PATH_PAGE_SIZE = 'import/format_v2/page_size';
 
     /**
      * Size of varchar value
      */
-    const DB_MAX_VARCHAR_LENGTH = 256;
+    public const DB_MAX_VARCHAR_LENGTH = 256;
 
     /**
      * Size of text value
      */
-    const DB_MAX_TEXT_LENGTH = 65536;
+    public const DB_MAX_TEXT_LENGTH = 65536;
 
-    const ERROR_CODE_SYSTEM_EXCEPTION = 'systemException';
-    const ERROR_CODE_COLUMN_NOT_FOUND = 'columnNotFound';
-    const ERROR_CODE_COLUMN_EMPTY_HEADER = 'columnEmptyHeader';
-    const ERROR_CODE_COLUMN_NAME_INVALID = 'columnNameInvalid';
-    const ERROR_CODE_ATTRIBUTE_NOT_VALID = 'attributeNotInvalid';
-    const ERROR_CODE_DUPLICATE_UNIQUE_ATTRIBUTE = 'duplicateUniqueAttribute';
-    const ERROR_CODE_ILLEGAL_CHARACTERS = 'illegalCharacters';
-    const ERROR_CODE_INVALID_ATTRIBUTE = 'invalidAttributeName';
-    const ERROR_CODE_WRONG_QUOTES = 'wrongQuotes';
-    const ERROR_CODE_COLUMNS_NUMBER = 'wrongColumnsNumber';
-    const ERROR_EXCEEDED_MAX_LENGTH = 'exceededMaxLength';
-    const ERROR_INVALID_ATTRIBUTE_TYPE = 'invalidAttributeType';
-    const ERROR_INVALID_ATTRIBUTE_OPTION = 'absentAttributeOption';
+    public const ERROR_CODE_SYSTEM_EXCEPTION = 'systemException';
+    public const ERROR_CODE_COLUMN_NOT_FOUND = 'columnNotFound';
+    public const ERROR_CODE_COLUMN_EMPTY_HEADER = 'columnEmptyHeader';
+    public const ERROR_CODE_COLUMN_NAME_INVALID = 'columnNameInvalid';
+    public const ERROR_CODE_ATTRIBUTE_NOT_VALID = 'attributeNotInvalid';
+    public const ERROR_CODE_DUPLICATE_UNIQUE_ATTRIBUTE = 'duplicateUniqueAttribute';
+    public const ERROR_CODE_ILLEGAL_CHARACTERS = 'illegalCharacters';
+    public const ERROR_CODE_INVALID_ATTRIBUTE = 'invalidAttributeName';
+    public const ERROR_CODE_WRONG_QUOTES = 'wrongQuotes';
+    public const ERROR_CODE_COLUMNS_NUMBER = 'wrongColumnsNumber';
+    public const ERROR_EXCEEDED_MAX_LENGTH = 'exceededMaxLength';
+    public const ERROR_INVALID_ATTRIBUTE_TYPE = 'invalidAttributeType';
+    public const ERROR_INVALID_ATTRIBUTE_OPTION = 'absentAttributeOption';
 
     /**
      * @var array
@@ -668,6 +668,7 @@ public function isAttributeValid(
         $multiSeparator = Import::DEFAULT_GLOBAL_MULTI_VALUE_SEPARATOR
     ) {
         $message = '';
+        $rowData[$attributeCode] = $rowData[$attributeCode] ?? '';
         switch ($attributeParams['type']) {
             case 'varchar':
                 $value = $this->string->cleanString($rowData[$attributeCode]);
@@ -802,6 +803,7 @@ public function setSource(AbstractSource $source)
      *
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function validateData()
     {
@@ -819,7 +821,7 @@ public function validateData()
             foreach ($this->getSource()->getColNames() as $columnName) {
                 $columnNumber++;
                 if (!$this->isAttributeParticular($columnName)) {
-                    if (trim($columnName) == '') {
+                    if ($columnName === null || trim($columnName) == '') {
                         $emptyHeaderColumns[] = $columnNumber;
                     } elseif (!preg_match('/^[a-z][a-z0-9_]*$/', $columnName)) {
                         $invalidColumns[] = $columnName;
diff --git a/app/code/Magento/Paypal/Model/Ipn.php b/app/code/Magento/Paypal/Model/Ipn.php
@@ -117,7 +117,7 @@ protected function _getConfig()
         if (!$merchantEmail) {
             return $this->_config;
         }
-        $receiver = $this->getRequestData('business') ?: $this->getRequestData('receiver_email');
+        $receiver = $this->getRequestData('business') ?: ($this->getRequestData('receiver_email') ?? '');
         if (strtolower($merchantEmail) != strtolower($receiver)) {
             // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new Exception(
diff --git a/app/code/Magento/Paypal/Model/Payflowpro.php b/app/code/Magento/Paypal/Model/Payflowpro.php
@@ -632,7 +632,8 @@ protected function _buildPlaceRequest(DataObject $payment, $amount)
         $request = $this->buildBasicRequest();
         $request->setAmt($this->formatPrice($amount));
         $request->setAcct($payment->getCcNumber());
-        $request->setExpdate(sprintf('%02d', $payment->getCcExpMonth()) . substr($payment->getCcExpYear(), -2, 2));
+        $expYear = $payment->getCcExpYear() !== null ? substr($payment->getCcExpYear(), -2, 2) : '';
+        $request->setExpdate(sprintf('%02d', $payment->getCcExpMonth()) . $expYear);
         $request->setCvv2($payment->getCcCid());
 
         $order = $payment->getOrder();
diff --git a/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php b/app/code/Magento/Paypal/Model/System/Config/Backend/Cron.php

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ public function getOutputFormat()`
`509`	`509`	`{`
`510`	`510`	`$formatted = $this->formatTxt(0);`
`511`	`511`	`$number = $this->formatTxt(0, ['display' => \Magento\Framework\Currency::NO_SYMBOL]);`
`512`		`- return str_replace($this->trimUnicodeDirectionMark($number), '%s', $formatted);`
	`512`	`+ return $formatted !== null ? str_replace($this->trimUnicodeDirectionMark($number), '%s', $formatted) : '';`
`513`	`513`	`}`
`514`	`514`
`515`	`515`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,8 @@ private function getConfigForAllStores(string $path)`
`75`	`75`	`{`
`76`	`76`	`$storesResult = [];`
`77`	`77`	`foreach ($this->storeManager->getStores() as $store) {`
`78`		`- $storesResult[] = explode(`
`79`		`- ',',`
`80`		`- $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode())`
`81`		`- );`
	`78`	`+ $value = $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode());`
	`79`	`+ $storesResult[] = $value !== null ? explode(',', $value) : [];`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`return array_merge([], ...$storesResult);`
`@@ -94,6 +92,7 @@ private function getConfigForCurrentStore(string $path)`
`94`	`92`	`{`
`95`	`93`	`$store = $this->storeManager->getStore();`
`96`	`94`
`97`		`- return explode(',', $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode()));`
	`95`	`+ $value = $this->config->getValue($path, ScopeInterface::SCOPE_STORE, $store->getCode());`
	`96`	`+ return $value !== null ? explode(',', $value) : [];`
`98`	`97`	`}`
`99`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,7 @@ public function transDirective($construction)`
`638`	`638`	`*/`
`639`	`639`	`protected function getTransParameters($value)`
`640`	`640`	`{`
`641`		`- if (preg_match(self::TRANS_DIRECTIVE_REGEX, $value, $matches) !== 1) {`
	`641`	`+ if ($value === null \|\| preg_match(self::TRANS_DIRECTIVE_REGEX, $value, $matches) !== 1) {`
`642`	`642`	`return ['', []]; // malformed directive body; return without breaking list`
`643`	`643`	`}`
`644`	`644`	`// phpcs:disable Magento2.Functions.DiscouragedFunction`
`@@ -691,7 +691,7 @@ public function varDirective($construction)`
`691`	`691`	`*/`
`692`	`692`	`protected function explodeModifiers($value, $default = null)`
`693`	`693`	`{`
`694`		`- $parts = explode('\|', $value, 2);`
	`694`	`+ $parts = $value !== null ? explode('\|', $value, 2) : [];`
`695`	`695`	`if (2 === count($parts)) {`
`696`	`696`	`return $parts;`
`697`	`697`	`}`
`@@ -710,7 +710,8 @@ protected function explodeModifiers($value, $default = null)`
`710`	`710`	`*/`
`711`	`711`	`protected function applyModifiers($value, $modifiers)`
`712`	`712`	`{`
`713`		`- foreach (explode('\|', $modifiers) as $part) {`
	`713`	`+ $modifiersParts = $modifiers !== null ? explode('\|', $modifiers) : [];`
	`714`	`+ foreach ($modifiersParts as $part) {`
`714`	`715`	`if (empty($part)) {`
`715`	`716`	`continue;`
`716`	`717`	`}`
Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,8 @@ public function isMessagesAvailable()`
`358`	`358`	`*/`
`359`	`359`	`public function isItemMessagesAvailable($item)`
`360`	`360`	`{`
`361`		`- $type = substr($this->getType(), 0, 5) == 'multi' ? 'address_item' : 'item';`
	`361`	`+ $type = $this->getType() !== null && substr($this->getType(), 0, 5) === 'multi' ?`
	`362`	`+ 'address_item' : 'item';`
`362`	`363`	`return $this->_giftMessageMessage->isMessagesAllowed($type, $item);`
`363`	`364`	`}`
`364`	`365`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,8 @@ public function __construct(`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
	`58`	`+ * Model construct that should be used for object initialization`
	`59`	`+ *`
`58`	`60`	`* @return void`
`59`	`61`	`*/`
`60`	`62`	`protected function _construct()`
`@@ -80,85 +82,85 @@ public function getEntityModelByType($type)`
`80`	`82`	`*/`
`81`	`83`	`public function isMessageEmpty()`
`82`	`84`	`{`
`83`		`- return trim($this->getMessage()) == '';`
	`85`	`+ return $this->getMessage() === null \|\| trim($this->getMessage()) == '';`
`84`	`86`	`}`
`85`	`87`
`86`	`88`	`//@codeCoverageIgnoreStart`
`87`	`89`
`88`	`90`	`/**`
`89`		`- * {@inheritdoc}`
	`91`	`+ * @inheritdoc`
`90`	`92`	`*/`
`91`	`93`	`public function getGiftMessageId()`
`92`	`94`	`{`
`93`	`95`	`return $this->getData(self::GIFT_MESSAGE_ID);`
`94`	`96`	`}`
`95`	`97`
`96`	`98`	`/**`
`97`		`- * {@inheritdoc}`
	`99`	`+ * @inheritdoc`
`98`	`100`	`*/`
`99`	`101`	`public function setGiftMessageId($id)`
`100`	`102`	`{`
`101`	`103`	`return $this->setData(self::GIFT_MESSAGE_ID, $id);`
`102`	`104`	`}`
`103`	`105`
`104`	`106`	`/**`
`105`		`- * {@inheritdoc}`
	`107`	`+ * @inheritdoc`
`106`	`108`	`*/`
`107`	`109`	`public function getCustomerId()`
`108`	`110`	`{`
`109`	`111`	`return $this->getData(self::CUSTOMER_ID);`
`110`	`112`	`}`
`111`	`113`
`112`	`114`	`/**`
`113`		`- * {@inheritdoc}`
	`115`	`+ * @inheritdoc`
`114`	`116`	`*/`
`115`	`117`	`public function setCustomerId($id)`
`116`	`118`	`{`
`117`	`119`	`return $this->setData(self::CUSTOMER_ID, $id);`
`118`	`120`	`}`
`119`	`121`
`120`	`122`	`/**`
`121`		`- * {@inheritdoc}`
	`123`	`+ * @inheritdoc`
`122`	`124`	`*/`
`123`	`125`	`public function getSender()`
`124`	`126`	`{`
`125`	`127`	`return $this->getData(self::SENDER);`
`126`	`128`	`}`
`127`	`129`
`128`	`130`	`/**`
`129`		`- * {@inheritdoc}`
	`131`	`+ * @inheritdoc`
`130`	`132`	`*/`
`131`	`133`	`public function setSender($sender)`
`132`	`134`	`{`
`133`	`135`	`return $this->setData(self::SENDER, $sender);`
`134`	`136`	`}`
`135`	`137`
`136`	`138`	`/**`
`137`		`- * {@inheritdoc}`
	`139`	`+ * @inheritdoc`
`138`	`140`	`*/`
`139`	`141`	`public function getRecipient()`
`140`	`142`	`{`
`141`	`143`	`return $this->getData(self::RECIPIENT);`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`/**`
`145`		`- * {@inheritdoc}`
	`147`	`+ * @inheritdoc`
`146`	`148`	`*/`
`147`	`149`	`public function setRecipient($recipient)`
`148`	`150`	`{`
`149`	`151`	`return $this->setData(self::RECIPIENT, $recipient);`
`150`	`152`	`}`
`151`	`153`
`152`	`154`	`/**`
`153`		`- * {@inheritdoc}`
	`155`	`+ * @inheritdoc`
`154`	`156`	`*/`
`155`	`157`	`public function getMessage()`
`156`	`158`	`{`
`157`	`159`	`return $this->getData(self::MESSAGE);`
`158`	`160`	`}`
`159`	`161`
`160`	`162`	`/**`
`161`		`- * {@inheritdoc}`
	`163`	`+ * @inheritdoc`
`162`	`164`	`*/`
`163`	`165`	`public function setMessage($message)`
`164`	`166`	`{`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ public function dispatch(RequestInterface $request): ResponseInterface`
`205`	`205`	`$jsonResult->renderResult($this->httpResponse);`
`206`	`206`
`207`	`207`	`// log information about the query, unless it is an introspection query`
`208`		`- if (strpos($data['query'], 'IntrospectionQuery') === false) {`
	`208`	`+ if (!isset($data['query']) \|\| strpos($data['query'], 'IntrospectionQuery') === false) {`
`209`	`209`	`$queryInformation = $this->logDataHelper->getLogData($request, $data, $schema, $this->httpResponse);`
`210`	`210`	`$this->loggerPool->execute($queryInformation);`
`211`	`211`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function validate(HttpRequestInterface $request): void`
`49`	`49`	`]`
`50`	`50`	`);`
`51`	`51`
`52`		`- if (strtolower($operationType) === 'mutation') {`
	`52`	`+ if ($operationType !== null && strtolower($operationType) === 'mutation') {`
`53`	`53`	`throw new GraphQlInputException(`
`54`	`54`	`new Phrase('Mutation requests allowed only for POST requests')`
`55`	`55`	`);`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function execute(array $queryDetails)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$transactionName = $queryDetails[LoggerInterface::OPERATION_NAMES] ?: '';`
`53`		`- if (strpos($queryDetails[LoggerInterface::OPERATION_NAMES], ',') !== false) {`
	`53`	`+ if (strpos($transactionName, ',') !== false) {`
`54`	`54`	`$transactionName = 'multipleQueries';`
`55`	`55`	`}`
`56`	`56`	`$this->newRelicWrapper->setTransactionName('GraphQL-' . $transactionName);`