@@ -38,15 +38,15 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | protected $renderedBody; |
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * HTMLTemplateMessage constructor. |
|
| 43 | - * |
|
| 44 | - * @param ContainerInterface $serviceManager |
|
| 45 | - * @param array $options |
|
| 46 | - */ |
|
| 41 | + /** |
|
| 42 | + * HTMLTemplateMessage constructor. |
|
| 43 | + * |
|
| 44 | + * @param ContainerInterface $serviceManager |
|
| 45 | + * @param array $options |
|
| 46 | + */ |
|
| 47 | 47 | public function __construct( |
| 48 | - ContainerInterface $serviceManager, |
|
| 49 | - array $options = array() |
|
| 48 | + ContainerInterface $serviceManager, |
|
| 49 | + array $options = array() |
|
| 50 | 50 | ) |
| 51 | 51 | { |
| 52 | 52 | // @TODO make this multipart |
@@ -266,11 +266,11 @@ discard block |
||
| 266 | 266 | return $this->renderedBody; |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | - /** |
|
| 270 | - * @param ContainerInterface $container |
|
| 271 | - * |
|
| 272 | - * @return static |
|
| 273 | - */ |
|
| 269 | + /** |
|
| 270 | + * @param ContainerInterface $container |
|
| 271 | + * |
|
| 272 | + * @return static |
|
| 273 | + */ |
|
| 274 | 274 | public static function factory(ContainerInterface $container) |
| 275 | 275 | { |
| 276 | 276 | return new static($container); |
@@ -219,10 +219,10 @@ |
||
| 219 | 219 | ], |
| 220 | 220 | |
| 221 | 221 | 'input_filters' => [ |
| 222 | - 'aliases' => [ |
|
| 223 | - 'Cv/Employment' => Employment::class, |
|
| 224 | - 'Cv/Education' => Education::class |
|
| 225 | - ], |
|
| 222 | + 'aliases' => [ |
|
| 223 | + 'Cv/Employment' => Employment::class, |
|
| 224 | + 'Cv/Education' => Education::class |
|
| 225 | + ], |
|
| 226 | 226 | 'invokables' => [ |
| 227 | 227 | 'Cv/Employment' => Employment::class, |
| 228 | 228 | 'Cv/Education' => Education::class |
@@ -24,12 +24,12 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | class PaginationQueryFactory implements FactoryInterface |
| 26 | 26 | { |
| 27 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 28 | - { |
|
| 29 | - $auth = $container->get('AuthenticationService'); |
|
| 30 | - $user = $auth->hasIdentity() ? $auth->getUser() : null; |
|
| 31 | - $filter = new PaginationQuery($user); |
|
| 27 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 28 | + { |
|
| 29 | + $auth = $container->get('AuthenticationService'); |
|
| 30 | + $user = $auth->hasIdentity() ? $auth->getUser() : null; |
|
| 31 | + $filter = new PaginationQuery($user); |
|
| 32 | 32 | |
| 33 | - return $filter; |
|
| 34 | - } |
|
| 33 | + return $filter; |
|
| 34 | + } |
|
| 35 | 35 | } |
@@ -28,27 +28,27 @@ |
||
| 28 | 28 | */ |
| 29 | 29 | class ManageController extends AbstractActionController |
| 30 | 30 | { |
| 31 | - private $repositories; |
|
| 31 | + private $repositories; |
|
| 32 | 32 | |
| 33 | - private $formElements; |
|
| 33 | + private $formElements; |
|
| 34 | 34 | |
| 35 | - private $viewHelper; |
|
| 35 | + private $viewHelper; |
|
| 36 | 36 | |
| 37 | - static public function factory(ContainerInterface $container) |
|
| 38 | - { |
|
| 39 | - $controller = new static(); |
|
| 40 | - $controller->init($container); |
|
| 41 | - return $controller; |
|
| 42 | - } |
|
| 37 | + static public function factory(ContainerInterface $container) |
|
| 38 | + { |
|
| 39 | + $controller = new static(); |
|
| 40 | + $controller->init($container); |
|
| 41 | + return $controller; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - public function init(ContainerInterface $container) |
|
| 45 | - { |
|
| 46 | - $this->repositories = $container->get('repositories'); |
|
| 47 | - $this->formElements = $container->get('FormElementManager'); |
|
| 48 | - $this->viewHelper = $container->get('ViewHelperManager'); |
|
| 49 | - } |
|
| 44 | + public function init(ContainerInterface $container) |
|
| 45 | + { |
|
| 46 | + $this->repositories = $container->get('repositories'); |
|
| 47 | + $this->formElements = $container->get('FormElementManager'); |
|
| 48 | + $this->viewHelper = $container->get('ViewHelperManager'); |
|
| 49 | + } |
|
| 50 | 50 | |
| 51 | - public function formAction() |
|
| 51 | + public function formAction() |
|
| 52 | 52 | { |
| 53 | 53 | $repositories = $this->repositories; |
| 54 | 54 | /* @var $cvRepository \Cv\Repository\Cv */ |
@@ -25,8 +25,8 @@ discard block |
||
| 25 | 25 | public function init() |
| 26 | 26 | { |
| 27 | 27 | $this->setName('employment') |
| 28 | - ->setHydrator(new EntityHydrator()) |
|
| 29 | - ->setObject(new EmploymentEntity()); |
|
| 28 | + ->setHydrator(new EntityHydrator()) |
|
| 29 | + ->setObject(new EmploymentEntity()); |
|
| 30 | 30 | |
| 31 | 31 | $this->add( |
| 32 | 32 | array( |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | { |
| 89 | 89 | return [ |
| 90 | 90 | //'type' => 'Cv/Employment' |
| 91 | - 'type' => Employment::class |
|
| 91 | + 'type' => Employment::class |
|
| 92 | 92 | ]; |
| 93 | 93 | } |
| 94 | 94 | |
@@ -14,133 +14,133 @@ |
||
| 14 | 14 | |
| 15 | 15 | return [ |
| 16 | 16 | |
| 17 | - 'doctrine' => [ |
|
| 18 | - 'driver' => [ |
|
| 19 | - 'odm_default' => [ |
|
| 20 | - 'drivers' => [ |
|
| 21 | - 'Settings\Entity' => 'annotation', |
|
| 22 | - ], |
|
| 23 | - ], |
|
| 24 | - ], |
|
| 25 | - 'eventmanager' => [ |
|
| 26 | - 'odm_default' => [ |
|
| 27 | - 'subscribers' => [ |
|
| 28 | - 'Settings/InjectEntityResolverListener', |
|
| 29 | - ], |
|
| 30 | - ], |
|
| 31 | - ], |
|
| 32 | - ], |
|
| 17 | + 'doctrine' => [ |
|
| 18 | + 'driver' => [ |
|
| 19 | + 'odm_default' => [ |
|
| 20 | + 'drivers' => [ |
|
| 21 | + 'Settings\Entity' => 'annotation', |
|
| 22 | + ], |
|
| 23 | + ], |
|
| 24 | + ], |
|
| 25 | + 'eventmanager' => [ |
|
| 26 | + 'odm_default' => [ |
|
| 27 | + 'subscribers' => [ |
|
| 28 | + 'Settings/InjectEntityResolverListener', |
|
| 29 | + ], |
|
| 30 | + ], |
|
| 31 | + ], |
|
| 32 | + ], |
|
| 33 | 33 | |
| 34 | 34 | |
| 35 | - // Translations |
|
| 36 | - 'translator' => [ |
|
| 37 | - 'translation_file_patterns' => [ |
|
| 38 | - [ |
|
| 39 | - 'type' => 'gettext', |
|
| 40 | - 'base_dir' => __DIR__ . '/../language', |
|
| 41 | - 'pattern' => '%s.mo', |
|
| 42 | - ], |
|
| 43 | - ], |
|
| 44 | - ], |
|
| 45 | - // Routes |
|
| 46 | - 'router' => [ |
|
| 47 | - 'routes' => [ |
|
| 48 | - 'lang' => [ |
|
| 49 | - 'child_routes' => [ |
|
| 50 | - 'settings' => [ |
|
| 51 | - 'type' => 'Segment', |
|
| 52 | - 'options' => [ |
|
| 53 | - 'route' => '/settings[/:module]', |
|
| 54 | - 'defaults' => [ |
|
| 55 | - 'controller' => 'Settings\Controller\Index', |
|
| 56 | - 'action' => 'index', |
|
| 57 | - 'module' => 'Core', |
|
| 58 | - ], |
|
| 59 | - ], |
|
| 60 | - 'may_terminate' => true, |
|
| 61 | - ], |
|
| 62 | - ], |
|
| 63 | - ], |
|
| 64 | - ], |
|
| 65 | - ], |
|
| 35 | + // Translations |
|
| 36 | + 'translator' => [ |
|
| 37 | + 'translation_file_patterns' => [ |
|
| 38 | + [ |
|
| 39 | + 'type' => 'gettext', |
|
| 40 | + 'base_dir' => __DIR__ . '/../language', |
|
| 41 | + 'pattern' => '%s.mo', |
|
| 42 | + ], |
|
| 43 | + ], |
|
| 44 | + ], |
|
| 45 | + // Routes |
|
| 46 | + 'router' => [ |
|
| 47 | + 'routes' => [ |
|
| 48 | + 'lang' => [ |
|
| 49 | + 'child_routes' => [ |
|
| 50 | + 'settings' => [ |
|
| 51 | + 'type' => 'Segment', |
|
| 52 | + 'options' => [ |
|
| 53 | + 'route' => '/settings[/:module]', |
|
| 54 | + 'defaults' => [ |
|
| 55 | + 'controller' => 'Settings\Controller\Index', |
|
| 56 | + 'action' => 'index', |
|
| 57 | + 'module' => 'Core', |
|
| 58 | + ], |
|
| 59 | + ], |
|
| 60 | + 'may_terminate' => true, |
|
| 61 | + ], |
|
| 62 | + ], |
|
| 63 | + ], |
|
| 64 | + ], |
|
| 65 | + ], |
|
| 66 | 66 | |
| 67 | - 'acl' => ['rules' => [ |
|
| 68 | - 'user' => [ |
|
| 69 | - 'allow' => [ |
|
| 70 | - 'route/lang/settings', |
|
| 71 | - 'Settings\Controller\Index', |
|
| 72 | - ], |
|
| 73 | - ], |
|
| 74 | - ]], |
|
| 75 | - 'navigation' => [ |
|
| 76 | - 'default' => [ |
|
| 77 | - 'settings' => [ |
|
| 78 | - 'label' => /*@translate*/ 'Settings', |
|
| 79 | - 'route' => 'lang/settings', |
|
| 80 | - 'resource' => 'route/lang/settings', |
|
| 81 | - 'order' => 100, |
|
| 82 | - 'params' => ['module' => null], |
|
| 83 | - ], |
|
| 84 | - ], |
|
| 85 | - ], |
|
| 67 | + 'acl' => ['rules' => [ |
|
| 68 | + 'user' => [ |
|
| 69 | + 'allow' => [ |
|
| 70 | + 'route/lang/settings', |
|
| 71 | + 'Settings\Controller\Index', |
|
| 72 | + ], |
|
| 73 | + ], |
|
| 74 | + ]], |
|
| 75 | + 'navigation' => [ |
|
| 76 | + 'default' => [ |
|
| 77 | + 'settings' => [ |
|
| 78 | + 'label' => /*@translate*/ 'Settings', |
|
| 79 | + 'route' => 'lang/settings', |
|
| 80 | + 'resource' => 'route/lang/settings', |
|
| 81 | + 'order' => 100, |
|
| 82 | + 'params' => ['module' => null], |
|
| 83 | + ], |
|
| 84 | + ], |
|
| 85 | + ], |
|
| 86 | 86 | |
| 87 | - // Configuration of the controller service manager (Which loads controllers) |
|
| 88 | - 'controllers' => [ |
|
| 89 | - 'factories' => [ |
|
| 90 | - 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory'] |
|
| 91 | - ], |
|
| 92 | - ], |
|
| 87 | + // Configuration of the controller service manager (Which loads controllers) |
|
| 88 | + 'controllers' => [ |
|
| 89 | + 'factories' => [ |
|
| 90 | + 'Settings\Controller\Index' => [\Settings\Controller\IndexController::class,'factory'] |
|
| 91 | + ], |
|
| 92 | + ], |
|
| 93 | 93 | |
| 94 | - // Configure the view service manager |
|
| 95 | - 'view_manager' => [ |
|
| 96 | - // Map template to files. Speeds up the lookup through the template stack. |
|
| 97 | - 'template_map' => [ |
|
| 98 | - ], |
|
| 94 | + // Configure the view service manager |
|
| 95 | + 'view_manager' => [ |
|
| 96 | + // Map template to files. Speeds up the lookup through the template stack. |
|
| 97 | + 'template_map' => [ |
|
| 98 | + ], |
|
| 99 | 99 | |
| 100 | - // Where to look for view templates not mapped above |
|
| 101 | - 'template_path_stack' => [ |
|
| 102 | - __DIR__ . '/../view', |
|
| 103 | - ], |
|
| 104 | - ], |
|
| 100 | + // Where to look for view templates not mapped above |
|
| 101 | + 'template_path_stack' => [ |
|
| 102 | + __DIR__ . '/../view', |
|
| 103 | + ], |
|
| 104 | + ], |
|
| 105 | 105 | |
| 106 | - 'view_helpers' => [ |
|
| 107 | - 'invokables' => [ |
|
| 108 | - 'Settings/FormDisableElementsCapableFormSettings' => 'Settings\Form\View\Helper\FormDisableElementsCapableFormSettings', |
|
| 109 | - ], |
|
| 110 | - 'factories' => [ |
|
| 111 | - ], |
|
| 112 | - ], |
|
| 106 | + 'view_helpers' => [ |
|
| 107 | + 'invokables' => [ |
|
| 108 | + 'Settings/FormDisableElementsCapableFormSettings' => 'Settings\Form\View\Helper\FormDisableElementsCapableFormSettings', |
|
| 109 | + ], |
|
| 110 | + 'factories' => [ |
|
| 111 | + ], |
|
| 112 | + ], |
|
| 113 | 113 | |
| 114 | - 'service_manager' => [ |
|
| 115 | - 'factories' => [ |
|
| 116 | - 'Settings' => '\Settings\Settings\SettingsFactory', |
|
| 117 | - 'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory', |
|
| 118 | - 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'], |
|
| 119 | - ], |
|
| 120 | - 'initializers' => [], |
|
| 121 | - 'shared' => [], |
|
| 122 | - 'aliases' => [], |
|
| 123 | - ], |
|
| 114 | + 'service_manager' => [ |
|
| 115 | + 'factories' => [ |
|
| 116 | + 'Settings' => '\Settings\Settings\SettingsFactory', |
|
| 117 | + 'Settings/EntityResolver' => '\Settings\Repository\SettingsEntityResolverFactory', |
|
| 118 | + 'Settings/InjectEntityResolverListener' => [\Settings\Repository\Event\InjectSettingsEntityResolverListener::class,'factory'], |
|
| 119 | + ], |
|
| 120 | + 'initializers' => [], |
|
| 121 | + 'shared' => [], |
|
| 122 | + 'aliases' => [], |
|
| 123 | + ], |
|
| 124 | 124 | |
| 125 | - 'controller_plugins' => [ |
|
| 126 | - 'factories' => ['settings' => '\Settings\Controller\Plugin\SettingsFactory'], |
|
| 127 | - ], |
|
| 125 | + 'controller_plugins' => [ |
|
| 126 | + 'factories' => ['settings' => '\Settings\Controller\Plugin\SettingsFactory'], |
|
| 127 | + ], |
|
| 128 | 128 | |
| 129 | - 'form_elements' => [ |
|
| 130 | - 'factories' => [ |
|
| 131 | - 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'], |
|
| 132 | - 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'], |
|
| 133 | - 'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class, |
|
| 134 | - ], |
|
| 135 | - 'aliases' => [ |
|
| 136 | - ], |
|
| 137 | - ], |
|
| 129 | + 'form_elements' => [ |
|
| 130 | + 'factories' => [ |
|
| 131 | + 'Settings/Form' => [\Settings\Form\AbstractSettingsForm::class,'factory'], |
|
| 132 | + 'Settings/DisableElementsCapableFormSettingsFieldset' => [\Settings\Form\DisableElementsCapableFormSettingsFieldset::class,'factory'], |
|
| 133 | + 'Settings/Fieldset' => \Settings\Form\Factory\SettingsFieldsetFactory::class, |
|
| 134 | + ], |
|
| 135 | + 'aliases' => [ |
|
| 136 | + ], |
|
| 137 | + ], |
|
| 138 | 138 | |
| 139 | - 'filters' => [ |
|
| 140 | - 'invokables' => [ |
|
| 141 | - 'Settings/Filter/DisableElementsCapableFormSettings' => \Settings\Form\Filter\DisableElementsCapableFormSettings::class, |
|
| 142 | - ] |
|
| 143 | - ] |
|
| 139 | + 'filters' => [ |
|
| 140 | + 'invokables' => [ |
|
| 141 | + 'Settings/Filter/DisableElementsCapableFormSettings' => \Settings\Form\Filter\DisableElementsCapableFormSettings::class, |
|
| 142 | + ] |
|
| 143 | + ] |
|
| 144 | 144 | |
| 145 | 145 | |
| 146 | 146 | ]; |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | public function onBootstrap(MvcEvent $e) |
| 31 | 31 | { |
| 32 | - // we attach with wildcard events name |
|
| 32 | + // we attach with wildcard events name |
|
| 33 | 33 | $events = $e->getApplication()->getEventManager(); |
| 34 | 34 | $events->attach( |
| 35 | 35 | MvcEvent::EVENT_RENDER, |
@@ -19,23 +19,23 @@ |
||
| 19 | 19 | |
| 20 | 20 | class SettingsEntityResolverFactory implements FactoryInterface |
| 21 | 21 | { |
| 22 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 23 | - { |
|
| 24 | - $moduleManager = $container->get('ModuleManager'); |
|
| 25 | - $config = $container->get('Config'); |
|
| 22 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 23 | + { |
|
| 24 | + $moduleManager = $container->get('ModuleManager'); |
|
| 25 | + $config = $container->get('Config'); |
|
| 26 | 26 | |
| 27 | - $map = array(); |
|
| 28 | - foreach (array_keys($moduleManager->getLoadedModules()) as $module) { |
|
| 29 | - $map[$module] = isset($config[$module]['settings']['entity']) |
|
| 30 | - ? $config[$module]['settings']['entity'] |
|
| 31 | - : '\Settings\Entity\ModuleSettingsContainer'; |
|
| 32 | - } |
|
| 27 | + $map = array(); |
|
| 28 | + foreach (array_keys($moduleManager->getLoadedModules()) as $module) { |
|
| 29 | + $map[$module] = isset($config[$module]['settings']['entity']) |
|
| 30 | + ? $config[$module]['settings']['entity'] |
|
| 31 | + : '\Settings\Entity\ModuleSettingsContainer'; |
|
| 32 | + } |
|
| 33 | 33 | |
| 34 | - $resolver = new SettingsEntityResolver($map); |
|
| 35 | - return $resolver; |
|
| 36 | - } |
|
| 34 | + $resolver = new SettingsEntityResolver($map); |
|
| 35 | + return $resolver; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - public function createService(ServiceLocatorInterface $serviceLocator) |
|
| 38 | + public function createService(ServiceLocatorInterface $serviceLocator) |
|
| 39 | 39 | { |
| 40 | 40 | |
| 41 | 41 | } |
@@ -11,17 +11,17 @@ |
||
| 11 | 11 | |
| 12 | 12 | class SettingsFactory implements FactoryInterface |
| 13 | 13 | { |
| 14 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 15 | - { |
|
| 16 | - $settings = new Settings(); |
|
| 17 | - $settings->setServiceLocator($container); |
|
| 18 | - $settings->setUserRepository($container->get('RepositoryManager')->get('User')); |
|
| 19 | - $config = $container->get('Config'); |
|
| 14 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
| 15 | + { |
|
| 16 | + $settings = new Settings(); |
|
| 17 | + $settings->setServiceLocator($container); |
|
| 18 | + $settings->setUserRepository($container->get('RepositoryManager')->get('User')); |
|
| 19 | + $config = $container->get('Config'); |
|
| 20 | 20 | |
| 21 | - // put on the Listener for saving the entity |
|
| 22 | - $application = $container->get('Application'); |
|
| 23 | - $events = $application->getEventManager(); |
|
| 24 | - $events->attach('postDispatch', array($settings, 'onPostDispatch')); |
|
| 25 | - return $settings; |
|
| 26 | - } |
|
| 21 | + // put on the Listener for saving the entity |
|
| 22 | + $application = $container->get('Application'); |
|
| 23 | + $events = $application->getEventManager(); |
|
| 24 | + $events->attach('postDispatch', array($settings, 'onPostDispatch')); |
|
| 25 | + return $settings; |
|
| 26 | + } |
|
| 27 | 27 | } |