feature: review source models

Author: deguif

Model/FileSource.php

@@ -22,63 +22,29 @@
 
 class FileSource implements SourceInterface
 {
-    /**
-     * @var string
-     */
-    private $path;
-
-    /**
-     * @var int
-     */
-    private $line;
-
-    /**
-     * @var int
-     */
-    private $column;
-
-    /**
-     * @param string $path
-     * @param int|null $line
-     * @param int|null $column
-     */
-    public function __construct($path, $line = null, $column = null)
-    {
-        $this->path = $path;
-        $this->line = $line;
-        $this->column = $column;
+    public function __construct(
+        private string $path,
+        private int|null $line = null,
+        private int|null $column = null,
+    ) {
     }
 
-    /**
-     * @return string
-     */
-    public function getPath()
+    public function getPath(): string
     {
         return $this->path;
     }
 
-    /**
-     * @return int|null
-     */
-    public function getLine()
+    public function getLine(): int|null
     {
         return $this->line;
     }
 
-    /**
-     * @return int|null
-     */
-    public function getColumn()
+    public function getColumn(): int|null
     {
         return $this->column;
     }
 
-    /**
-     * @param SourceInterface $source
-     *
-     * @return bool
-     */
-    public function equals(SourceInterface $source)
+    public function equals(SourceInterface $source): bool
     {
         if (!$source instanceof FileSource) {
             return false;
@@ -95,10 +61,7 @@ public function equals(SourceInterface $source)
         return $this->column === $source->getColumn();
     }
 
-    /**
-     * @return string
-     */
-    public function __toString()
+    public function __toString(): string
     {
         $str = $this->path;
 

Model/SourceInterface.php

@@ -20,9 +20,7 @@
 
 namespace JMS\TranslationBundle\Model;
 
-interface SourceInterface
+interface SourceInterface extends \Stringable
 {
-    public function equals(SourceInterface $source);
-
-    public function __toString();
+    public function equals(SourceInterface $source): bool;
 }