Skip to content

Commit 170d34d

Browse files
TomHAndersonTomHAnderson
committed
Result of laminas-migrate
1 parent 5693988 commit 170d34d

File tree

52 files changed

+151
-149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+151
-149
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@ vendor/
33
phpunit.xml
44
.project/
55
nbproject/
6-
composer.phar
6+
composer.phar
7+
.phpcs-cache
8+
.phpunit.result.cache

‎.travis/config/application.config.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
return [
44
'modules' => [
5-
'Zend\Cache',
6-
'Zend\Form',
7-
'Zend\Hydrator',
8-
'Zend\Mvc\Console',
9-
'Zend\Paginator',
10-
'Zend\Router',
11-
'Zend\Validator',
5+
'Laminas\Cache',
6+
'Laminas\Form',
7+
'Laminas\Hydrator',
8+
'Laminas\Mvc\Console',
9+
'Laminas\Paginator',
10+
'Laminas\Router',
11+
'Laminas\Validator',
1212
'DoctrineModule',
1313
'DoctrineORMModule',
1414
],

‎src/DoctrineORMModule/CliConfigurator.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
use Symfony\Component\Console\Helper\QuestionHelper;
1313
use Symfony\Component\Console\Input\ArgvInput;
1414
use Symfony\Component\Console\Input\InputOption;
15-
use Zend\Stdlib\ArrayUtils;
15+
use Laminas\Stdlib\ArrayUtils;
1616

1717
/**
1818
* @license MIT

‎src/DoctrineORMModule/Collector/MappingCollector.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44

55
use Serializable;
66

7-
use ZendDeveloperTools\Collector\CollectorInterface;
8-
use ZendDeveloperTools\Collector\AutoHideInterface;
7+
use Laminas\DeveloperTools\Collector\CollectorInterface;
8+
use Laminas\DeveloperTools\Collector\AutoHideInterface;
99

10-
use Zend\Mvc\MvcEvent;
10+
use Laminas\Mvc\MvcEvent;
1111

1212
use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
1313

1414
/**
15-
* Collector to be used in ZendDeveloperTools to record and display mapping information
15+
* Collector to be used in Laminas\DeveloperTools to record and display mapping information
1616
*
1717
* @license MIT
1818
* @link www.doctrine-project.org

‎src/DoctrineORMModule/Collector/SQLLoggerCollector.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
namespace DoctrineORMModule\Collector;
44

5-
use ZendDeveloperTools\Collector\CollectorInterface;
6-
use ZendDeveloperTools\Collector\AutoHideInterface;
5+
use Laminas\DeveloperTools\Collector\CollectorInterface;
6+
use Laminas\DeveloperTools\Collector\AutoHideInterface;
77

8-
use Zend\Mvc\MvcEvent;
8+
use Laminas\Mvc\MvcEvent;
99

1010
use Doctrine\DBAL\Logging\DebugStack;
1111

1212
/**
13-
* Collector to be used in ZendDeveloperTools to record and display SQL queries
13+
* Collector to be used in Laminas\DeveloperTools to record and display SQL queries
1414
*
1515
* @license MIT
1616
* @link www.doctrine-project.org

‎src/DoctrineORMModule/Form/Annotation/AnnotationBuilder.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Doctrine\Common\Persistence\Mapping\ClassMetadata;
66
use Doctrine\Common\Persistence\ObjectManager;
77
use DoctrineModule\Form\Element;
8-
use Zend\EventManager\EventManagerInterface;
9-
use Zend\Form\Annotation\AnnotationBuilder as ZendAnnotationBuilder;
8+
use Laminas\EventManager\EventManagerInterface;
9+
use Laminas\Form\Annotation\AnnotationBuilder as ZendAnnotationBuilder;
1010

1111
/**
1212
* @author Kyle Spraggs <[email protected]>

‎src/DoctrineORMModule/Form/Annotation/ElementAnnotationsListener.php

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
use Doctrine\Common\Persistence\ObjectManager;
77
use Doctrine\ORM\Mapping\ClassMetadata;
88
use DoctrineORMModule\Form\Element\EntitySelect;
9-
use Zend\EventManager\AbstractListenerAggregate;
10-
use Zend\EventManager\EventInterface;
11-
use Zend\EventManager\EventManagerInterface;
12-
use Zend\Form\Element as ZendFormElement;
9+
use Laminas\EventManager\AbstractListenerAggregate;
10+
use Laminas\EventManager\EventInterface;
11+
use Laminas\EventManager\EventManagerInterface;
12+
use Laminas\Form\Element as LaminasFormElement;
1313

1414
/**
1515
* @author Kyle Spraggs <[email protected]>
@@ -267,27 +267,27 @@ public function handleTypeField(EventInterface $event)
267267
case 'bigint':
268268
case 'integer':
269269
case 'smallint':
270-
$type = ZendFormElement\Number::class;
270+
$type = LaminasFormElement\Number::class;
271271
break;
272272
case 'bool':
273273
case 'boolean':
274-
$type = ZendFormElement\Checkbox::class;
274+
$type = LaminasFormElement\Checkbox::class;
275275
break;
276276
case 'date':
277-
$type = ZendFormElement\Date::class;
277+
$type = LaminasFormElement\Date::class;
278278
break;
279279
case 'datetimetz':
280280
case 'datetime':
281-
$type = ZendFormElement\DateTime::class;
281+
$type = LaminasFormElement\DateTime::class;
282282
break;
283283
case 'time':
284-
$type = ZendFormElement\Time::class;
284+
$type = LaminasFormElement\Time::class;
285285
break;
286286
case 'text':
287-
$type = ZendFormElement\Textarea::class;
287+
$type = LaminasFormElement\Textarea::class;
288288
break;
289289
default:
290-
$type = ZendFormElement::class;
290+
$type = LaminasFormElement::class;
291291
break;
292292
}
293293

@@ -330,7 +330,7 @@ public function handleValidatorField(EventInterface $event)
330330
case 'string':
331331
$elementSpec = $event->getParam('elementSpec');
332332
if (isset($elementSpec['spec']['type']) &&
333-
in_array($elementSpec['spec']['type'], ['File', 'Zend\Form\Element\File'])
333+
in_array($elementSpec['spec']['type'], ['File', 'Laminas\Form\Element\File'])
334334
) {
335335
return;
336336
}

‎src/DoctrineORMModule/Module.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
namespace DoctrineORMModule;
44

55
use Interop\Container\ContainerInterface;
6-
use Zend\EventManager\EventInterface;
7-
use Zend\ModuleManager\Feature\ControllerProviderInterface;
8-
use Zend\ModuleManager\Feature\ConfigProviderInterface;
9-
use Zend\ModuleManager\Feature\DependencyIndicatorInterface;
10-
use Zend\ModuleManager\ModuleManagerInterface;
6+
use Laminas\EventManager\EventInterface;
7+
use Laminas\ModuleManager\Feature\ControllerProviderInterface;
8+
use Laminas\ModuleManager\Feature\ConfigProviderInterface;
9+
use Laminas\ModuleManager\Feature\DependencyIndicatorInterface;
10+
use Laminas\ModuleManager\ModuleManagerInterface;
1111
use DoctrineORMModule\CliConfigurator;
12-
use ZendDeveloperTools\ProfilerEvent;
12+
use Laminas\DeveloperTools\ProfilerEvent;
1313

1414
/**
1515
* Base module for Doctrine ORM.
@@ -46,7 +46,7 @@ function (EventInterface $event) {
4646
1
4747
);
4848

49-
// Initialize logger collector in ZendDeveloperTools
49+
// Initialize logger collector in Laminas\DeveloperTools
5050
if (class_exists(ProfilerEvent::class)) {
5151
$manager
5252
->getEventManager()

‎src/DoctrineORMModule/Options/Configuration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Doctrine\ORM\Mapping\NamingStrategy;
77
use Doctrine\ORM\Mapping\QuoteStrategy;
88
use Doctrine\ORM\Repository\RepositoryFactory;
9-
use Zend\Stdlib\Exception\InvalidArgumentException;
9+
use Laminas\Stdlib\Exception\InvalidArgumentException;
1010

1111
/**
1212
* Configuration options for an ORM Configuration

‎src/DoctrineORMModule/Options/DBALConfiguration.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace DoctrineORMModule\Options;
44

5-
use Zend\Stdlib\AbstractOptions;
5+
use Laminas\Stdlib\AbstractOptions;
66

77
/**
88
* Configuration options for a DBAL Connection

‎src/DoctrineORMModule/Options/DBALConnection.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace DoctrineORMModule\Options;
44

55
use Doctrine\DBAL\Driver\PDOMySql\Driver;
6-
use Zend\Stdlib\AbstractOptions;
6+
use Laminas\Stdlib\AbstractOptions;
77

88
/**
99
* DBAL Connection options

‎src/DoctrineORMModule/Options/EntityManager.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace DoctrineORMModule\Options;
44

5-
use Zend\Stdlib\AbstractOptions;
5+
use Laminas\Stdlib\AbstractOptions;
66

77
class EntityManager extends AbstractOptions
88
{

‎src/DoctrineORMModule/Options/EntityResolver.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace DoctrineORMModule\Options;
44

55
use InvalidArgumentException;
6-
use Zend\Stdlib\AbstractOptions;
6+
use Laminas\Stdlib\AbstractOptions;
77

88
class EntityResolver extends AbstractOptions
99
{

‎src/DoctrineORMModule/Options/SQLLoggerCollectorOptions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace DoctrineORMModule\Options;
44

5-
use Zend\Stdlib\AbstractOptions;
5+
use Laminas\Stdlib\AbstractOptions;
66

77
/**
88
* Configuration options for an collector

‎src/DoctrineORMModule/Options/SecondLevelCacheConfiguration.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
use Doctrine\ORM\Mapping\EntityListenerResolver;
77
use Doctrine\ORM\Mapping\NamingStrategy;
88
use Doctrine\ORM\Repository\RepositoryFactory;
9-
use Zend\Stdlib\AbstractOptions;
10-
use Zend\Stdlib\Exception\InvalidArgumentException;
9+
use Laminas\Stdlib\AbstractOptions;
10+
use Laminas\Stdlib\Exception\InvalidArgumentException;
1111

1212
/**
1313
* Configuration options for Second Level Cache

‎src/DoctrineORMModule/Paginator/Adapter/DoctrinePaginator.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace DoctrineORMModule\Paginator\Adapter;
44

55
use Doctrine\ORM\Tools\Pagination\Paginator;
6-
use Zend\Paginator\Adapter\AdapterInterface;
6+
use Laminas\Paginator\Adapter\AdapterInterface;
77

88
/**
9-
* Paginator adapter for the Zend\Paginator component
9+
* Paginator adapter for the Laminas\Paginator component
1010
*
1111
* @license MIT
1212
* @link http://www.doctrine-project.org/

‎src/DoctrineORMModule/Service/CliConfiguratorFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
use DoctrineORMModule\CliConfigurator;
66
use Interop\Container\ContainerInterface;
7-
use Zend\ServiceManager\FactoryInterface;
8-
use Zend\ServiceManager\ServiceLocatorInterface;
7+
use Laminas\ServiceManager\FactoryInterface;
8+
use Laminas\ServiceManager\ServiceLocatorInterface;
99

1010
class CliConfiguratorFactory implements FactoryInterface
1111
{

‎src/DoctrineORMModule/Service/ConfigurationFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
use DoctrineORMModule\Options\Configuration as DoctrineORMModuleConfiguration;
1010
use DoctrineORMModule\Service\DBALConfigurationFactory as DoctrineConfigurationFactory;
1111
use Interop\Container\ContainerInterface;
12-
use Zend\ServiceManager\ServiceLocatorInterface;
13-
use Zend\ServiceManager\Exception\InvalidArgumentException;
12+
use Laminas\ServiceManager\ServiceLocatorInterface;
13+
use Laminas\ServiceManager\Exception\InvalidArgumentException;
1414
use Doctrine\ORM\Configuration;
1515

1616
class ConfigurationFactory extends DoctrineConfigurationFactory

‎src/DoctrineORMModule/Service/DBALConfigurationFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use RuntimeException;
88
use Doctrine\DBAL\Configuration;
99
use Doctrine\DBAL\Types\Type;
10-
use Zend\ServiceManager\FactoryInterface;
11-
use Zend\ServiceManager\ServiceLocatorInterface;
10+
use Laminas\ServiceManager\FactoryInterface;
11+
use Laminas\ServiceManager\ServiceLocatorInterface;
1212

1313
/**
1414
* DBAL Configuration ServiceManager factory

‎src/DoctrineORMModule/Service/DBALConnectionFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use DoctrineModule\Service\AbstractFactory;
99
use DoctrineORMModule\Options\DBALConnection;
1010
use Interop\Container\ContainerInterface;
11-
use Zend\ServiceManager\ServiceLocatorInterface;
11+
use Laminas\ServiceManager\ServiceLocatorInterface;
1212

1313
/**
1414
* DBAL Connection ServiceManager factory

‎src/DoctrineORMModule/Service/DoctrineObjectHydratorFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
2222
use Interop\Container\ContainerInterface;
23-
use Zend\ServiceManager\FactoryInterface;
24-
use Zend\ServiceManager\ServiceLocatorInterface;
23+
use Laminas\ServiceManager\FactoryInterface;
24+
use Laminas\ServiceManager\ServiceLocatorInterface;
2525

2626
class DoctrineObjectHydratorFactory implements FactoryInterface
2727
{

‎src/DoctrineORMModule/Service/EntityManagerAliasCompatFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
namespace DoctrineORMModule\Service;
44

55
use Interop\Container\ContainerInterface;
6-
use Zend\ServiceManager\FactoryInterface;
7-
use Zend\ServiceManager\ServiceLocatorInterface;
6+
use Laminas\ServiceManager\FactoryInterface;
7+
use Laminas\ServiceManager\ServiceLocatorInterface;
88

99
/**
1010
* Factory that provides the `Doctrine\ORM\EntityManager` alias for `doctrine.entitymanager.orm_default`

‎src/DoctrineORMModule/Service/EntityManagerFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use DoctrineModule\Service\AbstractFactory;
77
use DoctrineORMModule\Options\EntityManager as DoctrineORMModuleEntityManager;
88
use Interop\Container\ContainerInterface;
9-
use Zend\ServiceManager\ServiceLocatorInterface;
9+
use Laminas\ServiceManager\ServiceLocatorInterface;
1010

1111
class EntityManagerFactory extends AbstractFactory
1212
{

‎src/DoctrineORMModule/Service/EntityResolverFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
use DoctrineModule\Service\AbstractFactory;
99
use DoctrineORMModule\Options\EntityResolver;
1010
use Interop\Container\ContainerInterface;
11-
use Zend\EventManager\EventManager;
12-
use Zend\ServiceManager\ServiceLocatorInterface;
11+
use Laminas\EventManager\EventManager;
12+
use Laminas\ServiceManager\ServiceLocatorInterface;
1313

1414
class EntityResolverFactory extends AbstractFactory
1515
{

‎src/DoctrineORMModule/Service/FormAnnotationBuilderFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use DoctrineModule\Service\AbstractFactory;
66
use DoctrineORMModule\Form\Annotation\AnnotationBuilder;
77
use Interop\Container\ContainerInterface;
8-
use Zend\Form\Factory;
9-
use Zend\ServiceManager\ServiceLocatorInterface;
8+
use Laminas\Form\Factory;
9+
use Laminas\ServiceManager\ServiceLocatorInterface;
1010

1111
/**
1212
* Service factory responsible for instantiating {@see \DoctrineORMModule\Form\Annotation\AnnotationBuilder}

‎src/DoctrineORMModule/Service/MappingCollectorFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use DoctrineModule\Service\AbstractFactory;
66
use DoctrineORMModule\Collector\MappingCollector;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\ServiceLocatorInterface;
8+
use Laminas\ServiceManager\ServiceLocatorInterface;
99

1010
/**
1111
* Service factory responsible for instantiating {@see \DoctrineORMModule\Collector\MappingCollector}

‎src/DoctrineORMModule/Service/MigrationsCommandFactory.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
namespace DoctrineORMModule\Service;
2020

2121
use Interop\Container\ContainerInterface;
22-
use Zend\ServiceManager\FactoryInterface;
23-
use Zend\ServiceManager\ServiceLocatorInterface;
22+
use Laminas\ServiceManager\FactoryInterface;
23+
use Laminas\ServiceManager\ServiceLocatorInterface;
2424

2525
/**
2626
* Service factory for migrations command
@@ -69,7 +69,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
6969
}
7070

7171
/**
72-
* @param \Zend\ServiceManager\ServiceLocatorInterface $container
72+
* @param \Laminas\ServiceManager\ServiceLocatorInterface $container
7373
* @return \Doctrine\Migrations\Tools\Console\Command\AbstractCommand
7474
* @throws \InvalidArgumentException
7575
*/

‎src/DoctrineORMModule/Service/MigrationsConfigurationFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use Doctrine\Migrations\OutputWriter;
77
use DoctrineModule\Service\AbstractFactory;
88
use Interop\Container\ContainerInterface;
9-
use Zend\ServiceManager\ServiceLocatorInterface;
9+
use Laminas\ServiceManager\ServiceLocatorInterface;
1010
use Symfony\Component\Console\Output\ConsoleOutput;
1111

1212
/**

‎src/DoctrineORMModule/Service/ObjectMultiCheckboxFactory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
use Doctrine\ORM\EntityManager;
66
use DoctrineModule\Form\Element\ObjectMultiCheckbox;
77
use Interop\Container\ContainerInterface;
8-
use Zend\ServiceManager\ServiceLocatorInterface;
9-
use Zend\ServiceManager\FactoryInterface;
8+
use Laminas\ServiceManager\ServiceLocatorInterface;
9+
use Laminas\ServiceManager\FactoryInterface;
1010

1111
/**
1212
* Factory for {@see ObjectMultiCheckbox}

0 commit comments

Comments
 (0)