Merge remote-tracking branch 'upstream/develop' into 4.4

Author: kenjis

system/Entity/Entity.php

@@ -441,7 +441,7 @@ public function cast(?bool $cast = null)
      *
      * @param array|bool|float|int|object|string|null $value
      *
-     * @return $this
+     * @return void
      *
      * @throws Exception
      */
@@ -472,16 +472,14 @@ public function __set(string $key, $value = null)
         if (method_exists($this, $method) && $method !== 'setAttributes') {
             $this->{$method}($value);
 
-            return $this;
+            return;
         }
 
         // Otherwise, just the value. This allows for creation of new
         // class properties that are undefined, though they cannot be
         // saved. Useful for grabbing values through joins, assigning
         // relationships, etc.
         $this->attributes[$dbColumn] = $value;
-
-        return $this;
     }
 
     /**