@@ -84,12 +84,12 @@ discard block |
||
| 84 | 84 | $loadModuleObj = $this->getModuleNamespace($loadModule); |
| 85 | 85 | //Modules must be children of the Module template |
| 86 | 86 | if (!is_subclass_of($loadModuleObj, 'Core\Modules\Module')) { |
| 87 | - throw new \ErrorException('Module ' . $loadModuleName . ' must be a sub class of module'); |
|
| 87 | + throw new \ErrorException('Module '.$loadModuleName.' must be a sub class of module'); |
|
| 88 | 88 | } |
| 89 | 89 | $loadedModule = new $loadModuleObj($this->container); |
| 90 | 90 | //we are not allowed to create public modules, they must be a placeholder ready |
| 91 | 91 | if (!property_exists($this, $loadModuleName)) { |
| 92 | - throw new \ErrorException('the protected or private variable of ' . $loadModuleName . ' is not present'); |
|
| 92 | + throw new \ErrorException('the protected or private variable of '.$loadModuleName.' is not present'); |
|
| 93 | 93 | } |
| 94 | 94 | $this->$loadModuleName = $loadedModule; |
| 95 | 95 | } |
@@ -106,23 +106,23 @@ discard block |
||
| 106 | 106 | $childClass = new \ReflectionClass(get_class($this)); |
| 107 | 107 | $childClassNamespace = $childClass->getNamespaceName(); |
| 108 | 108 | //check in classNameSpace |
| 109 | - if (class_exists($childClassNamespace . '\\Modules\\' . $loadModule)) { |
|
| 110 | - $this->addToDevHelper('module ' . $loadModule . ' loaded', $childClassNamespace . '\\' . $loadModule); |
|
| 111 | - return $childClassNamespace . '\\' . $loadModule; |
|
| 109 | + if (class_exists($childClassNamespace.'\\Modules\\'.$loadModule)) { |
|
| 110 | + $this->addToDevHelper('module '.$loadModule.' loaded', $childClassNamespace.'\\'.$loadModule); |
|
| 111 | + return $childClassNamespace.'\\'.$loadModule; |
|
| 112 | 112 | } |
| 113 | 113 | //check in app |
| 114 | - if (class_exists('App\\Modules\\' . $loadModule)) { |
|
| 115 | - $this->addToDevHelper('module ' . $loadModule . ' loaded', 'App\\Modules\\' . $loadModule); |
|
| 116 | - return 'App\\Modules\\' . $loadModule; |
|
| 114 | + if (class_exists('App\\Modules\\'.$loadModule)) { |
|
| 115 | + $this->addToDevHelper('module '.$loadModule.' loaded', 'App\\Modules\\'.$loadModule); |
|
| 116 | + return 'App\\Modules\\'.$loadModule; |
|
| 117 | 117 | } |
| 118 | 118 | //check in core, send error popup if overcharged |
| 119 | - if (class_exists('Core\\Modules\\' . $loadModule)) { |
|
| 120 | - $this->addToDevHelper('module ' . $loadModule . ' loaded', 'Core\\Modules\\' . $loadModule); |
|
| 121 | - return 'Core\\Modules\\' . $loadModule; |
|
| 119 | + if (class_exists('Core\\Modules\\'.$loadModule)) { |
|
| 120 | + $this->addToDevHelper('module '.$loadModule.' loaded', 'Core\\Modules\\'.$loadModule); |
|
| 121 | + return 'Core\\Modules\\'.$loadModule; |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | //if we are here then no module found |
| 125 | - throw new \ErrorException('module ' . $loadModule . ' does not exist or not loaded'); |
|
| 125 | + throw new \ErrorException('module '.$loadModule.' does not exist or not loaded'); |
|
| 126 | 126 | |
| 127 | 127 | } |
| 128 | 128 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | public function getView($template) |
| 148 | 148 | { |
| 149 | 149 | $twig = $this->container->getTemplate(); |
| 150 | - return $twig->render($template . '.twig', $this->data); |
|
| 150 | + return $twig->render($template.'.twig', $this->data); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | /** |
@@ -169,7 +169,7 @@ discard block |
||
| 169 | 169 | $this->devHelper(); |
| 170 | 170 | } |
| 171 | 171 | $twig = $this->container->getTemplate(); |
| 172 | - $twig->display($template . '.twig', $this->data); |
|
| 172 | + $twig->display($template.'.twig', $this->data); |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | protected function addToDevHelper($name, $var) |
| 202 | 202 | { |
| 203 | 203 | //only populate if in dev environment |
| 204 | - if (Config::DEV_ENVIRONMENT){ |
|
| 204 | + if (Config::DEV_ENVIRONMENT) { |
|
| 205 | 205 | $classMethods = []; |
| 206 | 206 | $classMethods[$name] = $var; |
| 207 | 207 | if (!isset($this->data['dev_info'])) { |