Fixes for Phpstan 2.1.31 and Rector 2.2.3 #4991
Open
+118
−119
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan-phar-composer-source) from 2.1.29 to 2.1.31. - [Commits](https://github.com/phpstan/phpstan-phar-composer-source/commits) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-version: 2.1.31 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
…-2.1.31' into phpstan/fix2.1.31
github-actions
bot
added
Component: Catalog
There was a problem hiding this comment.
Pull Request Overview
This PR addresses PHPStan 2.1.31 compatibility issues by fixing type-related warnings and cleaning up code to meet stricter static analysis requirements.
- Fixed array key type casting to string where required by PHPStan
- Removed unused variables and redundant conditions identified by static analysis
- Updated docblock type annotations for better type safety
Reviewed Changes
Copilot reviewed 6 out of 7 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| lib/Varien/Http/Adapter/Curl.php | Updated method parameter docblock and added explicit cURL option initialization |
| lib/Mage/System/Ftp.php | Added string cast for array index to fix type issue |
| app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php | Removed unused variables and redundant conditions, added proper variable cleanup |
| app/code/core/Mage/ImportExport/Model/Export/Entity/Customer.php | Added proper variable cleanup with unset statements |
| app/code/core/Mage/Catalog/Model/Resource/Category/Flat.php | Improved variable naming for better clarity |
| app/code/core/Mage/Catalog/Model/Layer/Filter/Price/Algorithm.php | Added string casts for array indices to fix type issues |
github-actions
bot
added
Component: PayPal
github-actions
bot
added
Component: Bundle
sreichel
changed the title
kiatng
approved these changes
Oct 19, 2025
|
Hanmac
reviewed
Oct 22, 2025
| * | ||
| * @return int | ||
| */ | ||
| public function getVersionHash(Mage_Core_Model_Encryption $encryptionModel) |
There was a problem hiding this comment.
If the parameter isn't used anymore, maybe deprecate it?
There was a problem hiding this comment.
Its not an optional parameter.
Hanmac
reviewed
Oct 22, 2025
|
|
||
| $value = $this->getData($key); | ||
| return $this->escapeHtml($value !== null && strlen($value) > 0 ? $value : $default); | ||
| return $this->escapeHtml($value !== null && (string) $value !== '' ? $value : $default); |
There was a problem hiding this comment.
What of them rector/phpstan or pslam is against !empty($value)?
There was a problem hiding this comment.
Guess it includes multiple checks that makes it less readable.
addison74
approved these changes
Oct 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related ...