From 68f56533b7f5e54b3ed12424670dfbe584b580d0 Mon Sep 17 00:00:00 2001
From: saracubillas <sara.cubillas@gmail.com>
Date: Wed, 10 Apr 2024 19:39:27 -0500
Subject: [PATCH] Fix PHP 8 string offset warnings in getColumnName and
 addIndex

- Updated getColumnName method to handle cases where an empty array is passed, setting the fieldName to null to avoid PHP 8 string offset warnings.
- Modified addIndex method to ensure 'fields' are always treated as an array, preventing potential issues with non-array types.
- Added checks in both methods to ensure compatibility with PHP 8 while maintaining backward compatibility with older PHP versions.

These changes resolve the PHP 8 warnings related to string offsets in the Table class of the Doctrine integration within our Symfony project.
---
 lib/Doctrine/Table.php | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/lib/Doctrine/Table.php b/lib/Doctrine/Table.php
index faac80574..bf1f28c39 100644
--- a/lib/Doctrine/Table.php
+++ b/lib/Doctrine/Table.php
@@ -879,21 +879,19 @@ public function addCheckConstraint($definition, $name)
      */
     public function addIndex($index, array $definition)
     {
-        if (isset($definition['fields'])) {
-            foreach ((array) $definition['fields'] as $key => $field) {
-                if (is_numeric($key)) {
-                    $definition['fields'][$key] = $this->getColumnName($field);
-                } else {
-                    $columnName = $this->getColumnName($key);
-
-                    unset($definition['fields'][$key]);
-
-                    $definition['fields'][$columnName] = $field;
-                }
-            }
+      if (!isset($definition['fields']) || !is_array($definition['fields'])) {
+        $definition['fields'] = [];
+      }
+      foreach ((array)$definition['fields'] as $key => $field) {
+        if (is_numeric($key)) {
+          $definition['fields'][$key] = $this->getColumnName($field);
+        } else {
+          $columnName = $this->getColumnName($key);
+          unset($definition['fields'][$key]);
+          $definition['fields'][$columnName] = $field;
         }
-
-        $this->_options['indexes'][$index] = $definition;
+      }
+      $this->_options['indexes'][$index] = $definition;
     }
 
     /**
@@ -1171,10 +1169,11 @@ public function processOrderBy($alias, $orderBy, $columnNames = false)
      */
     public function getColumnName($fieldName)
     {
-        // FIX ME: This is being used in places where an array is passed, but it should not be an array
-        // For example in places where Doctrine should support composite foreign/primary keys
-        $fieldName = is_array($fieldName) ? $fieldName[0]:$fieldName;
-
+        if (is_array($fieldName) && !empty($fieldName)) {
+        $fieldName = $fieldName[0];
+        } else {
+            $fieldName = is_array($fieldName) ? null : $fieldName;
+        }
         if (isset($this->_columnNames[$fieldName])) {
             return $this->_columnNames[$fieldName];
         }