From d01548b1567bf9afc9dd918bf3d6b05aa38c31ef Mon Sep 17 00:00:00 2001 From: mhsdesign <85400359+mhsdesign@users.noreply.github.com> Date: Thu, 4 Jul 2024 10:17:04 +0200 Subject: [PATCH] TASK: Adjust doctrine exception namespaces --- .../Classes/Command/MediaCommandController.php | 2 +- .../Migrations/Mysql/Version20181104152203.php | 12 ++++++------ .../Migrations/Mysql/Version20191125132700.php | 4 ++-- .../Migrations/Mysql/Version20200306233229.php | 2 +- .../Migrations/Mysql/Version20200823164700.php | 4 ++-- .../Migrations/Mysql/Version20200828170100.php | 4 ++-- .../Migrations/Postgresql/Version20181104152204.php | 12 ++++++------ .../Migrations/Postgresql/Version20190315122901.php | 4 ++-- .../Migrations/Postgresql/Version20191125132701.php | 4 ++-- .../Migrations/Postgresql/Version20200307122055.php | 2 +- .../Migrations/Postgresql/Version20200823164701.php | 4 ++-- .../Migrations/Postgresql/Version20200828170101.php | 4 ++-- Neos.Neos/Migrations/Mysql/Version20211220145601.php | 2 +- .../Migrations/Postgresql/Version20211220145602.php | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Neos.Media/Classes/Command/MediaCommandController.php b/Neos.Media/Classes/Command/MediaCommandController.php index 10925aff8d7..21cddcec330 100644 --- a/Neos.Media/Classes/Command/MediaCommandController.php +++ b/Neos.Media/Classes/Command/MediaCommandController.php @@ -15,7 +15,7 @@ use Doctrine\Common\Collections\Collection; use Doctrine\DBAL\Connection; -use Doctrine\DBAL\DBALException; +use Doctrine\DBAL\Exception as DbalException; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Neos\Flow\Annotations as Flow; diff --git a/Neos.Media/Migrations/Mysql/Version20181104152203.php b/Neos.Media/Migrations/Mysql/Version20181104152203.php index 7a4c2e491f6..eee7c1ce263 100644 --- a/Neos.Media/Migrations/Mysql/Version20181104152203.php +++ b/Neos.Media/Migrations/Mysql/Version20181104152203.php @@ -11,8 +11,8 @@ * source code. */ -use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Migrations\AbortMigrationException; +use Doctrine\DBAL\Exception as DbalException; +use Doctrine\Migrations\Exception\AbortMigration as AbortMigrationException; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -22,7 +22,7 @@ class Version20181104152203 extends AbstractMigration /** * @return string */ - public function getDescription(): string + public function getDescription(): string { return 'Introduce copyright notice'; } @@ -33,7 +33,7 @@ public function getDescription(): string * @throws DBALException * @throws AbortMigrationException */ - public function up(Schema $schema): void + public function up(Schema $schema): void { // this up() migration is autogenerated, please modify it to your needs $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); @@ -47,11 +47,11 @@ public function up(Schema $schema): void * @throws DBALException * @throws AbortMigrationException */ - public function down(Schema $schema): void + public function down(Schema $schema): void { // this down() migration is autogenerated, please modify it to your needs $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'mysql', 'Migration can only be executed safely on "mysql".'); - + $this->addSql('ALTER TABLE neos_media_domain_model_asset DROP copyrightnotice'); } } diff --git a/Neos.Media/Migrations/Mysql/Version20191125132700.php b/Neos.Media/Migrations/Mysql/Version20191125132700.php index 5e0a529d0d9..42563f172de 100644 --- a/Neos.Media/Migrations/Mysql/Version20191125132700.php +++ b/Neos.Media/Migrations/Mysql/Version20191125132700.php @@ -3,8 +3,8 @@ namespace Neos\Flow\Persistence\Doctrine\Migrations; -use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Migrations\AbortMigrationException; +use Doctrine\DBAL\Exception as DbalException; +use Doctrine\Migrations\Exception\AbortMigration as AbortMigrationException; use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; diff --git a/Neos.Media/Migrations/Mysql/Version20200306233229.php b/Neos.Media/Migrations/Mysql/Version20200306233229.php index 6a71c55fe5f..91a5b7b2a1c 100644 --- a/Neos.Media/Migrations/Mysql/Version20200306233229.php +++ b/Neos.Media/Migrations/Mysql/Version20200306233229.php @@ -5,7 +5,7 @@ use Doctrine\Migrations\AbstractMigration; use Doctrine\DBAL\Schema\Schema; -use Doctrine\DBAL\Migrations\AbortMigrationException; +use Doctrine\Migrations\Exception\AbortMigration as AbortMigrationException; class Version20200306233229 extends AbstractMigration { diff --git a/Neos.Media/Migrations/Mysql/Version20200823164700.php b/Neos.Media/Migrations/Mysql/Version20200823164700.php index ef698af8695..a77431c6a83 100644 --- a/Neos.Media/Migrations/Mysql/Version20200823164700.php +++ b/Neos.Media/Migrations/Mysql/Version20200823164700.php @@ -3,8 +3,8 @@ namespace Neos\Flow\Persistence\Doctrine\Migrations; -use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Migrations\AbortMigrationException; +use Doctrine\DBAL\Exception as DbalException; +use Doctrine\Migrations\Exception\AbortMigration as AbortMigrationException; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/Neos.Media/Migrations/Mysql/Version20200828170100.php b/Neos.Media/Migrations/Mysql/Version20200828170100.php index b216aba3074..a5ebe1092c6 100644 --- a/Neos.Media/Migrations/Mysql/Version20200828170100.php +++ b/Neos.Media/Migrations/Mysql/Version20200828170100.php @@ -3,8 +3,8 @@ namespace Neos\Flow\Persistence\Doctrine\Migrations; -use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Migrations\AbortMigrationException; +use Doctrine\DBAL\Exception as DbalException; +use Doctrine\Migrations\Exception\AbortMigration as AbortMigrationException; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; diff --git a/Neos.Media/Migrations/Postgresql/Version20181104152204.php b/Neos.Media/Migrations/Postgresql/Version20181104152204.php index 9cf35587ea2..bb7c3fa7105 100644 --- a/Neos.Media/Migrations/Postgresql/Version20181104152204.php +++ b/Neos.Media/Migrations/Postgresql/Version20181104152204.php @@ -11,8 +11,8 @@ * source code. */ -use Doctrine\DBAL\DBALException; -use Doctrine\DBAL\Migrations\AbortMigrationException; +use Doctrine\DBAL\Exception as DbalException; +use Doctrine\Migrations\Exception\AbortMigration as AbortMigrationException; use Doctrine\DBAL\Schema\Schema; use Doctrine\Migrations\AbstractMigration; @@ -22,7 +22,7 @@ class Version20181104152204 extends AbstractMigration /** * @return string */ - public function getDescription(): string + public function getDescription(): string { return 'Introduce copyright notice'; } @@ -33,7 +33,7 @@ public function getDescription(): string * @throws DBALException * @throws AbortMigrationException */ - public function up(Schema $schema): void + public function up(Schema $schema): void { // this up() migration is autogenerated, please modify it to your needs $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".'); @@ -47,11 +47,11 @@ public function up(Schema $schema): void * @throws DBALException * @throws AbortMigrationException */ - public function down(Schema $schema): void + public function down(Schema $schema): void { // this down() migration is autogenerated, please modify it to your needs $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'postgresql', 'Migration can only be executed safely on "postgresql".'); - + $this->addSql('ALTER TABLE neos_media_domain_model_asset DROP copyrightnotice'); } } diff --git a/Neos.Media/Migrations/Postgresql/Version20190315122901.php b/Neos.Media/Migrations/Postgresql/Version20190315122901.php index b6f43c81260..9d7f883c420 100644 --- a/Neos.Media/Migrations/Postgresql/Version20190315122901.php +++ b/Neos.Media/Migrations/Postgresql/Version20190315122901.php @@ -1,8 +1,8 @@