Merge pull request #23 from php-etl/fix/file-used-in-extractor

Fixed code generated in the extractor to prevent an error if a file d…
php-etl · Sep 14, 2023 · d3bd8c4 · d3bd8c4
2 parents 4636a13 + 2a0de88
commit d3bd8c4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/src/Builder/Extractor.php b/src/Builder/Extractor.php
@@ -11,9 +11,7 @@ final class Extractor implements StepBuilderInterface
 {
     private ?Node\Expr $logger = null;
 
-    public function __construct(private Node\Expr $filePath, private ?Node\Expr $delimiter = null, private ?Node\Expr $enclosure = null, private ?Node\Expr $escape = null, private ?Node\Expr $columns = null, private bool $safeMode = true)
-    {
-    }
+    public function __construct(private Node\Expr $filePath, private ?Node\Expr $delimiter = null, private ?Node\Expr $enclosure = null, private ?Node\Expr $escape = null, private ?Node\Expr $columns = null, private bool $safeMode = true) {}
 
     public function withFilePath(Node\Expr $filePath): self
     {
@@ -85,12 +83,30 @@ public function getNode(): Node
     {
         $arguments = [
             new Node\Arg(
-                value: new Node\Expr\New_(
-                    class: new Node\Name\FullyQualified('SplFileObject'),
-                    args: [
-                        new Node\Arg($this->filePath),
-                        new Node\Arg(new Node\Scalar\String_('r')),
-                    ],
+                value: new Node\Expr\Ternary(
+                    cond: new Node\Expr\FuncCall(
+                        name: new Node\Name('file_exists'),
+                        args: [
+                            new Node\Arg(
+                                value: new Node\Expr\Assign(
+                                    var: new Node\Expr\Variable('file'),
+                                    expr: $this->filePath,
+                                )
+                            ),
+                        ],
+                    ),
+                    if: new Node\Expr\New_(
+                        class: new Node\Name\FullyQualified('SplFileObject'),
+                        args: [
+                            new Node\Arg(
+                                value: new Node\Expr\Variable('file'),
+                            ),
+                            new Node\Arg(new Node\Scalar\String_('r')),
+                        ],
+                    ),
+                    else: new Node\Expr\New_(
+                        class: new Node\Name\FullyQualified('SplTempFileObject'),
+                    ),
                 ),
                 name: new Node\Identifier('file'),
             ),

diff --git a/src/Builder/Loader.php b/src/Builder/Loader.php
@@ -11,9 +11,7 @@ final class Loader implements StepBuilderInterface
 {
     private ?Node\Expr $logger = null;
 
-    public function __construct(private Node\Expr $filePath, private ?Node\Expr $delimiter = null, private ?Node\Expr $enclosure = null, private ?Node\Expr $escape = null, private ?Node\Expr $columns = null, private bool $safeMode = true, private bool $withNonStandard = false)
-    {
-    }
+    public function __construct(private Node\Expr $filePath, private ?Node\Expr $delimiter = null, private ?Node\Expr $enclosure = null, private ?Node\Expr $escape = null, private ?Node\Expr $columns = null, private bool $safeMode = true, private bool $withNonStandard = false) {}
 
     public function withFilePath(Node\Expr $filePath): self
     {

diff --git a/src/Builder/MultipleFilesLoader.php b/src/Builder/MultipleFilesLoader.php
@@ -11,9 +11,7 @@ final class MultipleFilesLoader implements StepBuilderInterface
 {
     private ?Node\Expr $logger = null;
 
-    public function __construct(private Node\Expr $filePath, private Node\Expr $maxLines, private ?Node\Expr $delimiter = null, private ?Node\Expr $enclosure = null, private ?Node\Expr $escape = null, private ?Node\Expr $columns = null, private bool $safeMode = true, private bool $withNonStandard = false)
-    {
-    }
+    public function __construct(private Node\Expr $filePath, private Node\Expr $maxLines, private ?Node\Expr $delimiter = null, private ?Node\Expr $enclosure = null, private ?Node\Expr $escape = null, private ?Node\Expr $columns = null, private bool $safeMode = true, private bool $withNonStandard = false) {}
 
     public function withFilePath(Node\Expr $filePath): self
     {