Skip to content

Commit 5ac9d7c

Browse files
author
silinmykola
committed
fixes after a CR
1 parent f583ce2 commit 5ac9d7c

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Options/Options.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ protected function _prepareOptionValues(
147147
if ($type === 'select' || $type === 'multiselect') {
148148
$defaultValues = is_string($attribute->getDefaultValue())
149149
? explode(',', $attribute->getDefaultValue())
150-
: [''];
150+
: [];
151151
$inputType = $type === 'select' ? 'radio' : 'checkbox';
152152
} else {
153153
$defaultValues = [];

app/code/Magento/Paypal/Model/Api/Nvp.php

+5-1
Original file line numberDiff line numberDiff line change
@@ -387,11 +387,15 @@ class Nvp extends \Magento\Paypal\Model\Api\AbstractApi
387387
protected $_doVoidRequest = ['AUTHORIZATIONID', 'NOTE'];
388388

389389
/**
390+
* GetTransactionDetailsRequest
391+
*
390392
* @var string[]
391393
*/
392394
protected $_getTransactionDetailsRequest = ['TRANSACTIONID'];
393395

394396
/**
397+
* GetTransactionDetailsResponse
398+
*
395399
* @var string[]
396400
*/
397401
protected $_getTransactionDetailsResponse = [
@@ -1196,7 +1200,7 @@ public function call($methodName, array $request)
11961200
throw $e;
11971201
}
11981202

1199-
$response = preg_split('/^\r?$/m', $response ?? '', 2);
1203+
$response = preg_split('/^\r?$/m', $response, 2);
12001204
$response = trim($response[1]);
12011205
$response = $this->_deformatNVP($response);
12021206

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

-2
Original file line numberDiff line numberDiff line change
@@ -437,13 +437,11 @@ public function __sleep()
437437
public function __wakeup()
438438
{
439439
parent::__wakeup();
440-
// phpcs:disable Magento2.PHP.AutogeneratedClassNotInConstructor
441440
$this->_coreFileStorageDatabase = ObjectManager::getInstance()
442441
->get(\Magento\MediaStorage\Helper\File\Storage\Database::class);
443442
$this->_config = ObjectManager::getInstance()->get(
444443
\Magento\Framework\App\Config\ReinitableConfigInterface::class
445444
);
446-
// phpcs:enable
447445
}
448446

449447
/**

lib/internal/Magento/Framework/Stdlib/ArrayManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function exists($path, array $data, $delimiter = self::DEFAULT_PATH_DELIM
4949
*
5050
* @param array|string $path
5151
* @param array $data
52-
* @param array|null $defaultValue
52+
* @param mixed $defaultValue
5353
* @param string $delimiter
5454
* @return mixed|null
5555
* @since 100.1.0

0 commit comments

Comments
 (0)