diff --git a/composer.json b/composer.json index dce9b88..962a2b3 100644 --- a/composer.json +++ b/composer.json @@ -19,14 +19,14 @@ } ], "require": { - "php": ">=5.3.3", - "zendframework/zend-db": "~2.1", - "zendframework/zend-eventmanager": "~2.1 || ~3.0", - "zendframework/zend-loader": "~2.1", - "zendframework/zend-modulemanager": "~2.1", - "zendframework/zend-mvc": "~2.1 || ~3.0", - "zendframework/zend-servicemanager": "~2.1 || ~3.0", - "zendframework/zend-stdlib": "~2.1 || ~3.0" + "php": ">=7.2", + "zendframework/zend-db": "^2.1", + "zendframework/zend-eventmanager": "^3.0", + "zendframework/zend-loader": "^2.1", + "zendframework/zend-modulemanager": "^2.1", + "zendframework/zend-mvc": "^3.0", + "zendframework/zend-servicemanager": "^3.0", + "zendframework/zend-stdlib": "^3.0" }, "autoload": { "psr-0": { diff --git a/src/ZfcBase/Form/ProvidesEventsForm.php b/src/ZfcBase/Form/ProvidesEventsForm.php index 17514ca..e51aa81 100644 --- a/src/ZfcBase/Form/ProvidesEventsForm.php +++ b/src/ZfcBase/Form/ProvidesEventsForm.php @@ -48,7 +48,9 @@ public function getEventManager() } // silently ignore invalid eventIdentifier types } - $this->setEventManager(new EventManager($identifiers)); + $eventManager = new EventManager(); + $eventManager->setIdentifiers($identifiers); + $this->setEventManager($eventManager); } return $this->events; } diff --git a/src/ZfcBase/Mapper/AbstractDbMapper.php b/src/ZfcBase/Mapper/AbstractDbMapper.php index 2d50fa1..c53e08b 100644 --- a/src/ZfcBase/Mapper/AbstractDbMapper.php +++ b/src/ZfcBase/Mapper/AbstractDbMapper.php @@ -8,8 +8,8 @@ use Zend\Db\Sql\Select; use Zend\Db\Sql\Sql; use Zend\Db\Sql\TableIdentifier; -use Zend\Stdlib\Hydrator\HydratorInterface; -use Zend\Stdlib\Hydrator\ClassMethods; +use Laminas\Hydrator\HydratorInterface; +use Laminas\Hydrator\ClassMethodsHydrator; use ZfcBase\EventManager\EventProvider; use ZfcBase\Db\Adapter\MasterSlaveAdapterInterface; @@ -81,7 +81,7 @@ protected function initialize() } if (!$this->hydrator instanceof HydratorInterface) { - $this->hydrator = new ClassMethods; + $this->hydrator = new ClassMethodsHydrator; } if (!is_object($this->entityPrototype)) { @@ -257,7 +257,7 @@ public function setDbSlaveAdapter(Adapter $dbSlaveAdapter) public function getHydrator() { if (!$this->hydrator) { - $this->hydrator = new ClassMethods(false); + $this->hydrator = new ClassMethodsHydrator(false); } return $this->hydrator; }