Skip to content

Commit

Permalink
Replace Zend references with Laminas
Browse files Browse the repository at this point in the history
  • Loading branch information
zerocrates committed Jun 18, 2020
1 parent 29463a9 commit 66a9d6f
Show file tree
Hide file tree
Showing 25 changed files with 31 additions and 31 deletions.
4 changes: 2 additions & 2 deletions Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
namespace CSVImport;

use Omeka\Module\AbstractModule;
use Zend\ModuleManager\ModuleManager;
use Zend\ServiceManager\ServiceLocatorInterface;
use Laminas\ModuleManager\ModuleManager;
use Laminas\ServiceManager\ServiceLocatorInterface;

class Module extends AbstractModule
{
Expand Down
6 changes: 3 additions & 3 deletions src/Controller/IndexController.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
use Omeka\Service\Exception\ConfigException;
use Omeka\Settings\UserSettings;
use Omeka\Stdlib\Message;
use Zend\Mvc\Controller\AbstractActionController;
use Zend\View\Model\ViewModel;
use Laminas\Mvc\Controller\AbstractActionController;
use Laminas\View\Model\ViewModel;

class IndexController extends AbstractActionController
{
Expand Down Expand Up @@ -249,7 +249,7 @@ protected function getMappingsForResource($resourceType)
// First reorder mappings: for ergonomic reasons, it’s cleaner to keep
// the buttons of modules after the default ones. This is only needed in
// the mapping form. The default order is set in this module config too,
// before Zend merge.
// before Laminas merge.
$config = include dirname(dirname(__DIR__)) . '/config/module.config.php';
$defaultOrder = $config['csv_import']['mappings'];
$mappings = $this->config['csv_import']['mappings'];
Expand Down
2 changes: 1 addition & 1 deletion src/Form/ImportForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace CSVImport\Form;

use Omeka\Settings\UserSettings;
use Zend\Form\Form;
use Laminas\Form\Form;

class ImportForm extends Form
{
Expand Down
2 changes: 1 addition & 1 deletion src/Form/MappingForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Omeka\Form\Element\PropertySelect;
use Omeka\Form\Element\ResourceSelect;
use Omeka\Form\Element\ResourceClassSelect;
use Zend\Form\Form;
use Laminas\Form\Form;

class MappingForm extends Form
{
Expand Down
2 changes: 1 addition & 1 deletion src/Job/Import.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
use Omeka\Api\Manager;
use Omeka\Job\AbstractJob;
use Omeka\Stdlib\Message;
use Zend\Log\Logger;
use Laminas\Log\Logger;

class Import extends AbstractJob
{
Expand Down
4 changes: 2 additions & 2 deletions src/Mapping/AbstractMapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
namespace CSVImport\Mapping;

use Omeka\Api\Manager as ApiManager;
use Zend\Log\Logger;
use Zend\ServiceManager\ServiceLocatorInterface;
use Laminas\Log\Logger;
use Laminas\ServiceManager\ServiceLocatorInterface;

abstract class AbstractMapping implements MappingInterface
{
Expand Down
4 changes: 2 additions & 2 deletions src/Mapping/AbstractResourceMapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

use CSVImport\Mvc\Controller\Plugin\FindResourcesFromIdentifiers;
use Omeka\Stdlib\Message;
use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\View\Renderer\PhpRenderer;
use Laminas\ServiceManager\ServiceLocatorInterface;
use Laminas\View\Renderer\PhpRenderer;

abstract class AbstractResourceMapping extends AbstractMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/ItemMapping.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mapping;

use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class ItemMapping extends AbstractResourceMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/ItemSetMapping.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mapping;

use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class ItemSetMapping extends AbstractResourceMapping
{
Expand Down
4 changes: 2 additions & 2 deletions src/Mapping/MappingInterface.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?php
namespace CSVImport\Mapping;

use Zend\ServiceManager\ServiceLocatorInterface;
use Zend\View\Renderer\PhpRenderer;
use Laminas\ServiceManager\ServiceLocatorInterface;
use Laminas\View\Renderer\PhpRenderer;

interface MappingInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/MediaMapping.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mapping;

use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class MediaMapping extends AbstractResourceMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/MediaSourceMapping.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mapping;

use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class MediaSourceMapping extends AbstractMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/PropertyMapping.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mapping;

use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class PropertyMapping extends AbstractMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/ResourceMapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
namespace CSVImport\Mapping;

use Omeka\Stdlib\Message;
use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class ResourceMapping extends AbstractResourceMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mapping/UserMapping.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mapping;

use Zend\View\Renderer\PhpRenderer;
use Laminas\View\Renderer\PhpRenderer;

class UserMapping extends AbstractMapping
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/Controller/Plugin/AutomapHeadersToMetadata.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\Mvc\Controller\Plugin;

use Zend\Mvc\Controller\Plugin\AbstractPlugin;
use Laminas\Mvc\Controller\Plugin\AbstractPlugin;

class AutomapHeadersToMetadata extends AbstractPlugin
{
Expand Down
2 changes: 1 addition & 1 deletion src/Mvc/Controller/Plugin/FindResourcesFromIdentifiers.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

use Doctrine\DBAL\Connection;
use Omeka\Api\Manager as ApiManager;
use Zend\Mvc\Controller\Plugin\AbstractPlugin;
use Laminas\Mvc\Controller\Plugin\AbstractPlugin;

class FindResourcesFromIdentifiers extends AbstractPlugin
{
Expand Down
2 changes: 1 addition & 1 deletion src/Service/Controller/IndexControllerFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use CSVImport\Controller\IndexController;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class IndexControllerFactory implements FactoryInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use CSVImport\Mvc\Controller\Plugin\AutomapHeadersToMetadata;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class AutomapHeadersToMetadataFactory implements FactoryInterface
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use CSVImport\Mvc\Controller\Plugin\FindResourcesFromIdentifiers;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class FindResourcesFromIdentifiersFactory implements FactoryInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Service/Form/ImportFormFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use CSVImport\Form\ImportForm;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class ImportFormFactory implements FactoryInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Service/Form/MappingFormFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use CSVImport\Form\MappingForm;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class MappingFormFactory implements FactoryInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/Service/ViewHelper/MediaSourceSidebarFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use CSVImport\View\Helper\MediaSourceSidebar;
use Interop\Container\ContainerInterface;
use Zend\ServiceManager\Factory\FactoryInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;

class MediaSourceSidebarFactory implements FactoryInterface
{
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/MediaSourceSidebar.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\View\Helper;

use Zend\View\Helper\AbstractHelper;
use Laminas\View\Helper\AbstractHelper;

class MediaSourceSidebar extends AbstractHelper
{
Expand Down
2 changes: 1 addition & 1 deletion src/View/Helper/PropertySelector.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
namespace CSVImport\View\Helper;

use Zend\View\Helper\AbstractHelper;
use Laminas\View\Helper\AbstractHelper;

class PropertySelector extends AbstractHelper
{
Expand Down

0 comments on commit 66a9d6f

Please sign in to comment.