Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 2.5.7 into 2.6.x #1483

Closed
wants to merge 5 commits into from
Closed

Merge release 2.5.7 into 2.6.x #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39b6112
Stop giving charset examples
greg0ire Feb 16, 2022
e7be98c
Merge pull request #1479 from greg0ire/stop-recommending-charset
greg0ire Feb 16, 2022
eb7f3a2
Fix db name suffix parsing for replica (#1470)
kschusternetformic Feb 26, 2022
1e0d1d7
Fix default MySQL charset with doctrine/dbal > 2 (#1481)
alexander-schranz Mar 5, 2022
2a94127
Merge branch '2.6.x' into pr/1483
ostrolucky Mar 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Attribute/AsEntityListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public function __construct(
public ?string $method = null,
public ?bool $lazy = null,
public ?string $entityManager = null,
public ?string $entity = null,
) {
}
}
5 changes: 1 addition & 4 deletions Command/CreateDatabaseDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
*/
class CreateDatabaseDoctrineCommand extends DoctrineCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
$this
->setName('doctrine:database:create')
Expand Down
5 changes: 1 addition & 4 deletions Command/ImportMappingDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ public function __construct(ManagerRegistry $doctrine, array $bundles)
$this->bundles = $bundles;
}

/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
$this
->setName('doctrine:mapping:import')
Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/ClearMetadataCacheDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class ClearMetadataCacheDoctrineCommand extends MetadataCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -30,10 +27,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/ClearQueryCacheDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class ClearQueryCacheDoctrineCommand extends QueryCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -30,10 +27,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/ClearResultCacheDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class ClearResultCacheDoctrineCommand extends ResultCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -30,10 +27,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
8 changes: 2 additions & 6 deletions Command/Proxy/CollectionRegionDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class CollectionRegionDoctrineCommand extends CollectionRegionCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -29,8 +26,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/** @return int */
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/CreateSchemaDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
*/
class CreateSchemaDoctrineCommand extends CreateCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -31,10 +28,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/DropSchemaDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class DropSchemaDoctrineCommand extends DropCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -30,10 +27,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/EnsureProductionSettingsDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class EnsureProductionSettingsDoctrineCommand extends EnsureProductionSettingsCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -29,10 +26,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
8 changes: 2 additions & 6 deletions Command/Proxy/EntityRegionCacheDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class EntityRegionCacheDoctrineCommand extends EntityRegionCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -29,8 +26,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/** @return int */
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/InfoDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class InfoDoctrineCommand extends InfoCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
$this
->setName('doctrine:mapping:info');
Expand All @@ -27,10 +24,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
8 changes: 2 additions & 6 deletions Command/Proxy/QueryRegionCacheDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class QueryRegionCacheDoctrineCommand extends QueryRegionCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -29,8 +26,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/** @return int */
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/RunDqlDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class RunDqlDoctrineCommand extends RunDqlCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand Down Expand Up @@ -46,10 +43,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
5 changes: 1 addition & 4 deletions Command/Proxy/RunSqlDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ public function __construct(?ConnectionProvider $connectionProvider = null)
$this->connectionProvider = $connectionProvider;
}

/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/UpdateSchemaDoctrineCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
*/
class UpdateSchemaDoctrineCommand extends UpdateCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -30,10 +27,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
10 changes: 2 additions & 8 deletions Command/Proxy/ValidateSchemaCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
*/
class ValidateSchemaCommand extends DoctrineValidateSchemaCommand
{
/**
* {@inheritDoc}
*/
protected function configure()
protected function configure(): void
{
parent::configure();

Expand All @@ -29,10 +26,7 @@ protected function configure()
$this->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
}

/**
* {@inheritDoc}
*/
protected function execute(InputInterface $input, OutputInterface $output)
protected function execute(InputInterface $input, OutputInterface $output): int
{
DoctrineCommandHelper::setApplicationEntityManager($this->getApplication(), $input->getOption('em'));

Expand Down
Loading