Merge pull request #2 from stefandanaita/bugfix/singleton

Reset arrays in the make functions to avoid having data from previous…
stefandanaita · Jun 2, 2017 · 9d5a548 · 9d5a548
2 parents abe8447 + d543a46
commit 9d5a548
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/CsvValidator.php b/src/CsvValidator.php
@@ -19,12 +19,16 @@ class CsvValidator
     /**
      * @param \SplFileObject $csv
      * @param $rules
+     * @param array $requiredHeadings
      * @param bool $trim
      * @param string $encoding
      * @return $this
      */
     public function make(\SplFileObject $csv, $rules, $requiredHeadings = [], $trim = true, $encoding = 'UTF-8')
     {
+        // Reset the variables
+        $this->rules = $this->errors = $this->headingKeys = $this->requiredHeadings = [];
+
         $this->setRequiredHeadings($requiredHeadings);
         $this->setTrim($trim);
         $this->setEncoding($encoding);

diff --git a/src/CsvValidatorServiceProvider.php b/src/CsvValidatorServiceProvider.php
@@ -36,7 +36,7 @@ public function boot()
     public function register()
     {
         $this->app->bind('csv-validator', function ($app) {
-            return new CsvValidator();
+            return new CsvValidator;
         });
     }