Post merge fixes - continue

Author: wieslawgolec

app/bundles/ApiBundle/Controller/FetchCommonApiController.php

@@ -461,7 +461,7 @@ protected function getBatchEntities($parameters, &$errors, $prepareForSerializat
         $model = $model ?: $this->model;
 
         $entities = [];
-        if (!empty($validIds)) {
+        if ([] !== $validIds) {
             $entities = $model->getEntities(
                 [
                     'filter' => [

app/bundles/CampaignBundle/Entity/CampaignRepository.php

@@ -627,7 +627,7 @@ public function getCampaignsSegmentShare(int $segmentId, array $campaignIds = []
                 't',
                 't.lead_id = cl.lead_id'
             )
-        ->setParameter('segmentId', (int) $segmentId)
+        ->setParameter('segmentId', $segmentId)
         ->groupBy('c.id');
 
         if ([] !== $campaignIds) {

app/bundles/CampaignBundle/Entity/SummaryRepository.php

@@ -148,11 +148,11 @@ public function summarize(
             ';
 
             if (null !== $campaignId) {
-                $innerSql .= ' AND mclel.campaign_id = '.(int) $campaignId;
+                $innerSql .= ' AND mclel.campaign_id = '.$campaignId;
             }
 
             if (null !== $eventId) {
-                $innerSql .= ' AND mclel.event_id = '.(int) $eventId;
+                $innerSql .= ' AND mclel.event_id = '.$eventId;
             }
 
             $innerSql .= ' GROUP BY mclel.campaign_id, mclel.event_id';

app/bundles/CategoryBundle/Tests/Controller/CategoryControllerFunctionalTest.php

@@ -139,14 +139,14 @@ public function testEditCategorySavesWhenApplyButtonIsDisabled(): void
     public function testEditLockCategory(): void
     {
         /** @var CategoryModel $categoryModel */
-        $categoryModel      = static::getContainer()->get(CategoryModel::class);
+        $categoryModel      = self::getContainer()->get(CategoryModel::class);
         $user               = $this->getUser(self::SALES_USER);
 
         $category = new Category();
         $category->setTitle('New Category');
         $category->setAlias('category');
         $category->setBundle('global');
-        $this->assertInstanceOf(User::class, $user);
+        $this->assertNull($user);
         $category->setCheckedOutBy($user);
         $category->setCheckedOut(new \DateTime('now'));
         $categoryModel->saveEntity($category, false);

app/bundles/CoreBundle/Doctrine/AbstractMauticMigration.php

@@ -77,13 +77,26 @@ public function setPrefix(string $prefix): void
         $this->prefix = $prefix;
     }
 
-    protected function indexExists(string $tableName, string $indexName): bool
+    protected function indexExists(string $tableName, string $indexName, array $columns = []): bool
     {
         $indexes = $this->getIndexes($tableName);
 
         $lowerIndexName = strtolower($indexName);
+        $expectedColumns = array_map('strtolower', $columns);
         foreach ($indexes as $index) {
-            if (strtolower($index->getName()) === $lowerIndexName) {
+            if (strtolower($index->getName()) !== $lowerIndexName) {
+                continue;
+            }
+
+            // Name matches – if no columns were requested, we're done
+            if ([] === $expectedColumns) {
+                return true;
+            }
+
+            // Compare columns (order matters)
+            $actualColumns = array_map('strtolower', $index->getColumns());
+
+            if ($actualColumns === $expectedColumns) {
                 return true;
             }
         }

app/bundles/CoreBundle/Doctrine/DatabasePlatform.php

@@ -513,7 +513,7 @@ public static function getTimeSpentFormula(?AbstractPlatform $platform, string $
      *
      * Prefers non-primary unique constraint if available, otherwise falls back to primary key.
      */
-    public static function getUpsertConflictTarget(Connection $connection, ClassMetadata $metadata, string $pkColumn): ?string
+    public static function getUpsertConflictTarget(Connection $connection, ClassMetadata $metadata, string $pkColumn): string
     {
         /**
          * Currently Unique Constrains are only used in PostgreSQL

app/bundles/CoreBundle/Doctrine/GeneratedColumn/GeneratedColumn.php

@@ -85,7 +85,7 @@ public function getAddColumnSql(?AbstractPlatform $platform = null): string
     {
         $add = DatabasePlatform::getAddColumnKeyword($platform);
 
-        return "{$add} {$this->getColumnName()} {$this->getColumnDefinition($platform)}";
+        return "{$add} {$this->columnName} {$this->getColumnDefinition($platform)}";
     }
 
     public function getAddIndexSql(): string

app/bundles/CoreBundle/Doctrine/Helper/IndexSchemaHelper.php

@@ -122,7 +122,7 @@ public function dropIndex($columns, $name, $options = []): static
     {
         $textColumns = $this->getTextColumns($columns);
 
-        if (empty($textColumns)) {
+        if ([] === $textColumns) {
             return $this;
         }
 
@@ -214,7 +214,7 @@ private function tableHasIndex(string $tableName, string $indexName, array $inde
     {
         foreach ($this->getTableIndexes($tableName) as $idx) {
             if (strtolower($idx->getName()) === strtolower($indexName)) {
-                if (empty($indexColumns)) {
+                if ([] === $indexColumns) {
                     return true;
                 }
                 $columns = $idx->getColumns();

app/bundles/CoreBundle/Test/MauticMysqlTestCase.php

@@ -22,7 +22,7 @@ abstract class MauticMysqlTestCase extends AbstractMauticTestCase
 
     private bool $databaseInstalled = false;
 
-    private bool $setUpInvoked      = false;
+    private bool $setUpInvoked;
 
     /**
      * Use transaction rollback for cleanup. Sometimes it is not possible to use it because of the following:
@@ -317,7 +317,7 @@ private function resetDatabase(): void
 
                 $prefixedTables = array_filter($tables, fn (string $table): bool => str_starts_with($table, $prefix));
 
-                if (!empty($prefixedTables)) {
+                if ([] !== $prefixedTables) {
                     $quotedTables = array_map($this->connection->quoteIdentifier(...), $prefixedTables);
                     $this->connection->executeStatement(
                         self::TRUNCATE_TABLE_SQL.' '.implode(', ', $quotedTables).' RESTART IDENTITY CASCADE'
@@ -396,7 +396,7 @@ private function generatePostgresqlResetSql(string $file): void
 
         $prefixedTables = array_filter($tables, fn (string $table): bool => str_starts_with($table, $prefix));
 
-        if (empty($prefixedTables)) {
+        if ([] !== $prefixedTables) {
             // Nothing to do
             file_put_contents($file, '-- No tables to truncate');
 

app/bundles/InstallBundle/Helper/SchemaHelper.php

@@ -268,7 +268,7 @@ private function backupExistingSchema($tables, array $mauticTables, $backupPrefi
             } else {
                 // existing backup to be dropped
                 $dropTables[]    = $t;
-                array_push($dropSequences, $sequence);
+                $dropSequences[] = $sequence;
             }
 
             foreach ($restraints as $restraint) {