Rename to TransactionHandler

config/excel.php

@@ -137,17 +137,20 @@
 
         /*
         |--------------------------------------------------------------------------
-        | Transaction Driver
+        | Transaction Handler
         |--------------------------------------------------------------------------
         |
         | By default the import is wrapped in a transaction. This is useful
         | for when an import may fail and you want to retry it. With the
         | transactions, the previous import gets rolled-back.
         |
-        | Drivers: db|null
+        | You can disable the transaction handler by setting this to null.
+        | Or you can choose a custom made transaction handler here.
+        |
+        | Supported handlers: null|db
         |
         */
-        'driver' => 'db',
+        'handle' => 'db',
     ],
 
     'temporary_files' => [

src/ExcelServiceProvider.php

@@ -12,6 +12,7 @@
 use Maatwebsite\Excel\Mixins\DownloadCollection;
 use Maatwebsite\Excel\Files\TemporaryFileFactory;
 use Laravel\Lumen\Application as LumenApplication;
+use Maatwebsite\Excel\Transactions\TransactionHandler;
 use Maatwebsite\Excel\Transactions\TransactionManager;
 
 class ExcelServiceProvider extends ServiceProvider
@@ -46,7 +47,7 @@ public function register()
             return new TransactionManager($this->app);
         });
 
-        $this->app->bind(Transaction::class, function () {
+        $this->app->bind(TransactionHandler::class, function () {
             return $this->app->make(TransactionManager::class)->driver();
         });
 

src/Jobs/ReadChunk.php

@@ -9,7 +9,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use PhpOffice\PhpSpreadsheet\Reader\IReader;
 use Maatwebsite\Excel\Filters\ChunkReadFilter;
-use Maatwebsite\Excel\Transactions\Transaction;
+use Maatwebsite\Excel\Transactions\TransactionHandler;
 use Maatwebsite\Excel\Imports\HeadingRowExtractor;
 use Maatwebsite\Excel\Concerns\WithCustomValueBinder;
 
@@ -66,12 +66,12 @@ public function __construct(IReader $reader, TemporaryFile $temporaryFile, strin
     }
 
     /**
-     * @param Transaction $transaction
+     * @param TransactionHandler $transaction
      *
      * @throws \Maatwebsite\Excel\Exceptions\SheetNotFoundException
      * @throws \PhpOffice\PhpSpreadsheet\Reader\Exception
      */
-    public function handle(Transaction $transaction)
+    public function handle(TransactionHandler $transaction)
     {
         if ($this->sheetImport instanceof WithCustomValueBinder) {
             Cell::setValueBinder($this->sheetImport);

src/Reader.php

@@ -4,6 +4,7 @@
 
 use InvalidArgumentException;
 use Illuminate\Support\Collection;
+use Maatwebsite\Excel\Transactions\TransactionHandler;
 use PhpOffice\PhpSpreadsheet\Cell\Cell;
 use Maatwebsite\Excel\Events\AfterImport;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -50,15 +51,15 @@ class Reader
     protected $temporaryFileFactory;
 
     /**
-     * @var Transaction
+     * @var TransactionHandler
      */
     protected $transaction;
 
     /**
      * @param TemporaryFileFactory $temporaryFileFactory
-     * @param Transaction          $transaction
+     * @param TransactionHandler   $transaction
      */
-    public function __construct(TemporaryFileFactory $temporaryFileFactory, Transaction $transaction)
+    public function __construct(TemporaryFileFactory $temporaryFileFactory, TransactionHandler $transaction)
     {
         $this->setDefaultValueBinder();
 

src/Transactions/DbTransaction.php → src/Transactions/DbTransactionHandler.php

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\ConnectionInterface;
 
-class DbTransaction implements Transaction
+class DbTransactionHandler implements TransactionHandler
 {
     /**
      * @var ConnectionInterface

src/Transactions/NullTransaction.php → src/Transactions/NullTransactionHandler.php

@@ -2,7 +2,7 @@
 
 namespace Maatwebsite\Excel\Transactions;
 
-class NullTransaction implements Transaction
+class NullTransactionHandler implements TransactionHandler
 {
     /**
      * @param callable $callback

src/Transactions/Transaction.php → src/Transactions/TransactionHandler.php

@@ -2,7 +2,7 @@
 
 namespace Maatwebsite\Excel\Transactions;
 
-interface Transaction
+interface TransactionHandler
 {
     /**
      * @param callable $callback

src/Transactions/TransactionManager.php

@@ -15,19 +15,19 @@ public function getDefaultDriver()
     }
 
     /**
-     * @return NullTransaction
+     * @return NullTransactionHandler
      */
     public function createNullDriver()
     {
-        return new NullTransaction();
+        return new NullTransactionHandler();
     }
 
     /**
-     * @return DbTransaction
+     * @return DbTransactionHandler
      */
     public function createDbDriver()
     {
-        return new DbTransaction(
+        return new DbTransactionHandler(
             $this->app->get('db.connection')
         );
     }