@@ -38,7 +38,7 @@ |
||
38 | 38 | $name = "\\$namespace\\Entity\\$entityName"; |
39 | 39 | } |
40 | 40 | |
41 | - $repository = $this->dm->getRepository($name); |
|
41 | + $repository = $this->dm->getRepository($name); |
|
42 | 42 | return $repository; |
43 | 43 | } |
44 | 44 |
@@ -90,24 +90,24 @@ |
||
90 | 90 | $tabId = $containerId . '-' . strtolower($tabElement->getName()); |
91 | 91 | $tabsNav .= '<li><a data-toggle="tab" href="#' . $tabId . '">' . $translate($tabElement->getLabel()) . '</a></li>'; |
92 | 92 | $tabsContent .= '<div class="tab-pane" id="' . $tabId . '">' |
93 | - . $formContainer($tabElement, $layout, $parameter) |
|
94 | - . '</div>'; |
|
93 | + . $formContainer($tabElement, $layout, $parameter) |
|
94 | + . '</div>'; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="' . $containerId . '">' |
98 | - . '<ul>' . $tabsNav . '</ul>' |
|
99 | - . '<div class="tab-content">' . $tabsContent . '</div>'; |
|
98 | + . '<ul>' . $tabsNav . '</ul>' |
|
99 | + . '<div class="tab-content">' . $tabsContent . '</div>'; |
|
100 | 100 | if ($containerParams['pager']) { |
101 | 101 | $content .='<ul class="pager wizard">' |
102 | - . '<li class="previous"><a href="javascript:;">← ' . $translate('previous') . '</a></li>' |
|
103 | - . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' →</a></li>' |
|
104 | - . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">' |
|
105 | - . (false !== $containerParams['finish_label'] |
|
102 | + . '<li class="previous"><a href="javascript:;">← ' . $translate('previous') . '</a></li>' |
|
103 | + . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' →</a></li>' |
|
104 | + . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">' |
|
105 | + . (false !== $containerParams['finish_label'] |
|
106 | 106 | ? '<a class="pull-right" href="' . $containerParams['finish_href'] . '">' |
107 | - . $translate($containerParams['finish_label']) . ' •</a>' |
|
107 | + . $translate($containerParams['finish_label']) . ' •</a>' |
|
108 | 108 | : '' |
109 | 109 | ) |
110 | - . '</li></ul>'; |
|
110 | + . '</li></ul>'; |
|
111 | 111 | } |
112 | 112 | $content .= '</div>'; |
113 | 113 |
@@ -83,28 +83,28 @@ |
||
83 | 83 | |
84 | 84 | $containerId = $container->getAttribute('id'); |
85 | 85 | if (!$containerId) { |
86 | - $containerId = 'wizardcontainer-' . strtolower(str_replace('\\', '-', get_class($container))); |
|
86 | + $containerId = 'wizardcontainer-'.strtolower(str_replace('\\', '-', get_class($container))); |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | foreach ($container as $tabElement) { |
90 | - $tabId = $containerId . '-' . strtolower($tabElement->getName()); |
|
91 | - $tabsNav .= '<li><a data-toggle="tab" href="#' . $tabId . '">' . $translate($tabElement->getLabel()) . '</a></li>'; |
|
92 | - $tabsContent .= '<div class="tab-pane" id="' . $tabId . '">' |
|
90 | + $tabId = $containerId.'-'.strtolower($tabElement->getName()); |
|
91 | + $tabsNav .= '<li><a data-toggle="tab" href="#'.$tabId.'">'.$translate($tabElement->getLabel()).'</a></li>'; |
|
92 | + $tabsContent .= '<div class="tab-pane" id="'.$tabId.'">' |
|
93 | 93 | . $formContainer($tabElement, $layout, $parameter) |
94 | 94 | . '</div>'; |
95 | 95 | } |
96 | 96 | |
97 | - $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="' . $containerId . '">' |
|
98 | - . '<ul>' . $tabsNav . '</ul>' |
|
99 | - . '<div class="tab-content">' . $tabsContent . '</div>'; |
|
97 | + $content .= '<style type="text/css">.tab-content > div > div:first-child { margin-top: 10px; }</style><div class="wizard-container" id="'.$containerId.'">' |
|
98 | + . '<ul>'.$tabsNav.'</ul>' |
|
99 | + . '<div class="tab-content">'.$tabsContent.'</div>'; |
|
100 | 100 | if ($containerParams['pager']) { |
101 | - $content .='<ul class="pager wizard">' |
|
102 | - . '<li class="previous"><a href="javascript:;">← ' . $translate('previous') . '</a></li>' |
|
103 | - . '<li class="next"><a href="javascript:;">' . $translate('Next') . ' →</a></li>' |
|
104 | - . '<li class="finish' . ($containerParams['finish_enabled'] ? '' : ' disabled') . '">' |
|
101 | + $content .= '<ul class="pager wizard">' |
|
102 | + . '<li class="previous"><a href="javascript:;">← '.$translate('previous').'</a></li>' |
|
103 | + . '<li class="next"><a href="javascript:;">'.$translate('Next').' →</a></li>' |
|
104 | + . '<li class="finish'.($containerParams['finish_enabled'] ? '' : ' disabled').'">' |
|
105 | 105 | . (false !== $containerParams['finish_label'] |
106 | - ? '<a class="pull-right" href="' . $containerParams['finish_href'] . '">' |
|
107 | - . $translate($containerParams['finish_label']) . ' •</a>' |
|
106 | + ? '<a class="pull-right" href="'.$containerParams['finish_href'].'">' |
|
107 | + . $translate($containerParams['finish_label']).' •</a>' |
|
108 | 108 | : '' |
109 | 109 | ) |
110 | 110 | . '</li></ul>'; |
@@ -79,13 +79,13 @@ |
||
79 | 79 | 'name' => [ |
80 | 80 | 'required' => true, |
81 | 81 | 'filters' => [ |
82 | - [ 'name' => 'StringTrim' ], |
|
82 | + ['name' => 'StringTrim'], |
|
83 | 83 | ], |
84 | 84 | ], |
85 | 85 | 'value' => [ |
86 | 86 | 'required' => false, |
87 | 87 | 'filters' => [ |
88 | - [ 'name' => 'StringTrim' ], |
|
88 | + ['name' => 'StringTrim'], |
|
89 | 89 | ], |
90 | 90 | ], |
91 | 91 | ]; |
@@ -35,7 +35,7 @@ |
||
35 | 35 | * |
36 | 36 | * @var array |
37 | 37 | */ |
38 | - protected $scripts = [ '/js/html.sortable.min.js', 'Core/js/forms.tree-management.js' ]; |
|
38 | + protected $scripts = ['/js/html.sortable.min.js', 'Core/js/forms.tree-management.js']; |
|
39 | 39 | |
40 | 40 | /** |
41 | 41 | * Attributes. |
@@ -38,14 +38,14 @@ |
||
38 | 38 | |
39 | 39 | $globalConfigPaths = []; |
40 | 40 | foreach ($config['config_glob_paths'] as $path) { |
41 | - $globalConfigPaths[] = substr($path, 0, strrpos($path, DIRECTORY_SEPARATOR)) . DIRECTORY_SEPARATOR; |
|
41 | + $globalConfigPaths[] = substr($path, 0, strrpos($path, DIRECTORY_SEPARATOR)).DIRECTORY_SEPARATOR; |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | $moduleConfigPath = '.'; |
45 | 45 | foreach ($config['module_paths'] as $path) { |
46 | - $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR; |
|
47 | - if (file_exists($path . 'Jobs')) { |
|
48 | - $moduleConfigPath = $path . 'Jobs' . DIRECTORY_SEPARATOR . 'config' . DIRECTORY_SEPARATOR; |
|
46 | + $path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR; |
|
47 | + if (file_exists($path.'Jobs')) { |
|
48 | + $moduleConfigPath = $path.'Jobs'.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR; |
|
49 | 49 | break; |
50 | 50 | } |
51 | 51 | } |
@@ -67,13 +67,13 @@ |
||
67 | 67 | $file = "jobs.categories.$type.php"; |
68 | 68 | |
69 | 69 | foreach ($this->globalConfigPaths as $path) { |
70 | - if (file_exists($path . $file)) { |
|
71 | - return include $path . $file; |
|
70 | + if (file_exists($path.$file)) { |
|
71 | + return include $path.$file; |
|
72 | 72 | } |
73 | 73 | } |
74 | 74 | |
75 | - if (file_exists($this->moduleConfigPath . $file)) { |
|
76 | - return include $this->moduleConfigPath . $file; |
|
75 | + if (file_exists($this->moduleConfigPath.$file)) { |
|
76 | + return include $this->moduleConfigPath.$file; |
|
77 | 77 | } |
78 | 78 | |
79 | 79 | return false; |
@@ -110,7 +110,6 @@ |
||
110 | 110 | * @see \Core\Controller\Plugin\SearchForm::get() |
111 | 111 | * |
112 | 112 | * @param $elementsFieldset |
113 | - * @param null $buttonsFieldset |
|
114 | 113 | * @param string $as The name of the key in the result array. |
115 | 114 | * |
116 | 115 | * @return self |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | } |
79 | 79 | |
80 | 80 | if (!is_array($stack)) { |
81 | - throw new \InvalidArgumentException('Expected argument to be of type array, but received ' . gettype($stack)); |
|
81 | + throw new \InvalidArgumentException('Expected argument to be of type array, but received '.gettype($stack)); |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | $stack = array_intersect_key($stack, ['params' => true, 'form' => true, 'paginator' => true]); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * |
148 | 148 | * @return self |
149 | 149 | */ |
150 | - public function params($namespace, $defaults = [ 'page' => 1 ]) |
|
150 | + public function params($namespace, $defaults = ['page' => 1]) |
|
151 | 151 | { |
152 | 152 | $this->stack['params'] = [$namespace, $defaults]; |
153 | 153 | return $this; |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $queryArray[$match['name']][$v] = 1; |
243 | 243 | } |
244 | 244 | } else { |
245 | - $queryArray[ $match[ 'name' ] ] = $value; |
|
245 | + $queryArray[$match['name']] = $value; |
|
246 | 246 | } |
247 | 247 | unset($queryArray[$key]); |
248 | 248 | } |
@@ -83,6 +83,11 @@ |
||
83 | 83 | return $content; |
84 | 84 | } |
85 | 85 | |
86 | + /** |
|
87 | + * @param FormInterface $form |
|
88 | + * |
|
89 | + * @return null|FormInterface |
|
90 | + */ |
|
86 | 91 | public function renderElements($form, $colMap = null, $buttonsSpan = null) |
87 | 92 | { |
88 | 93 | if ($form instanceOf ViewPartialProviderInterface) { |
@@ -67,8 +67,8 @@ discard block |
||
67 | 67 | $content = $this->renderElements($form, $colMap, $buttonsSpan); |
68 | 68 | |
69 | 69 | return $this->openTag($form) |
70 | - . '<div class="row" style="padding: 0 15px;">' |
|
71 | - . $content . '</div>' . $this->closeTag(); |
|
70 | + . '<div class="row" style="padding: 0 15px;">' |
|
71 | + . $content . '</div>' . $this->closeTag(); |
|
72 | 72 | |
73 | 73 | } |
74 | 74 | |
@@ -82,8 +82,8 @@ discard block |
||
82 | 82 | $attrs = $helper->createAttributesString($button->getAttributes()); |
83 | 83 | |
84 | 84 | $content.= '<button ' . $attrs . '>' |
85 | - . $this->getTranslator()->translate($button->getLabel(), $this->getTranslatorTextDomain()) |
|
86 | - . '</button>'; |
|
85 | + . $this->getTranslator()->translate($button->getLabel(), $this->getTranslatorTextDomain()) |
|
86 | + . '</button>'; |
|
87 | 87 | } |
88 | 88 | |
89 | 89 | return $content; |
@@ -120,15 +120,15 @@ discard block |
||
120 | 120 | |
121 | 121 | if ($element->getName() == $form->getButtonElement()) { |
122 | 122 | $content.='<div class="input-group col-md-' . $cols . '">' |
123 | - . $formElement($element) |
|
124 | - . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
|
125 | - . $this->renderButtons($form->getButtons()) . '</div>' |
|
126 | - . '</div>'; |
|
123 | + . $formElement($element) |
|
124 | + . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
|
125 | + . $this->renderButtons($form->getButtons()) . '</div>' |
|
126 | + . '</div>'; |
|
127 | 127 | $buttonsRendered = true; |
128 | 128 | } else { |
129 | 129 | $content .= '<div class="input-group col-md-' . $cols . '">' |
130 | - . $formElement($element) |
|
131 | - . '</div>'; |
|
130 | + . $formElement($element) |
|
131 | + . '</div>'; |
|
132 | 132 | } |
133 | 133 | |
134 | 134 | $i += 1; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | $buttonsSpan = $form->getOption('buttons_span') ?: 12; |
140 | 140 | } |
141 | 141 | $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">' |
142 | - . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
142 | + . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | return $content; |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | * @param array $colMap |
36 | 36 | * @return Form|string |
37 | 37 | */ |
38 | - public function __invoke(FormInterface $form = null, $colMap=null) |
|
38 | + public function __invoke(FormInterface $form = null, $colMap = null) |
|
39 | 39 | { |
40 | 40 | if (!$form) { |
41 | 41 | return $this; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | return $this->render($form, $colMap); |
45 | 45 | } |
46 | 46 | |
47 | - public function render(FormInterface $form, $colMap=null, $buttonsSpan = null) |
|
47 | + public function render(FormInterface $form, $colMap = null, $buttonsSpan = null) |
|
48 | 48 | { |
49 | 49 | $headscript = $this->getView()->plugin('headscript'); |
50 | 50 | $basepath = $this->getView()->plugin('basepath'); |
@@ -61,14 +61,14 @@ discard block |
||
61 | 61 | $form->prepare(); |
62 | 62 | |
63 | 63 | if ($form instanceOf ViewPartialProviderInterface) { |
64 | - return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]); |
|
64 | + return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | $content = $this->renderElements($form, $colMap, $buttonsSpan); |
68 | 68 | |
69 | 69 | return $this->openTag($form) |
70 | 70 | . '<div class="row" style="padding: 0 15px;">' |
71 | - . $content . '</div>' . $this->closeTag(); |
|
71 | + . $content.'</div>'.$this->closeTag(); |
|
72 | 72 | |
73 | 73 | } |
74 | 74 | |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $button->removeAttribute('name'); |
82 | 82 | $attrs = $helper->createAttributesString($button->getAttributes()); |
83 | 83 | |
84 | - $content.= '<button ' . $attrs . '>' |
|
84 | + $content .= '<button '.$attrs.'>' |
|
85 | 85 | . $this->getTranslator()->translate($button->getLabel(), $this->getTranslatorTextDomain()) |
86 | 86 | . '</button>'; |
87 | 87 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | public function renderElements($form, $colMap = null, $buttonsSpan = null) |
93 | 93 | { |
94 | 94 | if ($form instanceOf ViewPartialProviderInterface) { |
95 | - return $this->getView()->partial($form->getViewPartial(), [ 'element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan ]); |
|
95 | + return $this->getView()->partial($form->getViewPartial(), ['element' => $form, 'colMap' => $colMap, 'buttonsSpan' => $buttonsSpan]); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | if (null === $colMap) { |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | } |
101 | 101 | |
102 | 102 | $formElement = $this->getView()->plugin('formElement'); |
103 | - $content = ''; $buttonsRendered = false; $i=0; |
|
103 | + $content = ''; $buttonsRendered = false; $i = 0; |
|
104 | 104 | foreach ($form as $element) { |
105 | 105 | |
106 | 106 | if ($element instanceOf Hidden) { |
@@ -119,14 +119,14 @@ discard block |
||
119 | 119 | } |
120 | 120 | |
121 | 121 | if ($element->getName() == $form->getButtonElement()) { |
122 | - $content.='<div class="input-group col-md-' . $cols . '">' |
|
122 | + $content .= '<div class="input-group col-md-'.$cols.'">' |
|
123 | 123 | . $formElement($element) |
124 | 124 | . '<div class="input-group-btn search-form-buttons" style="width: 1px;">' |
125 | - . $this->renderButtons($form->getButtons()) . '</div>' |
|
125 | + . $this->renderButtons($form->getButtons()).'</div>' |
|
126 | 126 | . '</div>'; |
127 | 127 | $buttonsRendered = true; |
128 | 128 | } else { |
129 | - $content .= '<div class="input-group col-md-' . $cols . '">' |
|
129 | + $content .= '<div class="input-group col-md-'.$cols.'">' |
|
130 | 130 | . $formElement($element) |
131 | 131 | . '</div>'; |
132 | 132 | } |
@@ -138,8 +138,8 @@ discard block |
||
138 | 138 | if (null === $buttonsSpan) { |
139 | 139 | $buttonsSpan = $form->getOption('buttons_span') ?: 12; |
140 | 140 | } |
141 | - $content .= '<div class="input-group search-form-buttons col-md-' . $buttonsSpan . ' text-right">' |
|
142 | - . '<div class="btn-group">' . $this->renderButtons($form->getButtons()) .'</div></div>'; |
|
141 | + $content .= '<div class="input-group search-form-buttons col-md-'.$buttonsSpan.' text-right">' |
|
142 | + . '<div class="btn-group">'.$this->renderButtons($form->getButtons()).'</div></div>'; |
|
143 | 143 | } |
144 | 144 | |
145 | 145 | return $content; |
@@ -167,7 +167,7 @@ |
||
167 | 167 | 'label' => $label, |
168 | 168 | ], |
169 | 169 | 'attributes' => [ |
170 | - 'class' => 'btn btn-' . ('submit' == $type ? 'primary' : 'default'), |
|
170 | + 'class' => 'btn btn-'.('submit' == $type ? 'primary' : 'default'), |
|
171 | 171 | 'type' => $type, |
172 | 172 | ], |
173 | 173 | ] |
@@ -47,6 +47,9 @@ discard block |
||
47 | 47 | $this->buttonsIterator->isLIFO(false); |
48 | 48 | } |
49 | 49 | |
50 | + /** |
|
51 | + * @param string $name |
|
52 | + */ |
|
50 | 53 | public function setButtonElement($name) |
51 | 54 | { |
52 | 55 | return $this->setOption('button_element', $name); |
@@ -182,6 +185,9 @@ discard block |
||
182 | 185 | return $this->buttonsIterator; |
183 | 186 | } |
184 | 187 | |
188 | + /** |
|
189 | + * @param string $name |
|
190 | + */ |
|
185 | 191 | public function addButton($name, $priority = 0, $type = 'button') |
186 | 192 | { |
187 | 193 | if (is_array($name)) { |