Merge pull request #408 from vincentchalamon/fix/cs

Fix CS
api-platform · Jun 29, 2023 · 7d0a356 · 7d0a356
2 parents 2f70987 + 3adab34
commit 7d0a356
Show file tree

Hide file tree

Showing 39 changed files with 59 additions and 188 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,6 +4,10 @@ on:
   push:
   pull_request:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 env:
   COVERAGE: '0'
 
@@ -25,7 +29,7 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - uses: actions/cache@v3
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.2.0
+
+* feat: improve type detection
+
 ## 5.1.1
 
 * fix: missing unique for self-referencing relations

diff --git a/scoper.inc.php b/scoper.inc.php
@@ -36,7 +36,7 @@ function (string $filePath, string $prefix, string $content): string {
         // TODO: Temporary patch until the issue is fixed upstream
         // @link https://github.com/humbug/php-scoper/issues/285
         function (string $filePath, string $prefix, string $content): string {
-            if (false === strpos($content, '@')) {
+            if (!str_contains($content, '@')) {
                 return $content;
             }
 
@@ -52,7 +52,7 @@ function (string $filePath, string $prefix, string $content): string {
             );
         },
         function (string $filePath, string $prefix, string $content): string {
-            if (0 !== strpos($filePath, 'src/AnnotationGenerator/')) {
+            if (!str_starts_with($filePath, 'src/AnnotationGenerator/')) {
                 return $content;
             }
 

diff --git a/src/AnnotationGenerator/AbstractAnnotationGenerator.php b/src/AnnotationGenerator/AbstractAnnotationGenerator.php
@@ -48,73 +48,46 @@ public function __construct(PhpTypeConverterInterface $phpTypeConverter, Inflect
         $this->classes = $classes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAnnotations(Class_ $class): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateInterfaceAnnotations(Class_ $class): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateConstantAnnotations(Constant $constant): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAnnotations(Property $property, string $className): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateGetterAnnotations(Property $property): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateSetterAnnotations(Property $property): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateAdderAnnotations(Property $property): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateRemoverAnnotations(Property $property): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateUses(Class_ $class): array
     {
         return [];

diff --git a/src/AnnotationGenerator/PhpDocAnnotationGenerator.php b/src/AnnotationGenerator/PhpDocAnnotationGenerator.php
@@ -31,35 +31,23 @@ final class PhpDocAnnotationGenerator extends AbstractAnnotationGenerator
 
     private HtmlConverter $htmlToMarkdown;
 
-    /**
-     * {@inheritdoc}
-     */
     public function __construct(PhpTypeConverterInterface $phpTypeConverter, InflectorInterface $inflector, array $config, array $classes)
     {
         parent::__construct($phpTypeConverter, $inflector, $config, $classes);
 
         $this->htmlToMarkdown = new HtmlConverter();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAnnotations(Class_ $class): array
     {
         return $this->generateDoc($class);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateInterfaceAnnotations(Class_ $class): array
     {
         return $this->generateDoc($class, true);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateConstantAnnotations(Constant $constant): array
     {
         $annotations = $this->formatDoc($constant->comment(), true);
@@ -68,9 +56,6 @@ public function generateConstantAnnotations(Constant $constant): array
         return $annotations;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAnnotations(Property $property, string $className): array
     {
         $description = $this->formatDoc((string) $property->description(), true);
@@ -92,9 +77,6 @@ public function generatePropertyAnnotations(Property $property, string $classNam
         return $annotations;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateGetterAnnotations(Property $property): array
     {
         if (!$this->isDocUseful($property)) {
@@ -104,9 +86,6 @@ public function generateGetterAnnotations(Property $property): array
         return [sprintf('@return %s', $this->toPhpDocType($property))];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateSetterAnnotations(Property $property): array
     {
         if (!$this->isDocUseful($property)) {
@@ -116,9 +95,6 @@ public function generateSetterAnnotations(Property $property): array
         return [sprintf('@param %s $%s', $this->toPhpDocType($property), $property->name())];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateAdderAnnotations(Property $property): array
     {
         if (!$this->isDocUseful($property, true)) {
@@ -128,9 +104,6 @@ public function generateAdderAnnotations(Property $property): array
         return [sprintf('@param %s $%s', $this->toPhpDocType($property, true), $this->inflector->singularize($property->name())[0])];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateRemoverAnnotations(Property $property): array
     {
         if (!$this->isDocUseful($property, true)) {

diff --git a/src/AttributeGenerator/AbstractAttributeGenerator.php b/src/AttributeGenerator/AbstractAttributeGenerator.php
@@ -47,33 +47,21 @@ public function __construct(PhpTypeConverterInterface $phpTypeConverter, Inflect
         $this->classes = $classes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAttributes(Class_ $class): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAttributes(Property $property, string $className): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateLateClassAttributes(Class_ $class): array
     {
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateUses(Class_ $class): array
     {
         return [];

diff --git a/src/AttributeGenerator/ApiPlatformCoreAttributeGenerator.php b/src/AttributeGenerator/ApiPlatformCoreAttributeGenerator.php
@@ -39,9 +39,6 @@
  */
 final class ApiPlatformCoreAttributeGenerator extends AbstractAttributeGenerator
 {
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAttributes(Class_ $class): array
     {
         if ($class->hasChild || $class->isEnum()) {
@@ -110,9 +107,6 @@ private function validateClassOperations(array $operations): array
         return $resolver->resolve($operations);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAttributes(Property $property, string $className): array
     {
         $arguments = [];
@@ -128,9 +122,6 @@ public function generatePropertyAttributes(Property $property, string $className
         return $property->isCustom ? [] : [new Attribute('ApiProperty', $arguments)];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateUses(Class_ $class): array
     {
         if ($this->config['apiPlatformOldAttributes']) {

diff --git a/src/AttributeGenerator/ConfigurationAttributeGenerator.php b/src/AttributeGenerator/ConfigurationAttributeGenerator.php
@@ -21,9 +21,6 @@
 
 final class ConfigurationAttributeGenerator extends AbstractAttributeGenerator
 {
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAttributes(Class_ $class): array
     {
         $typeAttributes = $this->config['types'][$class->name()]['attributes'] ?? [[]];
@@ -44,8 +41,8 @@ public function generateClassAttributes(Class_ $class): array
                 // An attribute from a vocabulary cannot be appended if a same one has not
                 // previously been generated or if the same one is not mergeable.
                 // It allows vocabulary attributes configuration to only merge the attributes args.
-                'alwaysGenerate' => !\in_array($name, $vocabAttributesNames, true) ||
-                    \in_array($name, $typeAttributesNames, true),
+                'alwaysGenerate' => !\in_array($name, $vocabAttributesNames, true)
+                    || \in_array($name, $typeAttributesNames, true),
                 // Custom explicitly configured attributes is not mergeable with next one
                 // but treated as repeated if given more than once.
                 'mergeable' => false,
@@ -69,9 +66,6 @@ public function generateClassAttributes(Class_ $class): array
         return $attributes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAttributes(Property $property, string $className): array
     {
         $typeConfig = $this->config['types'][$className] ?? null;
@@ -90,9 +84,6 @@ public function generatePropertyAttributes(Property $property, string $className
         return $attributes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateUses(Class_ $class): array
     {
         $uses = [];

diff --git a/src/AttributeGenerator/ConstraintAttributeGenerator.php b/src/AttributeGenerator/ConstraintAttributeGenerator.php
@@ -27,9 +27,6 @@
  */
 final class ConstraintAttributeGenerator extends AbstractAttributeGenerator
 {
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAttributes(Property $property, string $className): array
     {
         if ($property->isId) {
@@ -84,9 +81,6 @@ public function generatePropertyAttributes(Property $property, string $className
         return $asserts;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateUses(Class_ $class): array
     {
         if ($class->isEnum()) {
@@ -113,9 +107,6 @@ public function generateUses(Class_ $class): array
         return $uses;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAttributes(Class_ $class): array
     {
         if ($class->isEnum()) {

diff --git a/src/AttributeGenerator/DoctrineMongoDBAttributeGenerator.php b/src/AttributeGenerator/DoctrineMongoDBAttributeGenerator.php
@@ -30,9 +30,6 @@
  */
 final class DoctrineMongoDBAttributeGenerator extends AbstractAttributeGenerator
 {
-    /**
-     * {@inheritdoc}
-     */
     public function generateClassAttributes(Class_ $class): array
     {
         if ($class->isEnum()) {
@@ -72,9 +69,6 @@ public function generateClassAttributes(Class_ $class): array
         return $attributes;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generatePropertyAttributes(Property $property, string $className): array
     {
         if (null === $property->type && null === $property->reference) {
@@ -146,9 +140,6 @@ public function generatePropertyAttributes(Property $property, string $className
         return [];
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateUses(Class_ $class): array
     {
         return $class->isEnum() ? [] : [new Use_('Doctrine\ODM\MongoDB\Mapping\Annotations', 'MongoDB')];

diff --git a/src/AttributeGenerator/DoctrineOrmAssociationOverrideAttributeGenerator.php b/src/AttributeGenerator/DoctrineOrmAssociationOverrideAttributeGenerator.php
@@ -21,9 +21,6 @@ final class DoctrineOrmAssociationOverrideAttributeGenerator extends AbstractAtt
 {
     use GenerateIdentifierNameTrait;
 
-    /**
-     * {@inheritdoc}
-     */
     public function generateLateClassAttributes(Class_ $class): array
     {
         if ($class->isAbstract || !($parentName = $class->parent())) {