Merge pull request #939 from mbabker/bump-cs

Bump `doctrine/coding-standard` to latest
schmittjoh · Dec 18, 2023 · 100725a · 100725a
2 parents f9e82cb + 5798830
commit 100725a
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 161 deletions.
diff --git a/.phpcs.xml.dist b/.phpcs.xml.dist
@@ -108,10 +108,6 @@
         <exclude-pattern>tests/*</exclude-pattern>
     </rule>
 
-    <rule ref="SlevomatCodingStandard.Classes.UnusedPrivateElements">
-        <exclude-pattern>tests/*</exclude-pattern>
-    </rule>
-
     <rule ref="SlevomatCodingStandard.Commenting.DocCommentSpacing">
         <properties>
             <property name="annotationsGroups" type="array">

diff --git a/Cache/CacheClearer.php b/Cache/CacheClearer.php
@@ -8,19 +8,13 @@
 use Metadata\Cache\ClearableCacheInterface;
 use Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface;
 
-/**
- * @author Alexander Strizhak <[email protected]>
- */
+/** @author Alexander Strizhak <[email protected]> */
 class CacheClearer implements CacheClearerInterface
 {
-    /**
-     * @var CacheInterface|ClearableCacheInterface
-     */
+    /** @var CacheInterface|ClearableCacheInterface */
     private $cache;
 
-    /**
-     * @param CacheInterface|ClearableCacheInterface $cache
-     */
+    /** @param CacheInterface|ClearableCacheInterface $cache */
     public function __construct(CacheInterface $cache)
     {
         $this->cache = $cache;

diff --git a/Cache/CacheWarmer.php b/Cache/CacheWarmer.php
@@ -8,22 +8,14 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 
-/**
- * @author Asmir Mustafic <[email protected]>
- */
+/** @author Asmir Mustafic <[email protected]> */
 class CacheWarmer implements CacheWarmerInterface
 {
-    /**
-     * @var MetadataFactoryInterface
-     */
+    /** @var MetadataFactoryInterface */
     private $metadataFactory;
-    /**
-     * @var string[]
-     */
+    /** @var string[] */
     private $includePaths = [];
-    /**
-     * @var string[]
-     */
+    /** @var string[] */
     private $excludePaths = [];
 
     public function __construct(array $includePaths, MetadataFactoryInterface $metadataFactory, array $excludePaths = [])

diff --git a/ContextFactory/ConfiguredContextFactory.php b/ContextFactory/ConfiguredContextFactory.php
@@ -47,17 +47,13 @@ class ConfiguredContextFactory implements SerializationContextFactoryInterface,
      */
     private $groups = [];
 
-    /**
-     * @param string|null $version
-     */
+    /** @param string|null $version */
     public function setVersion($version)
     {
         $this->version = $version;
     }
 
-    /**
-     * @param bool $serializeNulls
-     */
+    /** @param bool $serializeNulls */
     public function setSerializeNulls($serializeNulls)
     {
         $this->serializeNulls = (bool) $serializeNulls;
@@ -68,17 +64,13 @@ public function enableMaxDepthChecks()
         $this->enableMaxDepthChecks = true;
     }
 
-    /**
-     * @param array $attributes
-     */
+    /** @param array $attributes */
     public function setAttributes(array $attributes)
     {
         $this->attributes = $attributes;
     }
 
-    /**
-     * @param string[] $groups
-     */
+    /** @param string[] $groups */
     public function setGroups(array $groups)
     {
         $this->groups = $groups;

diff --git a/DependencyInjection/Compiler/AssignVisitorsPass.php b/DependencyInjection/Compiler/AssignVisitorsPass.php
@@ -7,9 +7,7 @@
 use JMS\SerializerBundle\DependencyInjection\ScopedContainer;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * @internal
- */
+/** @internal */
 final class AssignVisitorsPass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Compiler/CustomHandlersPass.php b/DependencyInjection/Compiler/CustomHandlersPass.php
@@ -11,9 +11,7 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * @internal
- */
+/** @internal */
 final class CustomHandlersPass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Compiler/DoctrinePass.php b/DependencyInjection/Compiler/DoctrinePass.php
@@ -7,9 +7,7 @@
 use JMS\SerializerBundle\DependencyInjection\ScopedContainer;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * @internal
- */
+/** @internal */
 final class DoctrinePass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Compiler/ExpressionFunctionProviderPass.php b/DependencyInjection/Compiler/ExpressionFunctionProviderPass.php
@@ -8,9 +8,7 @@
 use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * @internal
- */
+/** @internal */
 final class ExpressionFunctionProviderPass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Compiler/FormErrorHandlerTranslationDomainPass.php b/DependencyInjection/Compiler/FormErrorHandlerTranslationDomainPass.php
@@ -6,9 +6,7 @@
 
 use JMS\SerializerBundle\DependencyInjection\ScopedContainer;
 
-/**
- * @internal
- */
+/** @internal */
 final class FormErrorHandlerTranslationDomainPass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Compiler/PerInstancePass.php b/DependencyInjection/Compiler/PerInstancePass.php
@@ -8,9 +8,7 @@
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
-/**
- * @internal
- */
+/** @internal */
 abstract class PerInstancePass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container): void

diff --git a/DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php b/DependencyInjection/Compiler/RegisterEventListenersAndSubscribersPass.php
@@ -9,9 +9,7 @@
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * @internal
- */
+/** @internal */
 final class RegisterEventListenersAndSubscribersPass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Compiler/TwigExtensionPass.php b/DependencyInjection/Compiler/TwigExtensionPass.php
@@ -6,9 +6,7 @@
 
 use JMS\SerializerBundle\DependencyInjection\ScopedContainer;
 
-/**
- * @internal
- */
+/** @internal */
 final class TwigExtensionPass extends PerInstancePass
 {
     protected function processInstance(ScopedContainer $container): void

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -10,16 +10,12 @@
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 use Symfony\Component\Config\Definition\Exception\InvalidTypeException;
 
-/**
- * @internal
- */
+/** @internal */
 final class Configuration implements ConfigurationInterface
 {
     private $debug;
 
-    /**
-     * @param bool $debug
-     */
+    /** @param bool $debug */
     public function __construct($debug = false)
     {
         $this->debug = $debug;

diff --git a/DependencyInjection/DIUtils.php b/DependencyInjection/DIUtils.php
@@ -9,14 +9,10 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Reference;
 
-/**
- * @internal
- */
+/** @internal */
 final class DIUtils
 {
-    /**
-     * @see \JMS\SerializerBundle\DependencyInjection\Compiler\AdjustDecorationPass
-     */
+    /** @see \JMS\SerializerBundle\DependencyInjection\Compiler\AdjustDecorationPass */
     public static function adjustDecorators(ContainerBuilder $container): void
     {
         foreach ($container->getDefinitions() as $definition) {

diff --git a/DependencyInjection/JMSSerializerExtension.php b/DependencyInjection/JMSSerializerExtension.php
@@ -15,7 +15,6 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
@@ -25,13 +24,11 @@
 use Symfony\Component\Uid\AbstractUid;
 use Symfony\Component\Yaml\Yaml;
 
-/**
- * @internal
- */
+/** @internal */
 final class JMSSerializerExtension extends Extension
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public function load(array $rawConfigs, ContainerBuilder $container): void
     {
@@ -321,9 +318,7 @@ private function loadInternal(array $config, ScopedContainer $container, array $
         $this->setContextFactories($container, $config);
     }
 
-    /**
-     * @return ConfigurationInterface
-     */
+    /** @return ConfigurationInterface */
     public function getConfiguration(array $config, ContainerBuilder $container)
     {
         return new Configuration($container->getParameterBag()->resolveValue('%kernel.debug%'));

diff --git a/ExpressionLanguage/BasicSerializerFunctionsProvider.php b/ExpressionLanguage/BasicSerializerFunctionsProvider.php
@@ -9,9 +9,7 @@
 
 class BasicSerializerFunctionsProvider implements ExpressionFunctionProviderInterface
 {
-    /**
-     * @return ExpressionFunction[]
-     */
+    /** @return ExpressionFunction[] */
     public function getFunctions(): array
     {
         return [
@@ -30,7 +28,7 @@ public function getFunctions(): array
             }, static function (array $variables, $attribute, $object = null) {
                 return call_user_func_array(
                     [$variables['container']->get('jms_serializer.authorization_checker'), 'isGranted'],
-                    [$attribute, $object]
+                    [$attribute, $object],
                 );
             }),
         ];

diff --git a/Serializer/StopwatchEventSubscriber.php b/Serializer/StopwatchEventSubscriber.php
@@ -8,13 +8,11 @@
 use JMS\Serializer\EventDispatcher\EventSubscriberInterface;
 use JMS\Serializer\EventDispatcher\ObjectEvent;
 
-/**
- * @author Adrien Brault <[email protected]>
- */
+/** @author Adrien Brault <[email protected]> */
 class StopwatchEventSubscriber implements EventSubscriberInterface
 {
     /**
-     * {@inheritdoc}
+     * {@inheritDoc}
      */
     public static function getSubscribedEvents()
     {
@@ -31,14 +29,10 @@ public static function getSubscribedEvents()
      */
     private $stopwatch;
 
-    /**
-     * @var string
-     */
+    /** @var string */
     private $name;
 
-    /**
-     * @var object
-     */
+    /** @var object */
     private $rootObject;
 
     public function __construct($stopwatch, $name = 'jms_serializer')

diff --git a/Templating/SerializerHelper.php b/Templating/SerializerHelper.php
@@ -12,9 +12,9 @@
  *
  * Basically provides access to JMSSerializer from PHP templates
  *
- * @author Rafał Wrzeszcz <[email protected]>
- *
  * @deprecated use Twig instead
+ *
+ * @author Rafał Wrzeszcz <[email protected]>
  */
 class SerializerHelper extends Helper
 {

diff --git a/Tests/DependencyInjection/Fixture/AnotherSimpleObject.php b/Tests/DependencyInjection/Fixture/AnotherSimpleObject.php
@@ -12,9 +12,7 @@ class AnotherSimpleObject
     #[Type(name: 'float')]
     private $num;
 
-    /**
-     * @Type("string")
-     */
+    /** @Type("string") */
     #[Type(name: 'string')]
     private $str;
 

diff --git a/Tests/DependencyInjection/Fixture/DefaultValuePropObject.php b/Tests/DependencyInjection/Fixture/DefaultValuePropObject.php
@@ -1,11 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace JMS\SerializerBundle\Tests\DependencyInjection\Fixture;
 
 class DefaultValuePropObject
 {
-    private string $foo = "some-value";
+    private string $foo = 'some-value';
 
-    public function __construct(private string $boo = "another-value") {
+    public function __construct(private string $boo = 'another-value')
+    {
     }
 }
diff --git a/Tests/DependencyInjection/Fixture/IncludeInterfaces/AnInterfaceImplementation.php b/Tests/DependencyInjection/Fixture/IncludeInterfaces/AnInterfaceImplementation.php
@@ -8,9 +8,7 @@
 
 class AnInterfaceImplementation implements AnInterface
 {
-    /**
-     * @Type("string")
-     */
+    /** @Type("string") */
     #[Type(name: 'string')]
     private $bar;
 

diff --git a/Tests/DependencyInjection/Fixture/IncludeInterfaces/AnObject.php b/Tests/DependencyInjection/Fixture/IncludeInterfaces/AnObject.php
@@ -8,15 +8,11 @@
 
 class AnObject
 {
-    /**
-     * @Type("string")
-     */
+    /** @Type("string") */
     #[Type(name: 'string')]
     private $foo;
 
-    /**
-     * @Type("JMS\SerializerBundle\Tests\DependencyInjection\Fixture\IncludeInterfaces\AnInterface")
-     */
+    /** @Type("JMS\SerializerBundle\Tests\DependencyInjection\Fixture\IncludeInterfaces\AnInterface") */
     #[Type(name: 'JMS\SerializerBundle\Tests\DependencyInjection\Fixture\IncludeInterfaces\AnInterface')]
     private $bar;
 

diff --git a/Tests/DependencyInjection/Fixture/ObjectUsingEnumDeserialize.php b/Tests/DependencyInjection/Fixture/ObjectUsingEnumDeserialize.php
@@ -10,14 +10,10 @@ class ObjectUsingEnumDeserialize
 {
     private ObjectUsingEnumDeserializeCard $one;
 
-    /**
-     * @Type("enum<'JMS\SerializerBundle\Tests\DependencyInjection\Fixture\ObjectUsingEnumDeserializeCard'>")
-     */
+    /** @Type("enum<'JMS\SerializerBundle\Tests\DependencyInjection\Fixture\ObjectUsingEnumDeserializeCard'>") */
     #[Type(name: 'enum<"JMS\SerializerBundle\Tests\DependencyInjection\Fixture\ObjectUsingEnumDeserializeCard">')]
     private $two;
-    /**
-     * @Type("array<enum<'JMS\SerializerBundle\Tests\DependencyInjection\Fixture\ObjectUsingEnumDeserializeCard'>>")
-     */
+    /** @Type("array<enum<'JMS\SerializerBundle\Tests\DependencyInjection\Fixture\ObjectUsingEnumDeserializeCard'>>") */
     #[Type(name: 'array<enum<"JMS\SerializerBundle\Tests\DependencyInjection\Fixture\ObjectUsingEnumDeserializeCard">>')]
     private array $three;