Merge pull request #2 from jaxwilko/wip/env-lexer

Fixes #1

Author: LukeTowers

phpstan.neon

@@ -1,7 +1,5 @@
 parameters:
-    level: 6
+    reportUnmatchedIgnoredErrors: false
+    level: 5
     paths:
         - src
-    ignoreErrors:
-        - message: '#Access to an undefined property.*?\$expr#'
-          path: src/ArrayFile.php

src/ArrayFile.php

@@ -20,16 +20,11 @@
 use Winter\LaravelConfigWriter\Parser\PHPFunction;
 use Winter\LaravelConfigWriter\Printer\ArrayPrinter;
 
-class ArrayFile implements DataFileInterface
+class ArrayFile extends DataFile implements DataFileInterface
 {
     const SORT_ASC = 'asc';
     const SORT_DESC = 'desc';
 
-    /**
-     * @var Stmt[]|null Abstract syntax tree produced by `PhpParser`
-     */
-    protected ?array $ast = null;
-
     /**
      * Lexer for use by `PhpParser`
      */
@@ -160,6 +155,7 @@ public function set($key, $value = null)
             if ($target->value->name->parts[0] !== 'env' || !isset($target->value->args[0])) {
                 return $this;
             }
+            /* @phpstan-ignore-next-line */
             if (isset($target->value->args[0]) && !isset($target->value->args[1])) {
                 $target->value->args[1] = new Arg($this->makeAstNode($valueType, $value));
             }
@@ -443,14 +439,4 @@ public function render(): string
     {
         return $this->printer->render($this->ast, $this->lexer) . "\n";
     }
-
-    /**
-     * Get currently loaded AST
-     *
-     * @return Stmt[]|null
-     */
-    public function getAst()
-    {
-        return $this->ast;
-    }
 }

src/Contracts/DataFileLexerInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Winter\LaravelConfigWriter\Contracts;
+
+interface DataFileLexerInterface
+{
+    public const T_ENV = 'T_ENV';
+    public const T_VALUE = 'T_VALUE';
+    public const T_QUOTED_VALUE = 'T_QUOTED_VALUE';
+    public const T_WHITESPACE = 'T_WHITESPACE';
+    public const T_COMMENT = 'T_COMMENT';
+
+    /**
+     * Get the ast from array of src lines
+     *
+     * @param string $string
+     * @return array<int, array>
+     */
+    public function parse(string $string): array;
+}

src/Contracts/DataFilePrinterInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Winter\LaravelConfigWriter\Contracts;
+
+interface DataFilePrinterInterface
+{
+    /**
+     * Transform the ast back to a src file string
+     * @param array<int, array> $ast
+     * @return string
+     */
+    public function render(array $ast): string;
+}

src/DataFile.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Winter\LaravelConfigWriter;
+
+use Winter\LaravelConfigWriter\Contracts\DataFileInterface;
+
+abstract class DataFile implements DataFileInterface
+{
+    /**
+     * Abstract syntax tree
+     *
+     * @var mixed
+     */
+    protected $ast = [];
+
+    /**
+     * Get currently loaded AST
+     *
+     * @return \PhpParser\Node\Stmt[]|array|null
+     */
+    public function getAst()
+    {
+        return $this->ast;
+    }
+}