Starbugstone / blogoc

App/Models/Includes.php

Spacing +2 added lines, -2 removed lines

@@ -22,8 +22,8 @@
         $data = [];
         //get the categories from database
         $categories = $this->getResultSet('categories');
-        foreach ( $categories as $category) {
-            $data +=[
+        foreach ($categories as $category) {
+            $data += [
                 $category['category_name'] => '/category/'.$category['idcategories']
             ];
         }

Core/Router.php

Spacing +2 added lines, -2 removed lines

@@ -67,7 +67,7 @@ 
             $specialNamespace = array_shift($url);
 
             //making sure we have a single backslash
-            $specialNamespace = rtrim($specialNamespace, '\\') . '\\';
+            $specialNamespace = rtrim($specialNamespace, '\\').'\\';
 
             //capitalize the special namespace
             $specialNamespace = $this->convertToStudlyCaps($specialNamespace);
@@ -134,7 +134,7 @@ 
     {
 
         //try to create the controller object
-        $fullControllerName = $this->currentNamespace . $this->currentController;
+        $fullControllerName = $this->currentNamespace.$this->currentController;
 
         //make sure the class exists before continuing
         if (!class_exists($fullControllerName)) {

App/Controllers/Admin/Home.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 
 
 class Home extends \Core\Controller {
-    public function index(){
+    public function index() {
         $this->view->renderTemplate('Admin/Home.twig');
     }
 }
\ No newline at end of file

Core/Model.php

Spacing +12 added lines, -12 removed lines

@@ -64,7 +64,7 @@ 
      */
     protected function bind($param, $value, $type = null): void
     {
-        if($this->stmt == null){
+        if ($this->stmt == null) {
             throw new \Exception("No query to bind to");
         }
         if (is_null($type)) { //need a bind value, so just check it in code. that way we can just call bind(param,value)
@@ -87,7 +87,7 @@ 
 
     protected function execute()
     {
-        if($this->stmt == null){
+        if ($this->stmt == null) {
             throw new \Exception("No statement to execute");
         }
         return $this->stmt->execute();
@@ -114,7 +114,7 @@ 
         if ($table == null) {
             $reflect = new \ReflectionClass(get_class($this));
             $table = $reflect->getShortName(); //this is to only get the model name, otherwise we get the full namespace
-            $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
+            $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
             $table = strtolower($table); //the database names are in lowercase
         }
 
@@ -131,7 +131,7 @@ 
         }
 
         //if we are here, then table doesn't exist, check for view
-        $view = 'v_' . $table;
+        $view = 'v_'.$table;
         $stmt->bindValue(':table', $view, PDO::PARAM_STR);
         $stmt->execute();
         $exists = $stmt->rowCount() > 0; //will return 1 if table exists or 0 if non existant
@@ -156,10 +156,10 @@ 
      * @throws \Exception if debugging is on and no result
      */
     private function returnArray($result):array{
-        if($result){
+        if ($result) {
             return $result;
         }
-        if (\App\Config::SHOW_ERRORS){
+        if (\App\Config::SHOW_ERRORS) {
             throw new \Exception("No results in database");
         }
         return [];
@@ -187,11 +187,11 @@ 
      * @return array the results from database
      * @throws \ReflectionException
      */
-    protected function getResultSetLimited($limit,$table = ''):array{
+    protected function getResultSetLimited($limit, $table = ''):array{
         $tableName = $this->getTable($table);
         $sql = "SELECT * FROM $tableName LIMIT :limit";
         $this->query($sql);
-        $this->bind(':limit',$limit);
+        $this->bind(':limit', $limit);
         $this->execute();
         $result = $this->stmt->fetchAll(); //returns an array or false if no results
         return $this->returnArray($result);
@@ -203,12 +203,12 @@ 
      * @return array result or empty array
      * @throws \ReflectionException (probably not, but will throw an exception if debugging is on and no results)
      */
-    protected function getRowById($rowId, $table=''):array{
+    protected function getRowById($rowId, $table = ''):array{
         $tableName = $this->getTable($table);
         $idName = 'id'.$tableName;
         $sql = "SELECT * FROM $tableName WHERE $idName = :rowId";
         $this->query($sql);
-        $this->bind(':rowId',$rowId);
+        $this->bind(':rowId', $rowId);
         $this->execute();
         $result = $this->stmt->fetch();
         return $this->returnArray($result);
@@ -223,10 +223,10 @@ 
      * @throws \ReflectionException (probably not, but will throw an exception if debugging is on and no results)
      * @throws \Exception if the column name consists of other characters than lower case, numbers and underscore for security
      */
-    protected function getRowByColumn($columnName,$value,$table=''):array{
+    protected function getRowByColumn($columnName, $value, $table = ''):array{
         $tableName = $this->getTable($table);
         $columnNameOk = preg_match("/^[a-z0-9_]+$/i", $columnName); //testing if column name only has lower case, numbers and underscore
-        if(!$columnNameOk){
+        if (!$columnNameOk) {
             throw new \Exception("Syntax error : Column name \"$columnName\" is not legal");
         }
         $sql = "SELECT * FROM $tableName WHERE $columnName = :value";

Core/Error.php

Indentation -1 removed lines

@@ -37,7 +37,6 @@
      * @throws \Twig_Error_Syntax
      *
      * @return void
-
      */
     public static function exceptionHandler($exception): void
     {

Spacing +4 added lines, -4 removed lines

@@ -57,17 +57,17 @@
             $viewData['showErrors'] = true; //sending the config option down to twig
             $viewData['classException'] = get_class($exception);
             $viewData['stackTrace'] = $exception->getTraceAsString();
-            $viewData['thrownIn'] = $exception->getFile() . " On line " . $exception->getLine();
+            $viewData['thrownIn'] = $exception->getFile()." On line ".$exception->getLine();
         }
 
         $view = new Container();
 
         //Making sure that the twig template renders correctly.
-        try{
+        try {
             $twig = $view->getTemplate();
-            echo $twig->render('ErrorPages/'.$code . '.twig', $viewData);
+            echo $twig->render('ErrorPages/'.$code.'.twig', $viewData);
             //$view->renderView('ErrorPages/'.$code . '.twig', $viewData);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             echo 'Twig Error : '.htmlspecialchars($e->getMessage());
         }
 

Braces +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
             $twig = $view->getTemplate();
             echo $twig->render('ErrorPages/'.$code . '.twig', $viewData);
             //$view->renderView('ErrorPages/'.$code . '.twig', $viewData);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             echo 'Twig Error : '.htmlspecialchars($e->getMessage());
         }
 

Core/Container.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 use PDO;
 
 
-class Container{
+class Container {
 
     //used for the model connection
     private $dbh = null;
@@ -12,15 +12,15 @@ 
 
     public function getTemplate()
     {
-        $loader = new \Twig_Loader_Filesystem(dirname(__DIR__) . '/App/Views');
+        $loader = new \Twig_Loader_Filesystem(dirname(__DIR__).'/App/Views');
         $twig = new \Twig_Environment($loader); //need to add cache
 
         return $twig;
     }
 
     //only set once
-    public function setPdo(){
-        if ($this->dbh){
+    public function setPdo() {
+        if ($this->dbh) {
             return $this->dbh;
         }
         $dsn = "mysql:host=".Config::DB_HOST.";dbname=".Config::DB_NAME.";charset=utf8"; //Creating the Data Source name
@@ -29,7 +29,7 @@ 
             PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
             PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC
         ];
-        $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt);;
+        $this->dbh = new PDO($dsn, Config::DB_USER, Config::DB_PASSWORD, $opt); ;
         return $this->dbh;
     }
 }
\ No newline at end of file

Core/Controller.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         echo $twig->render($template, $args);
     }
 
-    public function getContainer(){
+    public function getContainer() {
         return $this->container;
     }