Compare `d9b473d ... +138 ... d289b90`


namespace DoctrineORMModule\Service;

use Doctrine\Common\EventSubscriber;
use Doctrine\ORM\Events;
use Doctrine\ORM\Tools\ResolveTargetEntityListener;
use DoctrineModule\Service\AbstractFactory;
use DoctrineORMModule\Options\EntityResolver;
use Interop\Container\ContainerInterface;
use Laminas\EventManager\EventManager;
use Laminas\ServiceManager\ServiceLocatorInterface;

use function assert;

class EntityResolverFactory extends AbstractFactory
{
    /**
     * {@inheritDoc}
     */
    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
    {
        $options      = $this->getOptions($container, 'entity_resolver');
        $options = $this->getOptions($container, 'entity_resolver');
        assert($options instanceof EntityResolver);
        $eventManager = $container->get($options->getEventManager());
        $resolvers    = $options->getResolvers();


@@ -30,18 +31,15 @@

            $targetEntityListener->addResolveTargetEntity($oldEntity, $newEntity, []);
        }

        // Starting from Doctrine ORM 2.5, the listener implements EventSubscriber
        if ($targetEntityListener instanceof EventSubscriber) {
            $eventManager->addEventSubscriber($targetEntityListener);
        } else {
            $eventManager->addEventListener(Events::loadClassMetadata, $targetEntityListener);
        }
        $eventManager->addEventSubscriber($targetEntityListener);

        return $eventManager;
    }

    /**
     * {@inheritDoc}
     *
     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
     */
    public function createService(ServiceLocatorInterface $container)
    {

@@ -51,7 +49,7 @@

    /**
     * Get the class name of the options associated with this factory.
     */
    public function getOptionsClass() : string
    public function getOptionsClass(): string
    {
        return EntityResolver::class;
    }

@@ -20,9 +20,9 @@

     *
     * @return ObjectRadio
     */
    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
    public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)
    {
        $entityManager = $container->get(EntityManager::class);
        $entityManager = $serviceLocator->get(EntityManager::class);
        $element       = new ObjectRadio();

        $element->getProxy()->setObjectManager($entityManager);

@@ -32,9 +32,11 @@


    /**
     * {@inheritDoc}
     *
     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
     */
    public function createService(ServiceLocatorInterface $container)
    public function createService(ServiceLocatorInterface $serviceLocator)
    {
        return $this($container->getServiceLocator(), ObjectRadio::class);
        return $this($serviceLocator, ObjectRadio::class);
    }
}

@@ -10,6 +10,7 @@

use Laminas\ModuleManager\Feature\ControllerProviderInterface;
use Laminas\ModuleManager\Feature\DependencyIndicatorInterface;
use Laminas\ModuleManager\ModuleManagerInterface;

use function class_exists;

