Skip to content

Commit f1a152c

Browse files
authored
[Task]: Check and remove class_aliases in 11.x (pimcore#14766)
* fix: remove logger processor alias * fix: remove Logger class aliases * fix: update docs * fix: migrations * fix: remove remaining class aliases
1 parent baa9b97 commit f1a152c

File tree

11 files changed

+2
-21
lines changed

11 files changed

+2
-21
lines changed

bundles/ApplicationLoggerBundle/src/ApplicationLogger.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,5 +410,3 @@ private static function createExceptionFileObject(\Throwable $exceptionObject):
410410
return new FileObject($data);
411411
}
412412
}
413-
414-
@class_alias(ApplicationLogger::class, 'Pimcore\Log\ApplicationLogger');

bundles/ApplicationLoggerBundle/src/Controller/LogController.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,5 +274,3 @@ static function () use ($filePath) {
274274
return $response;
275275
}
276276
}
277-
278-
@class_alias(LogController::class, 'Pimcore\Bundle\AdminBundle\Controller\Admin\ApplicationLoggerDb');

bundles/ApplicationLoggerBundle/src/FileObject.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,3 @@ public function __toString(): string
6969
return $this->getFilename();
7070
}
7171
}
72-
73-
@class_alias(FileObject::class, 'Pimcore\Log\FileObject');

bundles/ApplicationLoggerBundle/src/Handler/ApplicationLoggerDb.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,3 @@ public static function getPriorities(): array
9292
return $priorities;
9393
}
9494
}
95-
96-
@class_alias(ApplicationLoggerDb::class, 'Pimcore\Log\Handler\ApplicationLoggerDb');

bundles/ApplicationLoggerBundle/src/Maintenance/LogArchiveTask.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,5 +134,3 @@ public function execute(): void
134134
} while ($archiveTableExists);
135135
}
136136
}
137-
138-
@class_alias(LogArchiveTask::class, 'Pimcore\Maintenance\Tasks\LogArchiveTask');

bundles/ApplicationLoggerBundle/src/Maintenance/LogMailMaintenanceTask.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,3 @@ public function execute(): void
9494
$db->executeQuery('UPDATE '.ApplicationLoggerDb::TABLE_NAME.' set maintenanceChecked = 1 WHERE maintenanceChecked != 1 OR maintenanceChecked IS NULL');
9595
}
9696
}
97-
98-
@class_alias(LogMailMaintenanceTask::class, 'Pimcore\Maintenance\Tasks\LogMailMaintenanceTask');

bundles/ApplicationLoggerBundle/src/Processor/ApplicationLoggerProcessor.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,5 +145,3 @@ private function normalizeFilename(string $filename): string
145145
return str_replace(PIMCORE_PROJECT_ROOT . '/', '', $filename);
146146
}
147147
}
148-
149-
@class_alias(ApplicationLoggerProcessor::class, 'Pimcore\Log\Processor\ApplicationLoggerProcessor');

bundles/CoreBundle/src/Migrations/Version20211209131141.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
use Doctrine\DBAL\Schema\Schema;
2121
use Doctrine\Migrations\AbstractMigration;
22-
use Pimcore\Log\Handler\ApplicationLoggerDb;
22+
use Pimcore\Bundle\ApplicationLoggerBundle\Handler\ApplicationLoggerDb;
2323

2424
/**
2525
* @internal

bundles/CoreBundle/src/Migrations/Version20220908113752.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
use Doctrine\DBAL\Schema\Schema;
2121
use Doctrine\Migrations\AbstractMigration;
22-
use Pimcore\Log\Handler\ApplicationLoggerDb;
22+
use Pimcore\Bundle\ApplicationLoggerBundle\Handler\ApplicationLoggerDb;
2323

2424
final class Version20220908113752 extends AbstractMigration
2525
{

models/Version.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -290,9 +290,6 @@ public function loadData(bool $renewReferences = true): mixed
290290
}
291291

292292
if ($this->getSerialized()) {
293-
// this makes it possible to restore data object versions from older Pimcore versions
294-
@class_alias(GeoCoordinates::class, 'Pimcore\Model\DataObject\Data\Geopoint');
295-
296293
$data = Serialize::unserialize($data);
297294
//clear runtime cache to avoid dealing with marshalled data
298295
\Pimcore::collectGarbage();

0 commit comments

Comments
 (0)