@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | $viewData['showErrors'] = true; //sending the config option down to twig |
67 | 67 | $viewData['classException'] = get_class($exception); |
68 | 68 | $viewData['stackTrace'] = $exception->getTraceAsString(); |
69 | - $viewData['thrownIn'] = $exception->getFile() . " On line " . $exception->getLine(); |
|
69 | + $viewData['thrownIn'] = $exception->getFile()." On line ".$exception->getLine(); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | $container = new Container(); |
@@ -74,9 +74,9 @@ discard block |
||
74 | 74 | //Making sure that the twig template renders correctly. |
75 | 75 | try { |
76 | 76 | $twig = $container->getTemplate(); |
77 | - $twig->display('ErrorPages/' . $code . '.twig', $viewData); |
|
77 | + $twig->display('ErrorPages/'.$code.'.twig', $viewData); |
|
78 | 78 | } catch (\Exception $e) { |
79 | - echo 'Twig Error : ' . $e->getMessage(); |
|
79 | + echo 'Twig Error : '.$e->getMessage(); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 |
@@ -47,10 +47,10 @@ discard block |
||
47 | 47 | $twigOptions = []; |
48 | 48 | if (!Config::DEV_ENVIRONMENT) { |
49 | 49 | $twigOptions = [ |
50 | - 'cache' => dirname(__DIR__) . '/Cache' |
|
50 | + 'cache' => dirname(__DIR__).'/Cache' |
|
51 | 51 | ]; |
52 | 52 | } |
53 | - $loader = new \Twig_Loader_Filesystem(dirname(__DIR__) . '/App/Views'); |
|
53 | + $loader = new \Twig_Loader_Filesystem(dirname(__DIR__).'/App/Views'); |
|
54 | 54 | $twig = new \Twig_Environment($loader, $twigOptions); |
55 | 55 | |
56 | 56 | return $twig; |
@@ -65,13 +65,13 @@ discard block |
||
65 | 65 | if ($this->dbh) { |
66 | 66 | return $this->dbh; |
67 | 67 | } |
68 | - $dsn = "mysql:host=" . Config::DB_HOST . ";dbname=" . Config::DB_NAME . ";charset=utf8"; //Creating the Data Source name |
|
68 | + $dsn = "mysql:host=".Config::DB_HOST.";dbname=".Config::DB_NAME.";charset=utf8"; //Creating the Data Source name |
|
69 | 69 | $opt = [ |
70 | 70 | PDO::ATTR_PERSISTENT => true, |
71 | 71 | PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, |
72 | 72 | PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC |
73 | 73 | ]; |
74 | - $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt);; |
|
74 | + $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt); ; |
|
75 | 75 | return $this->dbh; |
76 | 76 | } |
77 | 77 |
@@ -45,7 +45,7 @@ |
||
45 | 45 | $hash = bin2hex($rand); |
46 | 46 | $this->session->set('csrf_token', $hash); |
47 | 47 | } catch (\Exception $e) { |
48 | - echo 'Random generator not present on server: ' . $e->getMessage(); |
|
48 | + echo 'Random generator not present on server: '.$e->getMessage(); |
|
49 | 49 | } |
50 | 50 | } |
51 | 51 | } |
@@ -59,7 +59,7 @@ |
||
59 | 59 | { |
60 | 60 | $host = $_SERVER['HTTP_HOST']; |
61 | 61 | $https = !empty($_SERVER['HTTPS']) ? 'https' : 'http'; |
62 | - return $https . '://' . $host . '/'; |
|
62 | + return $https.'://'.$host.'/'; |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -116,7 +116,7 @@ discard block |
||
116 | 116 | if ($table === null) { |
117 | 117 | $reflect = new \ReflectionClass(get_class($this)); |
118 | 118 | $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace |
119 | - $table = $table . 's'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s |
|
119 | + $table = $table.'s'; //adding the s since the table should be plural. Might be some special case where the plural isn't just with an s |
|
120 | 120 | $table = strtolower($table); //the database names are in lowercase |
121 | 121 | } |
122 | 122 | |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | |
135 | 135 | //if we are here, then table doesn't exist, check for view |
136 | - $view = 'v_' . $table; |
|
136 | + $view = 'v_'.$table; |
|
137 | 137 | $stmt->bindValue(':table', $view, PDO::PARAM_STR); |
138 | 138 | $stmt->execute(); |
139 | 139 | $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | protected function getRowById($rowId, $table = ''): array |
213 | 213 | { |
214 | 214 | $tableName = $this->getTable($table); |
215 | - $idName = 'id' . $tableName; |
|
215 | + $idName = 'id'.$tableName; |
|
216 | 216 | $sql = "SELECT * FROM $tableName WHERE $idName = :rowId"; |
217 | 217 | $this->query($sql); |
218 | 218 | $this->bind(':rowId', $rowId); |
@@ -24,7 +24,7 @@ |
||
24 | 24 | $categories = $this->getResultSet('categories'); |
25 | 25 | foreach ($categories as $category) { |
26 | 26 | $data += [ |
27 | - $category['category_name'] => '/category/' . $category['idcategories'] |
|
27 | + $category['category_name'] => '/category/'.$category['idcategories'] |
|
28 | 28 | ]; |
29 | 29 | } |
30 | 30 | return $data; |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | |
61 | 61 | //We load all our module objects into our object |
62 | 62 | foreach ($this->loadModules as $loadModule) { |
63 | - $loadModuleObj = 'Core\\Modules\\' . $loadModule; |
|
63 | + $loadModuleObj = 'Core\\Modules\\'.$loadModule; |
|
64 | 64 | |
65 | 65 | $loadModuleName = lcfirst($loadModule); |
66 | 66 | $loadedModule = new $loadModuleObj($this->container); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | |
72 | 72 | //we are not allowed to create public modules, they must be a placeholder ready |
73 | 73 | if (!property_exists($this, $loadModuleName)) { |
74 | - throw new \ErrorException('class var ' . $loadModuleName . ' not present'); |
|
74 | + throw new \ErrorException('class var '.$loadModuleName.' not present'); |
|
75 | 75 | } |
76 | 76 | $this->$loadModuleName = $loadedModule; |
77 | 77 | } |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | public function getView($template) |
103 | 103 | { |
104 | 104 | $twig = $this->container->getTemplate(); |
105 | - return $twig->render($template . '.twig', $this->data); |
|
105 | + return $twig->render($template.'.twig', $this->data); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | $this->devHelper(); |
124 | 124 | } |
125 | 125 | $twig = $this->container->getTemplate(); |
126 | - $twig->display($template . '.twig', $this->data); |
|
126 | + $twig->display($template.'.twig', $this->data); |
|
127 | 127 | } |
128 | 128 | |
129 | 129 | protected function devHelper($var = '') |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | default: |
24 | 24 | $headerType = 'text/html'; |
25 | 25 | } |
26 | - $contentType = 'Content-Type: ' . $headerType; |
|
26 | + $contentType = 'Content-Type: '.$headerType; |
|
27 | 27 | |
28 | 28 | header($contentType); |
29 | 29 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | } |
42 | 42 | } |
43 | 43 | |
44 | - header("location: /" . $url); |
|
44 | + header("location: /".$url); |
|
45 | 45 | die(); //after redirect do not execute anything else from the function |
46 | 46 | } |
47 | 47 | } |
48 | 48 | \ No newline at end of file |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $specialNamespace = array_shift($url); |
68 | 68 | |
69 | 69 | //making sure we have a single backslash |
70 | - $specialNamespace = rtrim($specialNamespace, '\\') . '\\'; |
|
70 | + $specialNamespace = rtrim($specialNamespace, '\\').'\\'; |
|
71 | 71 | |
72 | 72 | //capitalize the special namespace |
73 | 73 | $specialNamespace = $this->convertToStudlyCaps($specialNamespace); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | { |
135 | 135 | |
136 | 136 | //try to create the controller object |
137 | - $fullControllerName = $this->currentNamespace . $this->currentController; |
|
137 | + $fullControllerName = $this->currentNamespace.$this->currentController; |
|
138 | 138 | |
139 | 139 | //make sure the class exists before continuing |
140 | 140 | if (!class_exists($fullControllerName)) { |