Critical bug fixes

src/Libraries/Database/Sleekdb/Statements/Result.php

@@ -25,10 +25,8 @@ trait Result
 
     /**
      * @inheritDoc
-     * @throws \Quantum\Exceptions\DatabaseException
      * @throws \SleekDB\Exceptions\IOException
      * @throws \SleekDB\Exceptions\InvalidArgumentException
-     * @throws \SleekDB\Exceptions\InvalidConfigurationException
      */
     public function get()
     {
@@ -37,61 +35,57 @@ public function get()
 
     /**
      * @inheritDoc
-     * @throws \Quantum\Exceptions\DatabaseException
-     * @throws \SleekDB\Exceptions\IOException
+     * @return \Quantum\Libraries\Database\DbalInterface
      * @throws \SleekDB\Exceptions\InvalidArgumentException
-     * @throws \SleekDB\Exceptions\InvalidConfigurationException
      */
     public function findOne(int $id): DbalInterface
     {
         $result = $this->getOrmModel()->findById($id);
 
         $this->data = $result;
         $this->modifiedFields = $result;
+        $this->isNew = false;
 
         return $this;
     }
 
     /**
      * @inheritDoc
-     * @throws \Quantum\Exceptions\DatabaseException
      * @throws \SleekDB\Exceptions\IOException
      * @throws \SleekDB\Exceptions\InvalidArgumentException
-     * @throws \SleekDB\Exceptions\InvalidConfigurationException
      */
     public function findOneBy(string $column, $value): DbalInterface
     {
         $result = $this->getOrmModel()->findOneBy([$column, '=', $value]);
 
         $this->data = $result;
         $this->modifiedFields = $result;
+        $this->isNew = false;
 
         return $this;
     }
 
     /**
      * @inheritDoc
-     * @throws \Quantum\Exceptions\DatabaseException
+     * @return \Quantum\Libraries\Database\DbalInterface
      * @throws \SleekDB\Exceptions\IOException
      * @throws \SleekDB\Exceptions\InvalidArgumentException
-     * @throws \SleekDB\Exceptions\InvalidConfigurationException
      */
     public function first(): DbalInterface
     {
         $result = $this->getBuilder()->getQuery()->first();
 
         $this->data = $result;
         $this->modifiedFields = $result;
+        $this->isNew = false;
 
         return $this;
     }
 
     /**
      * @inheritDoc
-     * @throws \Quantum\Exceptions\DatabaseException
      * @throws \SleekDB\Exceptions\IOException
      * @throws \SleekDB\Exceptions\InvalidArgumentException
-     * @throws \SleekDB\Exceptions\InvalidConfigurationException
      */
     public function count(): int
     {

src/Mvc/QtModel.php

@@ -83,13 +83,17 @@ public function setOrm(DbalInterface $orm)
 
     /**
      * Fills the object properties
-     * @param array $arguments
+     * @param array $props
      * @return \Quantum\Mvc\QtModel
      * @throws \Quantum\Exceptions\ModelException
      */
-    public function fillObjectProps(array $arguments): QtModel
+    public function fillObjectProps(array $props): QtModel
     {
-        foreach ($arguments as $key => $value) {
+        foreach ($props as $key => $value) {
+            if ($key == $this->idColumn) {
+                continue;
+            }
+
             if (!in_array($key, $this->fillable)) {
                 throw ModelException::inappropriateProperty($key);
             }

src/Routes/Route.php

@@ -35,17 +35,17 @@ class Route
      */
     private $module;
 
-    /**
+    /**`
      * Identifies the group middleware
      * @var bool
      */
-    private $isGroupeMiddlewares;
+    private $isGroupMiddlewares;
 
     /**
      * Identifies the group
      * @var boolean
      */
-    private $isGroupe = false;
+    private $isGroup = false;
 
     /**
      * Current group name
@@ -138,10 +138,10 @@ public function group(string $groupName, Closure $callback): self
     {
         $this->currentGroupName = $groupName;
 
-        $this->isGroupe = true;
-        $this->isGroupeMiddlewares = false;
+        $this->isGroup = true;
+        $this->isGroupMiddlewares = false;
         $callback($this);
-        $this->isGroupeMiddlewares = true;
+        $this->isGroupMiddlewares = true;
         $this->currentGroupName = null;
 
         return $this;
@@ -154,23 +154,22 @@ public function group(string $groupName, Closure $callback): self
      */
     public function middlewares(array $middlewares = []): self
     {
-        if (!$this->isGroupe) {
+        if (!$this->isGroup) {
             end($this->virtualRoutes['*']);
             $lastKey = key($this->virtualRoutes['*']);
             $this->virtualRoutes['*'][$lastKey]['middlewares'] = $middlewares;
         } else {
             end($this->virtualRoutes);
             $lastKeyOfFirstRound = key($this->virtualRoutes);
 
-            if (!$this->isGroupeMiddlewares) {
+            if (!$this->isGroupMiddlewares) {
                 end($this->virtualRoutes[$lastKeyOfFirstRound]);
                 $lastKeyOfSecondRound = key($this->virtualRoutes[$lastKeyOfFirstRound]);
                 $this->virtualRoutes[$lastKeyOfFirstRound][$lastKeyOfSecondRound]['middlewares'] = $middlewares;
             } else {
-                $this->isGroupe = false;
+                $this->isGroup = false;
                 foreach ($this->virtualRoutes[$lastKeyOfFirstRound] as &$route) {
-                    $hasMiddleware = end($route);
-                    if (!is_array($hasMiddleware)) {
+                    if(!key_exists('middlewares', $route)) {
                         $route['middlewares'] = $middlewares;
                     } else {
                         $reversedMiddlewares = array_reverse($middlewares);
@@ -197,7 +196,7 @@ public function name(string $name): self
             throw RouteException::nameBeforeDefinition();
         }
 
-        if ($this->isGroupeMiddlewares) {
+        if ($this->isGroupMiddlewares) {
             throw RouteException::nameOnGroup();
         }