@@ -65,20 +65,20 @@ discard block |
||
65 | 65 | $this->setupRequest(); |
66 | 66 | } |
67 | 67 | |
68 | - $this->serviceManager->setFactory('config', function () { |
|
68 | + $this->serviceManager->setFactory('config', function() { |
|
69 | 69 | return new HelperConfig(); |
70 | 70 | }); |
71 | 71 | $this->config = $this->serviceManager->get('config'); |
72 | 72 | |
73 | - $this->serviceManager->setFactory('helper', function (ServiceManager $serviceManager) { |
|
73 | + $this->serviceManager->setFactory('helper', function(ServiceManager $serviceManager) { |
|
74 | 74 | return new \HaaseIT\HCSF\Helper($serviceManager); |
75 | 75 | }); |
76 | 76 | |
77 | - $this->serviceManager->setFactory('helpercustomer', function (ServiceManager $serviceManager) { |
|
77 | + $this->serviceManager->setFactory('helpercustomer', function(ServiceManager $serviceManager) { |
|
78 | 78 | return new \HaaseIT\HCSF\Customer\Helper($serviceManager); |
79 | 79 | }); |
80 | 80 | |
81 | - $this->serviceManager->setFactory('helpershop', function (ServiceManager $serviceManager) { |
|
81 | + $this->serviceManager->setFactory('helpershop', function(ServiceManager $serviceManager) { |
|
82 | 82 | return new \HaaseIT\HCSF\Shop\Helper($serviceManager); |
83 | 83 | }); |
84 | 84 | |
@@ -104,11 +104,11 @@ discard block |
||
104 | 104 | |
105 | 105 | date_default_timezone_set($this->config->getCore('defaulttimezone')); |
106 | 106 | |
107 | - $this->serviceManager->setFactory('hardcodedtextcats', function () { |
|
107 | + $this->serviceManager->setFactory('hardcodedtextcats', function() { |
|
108 | 108 | return $this->setupHardcodedTextcats(); |
109 | 109 | }); |
110 | 110 | |
111 | - $this->serviceManager->setFactory('db', function () { |
|
111 | + $this->serviceManager->setFactory('db', function() { |
|
112 | 112 | return null; |
113 | 113 | }); |
114 | 114 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | if ($this->config->getCore('enable_module_shop')) { |
126 | - $this->serviceManager->setFactory('oItem', function (ServiceManager $serviceManager) { |
|
126 | + $this->serviceManager->setFactory('oItem', function(ServiceManager $serviceManager) { |
|
127 | 127 | return new \HaaseIT\HCSF\Shop\Items($serviceManager); |
128 | 128 | }); |
129 | 129 | } |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | { |
141 | 141 | // PSR-7 Stuff |
142 | 142 | // Init request object |
143 | - $this->serviceManager->setFactory('request', function () { |
|
143 | + $this->serviceManager->setFactory('request', function() { |
|
144 | 144 | $request = \Zend\Diactoros\ServerRequestFactory::fromGlobals(); |
145 | 145 | |
146 | 146 | // cleanup request |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | |
205 | 205 | protected function setupDB() |
206 | 206 | { |
207 | - $this->serviceManager->setFactory('dbal', function () { |
|
207 | + $this->serviceManager->setFactory('dbal', function() { |
|
208 | 208 | $config = new \Doctrine\DBAL\Configuration(); |
209 | 209 | |
210 | 210 | $connectionParams = [ |
@@ -225,14 +225,14 @@ discard block |
||
225 | 225 | return \Doctrine\DBAL\DriverManager::getConnection($connectionParams, $config); |
226 | 226 | }); |
227 | 227 | |
228 | - $this->serviceManager->setFactory('db', function (ServiceManager $serviceManager) { |
|
228 | + $this->serviceManager->setFactory('db', function(ServiceManager $serviceManager) { |
|
229 | 229 | return $serviceManager->get('dbal')->getWrappedConnection(); |
230 | 230 | }); |
231 | 231 | } |
232 | 232 | |
233 | 233 | protected function setupTextcats() |
234 | 234 | { |
235 | - $this->serviceManager->setFactory('textcats', function (ServiceManager $serviceManager) { |
|
235 | + $this->serviceManager->setFactory('textcats', function(ServiceManager $serviceManager) { |
|
236 | 236 | $langavailable = $this->config->getCore('lang_available'); |
237 | 237 | $textcats = new \HaaseIT\Toolbox\Textcat( |
238 | 238 | $this->config->getLang(), |
@@ -249,7 +249,7 @@ discard block |
||
249 | 249 | |
250 | 250 | protected function setupTwig() |
251 | 251 | { |
252 | - $this->serviceManager->setFactory('twig', function (ServiceManager $serviceManager) { |
|
252 | + $this->serviceManager->setFactory('twig', function(ServiceManager $serviceManager) { |
|
253 | 253 | $loader = new \Twig_Loader_Filesystem([PATH_BASEDIR.'customviews', HCSF_BASEDIR.'src/views/']); |
254 | 254 | |
255 | 255 | $twig_options = [ |
@@ -372,7 +372,7 @@ discard block |
||
372 | 372 | } |
373 | 373 | |
374 | 374 | $aP['countrylist'][] = ' | '; |
375 | - $configcountries = $this->config->getCountries('countries_' .$this->config->getLang()); |
|
375 | + $configcountries = $this->config->getCountries('countries_'.$this->config->getLang()); |
|
376 | 376 | foreach ($configcountries as $sKey => $sValue) { |
377 | 377 | $aP['countrylist'][] = $sKey.'|'.$sValue; |
378 | 378 | } |
@@ -21,7 +21,6 @@ |
||
21 | 21 | namespace HaaseIT\HCSF\Controller\Admin\Shop; |
22 | 22 | |
23 | 23 | |
24 | -use HaaseIT\HCSF\HelperConfig; |
|
25 | 24 | use HaaseIT\Toolbox\Tools; |
26 | 25 | use Zend\ServiceManager\ServiceManager; |
27 | 26 |
@@ -70,7 +70,7 @@ |
||
70 | 70 | } else { |
71 | 71 | if (!empty($routes['regex'])) { |
72 | 72 | foreach ($routes['regex'] as $regex) { |
73 | - $result = preg_match('(^' . $regex['regex'] . '$)', $this->sPath, $matches); |
|
73 | + $result = preg_match('(^'.$regex['regex'].'$)', $this->sPath, $matches); |
|
74 | 74 | if ($result) { |
75 | 75 | $class = $regex['controller']; |
76 | 76 | break; |