Fix column index in ActiveExcelSheet

Author: mikehaertl

src/ActiveExcelSheet.php

@@ -7,6 +7,9 @@
 /**
  * An excel sheet that is rendered with data from an `ActiveQuery`.
  * A query must be set with `setQuery()`.
+ *
+ * Note that for backwards compatibility this class still uses 0-based column
+ * indices for its configuration properties while PhpSpreadsheet now is 1-based.
  */
 class ActiveExcelSheet extends ExcelSheet
 {
@@ -58,7 +61,7 @@ public function getData()
     }
 
     /**
-     * @return string[] list of attributes for the table columns. If no
+     * @return string[] 0-based list of attributes for the table columns. If no
      * attributes are set, attributes are set to `ActiveRecord::attributes()`
      * for the main query record.
      */
@@ -71,7 +74,7 @@ public function getAttributes()
     }
 
     /**
-     * @param string[] $value list of attributes for the table columns
+     * @param string[] $value 0-based list of attributes for the table columns
      */
     public function setAttributes($value)
     {
@@ -130,8 +133,8 @@ public function getFormats()
     {
         if ($this->_formats === null) {
             $this->_formats = [];
-            $attrs = $this->normalizeIndex($this->getAttributes());
-            $schemas = $this->normalizeIndex($this->getColumnSchemas());
+            $attrs = $this->getAttributes();
+            $schemas = $this->getColumnSchemas();
             foreach ($attrs as $c => $attr) {
                 if (!isset($schemas[$c])) {
                     continue;
@@ -176,15 +179,15 @@ public function setFormats($value)
 
     /**
      * @return Callable[] the value formatters for the column cells indexed by
-     * 0-based column index.  If not set, the formatters are aut-generated from
+     * 0-based column index.  If not set, the formatters are auto-generated from
      * the DB column types.
      */
     public function getFormatters()
     {
         if ($this->_formatters === null) {
             $this->_formatters = [];
-            $attrs = $this->normalizeIndex($this->getAttributes());
-            $schemas = $this->normalizeIndex($this->getColumnSchemas());
+            $attrs = $this->getAttributes();
+            $schemas = $this->getColumnSchemas();
             foreach ($attrs as $c => $attr) {
                 if (!isset($schemas[$c])) {
                     continue;

src/ExcelSheet.php

@@ -5,6 +5,9 @@
 
 /**
  * An excel worksheet
+ *
+ * Note that for backwards compatibility this class still uses 0-based column
+ * indices for its configuration properties while PhpSpreadsheet now is 1-based.
  */
 class ExcelSheet extends Component
 {
@@ -13,7 +16,7 @@ class ExcelSheet extends Component
 
     /**
      * @var int|string the start column name or its 0-based index. When this is
-     * set, the 0-based offset is added to all numeric keys used anywhere in
+     * set, the offset is added to all numeric column keys used anywhere in
      * this class. Columns referenced by name will stay unchanged.  Default is
      * 'A'.
      */
@@ -290,7 +293,8 @@ protected function renderRow($data, $row, $formats, $formatters, $callbacks, $ty
     /**
      * @param array $data any data indexed by 0-based colum index or by column name.
      * @return array the array with alphanumeric column keys (A, B, C, ...)
-     * converted to numeric indices
+     * converted to numeric indices and numeric indices converted to 1-based
+     * and startColumn added
      */
     protected function normalizeIndex($data)
     {
@@ -305,7 +309,7 @@ protected function normalizeIndex($data)
     }
 
     /**
-     * @param int|string $column the column either as int or as string. If
+     * @param int|string $column the column either as 0-based index or as string. If
      * numeric, the startColumn offset will be added.
      * @return int the normalized numeric column index (1-based).
      */
@@ -314,7 +318,10 @@ public function normalizeColumn($column)
         if (is_string($column)) {
             return \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($column);
         } else {
-            return $column + self::normalizeColumn($this->startColumn);
+            $startIndex = is_string($this->startColumn) ?
+                self::normalizeColumn($this->startColumn) :
+                ($this->startColumn + 1);
+            return $column + $startIndex;
         }
     }
 }