@@ -24,130 +24,130 @@ |
||
24 | 24 | */ |
25 | 25 | class Select2Context extends RawMinkContext implements Context |
26 | 26 | { |
27 | - protected $timeout = 5; |
|
27 | + protected $timeout = 5; |
|
28 | 28 | |
29 | - /** |
|
30 | - * Fills in Select2 field with specified |
|
31 | - * |
|
32 | - * @When /^(?:|I )fill in select2 "(?P<field>(?:[^"]|\\")*)" with "(?P<value>(?:[^"]|\\")*)"$/ |
|
33 | - * @When /^(?:|I )fill in select2 "(?P<value>(?:[^"]|\\")*)" for "(?P<field>(?:[^"]|\\")*)"$/ |
|
34 | - */ |
|
35 | - public function iFillInSelect2Field($field, $value) |
|
36 | - { |
|
37 | - $page = $this->getSession()->getPage(); |
|
29 | + /** |
|
30 | + * Fills in Select2 field with specified |
|
31 | + * |
|
32 | + * @When /^(?:|I )fill in select2 "(?P<field>(?:[^"]|\\")*)" with "(?P<value>(?:[^"]|\\")*)"$/ |
|
33 | + * @When /^(?:|I )fill in select2 "(?P<value>(?:[^"]|\\")*)" for "(?P<field>(?:[^"]|\\")*)"$/ |
|
34 | + */ |
|
35 | + public function iFillInSelect2Field($field, $value) |
|
36 | + { |
|
37 | + $page = $this->getSession()->getPage(); |
|
38 | 38 | |
39 | - $this->openField($page, $field); |
|
40 | - $this->selectValue($page, $field, $value, $this->timeout); |
|
41 | - } |
|
39 | + $this->openField($page, $field); |
|
40 | + $this->selectValue($page, $field, $value, $this->timeout); |
|
41 | + } |
|
42 | 42 | |
43 | - /** |
|
44 | - * @When I fill in select2 search :field with :search and I choose :choice |
|
45 | - * @param $field |
|
46 | - * @param $value |
|
47 | - */ |
|
48 | - public function iFillInSelect2FieldWith($field,$search,$choice=null) |
|
49 | - { |
|
50 | - $page = $this->getSession()->getPage(); |
|
51 | - $this->openField($page, $field); |
|
52 | - $this->fillSearchField($page,$field,$search); |
|
53 | - $this->selectValue($page, $field, $choice); |
|
54 | - } |
|
43 | + /** |
|
44 | + * @When I fill in select2 search :field with :search and I choose :choice |
|
45 | + * @param $field |
|
46 | + * @param $value |
|
47 | + */ |
|
48 | + public function iFillInSelect2FieldWith($field,$search,$choice=null) |
|
49 | + { |
|
50 | + $page = $this->getSession()->getPage(); |
|
51 | + $this->openField($page, $field); |
|
52 | + $this->fillSearchField($page,$field,$search); |
|
53 | + $this->selectValue($page, $field, $choice); |
|
54 | + } |
|
55 | 55 | |
56 | - /** |
|
57 | - * Fill Select2 search field |
|
58 | - * |
|
59 | - * @param DocumentElement $page |
|
60 | - * @param string $field |
|
61 | - * @param string $value |
|
62 | - * @throws \Exception |
|
63 | - */ |
|
64 | - private function fillSearchField(DocumentElement $page, $field, $value) |
|
65 | - { |
|
66 | - $driver = $this->getSession()->getDriver(); |
|
67 | - if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) { |
|
68 | - // Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188 |
|
56 | + /** |
|
57 | + * Fill Select2 search field |
|
58 | + * |
|
59 | + * @param DocumentElement $page |
|
60 | + * @param string $field |
|
61 | + * @param string $value |
|
62 | + * @throws \Exception |
|
63 | + */ |
|
64 | + private function fillSearchField(DocumentElement $page, $field, $value) |
|
65 | + { |
|
66 | + $driver = $this->getSession()->getDriver(); |
|
67 | + if ('Behat\Mink\Driver\Selenium2Driver' === get_class($driver)) { |
|
68 | + // Can't use `$this->getSession()->getPage()->find()` because of https://github.com/minkphp/MinkSelenium2Driver/issues/188 |
|
69 | 69 | |
70 | - $element = $page->find('css','.select2-container--open .select2-search__field'); |
|
71 | - $xpath = $element->getXpath(); |
|
72 | - $select2Input = $this->getSession() |
|
73 | - ->getDriver() |
|
74 | - ->getWebDriverSession() |
|
75 | - ->element('xpath',$xpath) |
|
76 | - //->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]") |
|
77 | - ; |
|
78 | - if (!$select2Input) { |
|
79 | - throw new \Exception(sprintf('No field "%s" found', $field)); |
|
80 | - } |
|
70 | + $element = $page->find('css','.select2-container--open .select2-search__field'); |
|
71 | + $xpath = $element->getXpath(); |
|
72 | + $select2Input = $this->getSession() |
|
73 | + ->getDriver() |
|
74 | + ->getWebDriverSession() |
|
75 | + ->element('xpath',$xpath) |
|
76 | + //->element('xpath', "//html/descendant-or-self::*[@class and contains(concat(' ', normalize-space(@class), ' '), ' select2-search__field ')]") |
|
77 | + ; |
|
78 | + if (!$select2Input) { |
|
79 | + throw new \Exception(sprintf('No field "%s" found', $field)); |
|
80 | + } |
|
81 | 81 | |
82 | - $select2Input->postValue(['value' => [$value]]); |
|
83 | - } else { |
|
84 | - $select2Input = $page->find('css', '.select2-search__field'); |
|
85 | - if (!$select2Input) { |
|
86 | - throw new \Exception(sprintf('No input found for "%s"', $field)); |
|
87 | - } |
|
88 | - $select2Input->setValue($value); |
|
89 | - } |
|
82 | + $select2Input->postValue(['value' => [$value]]); |
|
83 | + } else { |
|
84 | + $select2Input = $page->find('css', '.select2-search__field'); |
|
85 | + if (!$select2Input) { |
|
86 | + throw new \Exception(sprintf('No input found for "%s"', $field)); |
|
87 | + } |
|
88 | + $select2Input->setValue($value); |
|
89 | + } |
|
90 | 90 | |
91 | - $this->waitForLoadingResults($this->timeout); |
|
92 | - } |
|
91 | + $this->waitForLoadingResults($this->timeout); |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * Select value in choice list |
|
96 | - * |
|
97 | - * @param DocumentElement $page |
|
98 | - * @param string $field |
|
99 | - * @param string $value |
|
100 | - * @param int $time |
|
101 | - * @throws \Exception |
|
102 | - */ |
|
103 | - private function selectValue(DocumentElement $page, $field, $value, $time=5) |
|
104 | - { |
|
105 | - $this->waitForLoadingResults($time); |
|
94 | + /** |
|
95 | + * Select value in choice list |
|
96 | + * |
|
97 | + * @param DocumentElement $page |
|
98 | + * @param string $field |
|
99 | + * @param string $value |
|
100 | + * @param int $time |
|
101 | + * @throws \Exception |
|
102 | + */ |
|
103 | + private function selectValue(DocumentElement $page, $field, $value, $time=5) |
|
104 | + { |
|
105 | + $this->waitForLoadingResults($time); |
|
106 | 106 | |
107 | - $chosenResults = $page->findAll('css', '.select2-results li'); |
|
108 | - foreach ($chosenResults as $result) { |
|
109 | - $text = $result->getText(); |
|
110 | - if (false!==strpos($text,$value)) { |
|
111 | - $result->click(); |
|
112 | - return; |
|
113 | - } |
|
114 | - } |
|
107 | + $chosenResults = $page->findAll('css', '.select2-results li'); |
|
108 | + foreach ($chosenResults as $result) { |
|
109 | + $text = $result->getText(); |
|
110 | + if (false!==strpos($text,$value)) { |
|
111 | + $result->click(); |
|
112 | + return; |
|
113 | + } |
|
114 | + } |
|
115 | 115 | |
116 | - throw new \Exception(sprintf('Value "%s" not found for "%s"', $value, $field)); |
|
117 | - } |
|
116 | + throw new \Exception(sprintf('Value "%s" not found for "%s"', $value, $field)); |
|
117 | + } |
|
118 | 118 | |
119 | - private function openField(DocumentElement $page, $field) |
|
120 | - { |
|
121 | - $inputField = $page->find('css',$field); |
|
122 | - if(!$inputField){ |
|
123 | - $fieldName = sprintf('select[name="%s"] + .select2-container', $field); |
|
124 | - $inputField = $page->find('css', $fieldName); |
|
125 | - } |
|
126 | - if (!$inputField) { |
|
127 | - throw new \Exception(sprintf('No field "%s" found', $field)); |
|
128 | - } |
|
119 | + private function openField(DocumentElement $page, $field) |
|
120 | + { |
|
121 | + $inputField = $page->find('css',$field); |
|
122 | + if(!$inputField){ |
|
123 | + $fieldName = sprintf('select[name="%s"] + .select2-container', $field); |
|
124 | + $inputField = $page->find('css', $fieldName); |
|
125 | + } |
|
126 | + if (!$inputField) { |
|
127 | + throw new \Exception(sprintf('No field "%s" found', $field)); |
|
128 | + } |
|
129 | 129 | |
130 | - $choice = $inputField->find('css', '.select2-selection'); |
|
131 | - if (!$choice) { |
|
132 | - throw new \Exception(sprintf('No select2 choice found for "%s"', $field)); |
|
133 | - } |
|
134 | - $choice->press(); |
|
135 | - } |
|
130 | + $choice = $inputField->find('css', '.select2-selection'); |
|
131 | + if (!$choice) { |
|
132 | + throw new \Exception(sprintf('No select2 choice found for "%s"', $field)); |
|
133 | + } |
|
134 | + $choice->press(); |
|
135 | + } |
|
136 | 136 | |
137 | - /** |
|
138 | - * Wait the end of fetching Select2 results |
|
139 | - * |
|
140 | - * @param int $time Time to wait in seconds |
|
141 | - */ |
|
142 | - private function waitForLoadingResults($time) |
|
143 | - { |
|
144 | - for ($i = 0; $i < $time; $i++) { |
|
145 | - if (!$this->getSession()->getPage()->find('css', '.select2-results__option.loading-results')) { |
|
146 | - return; |
|
147 | - } |
|
137 | + /** |
|
138 | + * Wait the end of fetching Select2 results |
|
139 | + * |
|
140 | + * @param int $time Time to wait in seconds |
|
141 | + */ |
|
142 | + private function waitForLoadingResults($time) |
|
143 | + { |
|
144 | + for ($i = 0; $i < $time; $i++) { |
|
145 | + if (!$this->getSession()->getPage()->find('css', '.select2-results__option.loading-results')) { |
|
146 | + return; |
|
147 | + } |
|
148 | 148 | |
149 | - sleep(1); |
|
150 | - } |
|
151 | - } |
|
149 | + sleep(1); |
|
150 | + } |
|
151 | + } |
|
152 | 152 | |
153 | 153 | } |
154 | 154 | \ No newline at end of file |
@@ -16,73 +16,73 @@ |
||
16 | 16 | |
17 | 17 | trait CommonContextTrait |
18 | 18 | { |
19 | - /** |
|
20 | - * @var MinkContext |
|
21 | - */ |
|
22 | - protected $minkContext; |
|
19 | + /** |
|
20 | + * @var MinkContext |
|
21 | + */ |
|
22 | + protected $minkContext; |
|
23 | 23 | |
24 | - /** |
|
25 | - * @var CoreContext |
|
26 | - */ |
|
27 | - protected $coreContext; |
|
24 | + /** |
|
25 | + * @var CoreContext |
|
26 | + */ |
|
27 | + protected $coreContext; |
|
28 | 28 | |
29 | - /** |
|
30 | - * @var UserContext |
|
31 | - */ |
|
32 | - protected $userContext; |
|
29 | + /** |
|
30 | + * @var UserContext |
|
31 | + */ |
|
32 | + protected $userContext; |
|
33 | 33 | |
34 | - /** |
|
35 | - * @var SummaryFormContext |
|
36 | - */ |
|
37 | - protected $summaryFormContext; |
|
34 | + /** |
|
35 | + * @var SummaryFormContext |
|
36 | + */ |
|
37 | + protected $summaryFormContext; |
|
38 | 38 | |
39 | - /** |
|
40 | - * @BeforeScenario |
|
41 | - * |
|
42 | - * @param BeforeScenarioScope $scope |
|
43 | - */ |
|
44 | - public function gatherContexts(BeforeScenarioScope $scope) |
|
45 | - { |
|
46 | - $this->minkContext = $scope->getEnvironment()->getContext(MinkContext::class); |
|
47 | - $this->coreContext = $scope->getEnvironment()->getContext(CoreContext::class); |
|
48 | - $this->userContext = $scope->getEnvironment()->getContext(UserContext::class); |
|
49 | - $this->summaryFormContext = $scope->getEnvironment()->getContext(SummaryFormContext::class); |
|
50 | - } |
|
39 | + /** |
|
40 | + * @BeforeScenario |
|
41 | + * |
|
42 | + * @param BeforeScenarioScope $scope |
|
43 | + */ |
|
44 | + public function gatherContexts(BeforeScenarioScope $scope) |
|
45 | + { |
|
46 | + $this->minkContext = $scope->getEnvironment()->getContext(MinkContext::class); |
|
47 | + $this->coreContext = $scope->getEnvironment()->getContext(CoreContext::class); |
|
48 | + $this->userContext = $scope->getEnvironment()->getContext(UserContext::class); |
|
49 | + $this->summaryFormContext = $scope->getEnvironment()->getContext(SummaryFormContext::class); |
|
50 | + } |
|
51 | 51 | |
52 | - public function generateUrl($url) |
|
53 | - { |
|
54 | - return $this->coreContext->generateUrl($url); |
|
55 | - } |
|
52 | + public function generateUrl($url) |
|
53 | + { |
|
54 | + return $this->coreContext->generateUrl($url); |
|
55 | + } |
|
56 | 56 | |
57 | - public function visit($url) |
|
58 | - { |
|
59 | - $this->coreContext->iVisit($this->generateUrl($url)); |
|
60 | - } |
|
57 | + public function visit($url) |
|
58 | + { |
|
59 | + $this->coreContext->iVisit($this->generateUrl($url)); |
|
60 | + } |
|
61 | 61 | |
62 | - /** |
|
63 | - * @param $id |
|
64 | - * @return mixed|object |
|
65 | - */ |
|
66 | - public function getService($id) |
|
67 | - { |
|
68 | - return $this->coreContext->getServiceManager()->get($id); |
|
69 | - } |
|
62 | + /** |
|
63 | + * @param $id |
|
64 | + * @return mixed|object |
|
65 | + */ |
|
66 | + public function getService($id) |
|
67 | + { |
|
68 | + return $this->coreContext->getServiceManager()->get($id); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * @param $id |
|
73 | - * |
|
74 | - * @return RepositoryInterface |
|
75 | - */ |
|
76 | - public function getRepository($id) |
|
77 | - { |
|
78 | - return $this->coreContext->getRepositories()->get($id); |
|
79 | - } |
|
71 | + /** |
|
72 | + * @param $id |
|
73 | + * |
|
74 | + * @return RepositoryInterface |
|
75 | + */ |
|
76 | + public function getRepository($id) |
|
77 | + { |
|
78 | + return $this->coreContext->getRepositories()->get($id); |
|
79 | + } |
|
80 | 80 | |
81 | - /** |
|
82 | - * @return \Auth\Entity\User |
|
83 | - */ |
|
84 | - public function getCurrentUser() |
|
85 | - { |
|
86 | - return $this->userContext->getCurrentUser(); |
|
87 | - } |
|
81 | + /** |
|
82 | + * @return \Auth\Entity\User |
|
83 | + */ |
|
84 | + public function getCurrentUser() |
|
85 | + { |
|
86 | + return $this->userContext->getCurrentUser(); |
|
87 | + } |
|
88 | 88 | } |
89 | 89 | \ No newline at end of file |
@@ -171,13 +171,13 @@ |
||
171 | 171 | $response_externalIdUpdate = $decodedBody->applyIdUpdate; |
172 | 172 | |
173 | 173 | if ($publisher->externalId != $response_externalIdUpdate || $publisher->reference != $response_referenceUpdate) { |
174 | - $logInfo = 'RestCall changed externalID [' |
|
175 | - . var_export($publisher->externalId, true) |
|
176 | - . ' => ' |
|
177 | - . var_export($response_externalIdUpdate, true) . '], reference [' |
|
178 | - . var_export($publisher->reference, true) |
|
179 | - . ' => ' |
|
180 | - . var_export($response_referenceUpdate, true) . ']'; |
|
174 | + $logInfo = 'RestCall changed externalID [' |
|
175 | + . var_export($publisher->externalId, true) |
|
176 | + . ' => ' |
|
177 | + . var_export($response_externalIdUpdate, true) . '], reference [' |
|
178 | + . var_export($publisher->reference, true) |
|
179 | + . ' => ' |
|
180 | + . var_export($response_referenceUpdate, true) . ']'; |
|
181 | 181 | $log->info($logInfo); |
182 | 182 | $publisher->reference = $response_referenceUpdate; |
183 | 183 | $publisher->externalId = $response_externalIdUpdate; |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | */ |
107 | 107 | public function onJobAccepted(JobEvent $e) |
108 | 108 | { |
109 | - $target = $e->getTarget(); |
|
109 | + $target = $e->getTarget(); |
|
110 | 110 | |
111 | 111 | $this->sendMail( |
112 | 112 | $target->getJobEntity(), |
@@ -141,13 +141,13 @@ discard block |
||
141 | 141 | { |
142 | 142 | $mail = $this->mailer->get('htmltemplate'); |
143 | 143 | $mail->setTemplate($template) |
144 | - ->setSubject($subject) |
|
145 | - ->setVariables( |
|
146 | - array( |
|
144 | + ->setSubject($subject) |
|
145 | + ->setVariables( |
|
146 | + array( |
|
147 | 147 | 'job' => $job, |
148 | 148 | 'siteName' => $this->options['siteName'], |
149 | 149 | ) |
150 | - ); |
|
150 | + ); |
|
151 | 151 | |
152 | 152 | if ($adminMail) { |
153 | 153 | $mail->setTo($this->options['adminEmail']); |
@@ -31,54 +31,54 @@ |
||
31 | 31 | */ |
32 | 32 | class ViewModelTemplateFilterFactory implements FactoryInterface |
33 | 33 | { |
34 | - /** |
|
35 | - * @var ServiceLocatorInterface |
|
36 | - */ |
|
37 | - protected $service; |
|
34 | + /** |
|
35 | + * @var ServiceLocatorInterface |
|
36 | + */ |
|
37 | + protected $service; |
|
38 | 38 | |
39 | - public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
40 | - { |
|
41 | - $this->service = $container; |
|
42 | - return $this; |
|
43 | - } |
|
39 | + public function __invoke( ContainerInterface $container, $requestedName, array $options = null ) |
|
40 | + { |
|
41 | + $this->service = $container; |
|
42 | + return $this; |
|
43 | + } |
|
44 | 44 | |
45 | - /** |
|
46 | - * @param $element |
|
47 | - * @return \Zend\View\Model\ViewModel |
|
48 | - * @throws \InvalidArgumentException |
|
49 | - * @TODO: [ZF3] renamed this method into getModel because conflict with FactoryInterface::__invoke() method |
|
50 | - */ |
|
51 | - public function getModel($element) |
|
52 | - { |
|
53 | - $filter = null; |
|
54 | - if ($element instanceof EntityInterface) { |
|
55 | - $filter = new ViewModelTemplateFilterJob; |
|
56 | - } |
|
57 | - if ($element instanceof Element) { |
|
58 | - $filter = new ViewModelTemplateFilterForm; |
|
59 | - $viewHelperManager = $this->service->get('ViewHelperManager'); |
|
60 | - $viewHelperForm = $viewHelperManager->get('formSimple'); |
|
61 | - $filter->setViewHelperForm($viewHelperForm); |
|
62 | - } |
|
63 | - if (!isset($filter)) { |
|
64 | - throw new \InvalidArgumentException(get_class($element) . ' cannot be used to initialize a template'); |
|
65 | - } |
|
66 | - $viewManager = $this->service->get('ViewHelperManager'); |
|
67 | - $basePathHelper = $viewManager->get('basePath'); |
|
68 | - $serverUrlHelper = $viewManager->get('serverUrl'); |
|
69 | - $imageFileCacheHelper = $this->service->get('Organizations\ImageFileCache\Manager'); |
|
70 | - $filter->setBasePathHelper($basePathHelper); |
|
71 | - $filter->setImageFileCacheHelper($imageFileCacheHelper); |
|
72 | - $filter->setServerUrlHelper($serverUrlHelper); |
|
45 | + /** |
|
46 | + * @param $element |
|
47 | + * @return \Zend\View\Model\ViewModel |
|
48 | + * @throws \InvalidArgumentException |
|
49 | + * @TODO: [ZF3] renamed this method into getModel because conflict with FactoryInterface::__invoke() method |
|
50 | + */ |
|
51 | + public function getModel($element) |
|
52 | + { |
|
53 | + $filter = null; |
|
54 | + if ($element instanceof EntityInterface) { |
|
55 | + $filter = new ViewModelTemplateFilterJob; |
|
56 | + } |
|
57 | + if ($element instanceof Element) { |
|
58 | + $filter = new ViewModelTemplateFilterForm; |
|
59 | + $viewHelperManager = $this->service->get('ViewHelperManager'); |
|
60 | + $viewHelperForm = $viewHelperManager->get('formSimple'); |
|
61 | + $filter->setViewHelperForm($viewHelperForm); |
|
62 | + } |
|
63 | + if (!isset($filter)) { |
|
64 | + throw new \InvalidArgumentException(get_class($element) . ' cannot be used to initialize a template'); |
|
65 | + } |
|
66 | + $viewManager = $this->service->get('ViewHelperManager'); |
|
67 | + $basePathHelper = $viewManager->get('basePath'); |
|
68 | + $serverUrlHelper = $viewManager->get('serverUrl'); |
|
69 | + $imageFileCacheHelper = $this->service->get('Organizations\ImageFileCache\Manager'); |
|
70 | + $filter->setBasePathHelper($basePathHelper); |
|
71 | + $filter->setImageFileCacheHelper($imageFileCacheHelper); |
|
72 | + $filter->setServerUrlHelper($serverUrlHelper); |
|
73 | 73 | |
74 | - if($filter instanceof ViewModelTemplateFilterJob || method_exists($filter,'setJsonLdHelper')){ |
|
75 | - $jsonLdHelper = $viewManager->get(JsonLd::class); |
|
76 | - $filter->setJsonLdHelper($jsonLdHelper); |
|
77 | - } |
|
78 | - $urlPlugin = $this->service->get('ControllerPluginManager')->get('url'); |
|
79 | - $filter->setUrlPlugin($urlPlugin); |
|
80 | - $options = $this->service->get('Jobs/Options'); |
|
81 | - $filter->setConfig($options); |
|
82 | - return $filter->filter($element); |
|
83 | - } |
|
74 | + if($filter instanceof ViewModelTemplateFilterJob || method_exists($filter,'setJsonLdHelper')){ |
|
75 | + $jsonLdHelper = $viewManager->get(JsonLd::class); |
|
76 | + $filter->setJsonLdHelper($jsonLdHelper); |
|
77 | + } |
|
78 | + $urlPlugin = $this->service->get('ControllerPluginManager')->get('url'); |
|
79 | + $filter->setUrlPlugin($urlPlugin); |
|
80 | + $options = $this->service->get('Jobs/Options'); |
|
81 | + $filter->setConfig($options); |
|
82 | + return $filter->filter($element); |
|
83 | + } |
|
84 | 84 | } |
85 | 85 | \ No newline at end of file |
@@ -47,10 +47,10 @@ |
||
47 | 47 | $params = $viewHelper->get('params'); |
48 | 48 | $serverUrl = $viewHelper->get('serverUrl'); |
49 | 49 | |
50 | - $helper = new JobUrl(); |
|
50 | + $helper = new JobUrl(); |
|
51 | 51 | $helper->setUrlHelper($url) |
52 | - ->setParamsHelper($params) |
|
53 | - ->setServerUrlHelper($serverUrl); |
|
52 | + ->setParamsHelper($params) |
|
53 | + ->setServerUrlHelper($serverUrl); |
|
54 | 54 | return $helper; |
55 | 55 | } |
56 | 56 | } |
@@ -44,11 +44,11 @@ |
||
44 | 44 | $params = $viewHelper->get('params'); |
45 | 45 | $serverUrl = $viewHelper->get('serverUrl'); |
46 | 46 | |
47 | - $helper = new ApplyUrl(); |
|
47 | + $helper = new ApplyUrl(); |
|
48 | 48 | $helper->setUrlHelper($url) |
49 | - ->setTranslateHelper($translate) |
|
50 | - ->setParamsHelper($params) |
|
51 | - ->setServerUrlHelper($serverUrl); |
|
49 | + ->setTranslateHelper($translate) |
|
50 | + ->setParamsHelper($params) |
|
51 | + ->setServerUrlHelper($serverUrl); |
|
52 | 52 | return $helper; |
53 | 53 | } |
54 | 54 | } |
@@ -33,17 +33,17 @@ |
||
33 | 33 | */ |
34 | 34 | $jobRepository = $container->get('repositories')->get('Jobs/Job'); |
35 | 35 | $options = $container->get('Jobs/Options'); |
36 | - $viewModelTemplateFilter = $container->get('Jobs/ViewModelTemplateFilter'); |
|
37 | - $translator = $container->get('translator'); |
|
38 | - $viewHelper = $container->get('ViewHelperManager'); |
|
39 | - $formManager = $container->get('FormElementManager'); |
|
36 | + $viewModelTemplateFilter = $container->get('Jobs/ViewModelTemplateFilter'); |
|
37 | + $translator = $container->get('translator'); |
|
38 | + $viewHelper = $container->get('ViewHelperManager'); |
|
39 | + $formManager = $container->get('FormElementManager'); |
|
40 | 40 | return new TemplateController( |
41 | - $jobRepository, |
|
42 | - $viewModelTemplateFilter, |
|
43 | - $translator, |
|
44 | - $options, |
|
45 | - $viewHelper, |
|
46 | - $formManager |
|
41 | + $jobRepository, |
|
42 | + $viewModelTemplateFilter, |
|
43 | + $translator, |
|
44 | + $options, |
|
45 | + $viewHelper, |
|
46 | + $formManager |
|
47 | 47 | ); |
48 | 48 | } |
49 | 49 | } |
@@ -45,17 +45,17 @@ |
||
45 | 45 | $jobEvents = $container->get('Jobs/Events'); |
46 | 46 | $jobEvent = $container->get('Jobs/Event'); |
47 | 47 | return new ManageController( |
48 | - $auth, |
|
49 | - $repositoryService, |
|
50 | - $translator, |
|
51 | - $filterManager, |
|
52 | - $jobFormEvents, |
|
53 | - $formManager, |
|
54 | - $options, |
|
55 | - $viewHelper, |
|
56 | - $validatorManager, |
|
57 | - $jobEvents, |
|
58 | - $jobEvent |
|
48 | + $auth, |
|
49 | + $repositoryService, |
|
50 | + $translator, |
|
51 | + $filterManager, |
|
52 | + $jobFormEvents, |
|
53 | + $formManager, |
|
54 | + $options, |
|
55 | + $viewHelper, |
|
56 | + $validatorManager, |
|
57 | + $jobEvents, |
|
58 | + $jobEvent |
|
59 | 59 | ); |
60 | 60 | } |
61 | 61 | } |