From 436e97ac02292d4a679dacd851e5d4a81ab78a4a Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 7 Dec 2020 21:38:37 +0700 Subject: [PATCH 1/4] use zfc-user ~3.0.0 for zend-hydrator 2 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e717a52..7da9fe3 100644 --- a/composer.json +++ b/composer.json @@ -22,8 +22,8 @@ } }, "require": { - "php": ">=5.4", - "zf-commons/zfc-user": "~1.2", + "php": "^7.2", + "zf-commons/zfc-user": "~3.0.0", "zf-commons/zfc-user-doctrine-orm": "1.*" }, "require-dev": { From d80c612b02a991ab8b96898ba701c0b0808753a7 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Mon, 7 Dec 2020 23:05:31 +0700 Subject: [PATCH 2/4] use fork zf-commons/zfc-user-doctrine-orm": "dev-patch-3 --- composer.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 7da9fe3..465683d 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require": { "php": "^7.2", "zf-commons/zfc-user": "~3.0.0", - "zf-commons/zfc-user-doctrine-orm": "1.*" + "zf-commons/zfc-user-doctrine-orm": "dev-patch-3" }, "require-dev": { "phpunit/phpunit": "~4.0.0", @@ -35,5 +35,12 @@ "psr-0": { "Eye4web\\ZfcUser\\Settings\\": "src/" } - } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/samsonasik/ZfcUserDoctrineORM", + "no-api": true + } + ] } From 1cb34a49c9df0eb8cdfc5c25084c9dbf9915f20b Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Sun, 20 Dec 2020 00:09:32 +0700 Subject: [PATCH 3/4] ugprade to zf sm3 factory syntax --- .../Factory/Controller/Plugin/UserSettingPluginFactory.php | 6 +++--- .../Factory/Mapper/DoctrineORM/UserSettingMapperFactory.php | 4 ++-- .../Settings/Factory/Service/UserSettingsServiceFactory.php | 4 ++-- .../Factory/View/Helper/UserSettingHelperFactory.php | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Eye4web/ZfcUser/Settings/Factory/Controller/Plugin/UserSettingPluginFactory.php b/src/Eye4web/ZfcUser/Settings/Factory/Controller/Plugin/UserSettingPluginFactory.php index bfc2ea6..e6365b5 100644 --- a/src/Eye4web/ZfcUser/Settings/Factory/Controller/Plugin/UserSettingPluginFactory.php +++ b/src/Eye4web/ZfcUser/Settings/Factory/Controller/Plugin/UserSettingPluginFactory.php @@ -22,12 +22,12 @@ use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -class UserSettingPluginFactory implements FactoryInterface +class UserSettingPluginFactory implements \Zend\ServiceManager\Factory\FactoryInterface { - public function createService(ServiceLocatorInterface $pluginManager) + public function __invoke(\Interop\Container\ContainerInterface $pluginManager, $requestedName, array $options = null) { /** @var ServiceLocatorInterface $serviceLocator */ - $serviceLocator = $pluginManager->getServiceLocator(); + $serviceLocator = $pluginManager->; $userSettingsService = $serviceLocator->get('Eye4web\ZfcUser\Settings\Service\UserSettingsService'); diff --git a/src/Eye4web/ZfcUser/Settings/Factory/Mapper/DoctrineORM/UserSettingMapperFactory.php b/src/Eye4web/ZfcUser/Settings/Factory/Mapper/DoctrineORM/UserSettingMapperFactory.php index 7f831ee..cfb2cc8 100644 --- a/src/Eye4web/ZfcUser/Settings/Factory/Mapper/DoctrineORM/UserSettingMapperFactory.php +++ b/src/Eye4web/ZfcUser/Settings/Factory/Mapper/DoctrineORM/UserSettingMapperFactory.php @@ -22,7 +22,7 @@ use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -class UserSettingMapperFactory implements FactoryInterface +class UserSettingMapperFactory implements \Zend\ServiceManager\Factory\FactoryInterface { /** * Create service @@ -30,7 +30,7 @@ class UserSettingMapperFactory implements FactoryInterface * @param ServiceLocatorInterface $serviceLocator * @return mixed */ - public function createService(ServiceLocatorInterface $serviceLocator) + public function __invoke(\Interop\Container\ContainerInterface $serviceLocator, $requestedName, array $options = null) { $entityManager = $serviceLocator->get('zfcuser_doctrine_em'); diff --git a/src/Eye4web/ZfcUser/Settings/Factory/Service/UserSettingsServiceFactory.php b/src/Eye4web/ZfcUser/Settings/Factory/Service/UserSettingsServiceFactory.php index 37c37ea..91ed12d 100644 --- a/src/Eye4web/ZfcUser/Settings/Factory/Service/UserSettingsServiceFactory.php +++ b/src/Eye4web/ZfcUser/Settings/Factory/Service/UserSettingsServiceFactory.php @@ -22,7 +22,7 @@ use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -class UserSettingsServiceFactory implements FactoryInterface +class UserSettingsServiceFactory implements \Zend\ServiceManager\Factory\FactoryInterface { /** * Create service @@ -30,7 +30,7 @@ class UserSettingsServiceFactory implements FactoryInterface * @param ServiceLocatorInterface $serviceLocator * @return mixed */ - public function createService(ServiceLocatorInterface $serviceLocator) + public function __invoke(\Interop\Container\ContainerInterface $serviceLocator, $requestedName, array $options = null) { $mapper = $serviceLocator->get('Eye4web\ZfcUser\Settings\Mapper\DoctrineORM\UserSettingMapper'); diff --git a/src/Eye4web/ZfcUser/Settings/Factory/View/Helper/UserSettingHelperFactory.php b/src/Eye4web/ZfcUser/Settings/Factory/View/Helper/UserSettingHelperFactory.php index 296a68e..ecfbee1 100644 --- a/src/Eye4web/ZfcUser/Settings/Factory/View/Helper/UserSettingHelperFactory.php +++ b/src/Eye4web/ZfcUser/Settings/Factory/View/Helper/UserSettingHelperFactory.php @@ -22,7 +22,7 @@ use Zend\ServiceManager\FactoryInterface; use Zend\ServiceManager\ServiceLocatorInterface; -class UserSettingHelperFactory implements FactoryInterface +class UserSettingHelperFactory implements \Zend\ServiceManager\Factory\FactoryInterface { /** * Create service @@ -30,10 +30,10 @@ class UserSettingHelperFactory implements FactoryInterface * @param ServiceLocatorInterface $helperLocator * @return UserSettingHelper|mixed */ - public function createService(ServiceLocatorInterface $helperLocator) + public function __invoke(\Interop\Container\ContainerInterface $helperLocator, $requestedName, array $options = null) { /** @var ServiceLocatorInterface $serviceLocator */ - $serviceLocator = $helperLocator->getServiceLocator(); + $serviceLocator = $helperLocator->; $userSettingsService = $serviceLocator->get('Eye4web\ZfcUser\Settings\Service\UserSettingsService'); $zfcUserIdentity = $helperLocator->get('ZfcUserIdentity'); From 703815af8510e1a12475296bcf961108e06c6e73 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 8 Jan 2021 12:43:26 +0700 Subject: [PATCH 4/4] allow php 8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 465683d..cd314a0 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ } }, "require": { - "php": "^7.2", + "php": "^7.2|~8.0", "zf-commons/zfc-user": "~3.0.0", "zf-commons/zfc-user-doctrine-orm": "dev-patch-3" },