Merge pull request #704 from driehle/feature/laminas-servicemanager

Removed signatures related to laminas-servicemanager 2.x

Author: driehle

src/Service/CliConfiguratorFactory.php

@@ -6,8 +6,7 @@
 
 use DoctrineORMModule\CliConfigurator;
 use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class CliConfiguratorFactory implements FactoryInterface
 {
@@ -18,14 +17,4 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
     {
         return new CliConfigurator($serviceLocator);
     }
-
-    /**
-     * {@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 $serviceLocator)
-    {
-        return $this($serviceLocator, CliConfigurator::class);
-    }
 }

src/Service/ConfigurationFactory.php

@@ -13,7 +13,6 @@
 use DoctrineORMModule\Service\DBALConfigurationFactory as DoctrineConfigurationFactory;
 use Interop\Container\ContainerInterface;
 use Laminas\ServiceManager\Exception\InvalidArgumentException;
-use Laminas\ServiceManager\ServiceLocatorInterface;
 
 use function is_string;
 use function method_exists;
@@ -165,14 +164,6 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
         return $config;
     }
 
-    /**
-     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator): Configuration
-    {
-        return $this($serviceLocator, Configuration::class);
-    }
-
     protected function getOptionsClass(): string
     {
         return DoctrineORMModuleConfiguration::class;

src/Service/DBALConfigurationFactory.php

@@ -8,8 +8,7 @@
 use Doctrine\DBAL\Types\Type;
 use DoctrineORMModule\Options\Configuration as DoctrineORMModuleConfiguration;
 use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use RuntimeException;
 
 use function is_string;
@@ -40,18 +39,6 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
         return $config;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
-     *
-     * @return Configuration
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        return $this($serviceLocator, Configuration::class);
-    }
-
     public function setupDBALConfiguration(ContainerInterface $serviceLocator, Configuration $config): void
     {
         $options = $this->getOptions($serviceLocator);

src/Service/DBALConnectionFactory.php

@@ -10,7 +10,6 @@
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Options\DBALConnection;
 use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
 use PDO;
 
 use function array_key_exists;
@@ -74,18 +73,6 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
         return $connection;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
-     *
-     * @return Connection
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator)
-    {
-        return $this($serviceLocator, Connection::class);
-    }
-
     /**
      * Get the class name of the options associated with this factory.
      */

src/Service/DoctrineObjectHydratorFactory.php

@@ -6,8 +6,7 @@
 
 use Doctrine\Laminas\Hydrator\DoctrineObject;
 use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 class DoctrineObjectHydratorFactory implements FactoryInterface
 {
@@ -18,14 +17,4 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
     {
         return new DoctrineObject($serviceLocator->get('doctrine.entitymanager.orm_default'));
     }
-
-    /**
-     * {@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 $serviceLocator)
-    {
-        return $this($serviceLocator, DoctrineObject::class);
-    }
 }

src/Service/EntityManagerAliasCompatFactory.php

@@ -6,8 +6,7 @@
 
 use Doctrine\ORM\EntityManager;
 use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 
 /**
  * Factory that provides the `Doctrine\ORM\EntityManager` alias for `doctrine.entitymanager.orm_default`
@@ -26,18 +25,4 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
     {
         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 $serviceLocator)
-    {
-        return $this($serviceLocator, EntityManager::class);
-    }
 }

src/Service/EntityManagerFactory.php

@@ -33,18 +33,6 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
         return EntityManager::create($connection, $config);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @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(ContainerInterface $container)
-    {
-        return $this($container, EntityManager::class);
-    }
-
     public function getOptionsClass(): string
     {
         return DoctrineORMModuleEntityManager::class;

src/Service/EntityResolverFactory.php

@@ -8,8 +8,6 @@
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Options\EntityResolver;
 use Interop\Container\ContainerInterface;
-use Laminas\EventManager\EventManager;
-use Laminas\ServiceManager\ServiceLocatorInterface;
 
 use function assert;
 
@@ -36,16 +34,6 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
         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)
-    {
-        return $this($container, EventManager::class);
-    }
-
     /**
      * Get the class name of the options associated with this factory.
      */

src/Service/MappingCollectorFactory.php

@@ -8,7 +8,6 @@
 use DoctrineModule\Service\AbstractFactory;
 use DoctrineORMModule\Collector\MappingCollector;
 use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
 
 /**
  * Service factory responsible for instantiating {@see \DoctrineORMModule\Collector\MappingCollector}
@@ -28,18 +27,6 @@ public function __invoke(ContainerInterface $container, $requestedName, ?array $
         return new MappingCollector($objectManager->getMetadataFactory(), 'doctrine.mapping_collector.' . $name);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
-     *
-     * @return MappingCollector
-     */
-    public function createService(ServiceLocatorInterface $container)
-    {
-        return $this($container, MappingCollector::class);
-    }
-
     public function getOptionsClass(): string
     {
         throw new BadMethodCallException();

src/Service/MigrationsCommandFactory.php

@@ -10,8 +10,7 @@
 use Doctrine\Migrations\Tools\Console\Command\DoctrineCommand;
 use Interop\Container\ContainerInterface;
 use InvalidArgumentException;
-use Laminas\ServiceManager\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use RuntimeException;
 use Symfony\Component\Console\Input\ArgvInput;
 
@@ -102,16 +101,6 @@ public function __invoke(ContainerInterface $serviceLocator, $requestedName, ?ar
         return new $commandClassName($dependencyFactory);
     }
 
-    /**
-     * @deprecated 4.1.0 With laminas-servicemanager v3 this method is obsolete and will be removed in 5.0.0.
-     *
-     * @throws InvalidArgumentException
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator): DoctrineCommand
-    {
-        return $this($serviceLocator, $this->commandClassName);
-    }
-
     private function getObjectManagerName(): string
     {
         $arguments = new ArgvInput();