From 832809841f9b8f99734b863c6e3e305b394c82b1 Mon Sep 17 00:00:00 2001
From: Luke Towers <github@luketowers.ca>
Date: Tue, 31 Mar 2020 09:57:36 -0600
Subject: [PATCH] Switch to using league/csv >= 9.1

---
 modules/backend/behaviors/ImportExportController.php | 9 ++-------
 modules/backend/models/ExportModel.php               | 5 ++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/backend/behaviors/ImportExportController.php b/modules/backend/behaviors/ImportExportController.php
index c146050b6..b0278ccdc 100644
--- a/modules/backend/behaviors/ImportExportController.php
+++ b/modules/backend/behaviors/ImportExportController.php
@@ -11,7 +11,7 @@ use Backend\Behaviors\ImportExportController\TranscodeFilter;
 use Illuminate\Database\Eloquent\MassAssignmentException;
 use League\Csv\Reader as CsvReader;
 use League\Csv\Writer as CsvWriter;
-use October\Rain\Parse\League\EscapeFormula as CsvEscapeFormula;
+use League\Csv\EscapeFormula as CsvEscapeFormula;
 use ApplicationException;
 use SplTempFileObject;
 use Exception;
@@ -624,9 +624,7 @@ class ImportExportController extends ControllerBehavior
         $csv->setDelimiter($options['delimiter']);
         $csv->setEnclosure($options['enclosure']);
         $csv->setEscape($options['escape']);
-
-        // Temporary until upgrading to league/csv >= 9.1.0 (will be $csv->addFormatter($formatter))
-        $formatter = new CsvEscapeFormula();
+        $csv->addFormatter(new CsvEscapeFormula());
 
         /*
          * Add headers
@@ -662,9 +660,6 @@ class ImportExportController extends ControllerBehavior
                 $record[] = $value;
             }
 
-            // Temporary until upgrading to league/csv >= 9.1.0
-            $record = $formatter($record);
-
             $csv->insertOne($record);
         }
 
diff --git a/modules/backend/models/ExportModel.php b/modules/backend/models/ExportModel.php
index 1a03a813b..dfd03c5ef 100644
--- a/modules/backend/models/ExportModel.php
+++ b/modules/backend/models/ExportModel.php
@@ -5,7 +5,7 @@ use Lang;
 use Model;
 use Response;
 use League\Csv\Writer as CsvWriter;
-use October\Rain\Parse\League\EscapeFormula as CsvEscapeFormula;
+use League\Csv\EscapeFormula as CsvEscapeFormula;
 use ApplicationException;
 use SplTempFileObject;
 
@@ -112,8 +112,7 @@ abstract class ExportModel extends Model
             $csv->setEscape($options['escape']);
         }
 
-        // Temporary until upgrading to league/csv >= 9.1.0 (will be $csv->addFormatter($formatter))
-        $formatter = new CsvEscapeFormula();
+        $csv->addFormatter(new CsvEscapeFormula());
 
         /*
          * Add headers