Symfony 7 support continuation

composer.json

@@ -9,17 +9,17 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^8.1",
         "nikic/php-parser": "^3.0 || ^4.0",
-        "symfony/finder": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+        "symfony/finder": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
         "twig/twig": "^2.0 || ^3.0",
         "doctrine/annotations": "^1.7 || ^2.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^5.0 || ^6.0",
-        "symfony/translation": "^3.4 || ^4.4 || ^5.0 || ^6.0",
-        "symfony/validator": "^3.4 || ^4.4 || ^5.0 || ^6.0",
-        "symfony/twig-bridge": "^3.4 || ^4.4 || ^5.0 || ^6.0",
+        "symfony/phpunit-bridge": "^5.0 || ^6.0 || ^7.0",
+        "symfony/translation": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/validator": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/twig-bridge": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0",
         "knplabs/knp-menu": "^3.1"
     },
     "autoload": {

src/Annotation/Desc.php

@@ -11,9 +11,12 @@
 
 namespace Translation\Extractor\Annotation;
 
+use JetBrains\PhpStorm\Deprecated;
+
 /**
  * @Annotation
  */
+#[Deprecated]
 final class Desc
 {
     /**

src/Annotation/Ignore.php

@@ -11,9 +11,12 @@
 
 namespace Translation\Extractor\Annotation;
 
+use JetBrains\PhpStorm\Deprecated;
+
 /**
  * @Annotation
  */
+#[Deprecated]
 final class Ignore
 {
 }

src/Annotation/Translate.php

@@ -11,9 +11,12 @@
 
 namespace Translation\Extractor\Annotation;
 
+use JetBrains\PhpStorm\Deprecated;
+
 /**
  * @Annotation
  */
+#[Deprecated]
 class Translate
 {
     /**

src/Attribute/Desc.php

@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the PHP Translation package.
+ *
+ * (c) PHP Translation team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Translation\Extractor\Attribute;
+
+#[\Attribute]
+final class Desc
+{
+    public string $text;
+}

src/Attribute/Ignore.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the PHP Translation package.
+ *
+ * (c) PHP Translation team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Translation\Extractor\Attribute;
+
+#[\Attribute]
+final class Ignore
+{
+}

src/Attribute/Translate.php

@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the PHP Translation package.
+ *
+ * (c) PHP Translation team <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Translation\Extractor\Attribute;
+
+#[\Attribute]
+class Translate
+{
+    private string $domain = '';
+
+    /**
+     * Translate constructor.
+     */
+    public function __construct(array $values = ['domain' => 'messages'])
+    {
+        if (isset($values['domain'])) {
+            $this->domain = $values['domain'];
+        }
+    }
+
+    public function getDomain(): string
+    {
+        return $this->domain;
+    }
+}

src/Extractor.php

@@ -27,7 +27,7 @@ final class Extractor
     /**
      * @var FileExtractor[]
      */
-    private $fileExtractors = [];
+    private array $fileExtractors = [];
 
     public function extract(Finder $finder): SourceCollection
     {

src/FileExtractor/PHPFileExtractor.php

@@ -27,7 +27,7 @@ final class PHPFileExtractor implements FileExtractor
     /**
      * @var Visitor[]|NodeVisitor[]
      */
-    private $visitors = [];
+    private array $visitors = [];
 
     /**
      * {@inheritdoc}

src/FileExtractor/TwigFileExtractor.php

@@ -27,12 +27,10 @@ final class TwigFileExtractor extends AbstractExtension implements FileExtractor
     /**
      * @var NodeVisitorInterface[]
      */
-    private $visitors = [];
-    private $twig;
+    private array $visitors = [];
 
-    public function __construct(Environment $twig)
+    public function __construct(private readonly Environment $twig)
     {
-        $this->twig = $twig;
         $twig->addExtension($this);
     }
 

src/Model/Error.php

@@ -18,16 +18,11 @@
  */
 final class Error
 {
-    private $message;
-    private $path;
-    private $line;
-
-    public function __construct(string $message, string $path, int $line)
-    {
-        $this->message = $message;
-        $this->path = (string) $path;
-        $this->line = $line;
-    }
+    public function __construct(
+        private readonly string $message,
+        private readonly string $path,
+        private readonly int $line
+    ){}
 
     public function getMessage(): string
     {

src/Model/SourceCollection.php

@@ -19,12 +19,12 @@ final class SourceCollection implements \Countable, \IteratorAggregate
     /**
      * @var SourceLocation[]
      */
-    private $sourceLocations = [];
+    private array $sourceLocations = [];
 
     /**
      * @var Error[]
      */
-    private $errors = [];
+    private array $errors = [];
 
     /**
      * {@inheritdoc}

src/Model/SourceLocation.php

@@ -16,21 +16,12 @@
  */
 final class SourceLocation
 {
-    /**
-     * Translation key.
-     */
-    private $message;
-    private $path;
-    private $line;
-    private $context;
-
-    public function __construct(string $message, string $path, int $line, array $context = [])
-    {
-        $this->message = $message;
-        $this->path = (string) $path;
-        $this->line = $line;
-        $this->context = $context;
-    }
+    public function __construct(
+        private readonly string $message, /** Translation key. */
+        private readonly string $path,
+        private readonly int $line,
+        private readonly array $context = []
+    ) {}
 
     /**
      * Create a source location from your current location.

src/Visitor/BaseVisitor.php

@@ -14,8 +14,8 @@
 use Doctrine\Common\Annotations\DocParser;
 use PhpParser\Node;
 use Symfony\Component\Finder\SplFileInfo;
-use Translation\Extractor\Annotation\Desc;
-use Translation\Extractor\Annotation\Ignore;
+use Translation\Extractor\Attribute\Desc;
+use Translation\Extractor\Attribute\Ignore;
 use Translation\Extractor\Model\Error;
 use Translation\Extractor\Model\SourceCollection;
 use Translation\Extractor\Model\SourceLocation;
@@ -27,17 +27,11 @@
  */
 abstract class BaseVisitor implements Visitor
 {
-    protected $collection;
-    protected $file;
+    private ?DocParser $docParser = null;
 
-    /**
-     * @var DocParser
-     */
-    private $docParser;
+    protected SourceCollection $collection;
+    protected SplFileInfo $file;
 
-    /**
-     * {@inheritdoc}
-     */
     public function init(SourceCollection $collection, SplFileInfo $file): void
     {
         $this->collection = $collection;

src/Visitor/Php/Knp/Menu/AbstractKnpMenuVisitor.php

@@ -21,20 +21,14 @@
  */
 abstract class AbstractKnpMenuVisitor extends BasePHPVisitor implements NodeVisitor
 {
-    /**
-     * @var bool
-     */
-    private $isKnpMenuBuildingMethod = false;
+    private bool $isKnpMenuBuildingMethod = false;
 
-    /**
-     * @var string|bool
-     */
-    private $domain;
+    private string|bool|null $domain;
 
     /**
      * @var SourceLocation[]
      */
-    private $sourceLocations = [];
+    private array $sourceLocations = [];
 
     public function beforeTraverse(array $nodes): ?Node
     {
@@ -126,7 +120,6 @@ public function afterTraverse(array $nodes): ?Node
             return null;
         }
 
-        /** @var SourceLocation $location */
         foreach ($this->sourceLocations as $location) {
             if (null !== $this->domain) {
                 $context = $location->getContext();

src/Visitor/Php/SourceLocationContainerVisitor.php

@@ -23,15 +23,8 @@
  */
 final class SourceLocationContainerVisitor extends BasePHPVisitor implements NodeVisitor
 {
-    /**
-     * @var string
-     */
-    private $namespace = '';
-
-    /**
-     * @var array
-     */
-    private $useStatements = [];
+    private string $namespace = '';
+    private array $useStatements = [];
 
     /**
      * {@inheritdoc}
@@ -49,16 +42,16 @@ public function enterNode(Node $node): ?Node
         if ($node instanceof Node\Stmt\Namespace_) {
             if (isset($node->name)) {
                 // Save namespace of this class for later.
-                $this->namespace = implode('\\', $node->name->parts);
+                $this->namespace = implode('\\', $node->name->getParts());
             }
             $this->useStatements = [];
 
             return null;
         }
 
         if ($node instanceof Node\Stmt\UseUse) {
-            $key = isset($node->alias) ? $node->alias : $node->name->parts[\count($node->name->parts) - 1];
-            $this->useStatements[(string) $key] = implode('\\', $node->name->parts);
+            $key = $node->alias ?? $node->name->getParts()[\count($node->name->getParts()) - 1];
+            $this->useStatements[(string) $key] = implode('\\', $node->name->getParts());
 
             return null;
         }
@@ -69,7 +62,7 @@ public function enterNode(Node $node): ?Node
 
         $isContainer = false;
         foreach ($node->implements as $interface) {
-            $name = implode('\\', $interface->parts);
+            $name = implode('\\', $interface->getParts());
             if (isset($this->useStatements[$name])) {
                 $name = $this->useStatements[$name];
             }

src/Visitor/Php/Symfony/AbstractFormType.php

@@ -24,12 +24,9 @@ abstract class AbstractFormType extends BasePHPVisitor implements NodeVisitor
     /**
      * @var SourceLocation[]
      */
-    private $sourceLocations = [];
+    private array $sourceLocations = [];
 
-    /**
-     * @var string|null
-     */
-    private $defaultDomain;
+    private string|null $defaultDomain;
 
     /**
      * {@inheritdoc}
@@ -121,7 +118,6 @@ private function parseDefaultsCall(Node $node): void
         }
 
         // check if a translation_domain is set as a default option
-        $domain = null;
         foreach ($node->args[0]->value->items as $item) {
             if (!$item->key instanceof Node\Scalar\String_) {
                 continue;
@@ -142,7 +138,6 @@ private function parseDefaultsCall(Node $node): void
      */
     public function afterTraverse(array $nodes): ?Node
     {
-        /** @var SourceLocation $location */
         foreach ($this->sourceLocations as $location) {
             if (null !== $this->defaultDomain) {
                 $context = $location->getContext();

src/Visitor/Php/Symfony/Constraint.php

@@ -111,7 +111,7 @@ public function enterNode(Node $node): ?Node
             return null;
         }
 
-        $parts = $className->parts;
+        $parts = $className->getParts();
         $isConstraintClass = false;
 
         // we need to check every part since `Assert\NotBlank` would be split in 2 different pieces
@@ -151,7 +151,7 @@ public function enterNode(Node $node): ?Node
                 continue;
             }
 
-            // there could be false positives but it should catch most of the useful properties
+            // there could be false positives, but it should catch most of the useful properties
             // (e.g. `message`, `minMessage`)
             if (false === stripos($item->key->value, 'message')) {
                 continue;