Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix required after optional parameter in doctrine config factory

Browse Source 
[MAILPOET-3296]
This commit is contained in:
Rostislav Wolny
2020-11-24 12:03:45 +01:00
committed by Veljko V
parent 56d7cd1398
commit 12cc818f8b
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RoboFile.php
View File

@ -1038,7 +1038,7 @@ class RoboFile extends \Robo\Tasks {
\MailPoet\Config\Env::$dbPrefix = ''; // ensure some prefix is set
}
$annotationReaderProvider = new \MailPoet\Doctrine\Annotations\AnnotationReaderProvider();
$configuration = (new \MailPoet\Doctrine\ConfigurationFactory(true, $annotationReaderProvider))->createConfiguration();
$configuration = (new \MailPoet\Doctrine\ConfigurationFactory($annotationReaderProvider, true))->createConfiguration();
$platformClass = \MailPoet\Doctrine\ConnectionFactory::PLATFORM_CLASS;
return \MailPoetVendor\Doctrine\ORM\EntityManager::create([
'driver' => \MailPoet\Doctrine\ConnectionFactory::DRIVER,

2
lib/Doctrine/ConfigurationFactory.php
View File

@ -22,7 +22,7 @@ class ConfigurationFactory {
/** @var AnnotationReaderProvider */
private $annotationReaderProvider;
public function __construct($isDevMode = null, AnnotationReaderProvider $annotationReaderProvider) {
public function __construct(AnnotationReaderProvider $annotationReaderProvider, $isDevMode = null) {
$this->isDevMode = $isDevMode === null ? WP_DEBUG : $isDevMode;
$this->annotationReaderProvider = $annotationReaderProvider;
}

2
tasks/phpstan/create-entity-manager.php
View File

@ -10,7 +10,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping\Driver\AnnotationDriver;
$annotationReaderProvider = new AnnotationReaderProvider();
$annotationReader = $annotationReaderProvider->getAnnotationReader();
$configuration = (new ConfigurationFactory(false, $annotationReaderProvider))->createConfiguration();
$configuration = (new ConfigurationFactory($annotationReaderProvider, false))->createConfiguration();
$configuration->setMetadataDriverImpl(
new class($annotationReader, [ConfigurationFactory::ENTITY_DIR]) extends AnnotationDriver {
// Returning 'isTransient' = true means 'do not try to load Doctrine metadata' (which is true for most classes).

6
tests/integration/Doctrine/ConfigurationFactoryTest.php
View File

@ -14,7 +14,7 @@ use MailPoetVendor\Doctrine\ORM\Mapping\UnderscoreNamingStrategy;
class ConfigurationFactoryTest extends \MailPoetTest {
public function testItSetsUpBasicOptions() {
$configurationFactory = new ConfigurationFactory(false, new AnnotationReaderProvider());
$configurationFactory = new ConfigurationFactory(new AnnotationReaderProvider(), false);
$configuration = $configurationFactory->createConfiguration();
expect($configuration)->isInstanceOf(Configuration::class);
@ -36,12 +36,12 @@ class ConfigurationFactoryTest extends \MailPoetTest {
public function testItSetsUpEnvironmentSpecificOptions() {
// dev mode
$configurationFactory = new ConfigurationFactory(true, new AnnotationReaderProvider());
$configurationFactory = new ConfigurationFactory(new AnnotationReaderProvider(), true);
$configuration = $configurationFactory->createConfiguration();
expect($configuration->getAutoGenerateProxyClasses())->equals(AbstractProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS);
// production mode
$configurationFactory = new ConfigurationFactory(false, new AnnotationReaderProvider());
$configurationFactory = new ConfigurationFactory(new AnnotationReaderProvider(), false);
$configuration = $configurationFactory->createConfiguration();
expect($configuration->getAutoGenerateProxyClasses())->equals(AbstractProxyFactory::AUTOGENERATE_NEVER);
}

2
tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
View File

@ -83,7 +83,7 @@ class TimestampListenerTest extends \MailPoetTest {
private function createEntityManager() {
$annotationReaderProvider = new AnnotationReaderProvider();
$configurationFactory = new ConfigurationFactory(false, $annotationReaderProvider);
$configurationFactory = new ConfigurationFactory($annotationReaderProvider, false);
$configuration = $configurationFactory->createConfiguration();
$metadataDriver = $configuration->newDefaultAnnotationDriver([__DIR__], false);

2
tests/integration/Doctrine/EventListeners/ValidationTest.php
View File

@ -67,7 +67,7 @@ class ValidationTest extends \MailPoetTest {
private function createEntityManager() {
$annotationReaderProvider = new AnnotationReaderProvider();
$configurationFactory = new ConfigurationFactory(false, $annotationReaderProvider);
$configurationFactory = new ConfigurationFactory($annotationReaderProvider, false);
$configuration = $configurationFactory->createConfiguration();
$metadataDriver = $configuration->newDefaultAnnotationDriver([__DIR__], false);

2
tests/integration/Doctrine/Types/JsonTypesTest.php
View File

@ -175,7 +175,7 @@ class JsonTypesTest extends \MailPoetTest {
private function createEntityManager() {
$annotationReaderProvider = new AnnotationReaderProvider();
$configurationFactory = new ConfigurationFactory(false, $annotationReaderProvider);
$configurationFactory = new ConfigurationFactory($annotationReaderProvider, false);
$configuration = $configurationFactory->createConfiguration();
$metadataDriver = $configuration->newDefaultAnnotationDriver([__DIR__], false);