Skip to content

Commit dd33b79

Browse files
committed
styles
1 parent 0a28ed9 commit dd33b79

File tree

8 files changed

+25
-19
lines changed

8 files changed

+25
-19
lines changed

src/Symfony/FakeParameterMap.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@ public static function getParameterKeyFromNode(Expr $node, Scope $scope): ?strin
2525
{
2626
return null;
2727
}
28+
2829
}

src/Symfony/Parameter.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ final class Parameter implements ParameterDefinition
77

88
/** @var string */
99
private $key;
10+
1011
/** @var array<mixed>|bool|float|int|string */
1112
private $value;
1213

1314
/**
15+
* @param string $key
1416
* @param array<mixed>|bool|float|int|string $value
1517
*/
1618
public function __construct(
@@ -27,6 +29,9 @@ public function getKey(): string
2729
return $this->key;
2830
}
2931

32+
/**
33+
* @return array<mixed>|bool|float|int|string
34+
*/
3035
public function getValue()
3136
{
3237
return $this->value;

src/Symfony/XmlParameterMapFactory.php

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php declare(strict_types=1);
1+
<?php declare(strict_types = 1);
22

33
namespace PHPStan\Symfony;
44

@@ -61,7 +61,7 @@ private function getNodeValue(\SimpleXMLElement $def)
6161
case 'collection':
6262
$value = [];
6363
foreach ($def->children() as $child) {
64-
/** @var \SimpleXMLElement $attrs */
64+
/** @var \SimpleXMLElement $childAttrs */
6565
$childAttrs = $child->attributes();
6666

6767
if (isset($childAttrs->key)) {
@@ -77,8 +77,9 @@ private function getNodeValue(\SimpleXMLElement $def)
7777
break;
7878

7979
case 'binary':
80-
if (false === $value = base64_decode((string) $def, true)) {
81-
throw new \InvalidArgumentException(sprintf('Tag "<%s>" with type="binary" is not a valid base64 encoded string.', (string) $attrs->key));
80+
$value = base64_decode((string) $def, true);
81+
if ($value === false) {
82+
throw new \InvalidArgumentException(sprintf('Parameter "%s" of binary type is not valid base64 encoded string.', (string) $attrs->key));
8283
}
8384

8485
break;
@@ -87,18 +88,19 @@ private function getNodeValue(\SimpleXMLElement $def)
8788
$value = (string) $def;
8889

8990
if (is_numeric($value)) {
90-
if (false !== strpos($value, '.')) {
91+
if (strpos($value, '.') !== false) {
9192
$value = (float) $value;
9293
} else {
9394
$value = (int) $value;
9495
}
95-
} else if ($value === 'true') {
96+
} elseif ($value === 'true') {
9697
$value = true;
97-
} else if ($value === 'false') {
98+
} elseif ($value === 'false') {
9899
$value = false;
99100
}
100101
}
101102

102103
return $value;
103104
}
105+
104106
}

src/Type/Symfony/ParameterDynamicReturnTypeExtension.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@
99
use PHPStan\ShouldNotHappenException;
1010
use PHPStan\Symfony\ParameterMap;
1111
use PHPStan\Type\Constant\ConstantBooleanType;
12-
use PHPStan\Type\ConstantTypeHelper;
1312
use PHPStan\Type\DynamicMethodReturnTypeExtension;
14-
use PHPStan\Type\ObjectType;
1513
use PHPStan\Type\Type;
1614
use function in_array;
1715

@@ -33,7 +31,6 @@ final class ParameterDynamicReturnTypeExtension implements DynamicMethodReturnTy
3331
/** @var \PHPStan\Symfony\ParameterMap */
3432
private $parameterMap;
3533

36-
3734
public function __construct(string $className, ?string $methodGet, ?string $methodHas, bool $constantHassers, ParameterMap $symfonyParameterMap)
3835
{
3936
$this->className = $className;
@@ -50,7 +47,7 @@ public function getClass(): string
5047

5148
public function isMethodSupported(MethodReflection $methodReflection): bool
5249
{
53-
$methods = array_filter([$this->methodGet, $this->methodHas], function(?string $method): bool {
50+
$methods = array_filter([$this->methodGet, $this->methodHas], function (?string $method): bool {
5451
return $method !== null;
5552
});
5653

tests/Symfony/DefaultParameterMapTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ function (?Parameter $parameter): void {
109109
['name' => 'the name', 'value' => 'the value'],
110110
['name' => 'another name', 'value' => 'another value'],
111111
], $parameter->getValue());
112-
113112
},
114113
];
115114
yield [

tests/Type/Symfony/ExtensionTestWithoutContainer.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,11 @@ public function dataFileAsserts(): iterable
1414
yield from $this->gatherAssertTypes(__DIR__ . '/data/ExampleController.php');
1515
}
1616

17-
if (class_exists('Symfony\Bundle\FrameworkBundle\Controller\AbstractController')) {
18-
yield from $this->gatherAssertTypes(__DIR__ . '/data/ExampleAbstractController.php');
17+
if (!class_exists('Symfony\Bundle\FrameworkBundle\Controller\AbstractController')) {
18+
return;
1919
}
20+
21+
yield from $this->gatherAssertTypes(__DIR__ . '/data/ExampleAbstractController.php');
2022
}
2123

2224
/**

tests/Type/Symfony/data/ExampleAbstractController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public function services(): void
2525

2626
public function parameters(ContainerInterface $container, ParameterBagInterface $parameterBag): void
2727
{
28-
assertType('mixed', $container->getParameter('unknown'));
28+
assertType('array|bool|float|int|string|null', $container->getParameter('unknown'));
2929
assertType('mixed', $parameterBag->get('unknown'));
30-
//assertType('mixed', $this->getParameter('unknown'));
30+
//assertType('array|bool|float|int|string|null', $this->getParameter('unknown'));
3131
assertType("'abcdef'", $container->getParameter('app.string'));
3232
assertType("'abcdef'", $parameterBag->get('app.string'));
3333
//assertType("'abcdef'", $this->getParameter('app.string'));

tests/Type/Symfony/data/ExampleController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public function services(): void
2525

2626
public function parameters(ContainerInterface $container, ParameterBagInterface $parameterBag): void
2727
{
28-
assertType('mixed', $container->getParameter('unknown'));
29-
assertType('mixed', $parameterBag->get('unknown'));
30-
//assertType('mixed', $this->getParameter('unknown'));
28+
assertType('array|bool|float|int|string|null', $container->getParameter('unknown'));
29+
assertType('array|bool|float|int|string|null', $parameterBag->get('unknown'));
30+
//assertType('array|bool|float|int|string|null', $this->getParameter('unknown'));
3131
assertType("'abcdef'", $container->getParameter('app.string'));
3232
assertType("'abcdef'", $parameterBag->get('app.string'));
3333
//assertType("'abcdef'", $this->getParameter('app.string'));

0 commit comments

Comments
 (0)