Merge 89d8a3d into ecbc45d

src/Driver/AbstractDriver.php

@@ -27,8 +27,6 @@ public function serializeValue($value)
     /**
      * Serializes an array of values.
      *
-     * @param array $values
-     *
      * @return array
      */
     protected function serialize(array $values)
@@ -124,14 +122,13 @@ protected function prefixColumn($column, $tablename)
     /**
      * Adds join conditions to a select query.
      *
-     * @param Query       $query
      * @param string      $tablename
      * @param SelectQuery $dbQuery
      */
     protected function addJoins(Query $query, $tablename, $dbQuery)
     {
         foreach ($query->getJoins() as $join) {
-            list($foreignModelClass, $column, $foreignKey) = $join;
+            [$foreignModelClass, $column, $foreignKey] = $join;
 
             $foreignModel = new $foreignModelClass();
             $foreignTablename = $foreignModel->getTablename();

src/Driver/DatabaseDriver.php

@@ -85,10 +85,10 @@ public function getConnection(?string $id): QueryBuilder
             try {
                 if ($id) {
                     return $this->connections->get($id);
-                } else {
-                    return $this->connections->getDefault();
                 }
-            } catch (JAQBException | PDOException $e) {
+
+                return $this->connections->getDefault();
+            } catch (JAQBException|PDOException $e) {
                 throw new DriverException($e->getMessage(), $e->getCode(), $e);
             }
         }
@@ -108,8 +108,8 @@ public function createModel(Model $model, array $parameters)
 
         try {
             return $db->insert($values)
-                    ->into($tablename)
-                    ->execute() instanceof PDOStatement;
+                ->into($tablename)
+                ->execute() instanceof PDOStatement;
         } catch (PDOException $original) {
             throw new DriverException('An error occurred in the database driver when creating the '.$model::modelName().': '.$original->getMessage(), $original->getCode(), $original);
         }
@@ -157,9 +157,9 @@ public function updateModel(Model $model, array $parameters): bool
 
         try {
             return $db->update($tablename)
-                    ->values($values)
-                    ->where($model->ids())
-                    ->execute() instanceof PDOStatement;
+                ->values($values)
+                ->where($model->ids())
+                ->execute() instanceof PDOStatement;
         } catch (PDOException $original) {
             throw new DriverException('An error occurred in the database driver when updating the '.$model::modelName().': '.$original->getMessage(), $original->getCode(), $original);
         }
@@ -172,8 +172,8 @@ public function deleteModel(Model $model): bool
 
         try {
             return $db->delete($tablename)
-                    ->where($model->ids())
-                    ->execute() instanceof PDOStatement;
+                ->where($model->ids())
+                ->execute() instanceof PDOStatement;
         } catch (PDOException $original) {
             throw new DriverException('An error occurred in the database driver while deleting the '.$model::modelName().': '.$original->getMessage(), $original->getCode(), $original);
         }

src/Driver/DbalDriver.php

@@ -246,9 +246,9 @@ private function buildSelectQuery(Query $query, string $tablename): SelectQuery
     /**
      * Executes a select query through DBAL and returns a scalar result.
      *
-     * @return false|mixed
-     *
      * @throws DriverException
+     *
+     * @return false|mixed
      */
     private function executeScalar(SelectQuery $query, Model $model, string $field)
     {

src/Driver/DriverInterface.php

@@ -23,19 +23,19 @@ interface DriverInterface
     /**
      * Creates a model.
      *
-     * @return mixed result
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return mixed result
      */
     public function createModel(Model $model, array $parameters);
 
     /**
      * Gets the last inserted ID. Used for drivers that generate
      * IDs for models after creation.
      *
-     * @return mixed
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return mixed
      */
     public function getCreatedId(Model $model, string $propertyName);
 
@@ -49,9 +49,9 @@ public function loadModel(Model $model): ?array;
     /**
      * Performs a query to find models of the given type.
      *
-     * @return array raw data from storage
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return array raw data from storage
      */
     public function queryModels(Query $query): array;
 
@@ -79,36 +79,36 @@ public function count(Query $query): int;
     /**
      * Gets the sum matching the given query.
      *
-     * @return number
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return number
      */
     public function sum(Query $query, string $field);
 
     /**
      * Gets the average matching the given query.
      *
-     * @return number
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return number
      */
     public function average(Query $query, string $field);
 
     /**
      * Gets the max matching the given query.
      *
-     * @return number
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return number
      */
     public function max(Query $query, string $field);
 
     /**
      * Gets the min matching the given query.
      *
-     * @return number
-     *
      * @throws DriverException when an exception occurs within the driver
+     *
+     * @return number
      */
     public function min(Query $query, string $field);
 

src/Model.php

@@ -581,9 +581,9 @@ public function saveOrFail()
      *
      * @param array $data optional key-value properties to set
      *
-     * @return bool true when the operation was successful
-     *
      * @throws BadMethodCallException when called on an existing model
+     *
+     * @return bool true when the operation was successful
      */
     public function create(array $data = []): bool
     {
@@ -963,9 +963,9 @@ public function dirty(?string $name = null, bool $hasChanged = false): bool
      *
      * @param array $data optional key-value properties to set
      *
-     * @return bool true when the operation was successful
-     *
      * @throws BadMethodCallException when not called on an existing model
+     *
+     * @return bool true when the operation was successful
      */
     public function set(array $data = []): bool
     {
@@ -1200,9 +1200,9 @@ public static function find($id)
      *
      * @param mixed $id
      *
-     * @return static
-     *
      * @throws ModelNotFoundException when a model could not be found
+     *
+     * @return static
      */
     public static function findOrFail($id)
     {

src/Property.php

@@ -15,7 +15,7 @@ final class Property implements ArrayAccess
     private $name;
 
     /** @var string|null */
-    private $type = null;
+    private $type;
 
     /** @var string */
     private $mutable = self::MUTABLE;
@@ -27,10 +27,10 @@ final class Property implements ArrayAccess
     private $required = false;
 
     /** @var array|string|null */
-    private $validate = null;
+    private $validate;
 
     /** @var mixed|null */
-    private $default = null;
+    private $default;
 
     /** @var bool */
     private $hasDefault;

src/Type.php

@@ -112,9 +112,9 @@ public static function to_date($value): int
     {
         if (!is_numeric($value)) {
             return strtotime($value);
-        } else {
-            return $value + 0;
         }
+
+        return $value + 0;
     }
 
     /**

tests/bootstrap.php

@@ -14,7 +14,7 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
-function modelValidate(&$value, array $options, \Pulsar\Model $model)
+function modelValidate(&$value, array $options, Pulsar\Model $model)
 {
     $model->getErrors()->add('Custom error message from callable', ['field' => $options['field']]);