/**

@@ -32,7 +33,7 @@

            ->attach(
                'doctrine',
                'loadCli.post',
                static function (EventInterface $event) : void {
                static function (EventInterface $event): void {
                    $event
                        ->getParam('ServiceManager')
                        ->get(CliConfigurator::class)

@@ -50,7 +51,7 @@

            ->getEventManager()
            ->attach(
                ProfilerEvent::EVENT_PROFILER_INIT,
                static function ($event) : void {
                static function ($event): void {
                    $container = $event->getTarget()->getParam('ServiceManager');
                    $container->get('doctrine.sql_logger_collector.orm_default');
                }

@@ -62,15 +63,15 @@

     */
    public function getConfig()
    {
        return include __DIR__ . '/../../config/module.config.php';
        return include __DIR__ . '/../config/module.config.php';
    }

    /**
     * {@inheritDoc}
     */
    public function getControllerConfig()
    {
        return include __DIR__ . '/../../config/controllers.config.php';
        return include __DIR__ . '/../config/controllers.config.php';
    }

    /**

@@ -9,6 +9,7 @@

use Doctrine\ORM\Mapping\QuoteStrategy;
use Doctrine\ORM\Repository\RepositoryFactory;
use Laminas\Stdlib\Exception\InvalidArgumentException;

use function get_class;
use function gettype;
use function is_object;

@@ -216,7 +217,7 @@

    /**
     * @param mixed[] $datetimeFunctions
     */
    public function setDatetimeFunctions(array $datetimeFunctions) : self
    public function setDatetimeFunctions(array $datetimeFunctions): self
    {
        $this->datetimeFunctions = $datetimeFunctions;


@@ -226,27 +227,27 @@

    /**
     * @return mixed[]
     */
    public function getDatetimeFunctions() : array
    public function getDatetimeFunctions(): array
    {
        return $this->datetimeFunctions;
    }

    public function setDriver(string $driver) : self
    public function setDriver(string $driver): self
    {
        $this->driver = $driver;

        return $this;
    }

    public function getDriver() : string
    public function getDriver(): string
    {
        return 'doctrine.driver.' . $this->driver;
    }

    /**
     * @param mixed[] $entityNamespaces
     */
    public function setEntityNamespaces(array $entityNamespaces) : self
    public function setEntityNamespaces(array $entityNamespaces): self
    {
        $this->entityNamespaces = $entityNamespaces;


@@ -256,61 +257,61 @@

    /**
     * @return mixed[]
     */
    public function getEntityNamespaces() : array
    public function getEntityNamespaces(): array
    {
        return $this->entityNamespaces;
    }

    public function setGenerateProxies(bool $generateProxies) : self
    public function setGenerateProxies(bool $generateProxies): self
    {
        $this->generateProxies = $generateProxies;

        return $this;
    }

    public function getGenerateProxies() : bool
    public function getGenerateProxies(): bool
    {
        return $this->generateProxies;
    }

    public function setMetadataCache(string $metadataCache) : self
    public function setMetadataCache(string $metadataCache): self
    {
        $this->metadataCache = $metadataCache;

        return $this;
    }

    public function getMetadataCache() : string
    public function getMetadataCache(): string
    {
        return 'doctrine.cache.' . $this->metadataCache;
    }

    public function setResultCache(string $resultCache) : void
    public function setResultCache(string $resultCache): void
    {
        $this->resultCache = $resultCache;
    }

    public function getResultCache() : string
    public function getResultCache(): string
    {
        return 'doctrine.cache.' . $this->resultCache;
    }

    public function setHydrationCache(string $hydrationCache) : self
    public function setHydrationCache(string $hydrationCache): self
    {
        $this->hydrationCache = $hydrationCache;

        return $this;
    }

    public function getHydrationCache() : string
    public function getHydrationCache(): string
    {
        return 'doctrine.cache.' . $this->hydrationCache;
    }

    /**
     * @param mixed[] $namedNativeQueries
     */
    public function setNamedNativeQueries(array $namedNativeQueries) : self
    public function setNamedNativeQueries(array $namedNativeQueries): self
    {
        $this->namedNativeQueries = $namedNativeQueries;


@@ -320,15 +321,15 @@

    /**
     * @return mixed[]
     */
    public function getNamedNativeQueries() : array
    public function getNamedNativeQueries(): array
    {
        return $this->namedNativeQueries;
    }

    /**
     * @param mixed[] $namedQueries
     */
    public function setNamedQueries(array $namedQueries) : self
    public function setNamedQueries(array $namedQueries): self
    {
        $this->namedQueries = $namedQueries;


@@ -338,15 +339,15 @@

    /**
     * @return mixed[]
     */
    public function getNamedQueries() : array
    public function getNamedQueries(): array
    {
        return $this->namedQueries;
    }

    /**
     * @param  mixed[] $numericFunctions
     */
    public function setNumericFunctions(array $numericFunctions) : self
    public function setNumericFunctions(array $numericFunctions): self
    {
        $this->numericFunctions = $numericFunctions;


@@ -356,15 +357,15 @@

    /**
     * @return mixed[]
     */
    public function getNumericFunctions() : array
    public function getNumericFunctions(): array
    {
        return $this->numericFunctions;
    }

    /**
     * @param mixed[] $filters
     */
    public function setFilters(array $filters) : self
    public function setFilters(array $filters): self
    {
        $this->filters = $filters;


@@ -374,51 +375,51 @@

    /**
     * @return mixed[]
     */
    public function getFilters() : array
    public function getFilters(): array
    {
        return $this->filters;
    }

    public function setProxyDir(string $proxyDir) : self
    public function setProxyDir(string $proxyDir): self
    {
        $this->proxyDir = $proxyDir;

        return $this;
    }

    public function getProxyDir() : string
    public function getProxyDir(): string
    {
        return $this->proxyDir;
    }

    public function setProxyNamespace(string $proxyNamespace) : self
    public function setProxyNamespace(string $proxyNamespace): self
    {
        $this->proxyNamespace = $proxyNamespace;

        return $this;
    }

    public function getProxyNamespace() : string
    public function getProxyNamespace(): string
    {
        return $this->proxyNamespace;
    }

    public function setQueryCache(string $queryCache) : self
    public function setQueryCache(string $queryCache): self
    {
        $this->queryCache = $queryCache;

        return $this;
    }

    public function getQueryCache() : string
    public function getQueryCache(): string
    {
        return 'doctrine.cache.' . $this->queryCache;
    }

    /**
     * @param  mixed[] $stringFunctions
     */
    public function setStringFunctions(array $stringFunctions) : self
    public function setStringFunctions(array $stringFunctions): self
    {
        $this->stringFunctions = $stringFunctions;


@@ -428,15 +429,15 @@

    /**
     * @return mixed[]
     */
    public function getStringFunctions() : array
    public function getStringFunctions(): array
    {
        return $this->stringFunctions;
    }

    /**
     * @param mixed[] $modes
     */
    public function setCustomHydrationModes(array $modes) : self
    public function setCustomHydrationModes(array $modes): self
    {
        $this->customHydrationModes = $modes;


@@ -446,7 +447,7 @@

    /**
     * @return mixed[]
     */
    public function getCustomHydrationModes() : array
    public function getCustomHydrationModes(): array
    {
        return $this->customHydrationModes;
    }

@@ -456,9 +457,10 @@

     *
     * @throws InvalidArgumentException   when the provided naming strategy does not fit the expected type.
     */
    public function setNamingStrategy($namingStrategy) : self
    public function setNamingStrategy($namingStrategy): self
    {
        if ($namingStrategy === null
        if (
            $namingStrategy === null
            || is_string($namingStrategy)
            || $namingStrategy instanceof NamingStrategy
        ) {

@@ -489,9 +491,10 @@

     *
     * @throws InvalidArgumentException   when the provided quote strategy does not fit the expected type.
     */
    public function setQuoteStrategy($quoteStrategy) : self
    public function setQuoteStrategy($quoteStrategy): self
    {
        if ($quoteStrategy === null
        if (
            $quoteStrategy === null
            || is_string($quoteStrategy)
            || $quoteStrategy instanceof QuoteStrategy
        ) {

@@ -522,9 +525,10 @@

     *
     * @throws InvalidArgumentException   when the provided repository factory does not fit the expected type.
     */
    public function setRepositoryFactory($repositoryFactory) : self
    public function setRepositoryFactory($repositoryFactory): self
    {
        if ($repositoryFactory === null
        if (
            $repositoryFactory === null
            || is_string($repositoryFactory)
            || $repositoryFactory instanceof RepositoryFactory
        ) {

@@ -555,14 +559,14 @@

     *
     * @see \Doctrine\ORM\Configuration::setClassMetadataFactoryName()
     */
    public function setClassMetadataFactoryName(string $factoryName) : self
    public function setClassMetadataFactoryName(string $factoryName): self
    {
        $this->classMetadataFactoryName = (string) $factoryName;

        return $this;
    }

    public function getClassMetadataFactoryName() : ?string
    public function getClassMetadataFactoryName(): ?string
    {
        return $this->classMetadataFactoryName;
    }

@@ -573,9 +577,10 @@

     * @throws InvalidArgumentException           When the provided entity listener resolver
     *                                            does not fit the expected type.
     */
    public function setEntityListenerResolver($entityListenerResolver) : self
    public function setEntityListenerResolver($entityListenerResolver): self
    {
        if ($entityListenerResolver === null
        if (
            $entityListenerResolver === null
            || $entityListenerResolver instanceof EntityListenerResolver
            || is_string($entityListenerResolver)
        ) {

@@ -602,34 +607,34 @@

    /**
     * @param  mixed[] $secondLevelCache
     */
    public function setSecondLevelCache(array $secondLevelCache) : self
    public function setSecondLevelCache(array $secondLevelCache): self
    {
        $this->secondLevelCache = new SecondLevelCacheConfiguration($secondLevelCache);

        return $this;
    }

    public function getSecondLevelCache() : SecondLevelCacheConfiguration
    public function getSecondLevelCache(): SecondLevelCacheConfiguration
    {
        return $this->secondLevelCache ?: new SecondLevelCacheConfiguration();
    }

    public function setFilterSchemaAssetsExpression(string $filterSchemaAssetsExpression) : self
    public function setFilterSchemaAssetsExpression(string $filterSchemaAssetsExpression): self
    {
        $this->filterSchemaAssetsExpression = $filterSchemaAssetsExpression;

        return $this;
    }

    public function getFilterSchemaAssetsExpression() : ?string
    public function getFilterSchemaAssetsExpression(): ?string
    {
        return $this->filterSchemaAssetsExpression;
    }

    /**
     * Sets default repository class.
     */
    public function setDefaultRepositoryClassName(string $className) : self
    public function setDefaultRepositoryClassName(string $className): self
    {
        $this->defaultRepositoryClassName = (string) $className;


@@ -639,7 +644,7 @@

    /**
     * Get default repository class name.
     */
    public function getDefaultRepositoryClassName() : ?string
    public function getDefaultRepositoryClassName(): ?string
    {
        return $this->defaultRepositoryClassName;
    }

@@ -22,21 +22,22 @@

     *
     * @return EntityManager
     */
    public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
    public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)
    {
        return $container->get('doctrine.entitymanager.orm_default');
        return $serviceLocator->get('doctrine.entitymanager.orm_default');
    }

    /**
     * {@inheritDoc}
     *
     * @deprecated this method was introduced to allow aliasing of service `Doctrine\ORM\EntityManager`
     *             from `doctrine.entitymanager.orm_default`
     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
     *
     * @return EntityManager
     */
    public function createService(ServiceLocatorInterface $container)
    public function createService(ServiceLocatorInterface $serviceLocator)
    {
        return $this($container, EntityManager::class);
        return $this($serviceLocator, EntityManager::class);
    }
}

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Click to load this diff.

Loading diff...

Learn more Showing 11 files with coverage changes found.

Changes in src/Options/Configuration.php

-4

→

Loading file...

New file src/Service/CliConfiguratorFactory.php

New

Loading file...

New file src/Service/RunSqlCommandFactory.php

New

Loading file...

New file src/Service/ReservedWordsCommandFactory.php

New

Loading file...

New file src/Service/MigrationsCommandFactory.php

New

Loading file...

New file src/Service/DoctrineObjectHydratorFactory.php

New

Loading file...

Changes in src/Service/DBALConfigurationFactory.php

-1

→

Loading file...

Changes in src/CliConfigurator.php

-1

→

Loading file...

Changes in src/Service/SQLLoggerCollectorFactory.php

-1

→

Loading file...

Changes in src/Options/EntityResolver.php

-1

→

Loading file...

Changes in src/Paginator/Adapter/DoctrinePaginator.php

-8

→

Loading file...

84.06% ø ø

update branch aliases

driehle

d289b90

CI Passed

84.06% ø ø

Merge pull request #689 from driehle/bugfix/missing-dependencies

driehle

d30abc1

CI Passed

84.06% ø ø

update DoctrineModule to 4.2.2

driehle

a51d3bb

CI Passed

84.06% ø ø

turn soft dependencies into hard dependencies

driehle

73995b9

CI Passed

84.06% 80.00% -0.02%

Merge pull request #690 from driehle/feature/static-analysis

driehle

0577534

CI Passed

84.06% ø ø

updated PhpStan settings and removed annotations

driehle

84d5fbd

CI Passed

84.06% 0.00% -0.02%

lower Psalm to level 5

driehle

0a54c25

CI Passed

Hiding 1 contexual commits

-1

84.08% ø +0.02%

Merge pull request #687 from driehle/feature/deprecations

driehle

81a46be

CI Passed

84.08% ø ø

Merge pull request #688 from driehle/feature/coverage-checker

driehle

ecc0917

CI Passed

84.08% ø ø

harmonize parameters in continous integration workflow

driehle

ea2fe9f

CI Passed

84.08% ø ø

remove coverage-checker and unneeded build dir

driehle

97992f4

CI Passed

Hiding 1 contexual commits

84.06% ø -0.02%

deprecate `createService()` methods still available from laminas-servicemanager 2.x

driehle

0d2efd6

CI Passed

-1

84.08% 64.71% -0.11%

Merge pull request #686 from driehle/feature/phpstan

driehle

96e3235

CI Passed

84.08% ø -0.11%

increased PHPStan to level 3

driehle

af6524d

CI Passed

Hiding 4 contexual commits

84.19% ø ø

Merge pull request #685 from driehle/feature/coding-standard-update

driehle

31a8288

CI Passed

84.19% ø ø

updated year in license file

driehle

c379d38

CI Passed

84.19% ø ø

renamed interface in unit tests to solve SuperfluousSuffix issue

driehle

3c3da12

CI Passed

Hiding 2 contexual commits

84.19% ø ø

Merge pull request #683 from driehle/feature/dependency-update

driehle

3071266

CI Passed

84.19% ø ø

run static analysis with PHP 8.0

driehle

fe683fb

CI Passed

84.19% ø ø

removed unneeded dev dependencies

driehle

9aca886

CI Passed

84.19% ø ø

allow install with PHP 8.1 and set up unit tests

driehle

0a3d362

CI Passed

Hiding 2 contexual commits

84.19% ø +0.13%

removed docs section which existed twice in the document

driehle

9aecce3

CI Passed

-1

84.07% 82.35% -0.07%

Merge pull request #675 from snapshotpl/dbal-v3

driehle

7cbd46e

CI Passed

-1

83.94% 100.00% -0.20%

removed check for presence of SingleConnectionProvider

driehle

94067d0

CI Passed

Hiding 2 contexual commits

+1 Files

84.14% ø -0.13%

Merge pull request #682 from driehle/feature/sidebar-and-links

driehle

59cc80d

CI Passed

-1

84.26% ø +0.13%

Merge pull request #680 from driehle/feature/update-workflows

driehle

4442f1a

CI Passed

-1

84.14% ø +5.34%

need to use `--ignore-platform-req=php` for PHP >= 8.0

driehle

37e2527

CI Passed

Hiding 2 contexual commits

+46

-41

78.80% ø -5.46%

use upstream workflows for coding standards and release-on-milestone-closed

driehle

1531a99

CI Passed

-5

-46

+41

84.14% ø -0.13%

add sidebar to documentation on website

driehle

fa8150c

CI Passed

-1

84.26% ø +0.15%

added json language to code samples

driehle

8fe19dd

CI Passed

84.26% ø ø

Merge pull request #677 from driehle/feature/remove-changelog

driehle

6986d06

CI Passed

-1

84.14% 100.00% -0.13%

Merge pull request #678 from driehle/feature/psr4

driehle

15866e8

CI Passed

84.12% ø -0.15%

updated docs and readme to include installation notes for PHP 8

driehle

f5cd457

CI Passed

-1

84.14% 100.00% -0.13%

switched from PSR-0 to PSR-4 and moved classes accordingly

driehle

d32b77b

CI Passed

-1

84.26% ø ø

Removed UPGRADE.md, see Github releases instead

0e605b8

84.26% ø ø

b1391bb

Merge pull request #674 from driehle/hotfix/update-slugs

driehle

6f82725

CI Passed

+46

-41

78.93% ø ø

Updated slugs for website generation

driehle

9a9a7a6

CI Passed

78.93% ø ø

Merge pull request #673 from driehle/feature/badges

2743468

0a1a13a

-5

-45

+40

84.14% ø +0.02%

Merge pull request #672 from driehle/feature/docs-update

driehle

c7b7265

CI Passed

84.14% ø +0.02%

updated `.doctrine-project.json`

driehle

d0abf82

CI Passed

Hiding 2 contexual commits

84.12% 100.00% -0.02%

Merge pull request #670 from FabianKoestring/doctrine-paginator-json-serializeable

driehle

2da90be

CI Passed

-1

84.14% 75.00% +1.55%

have DoctrinePaginator implement JsonSerializable to solve #669

FabianKoestring

e6f94d7

CI Passed

Hiding 1 contexual commits

+18

-11

82.59% ø ø

Merge pull request #671 from doctrine/website-build

SenseException

f4c096b

CI Passed

82.59% ø ø

Fix of older doc versions in website config

SenseException

01b2510

CI Passed

82.59% ø -0.13%

Updated README for active and inactive branches

TomHAnderson

cd309ad

CI Passed

Hiding 5 contexual commits

-1

82.71% ø +0.13%

Removed integer constant for proxy generation. While this seems like

TomHAnderson

8613f77

CI Passed

Hiding 1 contexual commits

-1

290feef

Hiding 4 contexual commits

-3 Files

-271

-258

-13

85.84% ø +0.04%

Move to separate workflow

snapshotpl

45f700d

CI Passed

Hiding 4 contexual commits

-4

-3

-1

85.80% ø ø

Merge pull request #660 from TomHAnderson/hotfix/migrations_configuration_3.2

greg0ire

#652 6ec92cf

CI Passed

85.80% ø -<.01%

Remove link from new documentation.

bfoosness

03f3d03

CI Passed

Hiding 2 contexual commits

+1 Files

d54f6c1

-1

85.89% ø ø

Removed migrations_configuration from services

TomHAnderson

1cb7f15

CI Passed

+28

-28

83.22% ø -2.67%

Remove version number from project name

SenseException

a5b649f

CI Passed

-28

+28

85.89% 100.00% +0.09%

Allow config DependencyFactory

fezfez

3efa272

CI Passed

85.80% 0.00% +1.93%

Add hack of class_exists to AnnotationBuilder

TomHAnderson

72e8f0e

CI Passed

Hiding 3 contexual commits

+21

-20

83.86% ø -1.85%

Remove composer.lock from version control

greg0ire

7c08c73

CI Passed

Hiding 3 contexual commits

-9

-27

+18

85.71% ø ø 444 0

Removed default value for orm_module organize_migrations because it cannot be un-set

TomHAnderson

a9c326d

CI Passed

85.71% 97.06% +6.55% 444 -12

Support for Migrations 3

TomHAnderson

1d9170b

CI Passed

-3 Files

-54

+26

-80

79.17% ø -0.34% 456 1

Sorted globals in .travis.yml

TomHAnderson

ed94f81

CI Passed

Hiding 6 contexual commits

79.51% ø ø 455 0

Changed current branch to 3.0.x

TomHAnderson

f445276

CI Passed

79.51% ø -3.49% 455 9

Fixed alignment of factories

TomHAnderson

6239b22

CI Passed

Hiding 15 contexual commits

+1 Files

+16

-25

+41

23ec211

Simplify name and slug for 1.x

TomHAnderson

9997e91

CI Passed

Hiding 2 contexual commits

82.99% ø -0.08% 446 0

phpcs remove spaces at end of line

TomHAnderson

#631 45a05e1

CI Passed

Hiding 1 contexual commits

83.07% ø ø 446 0

Sort use statement in config

TomHAnderson

a148093

CI Passed

Hiding 2 contexual commits

83.07% 85.62% ø 446 0

Merge pull request #630 from greg0ire/fix-build

TomHAnderson

f7e3725

CI Passed

83.07% ø ø 446 0

Spell out "query builder"

greg0ire

9e3dbdb

CI Passed

83.07% ø ø 446 0

Avoid recent versions of doctrine/migrations

dd1b2a4

a785da2

Hiding 3 contexual commits

83.07% ø ø 446 0

Merge pull request #622 from TomHAnderson/hotfix/conflict-migrations-3

greg0ire

d9b473d

CI Passed

Files		•	•	•	Coverage
src	-278	-223	ø	-55	^0.99% 84.06%
Project Totals (32 files)	803	675	0	128	84.06%

226	227		/**
227	228		* @return mixed[]
228	229		*/
229		-	public function getDatetimeFunctions() : array
	230	+	public function getDatetimeFunctions(): array
230	231		{
231	232		return $this->datetimeFunctions;
232	233		}
233	234
234		-	public function setDriver(string $driver) : self
	235	+	public function setDriver(string $driver): self
235	236		{
236	237		$this->driver = $driver;
237	238
238	239		return $this;
239	240		}
240	241
241		-	public function getDriver() : string
	242	+	public function getDriver(): string
242	243		{
243	244		return 'doctrine.driver.' . $this->driver;
244	245		}
245	246
246	247		/**
247	248		* @param mixed[] $entityNamespaces
248	249		*/
249		-	public function setEntityNamespaces(array $entityNamespaces) : self
	250	+	public function setEntityNamespaces(array $entityNamespaces): self
250	251		{
251	252		$this->entityNamespaces = $entityNamespaces;
252	253

256	257		/**
257	258		* @return mixed[]
258	259		*/
259		-	public function getEntityNamespaces() : array
	260	+	public function getEntityNamespaces(): array
260	261		{
261	262		return $this->entityNamespaces;
262	263		}
263	264
264		-	public function setGenerateProxies(bool $generateProxies) : self
	265	+	public function setGenerateProxies(bool $generateProxies): self
265	266		{
266	267		$this->generateProxies = $generateProxies;
267	268
268	269		return $this;
269	270		}
270	271
271		-	public function getGenerateProxies() : bool
	272	+	public function getGenerateProxies(): bool
272	273		{
273	274		return $this->generateProxies;
274	275		}
275	276
276		-	public function setMetadataCache(string $metadataCache) : self
	277	+	public function setMetadataCache(string $metadataCache): self
277	278		{
278	279		$this->metadataCache = $metadataCache;
279	280
280	281		return $this;
281	282		}
282	283
283		-	public function getMetadataCache() : string
	284	+	public function getMetadataCache(): string
284	285		{
285	286		return 'doctrine.cache.' . $this->metadataCache;
286	287		}
287	288
288		-	public function setResultCache(string $resultCache) : void
	289	+	public function setResultCache(string $resultCache): void
289	290		{
290	291		$this->resultCache = $resultCache;
291	292		}
292	293
293		-	public function getResultCache() : string
	294	+	public function getResultCache(): string
294	295		{
295	296		return 'doctrine.cache.' . $this->resultCache;
296	297		}
297	298
298		-	public function setHydrationCache(string $hydrationCache) : self
	299	+	public function setHydrationCache(string $hydrationCache): self
299	300		{
300	301		$this->hydrationCache = $hydrationCache;
301	302
302	303		return $this;
303	304		}
304	305
305		-	public function getHydrationCache() : string
	306	+	public function getHydrationCache(): string
306	307		{
307	308		return 'doctrine.cache.' . $this->hydrationCache;
308	309		}
309	310
310	311		/**
311	312		* @param mixed[] $namedNativeQueries
312	313		*/
313		-	public function setNamedNativeQueries(array $namedNativeQueries) : self
	314	+	public function setNamedNativeQueries(array $namedNativeQueries): self
314	315		{
315	316		$this->namedNativeQueries = $namedNativeQueries;
316	317

320	321		/**
321	322		* @return mixed[]
322	323		*/
323		-	public function getNamedNativeQueries() : array
	324	+	public function getNamedNativeQueries(): array
324	325		{
325	326		return $this->namedNativeQueries;
326	327		}
327	328
328	329		/**
329	330		* @param mixed[] $namedQueries
330	331		*/
331		-	public function setNamedQueries(array $namedQueries) : self
	332	+	public function setNamedQueries(array $namedQueries): self
332	333		{
333	334		$this->namedQueries = $namedQueries;
334	335

338	339		/**
339	340		* @return mixed[]
340	341		*/
341		-	public function getNamedQueries() : array
	342	+	public function getNamedQueries(): array
342	343		{
343	344		return $this->namedQueries;
344	345		}
345	346
346	347		/**
347	348		* @param mixed[] $numericFunctions
348	349		*/
349		-	public function setNumericFunctions(array $numericFunctions) : self
	350	+	public function setNumericFunctions(array $numericFunctions): self
350	351		{
351	352		$this->numericFunctions = $numericFunctions;
352	353

356	357		/**
357	358		* @return mixed[]
358	359		*/
359		-	public function getNumericFunctions() : array
	360	+	public function getNumericFunctions(): array
360	361		{
361	362		return $this->numericFunctions;
362	363		}
363	364
364	365		/**
365	366		* @param mixed[] $filters
366	367		*/
367		-	public function setFilters(array $filters) : self
	368	+	public function setFilters(array $filters): self
368	369		{
369	370		$this->filters = $filters;
370	371

Compare `d9b473d ... +138 ... d289b90`

No flags found

Show failed CI and contexual commits `c`

140 Commits

4	4
5	5		namespace DoctrineORMModule\Service;
6	6
7		-	use Doctrine\Common\EventSubscriber;
8		-	use Doctrine\ORM\Events;
9	7		use Doctrine\ORM\Tools\ResolveTargetEntityListener;
10	8		use DoctrineModule\Service\AbstractFactory;
11	9		use DoctrineORMModule\Options\EntityResolver;
12	10		use Interop\Container\ContainerInterface;
13	11		use Laminas\EventManager\EventManager;
14	12		use Laminas\ServiceManager\ServiceLocatorInterface;
15	13
	14	+	use function assert;
	15	+
16	16		class EntityResolverFactory extends AbstractFactory
17	17		{
18	18		/**
19	19		* {@inheritDoc}
20	20		*/
21	21		public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
22	22		{
23		-	$options = $this->getOptions($container, 'entity_resolver');
	23	+	$options = $this->getOptions($container, 'entity_resolver');
	24	+	assert($options instanceof EntityResolver);
24	25		$eventManager = $container->get($options->getEventManager());
25	26		$resolvers = $options->getResolvers();
26	27

30	31		$targetEntityListener->addResolveTargetEntity($oldEntity, $newEntity, []);
31	32		}
32	33
33		-	// Starting from Doctrine ORM 2.5, the listener implements EventSubscriber
34		-	if ($targetEntityListener instanceof EventSubscriber) {
35		-	$eventManager->addEventSubscriber($targetEntityListener);
36		-	} else {
37		-	$eventManager->addEventListener(Events::loadClassMetadata, $targetEntityListener);
38		-	}
	34	+	$eventManager->addEventSubscriber($targetEntityListener);
39	35
40	36		return $eventManager;
41	37		}
42	38
43	39		/**
44	40		* {@inheritDoc}
	41	+	*
	42	+	* @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
45	43		*/
46	44		public function createService(ServiceLocatorInterface $container)
47	45		{

51	49		/**
52	50		* Get the class name of the options associated with this factory.
53	51		*/
54		-	public function getOptionsClass() : string
	52	+	public function getOptionsClass(): string
55	53		{
56	54		return EntityResolver::class;
57	55		}

20	20		*
21	21		* @return ObjectRadio
22	22		*/
23		-	public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
	23	+	public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)
24	24		{
25		-	$entityManager = $container->get(EntityManager::class);
	25	+	$entityManager = $serviceLocator->get(EntityManager::class);
26	26		$element = new ObjectRadio();
27	27
28	28		$element->getProxy()->setObjectManager($entityManager);

10	10		use Laminas\ModuleManager\Feature\ControllerProviderInterface;
11	11		use Laminas\ModuleManager\Feature\DependencyIndicatorInterface;
12	12		use Laminas\ModuleManager\ModuleManagerInterface;
	13	+
13	14		use function class_exists;
14	15
15	16		/**

32	33		->attach(
33	34		'doctrine',
34	35		'loadCli.post',
35		-	static function (EventInterface $event) : void {
	36	+	static function (EventInterface $event): void {
36	37		$event
37	38		->getParam('ServiceManager')
38	39		->get(CliConfigurator::class)

50	51		->getEventManager()
51	52		->attach(
52	53		ProfilerEvent::EVENT_PROFILER_INIT,
53		-	static function ($event) : void {
	54	+	static function ($event): void {
54	55		$container = $event->getTarget()->getParam('ServiceManager');
55	56		$container->get('doctrine.sql_logger_collector.orm_default');
56	57		}

62	63		*/
63	64		public function getConfig()
64	65		{
65		-	return include __DIR__ . '/../../config/module.config.php';
	66	+	return include __DIR__ . '/../config/module.config.php';
66	67		}
67	68
68	69		/**
69	70		* {@inheritDoc}
70	71		*/
71	72		public function getControllerConfig()
72	73		{
73		-	return include __DIR__ . '/../../config/controllers.config.php';
	74	+	return include __DIR__ . '/../config/controllers.config.php';
74	75		}
75	76
76	77		/**

9	9		use Doctrine\ORM\Mapping\QuoteStrategy;
10	10		use Doctrine\ORM\Repository\RepositoryFactory;
11	11		use Laminas\Stdlib\Exception\InvalidArgumentException;
	12	+
12	13		use function get_class;
13	14		use function gettype;
14	15		use function is_object;

216	217		/**
217	218		* @param mixed[] $datetimeFunctions
218	219		*/
219		-	public function setDatetimeFunctions(array $datetimeFunctions) : self
	220	+	public function setDatetimeFunctions(array $datetimeFunctions): self
220	221		{
221	222		$this->datetimeFunctions = $datetimeFunctions;
222	223

374	375		/**
375	376		* @return mixed[]
376	377		*/
377		-	public function getFilters() : array
	378	+	public function getFilters(): array
378	379		{
379	380		return $this->filters;
380	381		}
381	382
382		-	public function setProxyDir(string $proxyDir) : self
	383	+	public function setProxyDir(string $proxyDir): self
383	384		{
384	385		$this->proxyDir = $proxyDir;
385	386
386	387		return $this;
387	388		}
388	389
389		-	public function getProxyDir() : string
	390	+	public function getProxyDir(): string
390	391		{
391	392		return $this->proxyDir;
392	393		}
393	394
394		-	public function setProxyNamespace(string $proxyNamespace) : self
	395	+	public function setProxyNamespace(string $proxyNamespace): self
395	396		{
396	397		$this->proxyNamespace = $proxyNamespace;
397	398
398	399		return $this;
399	400		}
400	401
401		-	public function getProxyNamespace() : string
	402	+	public function getProxyNamespace(): string
402	403		{
403	404		return $this->proxyNamespace;
404	405		}
405	406
406		-	public function setQueryCache(string $queryCache) : self
	407	+	public function setQueryCache(string $queryCache): self
407	408		{

428	429		/**
429	430		* @return mixed[]
430	431		*/
431		-	public function getStringFunctions() : array
	432	+	public function getStringFunctions(): array
432	433		{
433	434		return $this->stringFunctions;
434	435		}
435	436
436	437		/**
437	438		* @param mixed[] $modes
438	439		*/
439		-	public function setCustomHydrationModes(array $modes) : self
	440	+	public function setCustomHydrationModes(array $modes): self
440	441		{
441	442		$this->customHydrationModes = $modes;
442	443

555	559		*
556	560		* @see \Doctrine\ORM\Configuration::setClassMetadataFactoryName()
557	561		*/
558		-	public function setClassMetadataFactoryName(string $factoryName) : self
	562	+	public function setClassMetadataFactoryName(string $factoryName): self
559	563		{
560	564		$this->classMetadataFactoryName = (string) $factoryName;
561	565
562	566		return $this;
563	567		}
564	568
565		-	public function getClassMetadataFactoryName() : ?string
	569	+	public function getClassMetadataFactoryName(): ?string
566	570		{
567	571		return $this->classMetadataFactoryName;
568	572		}

Navigation	Overlay
`t` Navigate files	`h` Toggle hits
`y` Change url to tip of branch	`m` Toggle misses
`b / v` Jump to prev/next hit line	`p` Toggle partial
`z / x` Jump to prev/next missed or partial line	`1..9` Toggle flags
`shift + o` Open current page in GitHub	`a` Toggle all on
`/ or ?` Show keyboard shortcuts dialog	`c` Toggle context lines or commits

446	447		/**
447	448		* @return mixed[]
448	449		*/
449		-	public function getCustomHydrationModes() : array
	450	+	public function getCustomHydrationModes(): array
450	451		{
451	452		return $this->customHydrationModes;
452	453		}

456	457		*
457	458		* @throws InvalidArgumentException when the provided naming strategy does not fit the expected type.
458	459		*/
459		-	public function setNamingStrategy($namingStrategy) : self
	460	+	public function setNamingStrategy($namingStrategy): self
460	461		{
461		-	if ($namingStrategy === null
	462	+	if (
	463	+	$namingStrategy === null
462	464		\|\| is_string($namingStrategy)
463	465		\|\| $namingStrategy instanceof NamingStrategy
464	466		) {

489	491		*
490	492		* @throws InvalidArgumentException when the provided quote strategy does not fit the expected type.
491	493		*/
492		-	public function setQuoteStrategy($quoteStrategy) : self
	494	+	public function setQuoteStrategy($quoteStrategy): self
493	495		{
494		-	if ($quoteStrategy === null
	496	+	if (
	497	+	$quoteStrategy === null
495	498		\|\| is_string($quoteStrategy)
496	499		\|\| $quoteStrategy instanceof QuoteStrategy
497	500		) {

522	525		*
523	526		* @throws InvalidArgumentException when the provided repository factory does not fit the expected type.
524	527		*/
525		-	public function setRepositoryFactory($repositoryFactory) : self
	528	+	public function setRepositoryFactory($repositoryFactory): self
526	529		{
527		-	if ($repositoryFactory === null
	530	+	if (
	531	+	$repositoryFactory === null
528	532		\|\| is_string($repositoryFactory)
529	533		\|\| $repositoryFactory instanceof RepositoryFactory
530	534		) {

573	577		* @throws InvalidArgumentException When the provided entity listener resolver
574	578		* does not fit the expected type.
575	579		*/
576		-	public function setEntityListenerResolver($entityListenerResolver) : self
	580	+	public function setEntityListenerResolver($entityListenerResolver): self
577	581		{
578		-	if ($entityListenerResolver === null
	582	+	if (
	583	+	$entityListenerResolver === null
579	584		\|\| $entityListenerResolver instanceof EntityListenerResolver
580	585		\|\| is_string($entityListenerResolver)
581	586		) {

602	607		/**
603	608		* @param mixed[] $secondLevelCache
604	609		*/
605		-	public function setSecondLevelCache(array $secondLevelCache) : self
	610	+	public function setSecondLevelCache(array $secondLevelCache): self
606	611		{
607	612		$this->secondLevelCache = new SecondLevelCacheConfiguration($secondLevelCache);
608	613
609	614		return $this;
610	615		}
611	616
612		-	public function getSecondLevelCache() : SecondLevelCacheConfiguration
	617	+	public function getSecondLevelCache(): SecondLevelCacheConfiguration
613	618		{
614	619		return $this->secondLevelCache ?: new SecondLevelCacheConfiguration();
615	620		}
616	621
617		-	public function setFilterSchemaAssetsExpression(string $filterSchemaAssetsExpression) : self
	622	+	public function setFilterSchemaAssetsExpression(string $filterSchemaAssetsExpression): self
618	623		{
619	624		$this->filterSchemaAssetsExpression = $filterSchemaAssetsExpression;
620	625
621	626		return $this;
622	627		}
623	628
624		-	public function getFilterSchemaAssetsExpression() : ?string
	629	+	public function getFilterSchemaAssetsExpression(): ?string
625	630		{
626	631		return $this->filterSchemaAssetsExpression;
627	632		}
628	633
629	634		/**
630	635		* Sets default repository class.
631	636		*/
632		-	public function setDefaultRepositoryClassName(string $className) : self
	637	+	public function setDefaultRepositoryClassName(string $className): self
633	638		{
634	639		$this->defaultRepositoryClassName = (string) $className;
635	640

639	644		/**
640	645		* Get default repository class name.
641	646		*/
642		-	public function getDefaultRepositoryClassName() : ?string
	647	+	public function getDefaultRepositoryClassName(): ?string
643	648		{
644	649		return $this->defaultRepositoryClassName;
645	650		}

22	22		*
23	23		* @return EntityManager
24	24		*/
25		-	public function __invoke(ContainerInterface $container, $requestedName, ?array $options = null)
	25	+	public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?array $options = null)
26	26		{
27		-	return $container->get('doctrine.entitymanager.orm_default');
	27	+	return $serviceLocator->get('doctrine.entitymanager.orm_default');
28	28		}
29	29
30	30		/**
31	31		* {@inheritDoc}
32	32		*
33	33		* @deprecated this method was introduced to allow aliasing of service `Doctrine\ORM\EntityManager`
34	34		* from `doctrine.entitymanager.orm_default`
	35	+	* @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
35	36		*
36	37		* @return EntityManager
37	38		*/
38		-	public function createService(ServiceLocatorInterface $container)
	39	+	public function createService(ServiceLocatorInterface $serviceLocator)
39	40		{
40		-	return $this($container, EntityManager::class);
	41	+	return $this($serviceLocator, EntityManager::class);
41	42		}
42	43		}

Compare d9b473d ... +138 ... d289b90

No flags found

Show failed CI and contexual commits c 140 Commits

Compare `d9b473d ... +138 ... d289b90`

Show failed CI and contexual commits `c`

140 Commits