moved serviceConfig to config File

CriticalSource · Sep 16, 2015 · 5dbf0e1 · 5dbf0e1
1 parent 332bfa5
commit 5dbf0e1
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 57 deletions.
diff --git a/Module.php b/Module.php
@@ -13,14 +13,18 @@ class Module
 
     public function onBootstrap(MvcEvent $e)
     {
-        // Add translation file if default translator was defined
-        if ($translator = AbstractValidator::getDefaultTranslator()) {
-            $translator->addTranslationFilePattern(
-                'phpArray',
-                __DIR__ . '/language/Zend_Validate',
-                '%s.php'
-            );
-        }
+        $language = new \Zend\Session\Container('language');
+
+        $mvctranslator = $e->getApplication()->getServiceManager()->get('MvcTranslator');
+        $mvctranslator
+            ->setLocale($language->current)
+            ->setFallbackLocale('en_US');
+        $mvctranslator->addTranslationFile(
+            'phpArray',
+            './vendor/zendframework/zend-i18n-resources/languages/de/Zend_Validate.php',
+            'default',
+            'en_US'
+        );
     }
 
     public function getAutoloaderConfig()
@@ -41,54 +45,6 @@ public function getConfig()
 
     public function getServiceConfig()
     {
-        return array(
-            'invokables' => array(
-                'atansuser_change_email_form'        => 'AtansUser\Form\ChangeEmailForm',
-                'atansuser_change_password_form'     => 'AtansUser\Form\ChangePasswordForm',
-                'atansuser_login_form'               => 'AtansUser\Form\LoginForm',
-                'atansuser_permission_search_form'   => 'AtansUser\Form\PermissionSearchForm',
-                'atansuser_role_search_form'         => 'AtansUser\Form\RoleSearchForm',
-                'atansuser_user_service'             => 'AtansUser\Service\User',
-                'atansuser_user_admin_service'       => 'AtansUser\Service\UserAdmin',
-                'atansuser_permission_admin_service' => 'AtansUser\Service\PermissionAdmin',
-                'atansuser_role_admin_service'       => 'AtansUser\Service\RoleAdmin',
-            ),
-            'factories' => array(
-                'atansuser_module_options' => function ($sm) {
-                    $config = $sm->get('config');
-                    return new Options\ModuleOptions(isset($config['atansuser']) ? $config['atansuser'] : array());
-                },
-                'atansuser_register_form' => function ($sm) {
-                    return new Form\RegisterForm($sm);
-                },
-                'atansuser_permission_form' => function ($sm) {
-                    return new Form\PermissionForm($sm);
-                },
-                'atansuser_role_form' => function ($sm) {
-                    return new Form\RoleForm($sm);
-                },
-                'atansuser_user_add_form' => function ($sm) {
-                    return new Form\UserAddForm($sm);
-                },
-                'atansuser_user_edit_form' => function ($sm) {
-                    return new Form\UserEditForm($sm);
-                },
-                'atansuser_user_search_form' => function ($sm) {
-                    return new Form\UserSearchForm($sm);
-                },
-                'Zend\Authentication\AuthenticationService' => function ($sm) {
-                    return $sm->get('doctrine.authenticationservice.orm_default');
-                },
-                'atansuser_user_status_value_options' => function ($sm) {
-                    $translator = $sm->get('Translator');
-
-                    return array(
-                        Entity\User::STATUS_ACTIVE   => $translator->translate('Active', self::TRANSLATOR_TEXT_DOMAIN),
-                        Entity\User::STATUS_INACTIVE => $translator->translate('Inactive', self::TRANSLATOR_TEXT_DOMAIN),
-                        Entity\User::STATUS_DELETED  => $translator->translate('Deleted', self::TRANSLATOR_TEXT_DOMAIN),
-                    );
-                 },
-            ),
-        );
+        return (require __DIR__ . '/config/service_manager.config.php');
     }
 }
diff --git a/config/service_manager.config.php b/config/service_manager.config.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace AtansUser;
+
+return [
+    'invokables' => [
+        'atansuser_change_email_form'        => 'AtansUser\Form\ChangeEmailForm',
+        'atansuser_change_password_form'     => 'AtansUser\Form\ChangePasswordForm',
+        'atansuser_login_form'               => 'AtansUser\Form\LoginForm',
+        'atansuser_permission_search_form'   => 'AtansUser\Form\PermissionSearchForm',
+        'atansuser_role_search_form'         => 'AtansUser\Form\RoleSearchForm',
+        'atansuser_user_service'             => 'AtansUser\Service\User',
+        'atansuser_user_admin_service'       => 'AtansUser\Service\UserAdmin',
+        'atansuser_permission_admin_service' => 'AtansUser\Service\PermissionAdmin',
+        'atansuser_role_admin_service'       => 'AtansUser\Service\RoleAdmin',
+    ],
+    'factories' => [
+        'atansuser_module_options' => function ($sm) {
+            $config = $sm->get('config');
+            return new Options\ModuleOptions(isset($config['atansuser']) ? $config['atansuser'] : []);
+        },
+        'atansuser_register_form' => function ($sm) {
+            return new Form\RegisterForm($sm);
+        },
+        'atansuser_permission_form' => function ($sm) {
+            return new Form\PermissionForm($sm);
+        },
+        'atansuser_role_form' => function ($sm) {
+            return new Form\RoleForm($sm);
+        },
+        'atansuser_user_add_form' => function ($sm) {
+            return new Form\UserAddForm($sm);
+        },
+        'atansuser_user_edit_form' => function ($sm) {
+            return new Form\UserEditForm($sm);
+        },
+        'atansuser_user_search_form' => function ($sm) {
+            return new Form\UserSearchForm($sm);
+        },
+        'Zend\Authentication\AuthenticationService' => function ($sm) {
+            return $sm->get('doctrine.authenticationservice.orm_default');
+        },
+        'atansuser_user_status_value_options' => function ($sm) {
+            $translator = $sm->get('Translator');
+
+            return [
+                Entity\User::STATUS_ACTIVE   => $translator->translate('Active', self::TRANSLATOR_TEXT_DOMAIN),
+                Entity\User::STATUS_INACTIVE => $translator->translate('Inactive', self::TRANSLATOR_TEXT_DOMAIN),
+                Entity\User::STATUS_DELETED  => $translator->translate('Deleted', self::TRANSLATOR_TEXT_DOMAIN),
+            ];
+        },
+    ],
+];