Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed PHPStan stubs #3210

Merged
merged 5 commits into from
Apr 26, 2023
Merged

Removed PHPStan stubs #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8689eb3
Removed stubs, not necessary
fballiano Apr 22, 2023
ac4ea3d
Removed stubs, not necessary
fballiano Apr 22, 2023
60cae5f
Fixed docblock for Mage_Eav_Model_Adminhtml_System_Config_Source_Inpu…
fballiano Apr 22, 2023
b285d1c
Fixed docblock for Mage_Captcha_Model_Zend
fballiano Apr 22, 2023
b907d9a
Fixed reset values
fballiano Apr 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/core/Mage/Captcha/Model/Zend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class Mage_Captcha_Model_Zend extends Zend_Captcha_Image implements Mage_Captcha
/**
* Generated word
*
* @var string|null
* @var string
*/
protected $_word;

Expand Down Expand Up @@ -483,7 +483,7 @@ protected function _setWord($word)
protected function _clearWord()
{
$this->getSession()->unsetData($this->_getFormIdKey(self::SESSION_WORD));
$this->_word = null;
$this->_word = '';
return $this;
}

Expand Down
4 changes: 2 additions & 2 deletions app/code/core/Mage/Eav/Model/Adminhtml/System/Config/Source/Inputtype/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
class Mage_Eav_Model_Adminhtml_System_Config_Source_Inputtype_Validator extends Zend_Validate_InArray
{
/**
* @var array<string, string>|null
* @inheritdoc
fballiano marked this conversation as resolved.
Show resolved Hide resolved
*/
protected $_messageTemplates;

Expand All @@ -34,7 +34,7 @@ public function __construct()
$haystack = $helper->getInputTypesValidatorData();

//reset message template and set custom
$this->_messageTemplates = null;
$this->_messageTemplates = [];
$this->_initMessageTemplates();

//parent construct with options
Expand Down
11 changes: 0 additions & 11 deletions dev/phpstan/stubs/Zend_Captcha_Word.stub
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions dev/phpstan/stubs/Zend_Validate_InArray.stub
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions phpstan.dist.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ parameters:

# Instantiated class not found
- lib/Varien/Image/Adapter.php
stubFiles:
- dev/phpstan/stubs/Zend_Captcha_Word.stub
- dev/phpstan/stubs/Zend_Validate_InArray.stub
level: 4
checkFunctionNameCase: true
checkInternalClassCaseSensitivity: true
Expand Down