@@ -87,45 +87,45 @@ discard block |
||
| 87 | 87 | $childClassNamespace = new \ReflectionClass(get_class($this)); |
| 88 | 88 | $childClassNamespace = $childClassNamespace->getNamespaceName(); |
| 89 | 89 | //check in classNameSpace, make sure we are not already in App or core |
| 90 | - if (class_exists($childClassNamespace . '\\Modules\\' . $loadModule)) { |
|
| 91 | - if($childClassNamespace !== 'App\\Modules\\' || $childClassNamespace !== 'Core\\Modules\\'){ |
|
| 92 | - $loadModuleObj = $childClassNamespace . '\\' . $loadModule; |
|
| 90 | + if (class_exists($childClassNamespace.'\\Modules\\'.$loadModule)) { |
|
| 91 | + if ($childClassNamespace !== 'App\\Modules\\' || $childClassNamespace !== 'Core\\Modules\\') { |
|
| 92 | + $loadModuleObj = $childClassNamespace.'\\'.$loadModule; |
|
| 93 | 93 | $found = true; |
| 94 | 94 | } |
| 95 | 95 | } |
| 96 | 96 | //check in app |
| 97 | - if (class_exists('App\\Modules\\' . $loadModule)) { |
|
| 98 | - if($found && Config::DEV_ENVIRONMENT){ |
|
| 97 | + if (class_exists('App\\Modules\\'.$loadModule)) { |
|
| 98 | + if ($found && Config::DEV_ENVIRONMENT) { |
|
| 99 | 99 | $this->alertBox->setAlert($loadModule.' already defined in namespace', 'error'); |
| 100 | 100 | } |
| 101 | - if(!$found){ |
|
| 102 | - $loadModuleObj = 'App\\Modules\\' . $loadModule; |
|
| 101 | + if (!$found) { |
|
| 102 | + $loadModuleObj = 'App\\Modules\\'.$loadModule; |
|
| 103 | 103 | $found = true; |
| 104 | 104 | } |
| 105 | 105 | } |
| 106 | 106 | //check in core, send error popup if overcharged |
| 107 | - if (class_exists('Core\\Modules\\' . $loadModule)) { |
|
| 108 | - if($found && Config::DEV_ENVIRONMENT){ |
|
| 107 | + if (class_exists('Core\\Modules\\'.$loadModule)) { |
|
| 108 | + if ($found && Config::DEV_ENVIRONMENT) { |
|
| 109 | 109 | $this->alertBox->setAlert($loadModule.' already defined in app', 'error'); |
| 110 | 110 | } |
| 111 | - if(!$found){ |
|
| 112 | - $loadModuleObj = 'Core\\Modules\\' . $loadModule; |
|
| 111 | + if (!$found) { |
|
| 112 | + $loadModuleObj = 'Core\\Modules\\'.$loadModule; |
|
| 113 | 113 | $found = true; |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | - if(!$found || $loadModuleObj ==='') { |
|
| 117 | - throw new \ErrorException('module ' . $loadModule . ' does not exist or not loaded'); |
|
| 116 | + if (!$found || $loadModuleObj === '') { |
|
| 117 | + throw new \ErrorException('module '.$loadModule.' does not exist or not loaded'); |
|
| 118 | 118 | } |
| 119 | 119 | |
| 120 | 120 | //Modules must be children of the Module template |
| 121 | 121 | if (!is_subclass_of($loadModuleObj, 'Core\Modules\Module')) { |
| 122 | - throw new \ErrorException('Module ' . $loadModuleName . ' must be a sub class of module'); |
|
| 122 | + throw new \ErrorException('Module '.$loadModuleName.' must be a sub class of module'); |
|
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | $loadedModule = new $loadModuleObj($this->container); |
| 126 | 126 | //we are not allowed to create public modules, they must be a placeholder ready |
| 127 | 127 | if (!property_exists($this, $loadModuleName)) { |
| 128 | - throw new \ErrorException('the protected or private variable of ' . $loadModuleName . ' is not present'); |
|
| 128 | + throw new \ErrorException('the protected or private variable of '.$loadModuleName.' is not present'); |
|
| 129 | 129 | } |
| 130 | 130 | $this->$loadModuleName = $loadedModule; |
| 131 | 131 | } |
@@ -151,7 +151,7 @@ discard block |
||
| 151 | 151 | public function getView($template) |
| 152 | 152 | { |
| 153 | 153 | $twig = $this->container->getTemplate(); |
| 154 | - return $twig->render($template . '.twig', $this->data); |
|
| 154 | + return $twig->render($template.'.twig', $this->data); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | /** |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | $this->devHelper(); |
| 173 | 173 | } |
| 174 | 174 | $twig = $this->container->getTemplate(); |
| 175 | - $twig->display($template . '.twig', $this->data); |
|
| 175 | + $twig->display($template.'.twig', $this->data); |
|
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | protected function devHelper($var = '') |