Merge pull request #129 from FriendsOfCake/transcoding-extension

Rename option "extension" to more intuitive "transcodingExtension".

Author: ADmad

README.md

@@ -242,10 +242,10 @@ The defaults are:
 ** Only if those two variable are different your data will be converted to another encoding.
 
 CsvView uses the `iconv` extension by default to encode your data. You can change
-the php extension used to encode your data by setting the `extension` option:
+the php extension used to encode your data by setting the `transcodingExtension` option:
 
 ```php
-$this->viewBuilder()->setOption('extension', 'mbstring');
+$this->viewBuilder()->setOption('transcodingExtension', 'mbstring');
 ```
 
 The currently supported encoding extensions are as follows:

src/View/CsvView.php

@@ -141,7 +141,7 @@ class CsvView extends SerializedView
      * - 'setSeparator': (default false) Adds sep=[_delimiter] in the first line
      * - 'csvEncoding': (default 'UTF-8') CSV file encoding
      * - 'dataEncoding': (default 'UTF-8') Encoding of data to be serialized
-     * - 'extension': (default 'iconv') PHP extension to use for character encoding conversion
+     * - 'transcodingExtension': (default 'iconv') PHP extension to use for character encoding conversion
      *
      * @var array
      */
@@ -159,7 +159,7 @@ class CsvView extends SerializedView
         'setSeparator' => false,
         'csvEncoding' => 'UTF-8',
         'dataEncoding' => 'UTF-8',
-        'extension' => self::EXTENSION_ICONV,
+        'transcodingExtension' => self::EXTENSION_ICONV,
     ];
 
     /**
@@ -178,10 +178,10 @@ public function initialize(): void
         ];
 
         if (
-            $this->getConfig('extension') === self::EXTENSION_ICONV &&
+            $this->getConfig('transcodingExtension') === static::EXTENSION_ICONV &&
             !extension_loaded(self::EXTENSION_ICONV)
         ) {
-            $this->setConfig('extension', self::EXTENSION_MBSTRING);
+            $this->setConfig('transcodingExtension', static::EXTENSION_MBSTRING);
         }
 
         parent::initialize();
@@ -354,10 +354,10 @@ protected function _generateRow(?array $row = null)
         $dataEncoding = $this->getConfig('dataEncoding');
         $csvEncoding = $this->getConfig('csvEncoding');
         if ($dataEncoding !== $csvEncoding) {
-            $extension = $this->getConfig('extension');
-            if ($extension === self::EXTENSION_ICONV) {
+            $extension = $this->getConfig('transcodingExtension');
+            if ($extension === static::EXTENSION_ICONV) {
                 $csv = iconv($dataEncoding, $csvEncoding, $csv);
-            } elseif ($extension === self::EXTENSION_MBSTRING) {
+            } elseif ($extension === static::EXTENSION_MBSTRING) {
                 $csv = mb_convert_encoding($csv, $csvEncoding, $dataEncoding);
             }
         }