feature: tests 修复

Author: krissss

composer.json

@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",
-        "kriss/spout": "v3.3.0.6",
+        "kriss/spout": ">=3.3.0.6",
         "pestphp/pest": "^1.20",
         "phpoffice/phpspreadsheet": "^1.22"
     },

src/DataExporter.php

@@ -53,6 +53,12 @@ public static function __callStatic($name, $arguments)
         ]);
     }
 
+    public static function clean(): void
+    {
+        static::$container = null;
+        static::$setContainer = null;
+    }
+
     /**
      * @return ContainerContract
      */

src/DataExporter/Builder.php

@@ -21,8 +21,17 @@ class Builder
 
     public const EVENT_AFTER_OPEN = 'afterOpen';
     public const EVENT_BEFORE_CLOSE = 'beforeClose';
-    public const EVENT_BEFORE_ECHO_ROW_WRITE = 'beforeEchoRowWrite';
-    public const EVENT_AFTER_ECHO_ROW_WRITE = 'afterEchoRowWrite';
+    public const EVENT_BEFORE_EACH_ROW_WRITE = 'beforeEchoRowWrite';
+    public const EVENT_AFTER_EACH_ROW_WRITE = 'afterEachRowWrite';
+
+    /**
+     * @deprecated replace with EVENT_BEFORE_ECHO_ROW_WRITE
+     */
+    public const EVENT_BEFORE_ECHO_ROW_WRITE = self::EVENT_BEFORE_EACH_ROW_WRITE;
+    /**
+     * @deprecated replace with EVENT_AFTER_ECHO_ROW_WRITE
+     */
+    public const EVENT_AFTER_ECHO_ROW_WRITE = self::EVENT_AFTER_EACH_ROW_WRITE;
 
     /**
      * @var WriterInterface
@@ -97,10 +106,10 @@ public function export(): void
                 $lastSheet = $key; // 相同 sheet 名不重复设置
             }
             foreach ($source as $data) {
-                $this->handleEvent(self::EVENT_BEFORE_ECHO_ROW_WRITE, $data, $index, $this);
+                $this->handleEvent(self::EVENT_BEFORE_EACH_ROW_WRITE, $data, $index, $this);
                 $data = $this->prepareData($this->writer, $data);
                 $this->writer->write($data);
-                $this->handleEvent(self::EVENT_AFTER_ECHO_ROW_WRITE, $data, $index, $this);
+                $this->handleEvent(self::EVENT_AFTER_EACH_ROW_WRITE, $data, $index, $this);
                 $index++;
             }
         }

tests/Feature/DeleteBeforeWrite.php tests/Feature/DeleteBeforeWriteTest.phptests/Feature/DeleteBeforeWrite.php renamed to tests/Feature/DeleteBeforeWriteTest.php

@@ -6,7 +6,7 @@
 use Kriss\DataExporter\DataExporter;
 use Kriss\DataExporter\Exceptions\FileAlreadyExistException;
 
-class MyDataExport extends \Kriss\DataExporter\DataExporter
+class DontDeleteDataExport extends \Kriss\DataExporter\DataExporter
 {
     /**
      * @inheritDoc
@@ -26,9 +26,10 @@ protected static function customConfig(): array
     }
 
     try {
-        MyDataExport::csv([['a']])->saveAs($filename);
+        DontDeleteDataExport::csv([['a']])->saveAs($filename);
+        throw new \InvalidArgumentException();
     } catch (FileAlreadyExistException $e) {
-        expect($e->filename)->toBe($filename);
+        expect(true)->toBeTrue();
     }
 });
 
@@ -48,8 +49,9 @@ protected static function customConfig(): array
     DataExporter::setContainer($container);
 
     try {
-        MyDataExport::csv([['a']])->saveAs($filename);
+        DataExporter::csv([['a']])->saveAs($filename);
+        throw new \InvalidArgumentException();
     } catch (FileAlreadyExistException $e) {
-        expect($e->filename)->toBe($filename);
+        expect(true)->toBeTrue();
     }
 });

tests/Feature/EventTest.php

@@ -13,7 +13,7 @@
     $count = 0;
     DataExporter::csv($source)
         ->withEvents([
-            DataExporter\Builder::EVENT_AFTER_ECHO_ROW_WRITE => function ($data, $index) use ($source, &$count) {
+            DataExporter\Builder::EVENT_AFTER_EACH_ROW_WRITE => function ($data, $index) use ($source, &$count) {
                 expect($data)->toBe($source[$count]);
                 expect($index)->toBe($count);
                 $count += 1;

tests/Feature/ExceptionClean.php tests/Feature/ExceptionCleanTest.phptests/Feature/ExceptionClean.php renamed to tests/Feature/ExceptionCleanTest.php

@@ -12,7 +12,7 @@
     ];
     $builder = DataExporter::csv($source)
         ->withEvents([
-            DataExporter\Builder::EVENT_AFTER_ECHO_ROW_WRITE => function ($data, $index) {
+            DataExporter\Builder::EVENT_AFTER_EACH_ROW_WRITE => function ($data, $index) {
                 if ($index === 3) {
                     throw new Exception('Error');
                 }

tests/Feature/ExtensionSpoutTest.php

@@ -8,7 +8,7 @@
 use Kriss\DataExporter\DataExporter;
 use Kriss\DataExporter\Writer\Extension\NullSpoutExtend;
 
-class DefaultStyleExtend extends NullSpoutExtend
+class ExtensionSpoutDefaultStyleExtend extends NullSpoutExtend
 {
     /**
      * @inheritDoc
@@ -24,7 +24,7 @@ public function beforeOpen(WriterInterface $writer)
     }
 }
 
-class RowCellStyleExtend extends NullSpoutExtend
+class ExtensionSpoutRowCellStyleExtend extends NullSpoutExtend
 {
     /**
      * @inheritDoc
@@ -74,7 +74,7 @@ public function buildRowStyle($rowIndex): ?Style
 
 it("Extension Spout: set default style", function () {
     DataExporter::xlsxSpout($this->source, [
-        'extend' => new DefaultStyleExtend(),
+        'extend' => new ExtensionSpoutDefaultStyleExtend(),
     ])->saveAs($this->filename);
 
     // check by person
@@ -84,7 +84,7 @@ public function buildRowStyle($rowIndex): ?Style
 it("Extension Spout: set cell or row style", function () {
     DataExporter::xlsxSpout($this->source, [
         'showHeaders' => false,
-        'extend' => new RowCellStyleExtend(),
+        'extend' => new ExtensionSpoutRowCellStyleExtend(),
     ])->saveAs($this->filename);
 
     // check by person

tests/Feature/ExtensionSpreadsheetTest.php

@@ -5,7 +5,7 @@
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\IWriter;
 
-class MyExtend extends NullSpreadsheetExtend
+class ExtensionSpreadsheetMyExtend extends NullSpreadsheetExtend
 {
     /**
      * @inheritDoc
@@ -37,7 +37,7 @@ public function beforeWrite(Spreadsheet $spreadsheet, IWriter $writer): void
 
 it("Extension Spreadsheet: set style", function () {
     DataExporter::xlsxSpreadsheet($this->source, [
-        'extend' => new MyExtend(),
+        'extend' => new ExtensionSpreadsheetMyExtend(),
     ])->saveAs($this->filename);
 
     // check by person

tests/Feature/ExtraWriter.php tests/Feature/ExtraWriterTest.phptests/Feature/ExtraWriter.php renamed to tests/Feature/ExtraWriterTest.php

@@ -8,12 +8,12 @@
 /**
  * @method static Handler json($source, array $options = [])
  */
