Merge branch 'main' into dependabot/composer/friendsofphp/php-cs-fixe…

…r-3.65.0
OpenMage · Nov 25, 2024 · f51f714 · f51f714
2 parents 514f6ba + f153ced
commit f51f714
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/.phpstan.dist.baseline.neon b/.phpstan.dist.baseline.neon
@@ -4355,11 +4355,6 @@ parameters:
 			count: 1
 			path: app/code/core/Mage/ImportExport/Model/Export/Entity/Product.php
 
-		-
-			message: "#^Parameter \\#2 \\$length of function fgetcsv expects int\\<0, max\\>, null given\\.$#"
-			count: 4
-			path: app/code/core/Mage/ImportExport/Model/Import/Adapter/Csv.php
-
 		-
 			message: "#^Method Mage_Eav_Model_Entity_Attribute_Source_Interface\\:\\:getAllOptions\\(\\) invoked with 1 parameter, 0 required\\.$#"
 			count: 1

diff --git a/composer.lock b/composer.lock