Skip to content

Commit ad081be

Browse files
fabpotfabpot
committed
minor symfony#52117 DX: PHP CS Fixer - update excluded paths and apply some minor CS (keradus)
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- DX: PHP CS Fixer - update excluded paths and apply some minor CS | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT Commits ------- 749ba56 DX: PHP CS Fixer - update excluded paths and apply some minor CS
2 parents 18df11d + 749ba56 commit ad081be

File tree

10 files changed

+36
-26
lines changed

10 files changed

+36
-26
lines changed

‎.php-cs-fixer.dist.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'modernize_strpos' => true,
3939
'get_class_to_class_keyword' => true,
4040
'nullable_type_declaration' => true,
41+
// 'get_class_to_class_keyword' => true, // to be enabled when Bridge/PhpUnit will require PHP 8+
4142
])
4243
->setRiskyAllowed(true)
4344
->setFinder(
@@ -55,6 +56,9 @@
5556
'Symfony/Bridge/PhpUnit/Tests/DeprecationErrorHandler/',
5657
'Symfony/Component/Intl/Resources/data/',
5758
])
59+
// explicit tests for ommited @param type, against `no_superfluous_phpdoc_tags`
60+
->notPath('Symfony/Component/PropertyInfo/Tests/Extractor/PhpDocExtractorTest.php')
61+
->notPath('Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php')
5862
// Support for older PHPunit version
5963
->notPath('Symfony/Bridge/PhpUnit/SymfonyTestsListener.php')
6064
->notPath('#Symfony/Bridge/PhpUnit/.*Mock\.php#')

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public static function collectDeprecations($outputFile)
9696
{
9797
$deprecations = [];
9898
$previousErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) use (&$deprecations, &$previousErrorHandler) {
99-
if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || false === strpos($msg, '" targeting switch is equivalent to "break'))) {
99+
if (\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || !str_contains($msg, '" targeting switch is equivalent to "break'))) {
100100
if ($previousErrorHandler) {
101101
return $previousErrorHandler($type, $msg, $file, $line, $context);
102102
}
@@ -128,7 +128,7 @@ public static function collectDeprecations($outputFile)
128128
*/
129129
public function handleError($type, $msg, $file, $line, $context = [])
130130
{
131-
if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || false === strpos($msg, '" targeting switch is equivalent to "break'))) || !$this->getConfiguration()->isEnabled()) {
131+
if ((\E_USER_DEPRECATED !== $type && \E_DEPRECATED !== $type && (\E_WARNING !== $type || !str_contains($msg, '" targeting switch is equivalent to "break'))) || !$this->getConfiguration()->isEnabled()) {
132132
return \call_user_func(self::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
133133
}
134134

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation
104104
$this->getOriginalFilesStack();
105105
array_splice($this->originalFilesStack, 0, $j, [$this->triggeringFile]);
106106

107-
if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || (false === strpos($message, '()" will return') && false === strpos($message, 'native return type declaration') && preg_match('/^(?:The|Method) "([^":]++)/', $message, $m))) {
107+
if (preg_match('/(?|"([^"]++)" that is deprecated|should implement method "(?:static )?([^:]++))/', $message, $m) || (!str_contains($message, '()" will return') && !str_contains($message, 'native return type declaration') && preg_match('/^(?:The|Method) "([^":]++)/', $message, $m))) {
108108
$this->triggeringFile = (new \ReflectionClass($m[1]))->getFileName();
109109
array_unshift($this->originalFilesStack, $this->triggeringFile);
110110
}
@@ -142,7 +142,7 @@ public function __construct($message, array $trace, $file, $languageDeprecation
142142
return;
143143
}
144144

145-
if (!isset($line['class'], $trace[$i - 2]['function']) || 0 !== strpos($line['class'], SymfonyTestsListenerFor::class)) {
145+
if (!isset($line['class'], $trace[$i - 2]['function']) || !str_starts_with($line['class'], SymfonyTestsListenerFor::class)) {
146146
$this->originClass = isset($line['object']) ? \get_class($line['object']) : $line['class'];
147147
$this->originMethod = $line['function'];
148148

@@ -169,7 +169,7 @@ private function lineShouldBeSkipped(array $line)
169169
}
170170
$class = $line['class'];
171171

172-
return 'ReflectionMethod' === $class || 0 === strpos($class, 'PHPUnit\\');
172+
return 'ReflectionMethod' === $class || str_starts_with($class, 'PHPUnit\\');
173173
}
174174

175175
/**
@@ -211,7 +211,7 @@ public function originatingClass()
211211

212212
$class = $this->originClass;
213213

214-
return false !== strpos($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
214+
return str_contains($class, "@anonymous\0") ? (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous' : $class;
215215
}
216216

217217
/**
@@ -246,9 +246,9 @@ public function isLegacy()
246246
$method = $this->originatingMethod();
247247
$groups = class_exists(Groups::class, false) ? [new Groups(), 'groups'] : [Test::class, 'getGroups'];
248248

249-
return 0 === strpos($method, 'testLegacy')
250-
|| 0 === strpos($method, 'provideLegacy')
251-
|| 0 === strpos($method, 'getLegacy')
249+
return str_starts_with($method, 'testLegacy')
250+
|| str_starts_with($method, 'provideLegacy')
251+
|| str_starts_with($method, 'getLegacy')
252252
|| strpos($this->originClass, '\Legacy')
253253
|| \in_array('legacy', $groups($this->originClass, $method), true);
254254
}
@@ -262,10 +262,10 @@ public function isMuted()
262262
return false;
263263
}
264264
if (isset($this->trace[1]['class'])) {
265-
return 0 === strpos($this->trace[1]['class'], 'PHPUnit\\');
265+
return str_starts_with($this->trace[1]['class'], 'PHPUnit\\');
266266
}
267267

268-
return false !== strpos($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
268+
return str_contains($this->triggeringFile, \DIRECTORY_SEPARATOR.'vendor'.\DIRECTORY_SEPARATOR.'phpunit'.\DIRECTORY_SEPARATOR);
269269
}
270270

271271
/**
@@ -340,7 +340,7 @@ private function getPackage($path)
340340
{
341341
$path = realpath($path) ?: $path;
342342
foreach (self::getVendors() as $vendorRoot) {
343-
if (0 === strpos($path, $vendorRoot)) {
343+
if (str_starts_with($path, $vendorRoot)) {
344344
$relativePath = substr($path, \strlen($vendorRoot) + 1);
345345
$vendor = strstr($relativePath, \DIRECTORY_SEPARATOR, true);
346346
if (false === $vendor) {
@@ -366,7 +366,7 @@ private static function getVendors()
366366
self::$vendors[] = \dirname((new \ReflectionClass(DebugClassLoader::class))->getFileName());
367367
}
368368
foreach (get_declared_classes() as $class) {
369-
if ('C' === $class[0] && 0 === strpos($class, 'ComposerAutoloaderInit')) {
369+
if ('C' === $class[0] && str_starts_with($class, 'ComposerAutoloaderInit')) {
370370
$r = new \ReflectionClass($class);
371371
$v = \dirname($r->getFileName(), 2);
372372
if (file_exists($v.'/composer/installed.json')) {
@@ -381,7 +381,7 @@ private static function getVendors()
381381
}
382382
foreach ($paths as $path) {
383383
foreach (self::$vendors as $vendor) {
384-
if (0 !== strpos($path, $vendor)) {
384+
if (!str_starts_with($path, $vendor)) {
385385
self::$internalPaths[] = $path;
386386
}
387387
}
@@ -416,13 +416,13 @@ private function getPathType($path)
416416
return self::PATH_TYPE_UNDETERMINED;
417417
}
418418
foreach (self::getVendors() as $vendor) {
419-
if (0 === strpos($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
419+
if (str_starts_with($realPath, $vendor) && false !== strpbrk(substr($realPath, \strlen($vendor), 1), '/'.\DIRECTORY_SEPARATOR)) {
420420
return self::PATH_TYPE_VENDOR;
421421
}
422422
}
423423

424424
foreach (self::$internalPaths as $internalPath) {
425-
if (0 === strpos($realPath, $internalPath)) {
425+
if (str_starts_with($realPath, $internalPath)) {
426426
return self::PATH_TYPE_SELF;
427427
}
428428
}

‎src/Symfony/Bridge/PhpUnit/Tests/CoverageListenerTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function test()
4343
exec("$php $phpunit -c $dir/phpunit-with-listener.xml.dist $dir/tests/ --coverage-text --colors=never 2> /dev/null", $output);
4444
$output = implode("\n", $output);
4545

46-
if (false === strpos($output, 'FooCov')) {
46+
if (!str_contains($output, 'FooCov')) {
4747
$this->addToAssertionCount(1);
4848
} else {
4949
$this->assertMatchesRegularExpression('/FooCov\n\s*Methods:\s+0.00%[^\n]+Lines:\s+0.00%/', $output);

‎src/Symfony/Bridge/PhpUnit/bin/simple-phpunit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
break;
5858
}
5959
// short option
60-
if (0 === strpos($cliArgument, '-c')) {
60+
if (str_starts_with($cliArgument, '-c')) {
6161
if ('-c' === $cliArgument && array_key_exists($cliArgumentIndex + 1, $argv)) {
6262
$phpunitConfigFilename = $getPhpUnitConfig($argv[$cliArgumentIndex + 1]);
6363
} else {

‎src/Symfony/Bridge/PhpUnit/composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"require-dev": {
2424
"symfony/deprecation-contracts": "^2.5|^3.0",
2525
"symfony/error-handler": "^5.4|^6.0|^7.0",
26+
"symfony/polyfill-php80": "^1.27",
2627
"symfony/polyfill-php81": "^1.27"
2728
},
2829
"conflict": {

‎src/Symfony/Bundle/FrameworkBundle/Command/BuildDebugContainerTrait.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ protected function getContainerBuilder(KernelInterface $kernel): ContainerBuilde
5555
$this->prepareContainer($containerBuilder);
5656

5757
return $containerBuilder;
58-
}, $kernel, \get_class($kernel));
58+
}, $kernel, $kernel::class);
5959
$container = $buildContainer();
6060
(new XmlFileLoader($container, new FileLocator()))->load($kernel->getContainer()->getParameter('debug.container.dump'));
6161
$locatorPass = new ServiceLocatorTagPass();

‎src/Symfony/Component/Notifier/Bridge/MessageBird/MessageBirdOptions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function getRecipientId(): ?string
3030
return null;
3131
}
3232

33-
/**
33+
/**
3434
* @return $this
3535
*/
3636
public function createdDatetime(string $createdDatetime): static

‎src/Symfony/Component/Serializer/Normalizer/CustomNormalizer.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public function denormalize(mixed $data, string $type, string $format = null, ar
4848
/**
4949
* Checks if the given class implements the NormalizableInterface.
5050
*
51-
* @param mixed $data Data to normalize
52-
* @param string|null $format The format being (de-)serialized from or into
51+
* @param mixed $data Data to normalize
52+
* @param string|null $format The format being (de-)serialized from or into
5353
* @param array $context
5454
*/
5555
public function supportsNormalization(mixed $data, string $format = null /* , array $context = [] */): bool
@@ -60,9 +60,9 @@ public function supportsNormalization(mixed $data, string $format = null /* , ar
6060
/**
6161
* Checks if the given class implements the DenormalizableInterface.
6262
*
63-
* @param mixed $data Data to denormalize from
64-
* @param string $type The class to which the data should be denormalized
65-
* @param string|null $format The format being deserialized from
63+
* @param mixed $data Data to denormalize from
64+
* @param string $type The class to which the data should be denormalized
65+
* @param string|null $format The format being deserialized from
6666
* @param array $context
6767
*/
6868
public function supportsDenormalization(mixed $data, string $type, string $format = null /* , array $context = [] */): bool

‎src/Symfony/Component/Validator/Mapping/GenericMetadata.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class GenericMetadata implements MetadataInterface
3838
public array $constraints = [];
3939

4040
/**
41-
* @var array
41+
* @var array<string, Constraint[]>
4242
*
4343
* @internal This property is public in order to reduce the size of the
4444
* class' serialized representation. Do not access it. Use
@@ -180,6 +180,9 @@ public function addConstraints(array $constraints): static
180180
return $this;
181181
}
182182

183+
/**
184+
* @return Constraint[]
185+
*/
183186
public function getConstraints(): array
184187
{
185188
return $this->constraints;
@@ -195,6 +198,8 @@ public function hasConstraints(): bool
195198

196199
/**
197200
* Aware of the global group (* group).
201+
*
202+
* @return Constraint[]
198203
*/
199204
public function findConstraints(string $group): array
200205
{

0 commit comments

Comments
 (0)