diff --git a/composer.json b/composer.json index d2581462..d5e6f0a4 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,6 @@ "dotkernel/dot-debugbar": "^1.0", "dotkernel/dot-errorhandler": "^3.2", "dotkernel/dot-flashmessenger": "^3.2", - "dotkernel/dot-form": "^4.0", "dotkernel/dot-mail": "~3.4 || ~4.0", "dotkernel/dot-navigation": "^3.2", "dotkernel/dot-rbac-guard": "^3.2", @@ -64,6 +63,7 @@ "friendsofphp/proxy-manager-lts": "^1.0", "laminas/laminas-component-installer": "^2.8", "laminas/laminas-config-aggregator": "^1.8", + "laminas/laminas-form": "^3.13", "laminas/laminas-i18n": "^2.17", "mezzio/mezzio": "^3.11", "mezzio/mezzio-authorization-rbac": "^1.3", diff --git a/config/config.php b/config/config.php index 9b99ac21..64ffb44d 100644 --- a/config/config.php +++ b/config/config.php @@ -34,7 +34,7 @@ class_exists(\Mezzio\Swoole\ConfigProvider::class) \Dot\Session\ConfigProvider::class, \Dot\DebugBar\ConfigProvider::class, \Dot\Mail\ConfigProvider::class, - \Dot\Form\ConfigProvider::class, + \Laminas\Form\ConfigProvider::class, \Dot\Log\ConfigProvider::class, \Dot\ErrorHandler\ConfigProvider::class, \Dot\AnnotatedServices\ConfigProvider::class, diff --git a/src/Contact/src/ConfigProvider.php b/src/Contact/src/ConfigProvider.php index cc15cb56..06f0bb6b 100644 --- a/src/Contact/src/ConfigProvider.php +++ b/src/Contact/src/ConfigProvider.php @@ -27,7 +27,7 @@ public function __invoke(): array return [ 'dependencies' => $this->getDependencies(), 'templates' => $this->getTemplates(), - 'dot_form' => $this->getForms(), + 'forms' => $this->getForms(), 'doctrine' => $this->getDoctrineConfig() ]; } diff --git a/src/Plugin/src/Factory/FormsPluginFactory.php b/src/Plugin/src/Factory/FormsPluginFactory.php index 6779d8c1..71533f81 100644 --- a/src/Plugin/src/Factory/FormsPluginFactory.php +++ b/src/Plugin/src/Factory/FormsPluginFactory.php @@ -5,8 +5,8 @@ namespace Frontend\Plugin\Factory; use Dot\FlashMessenger\FlashMessengerInterface; -use Dot\Form\FormElementManager; use Frontend\Plugin\FormsPlugin; +use Laminas\Form\FormElementManager; use Psr\Container\ContainerExceptionInterface; use Psr\Container\ContainerInterface; use Psr\Container\NotFoundExceptionInterface; diff --git a/src/Plugin/src/FormsPlugin.php b/src/Plugin/src/FormsPlugin.php index 13bb7814..48ac476c 100644 --- a/src/Plugin/src/FormsPlugin.php +++ b/src/Plugin/src/FormsPlugin.php @@ -5,8 +5,8 @@ namespace Frontend\Plugin; use Dot\FlashMessenger\FlashMessengerInterface; -use Dot\Form\FormElementManager; use Laminas\Form\Form; +use Laminas\Form\FormElementManager; use Laminas\Form\FormInterface; class FormsPlugin implements PluginInterface diff --git a/src/User/src/ConfigProvider.php b/src/User/src/ConfigProvider.php index 8a6bf81c..49530e17 100644 --- a/src/User/src/ConfigProvider.php +++ b/src/User/src/ConfigProvider.php @@ -35,7 +35,7 @@ public function __invoke(): array return [ 'dependencies' => $this->getDependencies(), 'templates' => $this->getTemplates(), - 'dot_form' => $this->getForms(), + 'forms' => $this->getForms(), 'doctrine' => $this->getDoctrineConfig(), ]; }