Use type AdsTxtLineInterface instead of AbstractAdsTxtLine as return …

…type (#4) * V3 * Set coding style * Change type AdsTxtLineInterface to AbstractAdsTxtLine
badraxas · Jan 23, 2024 · 37fb598 · 37fb598
1 parent 000ea53
commit 37fb598
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/Interfaces/ParserInterface.php b/src/Interfaces/ParserInterface.php
@@ -2,7 +2,9 @@
 
 namespace Badraxas\Adstxt\Interfaces;
 
+use Badraxas\Adstxt\Lines\AbstractAdsTxtLine;
+
 interface ParserInterface
 {
-    public function parse(string $line): AdsTxtLineInterface;
+    public function parse(string $line): AbstractAdsTxtLine;
 }
diff --git a/src/Parsers/CommentParser.php b/src/Parsers/CommentParser.php
@@ -2,13 +2,13 @@
 
 namespace Badraxas\Adstxt\Parsers;
 
-use Badraxas\Adstxt\Interfaces\AdsTxtLineInterface;
 use Badraxas\Adstxt\Interfaces\ParserInterface;
+use Badraxas\Adstxt\Lines\AbstractAdsTxtLine;
 use Badraxas\Adstxt\Lines\Comment;
 
 class CommentParser implements ParserInterface
 {
-    public function parse(string $line): AdsTxtLineInterface
+    public function parse(string $line): AbstractAdsTxtLine
     {
         $raw = $line;
         $line = trim(mb_strcut($line, 1));

diff --git a/src/Parsers/InvalidParser.php b/src/Parsers/InvalidParser.php
@@ -2,14 +2,14 @@
 
 namespace Badraxas\Adstxt\Parsers;
 
-use Badraxas\Adstxt\Interfaces\AdsTxtLineInterface;
 use Badraxas\Adstxt\Interfaces\ParserInterface;
+use Badraxas\Adstxt\Lines\AbstractAdsTxtLine;
 use Badraxas\Adstxt\Lines\Comment;
 use Badraxas\Adstxt\Lines\Invalid;
 
 class InvalidParser implements ParserInterface
 {
-    public function parse(string $line): AdsTxtLineInterface
+    public function parse(string $line): AbstractAdsTxtLine
     {
         $raw = $line;
 

diff --git a/src/Parsers/RecordParser.php b/src/Parsers/RecordParser.php
@@ -2,15 +2,15 @@
 
 namespace Badraxas\Adstxt\Parsers;
 
-use Badraxas\Adstxt\Interfaces\AdsTxtLineInterface;
 use Badraxas\Adstxt\Interfaces\ParserInterface;
+use Badraxas\Adstxt\Lines\AbstractAdsTxtLine;
 use Badraxas\Adstxt\Lines\Comment;
 use Badraxas\Adstxt\Lines\Invalid;
 use Badraxas\Adstxt\Lines\Record;
 
 class RecordParser implements ParserInterface
 {
-    public function parse(string $line): AdsTxtLineInterface
+    public function parse(string $line): AbstractAdsTxtLine
     {
         $raw = $line;
         $comment = null;
@@ -23,6 +23,7 @@ public function parse(string $line): AdsTxtLineInterface
         }
 
         $exploded_line = explode(',', $line);
+        $exploded_line = array_map('trim', $exploded_line);
 
         $fieldsCount = count($exploded_line);
 

diff --git a/src/Parsers/VariableParser.php b/src/Parsers/VariableParser.php
@@ -2,15 +2,15 @@
 
 namespace Badraxas\Adstxt\Parsers;
 
-use Badraxas\Adstxt\Interfaces\AdsTxtLineInterface;
 use Badraxas\Adstxt\Interfaces\ParserInterface;
+use Badraxas\Adstxt\Lines\AbstractAdsTxtLine;
 use Badraxas\Adstxt\Lines\Comment;
 use Badraxas\Adstxt\Lines\Invalid;
 use Badraxas\Adstxt\Lines\Variable;
 
 class VariableParser implements ParserInterface
 {
-    public function parse(string $line): AdsTxtLineInterface
+    public function parse(string $line): AbstractAdsTxtLine
     {
         $comment = null;