-class MyDataExport extends \Kriss\DataExporter\DataExporter
+class ExtraWriterDataExport extends \Kriss\DataExporter\DataExporter
 {
     /**
      * @inheritDoc
      */
-    protected static function writerConfig(): array
+    public static function writerConfig(): array
     {
         return array_merge(parent::writerConfig(), [
             'json' => [
@@ -25,12 +25,12 @@ protected static function writerConfig(): array
     }
 }
 
-it('Dont delete file if exist', function () {
+it('export json', function () {
     $source = [
         ['aaa', 'bbb'],
         ['xxx', 'yyy'],
     ];
-    $filename = MyDataExport::json($source)->saveAs(__DIR__ . '/../tmp/test');
+    $filename = ExtraWriterDataExport::json($source)->saveAs(__DIR__ . '/../tmp/ExtraWriter_json');
 
     expect(file_get_contents($filename))->toBe(json_encode($source));
 });

tests/Feature/Handler.php tests/Feature/HandlerTest.phptests/Feature/Handler.php renamed to tests/Feature/HandlerTest.php

@@ -8,7 +8,7 @@
     $name = __DIR__ . '/../tmp/test';
     $filename = DataExporter::csv([['a']])->saveAs($name);
 
-    expect($filename)->toBe($name . '.csv');
+    expect($filename)->toBe(dirname(__DIR__) . '/tmp/test.csv');
 });
 
 it('Handler with browserDownload', function () {