Change use of deprecated methods

correct imports
ultra-bugs · Oct 14, 2024 · 9568d60 · 9568d60
1 parent 80280e1
commit 9568d60
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 10 deletions.
diff --git a/src/Traits/ExcelExportable.php b/src/Traits/ExcelExportable.php
@@ -29,13 +29,14 @@
 namespace Zuko\Flex2Cell\Traits;
 
 
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
 
 /**
  * Class ExcelExportable
  *
- * @package App\Traits\ExcelExport
+ * @package Zuko\Flex2Cell\Traits
  */
 trait ExcelExportable
 {
@@ -56,6 +57,10 @@ trait ExcelExportable
      * @var bool
      */
     protected $skipHeader = false;
+    /**
+     * @var array
+     */
+    protected $columnLetters = [];
 
     /**
      * @param $data
@@ -234,10 +239,10 @@ protected function writeHeaders($sheet)
     {
         $columnIndex = 1;
         foreach ($this->headers as $header) {
-            if (!in_array($header, $this->hiddens)) {
-                $sheet->setCellValueByColumnAndRow($columnIndex, 1, $this->getHeader($header));
+            if (!in_array($header, $this->hiddens, true)) {
+                $sheet->setCellValue([$columnIndex, 1], $this->getHeader($header));
                 if (isset($this->subHeaders[$header])) {
-                    $sheet->setCellValueByColumnAndRow($columnIndex, 2, $this->getSubHeader($header));
+                    $sheet->setCellValue([$columnIndex, 2], $this->getSubHeader($header));
                 }
                 $columnIndex++;
             }
@@ -257,10 +262,10 @@ protected function writeRow($sheet, $row, $rowIndex)
     {
         $columnIndex = 1;
         foreach ($this->mapping as $key => $header) {
-            if (!in_array($header, $this->hiddens)) {
+            if (!in_array($header, $this->hiddens, true)) {
                 $value = $this->getValue($row, $key);
                 $value = $this->formatValue($header, $value);
-                $sheet->setCellValueByColumnAndRow($columnIndex++, $rowIndex, $value);
+                $sheet->setCellValue([$columnIndex++, $rowIndex], $value);
             }
         }
     }
@@ -343,6 +348,17 @@ protected function getValue($row, $key)
      *
      * @return mixed The formatted value.
      */
+    protected function formatValue($mappingKey, $value)
+    {
+        return $this->parentFormat($mappingKey, $value);
+    }
+
+    /**
+     * Get the column letter for a mapping key.
+     *
+     * @param string $mappingKey
+     * @return string
+     */
     protected function getColumnLetter($mappingKey)
     {
         if (!isset($this->columnLetters[$mappingKey])) {
@@ -352,11 +368,23 @@ protected function getColumnLetter($mappingKey)
         return $this->columnLetters[$mappingKey];
     }
 
+    /**
+     * Get the mapping key from a header.
+     *
+     * @param string $header The header
+     * @return string The mapping key if found, null otherwise
+     */
     protected function getMappingKeyFromHeader($header)
     {
-        return array_search($header, $this->mapping);
+        return array_search($header, $this->mapping, true);
     }
 
+    /**
+     * Get a header from a mapping key.
+     *
+     * @param string $mappingKey The mapping key
+     * @return string The header if found, null otherwise
+     */
     protected function getHeaderFromMappingKey($mappingKey)
     {
         return $this->mapping[$mappingKey] ?? null;

diff --git a/src/Traits/HasExportAttributes.php b/src/Traits/HasExportAttributes.php
@@ -32,12 +32,24 @@
 /**
  * Class HasExportAttributes
  *
- * @package App\Traits\ExcelExport
+ * @package Zuko\Flex2Cell\Traits
  */
 trait HasExportAttributes
 {
     protected $formatters = [];
 
+    /**
+     * Set the formatters to be used for formatting values when exporting.
+     *
+     * $formatters is an associative array, where the keys are the column names
+     * and the values are either a callable or an object that implements
+     * FormatterInterface. If the value is a string, it will be treated as a class
+     * name and an instance of that class will be created.
+     *
+     * @param array|callable[]|\Zuko\Flex2Cell\Contracts\FormatterInterface[] $formatters An associative array of formatters.
+     *
+     * @return static
+     */
     public function setFormatters(array $formatters)
     {
         foreach ($formatters as $key => $formatter) {
@@ -52,7 +64,19 @@ public function setFormatters(array $formatters)
         }
         return $this;
     }
-
+    /**
+     * Format a value for export.
+     *
+     * This method is called once for each value that is exported.
+     * The default implementation simply returns the value as is,
+     * but you can override this method in your class to change the
+     * behavior.
+     *
+     * @param string $mappingKey The key of the mapped column that is being exported.
+     * @param mixed $value The value that is being exported.
+     *
+     * @return mixed The formatted value.
+     */
     protected function formatValue($mappingKey, $value)
     {
         if (isset($this->formatters[$mappingKey])) {

diff --git a/src/Traits/HasExportMerging.php b/src/Traits/HasExportMerging.php
@@ -33,7 +33,7 @@
 /**
  * Class HasExportMerging
  *
- * @package App\Traits\ExcelExport
+ * @package Zuko\Flex2Cell\Traits
  */
 trait HasExportMerging
 {