Skip to content

Commit eb3e763

Browse files
committed
Fixes a few phpstan errors up to level 10
1 parent 0aca521 commit eb3e763

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

src/bitExpert/PHPStan/Magento/Autoload/DataProvider/ClassLoaderProvider.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public function __construct(string $magentoRoot)
3030
$this->composer = new ClassLoader($magentoRoot . '/vendor');
3131
$autoloadFile = $magentoRoot . '/vendor/composer/autoload_namespaces.php';
3232
if (is_file($autoloadFile)) {
33+
/** @var array<string, string> $map */
3334
$map = require $autoloadFile;
3435
foreach ($map as $namespace => $path) {
3536
$this->composer->set($namespace, $path);
@@ -38,6 +39,7 @@ public function __construct(string $magentoRoot)
3839

3940
$autoloadFile = $magentoRoot . '/vendor/composer/autoload_psr4.php';
4041
if (is_file($autoloadFile)) {
42+
/** @var array<string, string> $map */
4143
$map = require $autoloadFile;
4244
foreach ($map as $namespace => $path) {
4345
$this->composer->setPsr4($namespace, $path);
@@ -46,6 +48,7 @@ public function __construct(string $magentoRoot)
4648

4749
$autoloadFile = $magentoRoot . '/vendor/composer/autoload_classmap.php';
4850
if (is_file($autoloadFile)) {
51+
/** @var ?array<string, string> $classMap */
4952
$classMap = require $autoloadFile;
5053
if (is_array($classMap)) {
5154
$this->composer->addClassMap($classMap);

src/bitExpert/PHPStan/Magento/Autoload/FactoryAutoloader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ protected function getFileContents(string $class): string
6969
$namespace = explode('\\', ltrim($class, '\\'));
7070
/** @var string $factoryClassname */
7171
$factoryClassname = array_pop($namespace);
72-
$originalClassname = preg_replace('#Factory$#', '', $factoryClassname);
72+
$originalClassname = preg_replace('#Factory$#', '', $factoryClassname) ?? $factoryClassname;
7373
$namespace = implode('\\', $namespace);
7474

7575
$template = "<?php\n";

src/bitExpert/PHPStan/Magento/Autoload/ProxyAutoloader.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ protected function getFileContents(string $class): string
110110
$defaultValue = ' = false';
111111
break;
112112
default:
113-
$defaultValue = ' = ' . $parameter->getDefaultValue();
113+
if (is_string($parameter->getDefaultValue())) {
114+
$defaultValue = ' = ' . $parameter->getDefaultValue();
115+
}
114116
break;
115117
}
116118
}

src/bitExpert/PHPStan/Magento/Reflection/MagicMethodReflection.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class MagicMethodReflection implements MethodReflection
2828
*/
2929
private $declaringClass;
3030
/**
31-
* @var ParametersAcceptor[]
31+
* @var list<ParametersAcceptor>
3232
*/
3333
private $variants;
3434

@@ -37,7 +37,7 @@ class MagicMethodReflection implements MethodReflection
3737
*
3838
* @param string $name
3939
* @param ClassReflection $declaringClass
40-
* @param ParametersAcceptor[] $variants
40+
* @param list<ParametersAcceptor> $variants
4141
*/
4242
public function __construct(string $name, ClassReflection $declaringClass, array $variants = [])
4343
{

0 commit comments

Comments
 (0)