@@ -179,7 +179,7 @@ |
||
179 | 179 | |
180 | 180 | /** |
181 | 181 | * @throws \RuntimeException |
182 | - * @return Collection |
|
182 | + * @return \Core\Entity\EntityInterface |
|
183 | 183 | */ |
184 | 184 | protected function getCollection() |
185 | 185 | { |
@@ -80,12 +80,12 @@ discard block |
||
80 | 80 | $collection[] = $this->newEntry; |
81 | 81 | $form = $this->buildForm($key, $this->newEntry); |
82 | 82 | $eventManager = $form->getEventManager(); |
83 | - $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) { |
|
83 | + $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) { |
|
84 | 84 | if (!$event->getParam('isValid')) { |
85 | 85 | $collection->removeElement($this->newEntry); |
86 | 86 | } |
87 | 87 | }); |
88 | - $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) { |
|
88 | + $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) { |
|
89 | 89 | $this->setupForm($event->getTarget(), $collection->indexOf($this->newEntry)); |
90 | 90 | }); |
91 | 91 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
120 | - /** |
|
120 | + /** |
|
121 | 121 | * @see \Core\Form\Element\ViewHelperProviderInterface::getViewHelper() |
122 | 122 | */ |
123 | 123 | public function getViewHelper() |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | */ |
222 | 222 | protected function setupForm(CoreForm $form, $key) |
223 | 223 | { |
224 | - $form->setAttribute('action', sprintf('?form=%s', $this->formatAction($key))) |
|
224 | + $form->setAttribute('action', sprintf('?form=%s', $this->formatAction($key))) |
|
225 | 225 | ->setAttribute('data-entry-key', $key); |
226 | 226 | } |
227 | 227 | } |
228 | 228 | \ No newline at end of file |
@@ -80,12 +80,12 @@ |
||
80 | 80 | $collection[] = $this->newEntry; |
81 | 81 | $form = $this->buildForm($key, $this->newEntry); |
82 | 82 | $eventManager = $form->getEventManager(); |
83 | - $eventManager->attach(CoreForm::EVENT_IS_VALID, function (Event $event) use ($collection) { |
|
83 | + $eventManager->attach(CoreForm::EVENT_IS_VALID, function(Event $event) use ($collection) { |
|
84 | 84 | if (!$event->getParam('isValid')) { |
85 | 85 | $collection->removeElement($this->newEntry); |
86 | 86 | } |
87 | 87 | }); |
88 | - $eventManager->attach(CoreForm::EVENT_PREPARE, function (Event $event) use ($collection) { |
|
88 | + $eventManager->attach(CoreForm::EVENT_PREPARE, function(Event $event) use ($collection) { |
|
89 | 89 | $this->setupForm($event->getTarget(), $collection->indexOf($this->newEntry)); |
90 | 90 | }); |
91 | 91 |
@@ -55,8 +55,8 @@ |
||
55 | 55 | { |
56 | 56 | /* @var $options \Applications\Options\ModuleOptions */ |
57 | 57 | $form->get($this->fileName)->setViewHelper('FormImageUpload') |
58 | - ->setMaxSize($options->getContactImageMaxSize()) |
|
59 | - ->setAllowedTypes($options->getContactImageMimeType()) |
|
60 | - ->setForm($form); |
|
58 | + ->setMaxSize($options->getContactImageMaxSize()) |
|
59 | + ->setAllowedTypes($options->getContactImageMimeType()) |
|
60 | + ->setForm($form); |
|
61 | 61 | } |
62 | 62 | } |
@@ -44,14 +44,14 @@ |
||
44 | 44 | $this->contact->setImage(null); |
45 | 45 | } |
46 | 46 | |
47 | - /** |
|
48 | - * @param Contact $contact |
|
49 | - * @return ContactImage |
|
50 | - */ |
|
51 | - public function setContact(Contact $contact) |
|
52 | - { |
|
53 | - $this->contact = $contact; |
|
47 | + /** |
|
48 | + * @param Contact $contact |
|
49 | + * @return ContactImage |
|
50 | + */ |
|
51 | + public function setContact(Contact $contact) |
|
52 | + { |
|
53 | + $this->contact = $contact; |
|
54 | 54 | |
55 | - return $this; |
|
56 | - } |
|
55 | + return $this; |
|
56 | + } |
|
57 | 57 | } |
@@ -33,7 +33,7 @@ |
||
33 | 33 | */ |
34 | 34 | public function getUri() |
35 | 35 | { |
36 | - return "/file/Cv.ContactImage/" . $this->id . "/" .urlencode($this->name); |
|
36 | + return "/file/Cv.ContactImage/".$this->id."/".urlencode($this->name); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
@@ -16,6 +16,6 @@ |
||
16 | 16 | $container = new \Core\Form\CollectionContainer('CvEmploymentForm', new \Cv\Entity\Employment()); |
17 | 17 | $container->setLabel(/*@translate */ 'Employment history'); |
18 | 18 | |
19 | - return $container; |
|
19 | + return $container; |
|
20 | 20 | } |
21 | 21 | } |
@@ -10,20 +10,20 @@ discard block |
||
10 | 10 | |
11 | 11 | return array( |
12 | 12 | 'doctrine' => array( |
13 | - 'driver' => array( |
|
13 | + 'driver' => array( |
|
14 | 14 | 'odm_default' => array( |
15 | 15 | 'drivers' => array( |
16 | 16 | 'Applications\Entity' => 'annotation', |
17 | 17 | ), |
18 | 18 | ), |
19 | 19 | 'annotation' => array( |
20 | - /* |
|
20 | + /* |
|
21 | 21 | * All drivers (except DriverChain) require paths to work on. You |
22 | 22 | * may set this value as a string (for a single path) or an array |
23 | 23 | * for multiple paths. |
24 | 24 | * example https://github.com/doctrine/DoctrineORMModule |
25 | 25 | */ |
26 | - 'paths' => array( __DIR__ . '/../src/Applications/Entity') |
|
26 | + 'paths' => array( __DIR__ . '/../src/Applications/Entity') |
|
27 | 27 | ), |
28 | 28 | ), |
29 | 29 | 'eventmanager' => array( |
@@ -63,15 +63,15 @@ discard block |
||
63 | 63 | 'Applications/Options/ModuleOptions' => 'Applications\Options\ModuleOptions' |
64 | 64 | ), |
65 | 65 | 'factories' => array( |
66 | - 'Applications/Options' => 'Applications\Factory\ModuleOptionsFactory', |
|
67 | - 'ApplicationRepository' => 'Applications\Repository\Service\ApplicationRepositoryFactory', |
|
68 | - 'ApplicationMapper' => 'Applications\Repository\Service\ApplicationMapperFactory', |
|
69 | - 'EducationMapper' => 'Applications\Repository\Service\EducationMapperFactory', |
|
70 | - 'Applications/Listener/ApplicationCreated' => 'Applications\Factory\Listener\EventApplicationCreatedFactory', |
|
71 | - 'Applications/Listener/ApplicationStatusChangePre' => 'Applications\Factory\Listener\StatusChangeFactory' |
|
66 | + 'Applications/Options' => 'Applications\Factory\ModuleOptionsFactory', |
|
67 | + 'ApplicationRepository' => 'Applications\Repository\Service\ApplicationRepositoryFactory', |
|
68 | + 'ApplicationMapper' => 'Applications\Repository\Service\ApplicationMapperFactory', |
|
69 | + 'EducationMapper' => 'Applications\Repository\Service\EducationMapperFactory', |
|
70 | + 'Applications/Listener/ApplicationCreated' => 'Applications\Factory\Listener\EventApplicationCreatedFactory', |
|
71 | + 'Applications/Listener/ApplicationStatusChangePre' => 'Applications\Factory\Listener\StatusChangeFactory' |
|
72 | 72 | ), |
73 | 73 | 'aliases' => [ |
74 | - 'Applications/Listener/ApplicationStatusChangePost' => 'Applications/Listener/ApplicationStatusChangePre' |
|
74 | + 'Applications/Listener/ApplicationStatusChangePost' => 'Applications/Listener/ApplicationStatusChangePre' |
|
75 | 75 | ] |
76 | 76 | ), |
77 | 77 | 'controllers' => array( |
@@ -169,25 +169,25 @@ discard block |
||
169 | 169 | ), |
170 | 170 | 'form_elements' => array( |
171 | 171 | 'invokables' => array( |
172 | - 'Applications/Mail' => 'Applications\Form\Mail', |
|
173 | - 'Applications/BaseFieldset' => 'Applications\Form\BaseFieldset', |
|
174 | - 'Applications/SettingsFieldset' => 'Applications\Form\SettingsFieldset', |
|
175 | - 'Applications/CommentForm' => 'Applications\Form\CommentForm', |
|
176 | - 'Applications/CommentFieldset' => 'Applications\Form\CommentFieldset', |
|
177 | - 'Applications/Apply' => 'Applications\Form\Apply', |
|
178 | - 'Applications/Contact' => 'Applications\Form\ContactContainer', |
|
179 | - 'Applications/Base' => 'Applications\Form\Base', |
|
180 | - 'Applications/Facts' => 'Applications\Form\Facts', |
|
181 | - 'Applications/FactsFieldset' => 'Applications\Form\FactsFieldset', |
|
182 | - 'Applications/Attributes' => 'Applications\Form\Attributes', |
|
183 | - 'Applications/Filter' => 'Applications\Form\FilterApplication', |
|
184 | - 'href' => 'Applications\Form\Element\Ref', |
|
185 | - ), |
|
172 | + 'Applications/Mail' => 'Applications\Form\Mail', |
|
173 | + 'Applications/BaseFieldset' => 'Applications\Form\BaseFieldset', |
|
174 | + 'Applications/SettingsFieldset' => 'Applications\Form\SettingsFieldset', |
|
175 | + 'Applications/CommentForm' => 'Applications\Form\CommentForm', |
|
176 | + 'Applications/CommentFieldset' => 'Applications\Form\CommentFieldset', |
|
177 | + 'Applications/Apply' => 'Applications\Form\Apply', |
|
178 | + 'Applications/Contact' => 'Applications\Form\ContactContainer', |
|
179 | + 'Applications/Base' => 'Applications\Form\Base', |
|
180 | + 'Applications/Facts' => 'Applications\Form\Facts', |
|
181 | + 'Applications/FactsFieldset' => 'Applications\Form\FactsFieldset', |
|
182 | + 'Applications/Attributes' => 'Applications\Form\Attributes', |
|
183 | + 'Applications/Filter' => 'Applications\Form\FilterApplication', |
|
184 | + 'href' => 'Applications\Form\Element\Ref', |
|
185 | + ), |
|
186 | 186 | 'factories' => array( |
187 | 187 | 'Applications/ContactImage' => 'Applications\Factory\Form\ContactImageFactory', |
188 | 188 | 'Applications/Attachments' => 'Applications\Factory\Form\AttachmentsFactory', |
189 | 189 | ), |
190 | - ), |
|
190 | + ), |
|
191 | 191 | |
192 | 192 | 'form_elements_config' => array( |
193 | 193 | 'Applications/Apply' => array( |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * for multiple paths. |
24 | 24 | * example https://github.com/doctrine/DoctrineORMModule |
25 | 25 | */ |
26 | - 'paths' => array( __DIR__ . '/../src/Applications/Entity') |
|
26 | + 'paths' => array(__DIR__.'/../src/Applications/Entity') |
|
27 | 27 | ), |
28 | 28 | ), |
29 | 29 | 'eventmanager' => array( |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | 'translation_file_patterns' => array( |
139 | 139 | array( |
140 | 140 | 'type' => 'gettext', |
141 | - 'base_dir' => __DIR__ . '/../language', |
|
141 | + 'base_dir' => __DIR__.'/../language', |
|
142 | 142 | 'pattern' => '%s.mo', |
143 | 143 | ), |
144 | 144 | ), |
@@ -146,16 +146,16 @@ discard block |
||
146 | 146 | // Configure the view service manager |
147 | 147 | 'view_manager' => array( |
148 | 148 | 'template_path_stack' => array( |
149 | - 'Applications' => __DIR__ . '/../view', |
|
149 | + 'Applications' => __DIR__.'/../view', |
|
150 | 150 | ), |
151 | 151 | 'template_map' => array( |
152 | - 'applications/error/not-found' => __DIR__ . '/../view/error/not-found.phtml', |
|
153 | - 'layout/apply' => __DIR__ . '/../view/layout/layout.phtml', |
|
154 | - 'applications/sidebar/manage' => __DIR__ . '/../view/sidebar/manage.phtml', |
|
155 | - 'applications/mail/forward' => __DIR__ . '/../view/mail/forward.phtml', |
|
156 | - 'applications/detail/pdf' => __DIR__ . '/../view/applications/manage/detail.pdf.phtml', |
|
157 | - 'applications/index/disclaimer' => __DIR__ . '/../view/applications/index/disclaimer.phtml', |
|
158 | - 'content/applications-privacy-policy' => __DIR__ . '/../view/applications/index/disclaimer.phtml', |
|
152 | + 'applications/error/not-found' => __DIR__.'/../view/error/not-found.phtml', |
|
153 | + 'layout/apply' => __DIR__.'/../view/layout/layout.phtml', |
|
154 | + 'applications/sidebar/manage' => __DIR__.'/../view/sidebar/manage.phtml', |
|
155 | + 'applications/mail/forward' => __DIR__.'/../view/mail/forward.phtml', |
|
156 | + 'applications/detail/pdf' => __DIR__.'/../view/applications/manage/detail.pdf.phtml', |
|
157 | + 'applications/index/disclaimer' => __DIR__.'/../view/applications/index/disclaimer.phtml', |
|
158 | + 'content/applications-privacy-policy' => __DIR__.'/../view/applications/index/disclaimer.phtml', |
|
159 | 159 | ) |
160 | 160 | ), |
161 | 161 | 'view_helpers' => array( |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $translator = $this->getTranslator(); |
56 | 56 | $formContainerHelper = $view->formContainer(); |
57 | 57 | $formsMarkup = ''; |
58 | - $formTemplateWrapper = '<div class="form-collection-container-form"> |
|
58 | + $formTemplateWrapper = '<div class="form-collection-container-form"> |
|
59 | 59 | <button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button> |
60 | 60 | %s |
61 | 61 | </div>'; |
@@ -66,16 +66,16 @@ discard block |
||
66 | 66 | } |
67 | 67 | |
68 | 68 | $templateForm = $container->getTemplateForm(); |
69 | - $templateMarkup = sprintf( |
|
69 | + $templateMarkup = sprintf( |
|
70 | 70 | $view->formCollection()->getTemplateWrapper(), |
71 | 71 | $view->escapeHtmlAttr(sprintf($formTemplateWrapper, $formContainerHelper->renderElement($templateForm, $layout, $parameter))) |
72 | 72 | ); |
73 | 73 | |
74 | - return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s"> |
|
74 | + return sprintf('<div class="form-collection-container" data-new-entry-key="%s" data-remove-action="%s" data-remove-question="%s"> |
|
75 | 75 | <h3>%s</h3> |
76 | 76 | %s%s%s |
77 | 77 | </div>', |
78 | - CollectionContainer::NEW_ENTRY, |
|
78 | + CollectionContainer::NEW_ENTRY, |
|
79 | 79 | $container->formatAction('remove'), |
80 | 80 | $translator->translate('Really remove?'), |
81 | 81 | $container->getLabel(), |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | $formContainerHelper = $view->formContainer(); |
57 | 57 | $formsMarkup = ''; |
58 | 58 | $formTemplateWrapper = '<div class="form-collection-container-form"> |
59 | - <button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove') . '</button> |
|
59 | + <button type="button" class="btn btn-sm btn-danger pull-right form-collection-container-remove-button">' . $translator->translate('Remove').'</button> |
|
60 | 60 | %s |
61 | 61 | </div>'; |
62 | 62 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $container->getLabel(), |
82 | 82 | $formsMarkup, |
83 | 83 | $templateMarkup, |
84 | - '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button">' . sprintf($translator->translate('Add %s'), $container->getLabel()) . '</button></div>' |
|
84 | + '<div class="form-collection-container-add-wrapper"><button type="button" class="btn btn-success form-collection-container-add-button">'.sprintf($translator->translate('Add %s'), $container->getLabel()).'</button></div>' |
|
85 | 85 | ); |
86 | 86 | } |
87 | 87 | } |
@@ -60,10 +60,12 @@ |
||
60 | 60 | %s |
61 | 61 | </div>'; |
62 | 62 | |
63 | - foreach ($container as $form) /* @var $form \Zend\Form\Form */ |
|
63 | + foreach ($container as $form) { |
|
64 | + /* @var $form \Zend\Form\Form */ |
|
64 | 65 | { |
65 | 66 | $formsMarkup .= sprintf($formTemplateWrapper, $formContainerHelper->renderElement($form, $layout, $parameter)); |
66 | 67 | } |
68 | + } |
|
67 | 69 | |
68 | 70 | $templateForm = $container->getTemplateForm(); |
69 | 71 | $templateMarkup = sprintf( |
@@ -16,6 +16,6 @@ |
||
16 | 16 | $container = new \Core\Form\CollectionContainer('CvEmploymentForm', new \Cv\Entity\Employment()); |
17 | 17 | $container->setLabel(/*@translate */ 'Employment history'); |
18 | 18 | |
19 | - return $container; |
|
19 | + return $container; |
|
20 | 20 | } |
21 | 21 | } |
@@ -16,6 +16,6 @@ |
||
16 | 16 | $container = new \Core\Form\CollectionContainer('CvEmploymentForm', new \Cv\Entity\Employment()); |
17 | 17 | $container->setLabel(/*@translate */ 'Employment history'); |
18 | 18 | |
19 | - return $container; |
|
19 | + return $container; |
|
20 | 20 | } |
21 | 21 | } |
@@ -32,9 +32,9 @@ |
||
32 | 32 | public function init() |
33 | 33 | { |
34 | 34 | $this->setName('preferredJob') |
35 | - ->setHydrator(new EntityHydrator()) |
|
36 | - ->setObject(new PreferredJob()) |
|
37 | - ->setLabel('Desired Employment'); |
|
35 | + ->setHydrator(new EntityHydrator()) |
|
36 | + ->setObject(new PreferredJob()) |
|
37 | + ->setLabel('Desired Employment'); |
|
38 | 38 | |
39 | 39 | $this->add( |
40 | 40 | array( |