freshsauce / model-orm-php

src/Model/Model.php

Doc Comments +5 added lines, -5 removed lines

@@ -129,7 +129,7 @@ 
     /**
      * Mark the field as dirty, so it will be set in inserts and updates
      *
-     * @param $name
+     * @param string $name
      */
     public function markFieldDirty( $name ) {
         $this->dirty->$name = true; // field became dirty
@@ -443,7 +443,7 @@ 
      * find one match based on a single field and match criteria
      *
      * @param string $fieldname
-     * @param mixed  $match string|array
+     * @param string  $match string|array
      * @param string $order ASC|DESC
      * @return object of calling class
      */
@@ -460,7 +460,7 @@ 
      * find multiple matches based on a single field and match criteria
      *
      * @param string $fieldname
-     * @param mixed  $match string|array
+     * @param string  $match string|array
      * @return object[] of objects of calling class
      */
     public static function fetchAllWhereMatchingSingleField( $fieldname, $match ) {
@@ -484,7 +484,7 @@ 
     /**
      * returns number of rows in the table
      *
-     * @return int
+     * @return string
      */
     static public function count() {
         $st = static::execute( 'SELECT COUNT(*) FROM ' . static::_quote_identifier( static::$_tableName ) );
@@ -496,7 +496,7 @@ 
      *
      * @param string $SQLfragment conditions, grouping to apply (to right of WHERE keyword)
      * @param array  $params      optional params to be escaped and injected into the SQL query (standrd PDO syntax)
-     * @return integer count of rows matching conditions
+     * @return string count of rows matching conditions
      */
     static public function countAllWhere( $SQLfragment = '', $params = array() ) {
         $SQLfragment = self::addWherePrefix( $SQLfragment );

Unused Use Statements -1 removed lines

@@ -19,7 +19,6 @@
      *
      * @package default
      */
-use phpDocumentor\Reflection\Types\Object_;
 
 /**
  * Class Model

Spacing +114 added lines, -114 removed lines

@@ -77,11 +77,11 @@ 
      * Model constructor.
      * @param array $data
      */
-    public function __construct( $data = array() ) {
+    public function __construct($data = array()) {
         static::getFieldnames(); // only called once first time an object is created
         $this->clearDirtyFields();
-        if (is_array( $data )) {
-            $this->hydrate( $data );
+        if (is_array($data)) {
+            $this->hydrate($data);
         }
     }
 
@@ -91,7 +91,7 @@ 
      * @return bool
      */
     public function hasData() {
-        return is_object( $this->data );
+        return is_object($this->data);
     }
 
 
@@ -103,7 +103,7 @@ 
      */
     public function dataPresent() {
         if (!$this->hasData()) {
-            throw new \Exception( 'No data' );
+            throw new \Exception('No data');
         }
 
         return true;
@@ -118,12 +118,12 @@ 
      *
      * @return void
      */
-    public function __set( $name, $value ) {
+    public function __set($name, $value) {
         if (!$this->hasData()) {
             $this->data = new \stdClass();
         }
         $this->data->$name = $value;
-        $this->markFieldDirty( $name );
+        $this->markFieldDirty($name);
     }
 
     /**
@@ -131,7 +131,7 @@ 
      *
      * @param $name
      */
-    public function markFieldDirty( $name ) {
+    public function markFieldDirty($name) {
         $this->dirty->$name = true; // field became dirty
     }
 
@@ -141,7 +141,7 @@ 
      * @param $name
      * @return bool
      */
-    public function isFieldDirty( $name ) {
+    public function isFieldDirty($name) {
         return isset($this->dirty->$name) && ($this->dirty->$name == true);
     }
 
@@ -161,20 +161,20 @@ 
      * @return mixed
      * @throws \Exception
      */
-    public function __get( $name ) {
+    public function __get($name) {
         if (!$this->hasData()) {
-            throw new \Exception( "data property=$name has not been initialised", 1 );
+            throw new \Exception("data property=$name has not been initialised", 1);
         }
 
-        if (property_exists( $this->data, $name )) {
+        if (property_exists($this->data, $name)) {
             return $this->data->$name;
         }
 
         $trace = debug_backtrace();
         throw new \Exception(
-            'Undefined property via __get(): ' . $name .
-            ' in ' . $trace[0]['file'] .
-            ' on line ' . $trace[0]['line'],
+            'Undefined property via __get(): '.$name.
+            ' in '.$trace[0]['file'].
+            ' on line '.$trace[0]['line'],
             1
         );
     }
@@ -187,8 +187,8 @@ 
      *
      * @return bool
      */
-    public function __isset( $name ) {
-        if ($this->hasData() && property_exists( $this->data, $name )) {
+    public function __isset($name) {
+        if ($this->hasData() && property_exists($this->data, $name)) {
             return true;
         }
 
@@ -206,9 +206,9 @@ 
      * @param string $password
      * @param array  $driverOptions
      */
-    public static function connectDb( $dsn, $username, $password, $driverOptions = array() ) {
-        static::$_db = new \PDO( $dsn, $username, $password, $driverOptions );
-        static::$_db->setAttribute( \PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION ); // Set Errorhandling to Exception
+    public static function connectDb($dsn, $username, $password, $driverOptions = array()) {
+        static::$_db = new \PDO($dsn, $username, $password, $driverOptions);
+        static::$_db->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); // Set Errorhandling to Exception
         static::_setup_identifier_quote_character();
     }
 
@@ -219,7 +219,7 @@ 
      * @return void
      */
     public static function _setup_identifier_quote_character() {
-        if (is_null( static::$_identifier_quote_character )) {
+        if (is_null(static::$_identifier_quote_character)) {
             static::$_identifier_quote_character = static::_detect_identifier_quote_character();
         }
     }
@@ -253,9 +253,9 @@ 
      */
     protected static function getDriverName() {
         if (!static::$_db) {
-            throw new \Exception( 'No database connection setup' );
+            throw new \Exception('No database connection setup');
         }
-        return static::$_db->getAttribute( \PDO::ATTR_DRIVER_NAME );
+        return static::$_db->getAttribute(\PDO::ATTR_DRIVER_NAME);
     }
 
     /**
@@ -266,14 +266,14 @@ 
      * @param string $identifier
      * @return string
      */
-    protected static function _quote_identifier( $identifier ) {
+    protected static function _quote_identifier($identifier) {
         $class = get_called_class();
-        $parts = explode( '.', $identifier );
-        $parts = array_map( array(
+        $parts = explode('.', $identifier);
+        $parts = array_map(array(
             $class,
             '_quote_identifier_part'
-        ), $parts );
-        return join( '.', $parts );
+        ), $parts);
+        return join('.', $parts);
     }
 
 
@@ -285,11 +285,11 @@ 
      * @param string $part
      * @return string
      */
-    protected static function _quote_identifier_part( $part ) {
+    protected static function _quote_identifier_part($part) {
         if ($part === '*') {
             return $part;
         }
-        return static::$_identifier_quote_character . $part . static::$_identifier_quote_character;
+        return static::$_identifier_quote_character.$part.static::$_identifier_quote_character;
     }
 
     /**
@@ -300,8 +300,8 @@ 
     protected static function getFieldnames() {
         $class = get_called_class();
         if (!isset(self::$_tableColumns[$class])) {
-            $st                          = static::execute( 'DESCRIBE ' . static::_quote_identifier( static::$_tableName ) );
-            self::$_tableColumns[$class] = $st->fetchAll( \PDO::FETCH_COLUMN );
+            $st                          = static::execute('DESCRIBE '.static::_quote_identifier(static::$_tableName));
+            self::$_tableColumns[$class] = $st->fetchAll(\PDO::FETCH_COLUMN);
         }
         return self::$_tableColumns[$class];
     }
@@ -313,7 +313,7 @@ 
      *
      * @return void
      */
-    public function hydrate( $data ) {
+    public function hydrate($data) {
         foreach (static::getFieldnames() as $fieldname) {
             if (isset($data[$fieldname])) {
                 $this->$fieldname = $data[$fieldname];
@@ -359,8 +359,8 @@ 
      * @param string $id
      * @return Object
      */
-    static public function getById( $id ) {
-        return static::fetchOneWhere( static::_quote_identifier( static::$_primary_column_name ) . ' = ?', array($id) );
+    static public function getById($id) {
+        return static::fetchOneWhere(static::_quote_identifier(static::$_primary_column_name).' = ?', array($id));
     }
 
     /**
@@ -369,7 +369,7 @@ 
      * @return Object
      */
     static public function first() {
-        return static::fetchOneWhere( '1=1 ORDER BY ' . static::_quote_identifier( static::$_primary_column_name ) . ' ASC' );
+        return static::fetchOneWhere('1=1 ORDER BY '.static::_quote_identifier(static::$_primary_column_name).' ASC');
     }
 
     /**
@@ -378,7 +378,7 @@ 
      * @return Object
      */
     static public function last() {
-        return static::fetchOneWhere( '1=1 ORDER BY ' . static::_quote_identifier( static::$_primary_column_name ) . ' DESC' );
+        return static::fetchOneWhere('1=1 ORDER BY '.static::_quote_identifier(static::$_primary_column_name).' DESC');
     }
 
     /**
@@ -387,9 +387,9 @@ 
      * @param string $id
      * @return object[] of objects for matching records
      */
-    static public function find( $id ) {
-        $find_by_method = 'find_by_' . (static::$_primary_column_name);
-        static::$find_by_method( $id );
+    static public function find($id) {
+        $find_by_method = 'find_by_'.(static::$_primary_column_name);
+        static::$find_by_method($id);
     }
 
     /**
@@ -404,39 +404,39 @@ 
      * @return mixed int|object[]|object
      * @throws \Exception
      */
-    static public function __callStatic( $name, $arguments ) {
+    static public function __callStatic($name, $arguments) {
         // Note: value of $name is case sensitive.
-        if (preg_match( '/^find_by_/', $name ) == 1) {
+        if (preg_match('/^find_by_/', $name) == 1) {
             // it's a find_by_{fieldname} dynamic method
-            $fieldname = substr( $name, 8 ); // remove find by
+            $fieldname = substr($name, 8); // remove find by
             $match     = $arguments[0];
-            return static::fetchAllWhereMatchingSingleField( $fieldname, $match );
-        } else if (preg_match( '/^findOne_by_/', $name ) == 1) {
+            return static::fetchAllWhereMatchingSingleField($fieldname, $match);
+        } else if (preg_match('/^findOne_by_/', $name) == 1) {
             // it's a findOne_by_{fieldname} dynamic method
-            $fieldname = substr( $name, 11 ); // remove findOne_by_
+            $fieldname = substr($name, 11); // remove findOne_by_
             $match     = $arguments[0];
-            return static::fetchOneWhereMatchingSingleField( $fieldname, $match, 'ASC' );
-        } else if (preg_match( '/^first_by_/', $name ) == 1) {
+            return static::fetchOneWhereMatchingSingleField($fieldname, $match, 'ASC');
+        } else if (preg_match('/^first_by_/', $name) == 1) {
             // it's a first_by_{fieldname} dynamic method
-            $fieldname = substr( $name, 9 ); // remove first_by_
+            $fieldname = substr($name, 9); // remove first_by_
             $match     = $arguments[0];
-            return static::fetchOneWhereMatchingSingleField( $fieldname, $match, 'ASC' );
-        } else if (preg_match( '/^last_by_/', $name ) == 1) {
+            return static::fetchOneWhereMatchingSingleField($fieldname, $match, 'ASC');
+        } else if (preg_match('/^last_by_/', $name) == 1) {
             // it's a last_by_{fieldname} dynamic method
-            $fieldname = substr( $name, 8 ); // remove last_by_
+            $fieldname = substr($name, 8); // remove last_by_
             $match     = $arguments[0];
-            return static::fetchOneWhereMatchingSingleField( $fieldname, $match, 'DESC' );
-        } else if (preg_match( '/^count_by_/', $name ) == 1) {
+            return static::fetchOneWhereMatchingSingleField($fieldname, $match, 'DESC');
+        } else if (preg_match('/^count_by_/', $name) == 1) {
             // it's a count_by_{fieldname} dynamic method
-            $fieldname = substr( $name, 9 ); // remove find by
+            $fieldname = substr($name, 9); // remove find by
             $match     = $arguments[0];
-            if (is_array( $match )) {
-                return static::countAllWhere( static::_quote_identifier( $fieldname ) . ' IN (' . static::createInClausePlaceholders( $match ) . ')', $match );
+            if (is_array($match)) {
+                return static::countAllWhere(static::_quote_identifier($fieldname).' IN ('.static::createInClausePlaceholders($match).')', $match);
             } else {
-                return static::countAllWhere( static::_quote_identifier( $fieldname ) . ' = ?', array($match) );
+                return static::countAllWhere(static::_quote_identifier($fieldname).' = ?', array($match));
             }
         }
-        throw new \Exception( __CLASS__ . ' not such static method[' . $name . ']' );
+        throw new \Exception(__CLASS__.' not such static method['.$name.']');
     }
 
     /**
@@ -447,11 +447,11 @@ 
      * @param string $order ASC|DESC
      * @return object of calling class
      */
-    public static function fetchOneWhereMatchingSingleField( $fieldname, $match, $order ) {
-        if (is_array( $match )) {
-            return static::fetchOneWhere( static::_quote_identifier( $fieldname ) . ' IN (' . static::createInClausePlaceholders( $match ) . ') ORDER BY ' . static::_quote_identifier( $fieldname ) . ' ' . $order, $match );
+    public static function fetchOneWhereMatchingSingleField($fieldname, $match, $order) {
+        if (is_array($match)) {
+            return static::fetchOneWhere(static::_quote_identifier($fieldname).' IN ('.static::createInClausePlaceholders($match).') ORDER BY '.static::_quote_identifier($fieldname).' '.$order, $match);
         } else {
-            return static::fetchOneWhere( static::_quote_identifier( $fieldname ) . ' = ? ORDER BY ' . static::_quote_identifier( $fieldname ) . ' ' . $order, array($match) );
+            return static::fetchOneWhere(static::_quote_identifier($fieldname).' = ? ORDER BY '.static::_quote_identifier($fieldname).' '.$order, array($match));
         }
     }
 
@@ -463,11 +463,11 @@ 
      * @param mixed  $match string|array
      * @return object[] of objects of calling class
      */
-    public static function fetchAllWhereMatchingSingleField( $fieldname, $match ) {
-        if (is_array( $match )) {
-            return static::fetchAllWhere( static::_quote_identifier( $fieldname ) . ' IN (' . static::createInClausePlaceholders( $match ) . ')', $match );
+    public static function fetchAllWhereMatchingSingleField($fieldname, $match) {
+        if (is_array($match)) {
+            return static::fetchAllWhere(static::_quote_identifier($fieldname).' IN ('.static::createInClausePlaceholders($match).')', $match);
         } else {
-            return static::fetchAllWhere( static::_quote_identifier( $fieldname ) . ' = ?', array($match) );
+            return static::fetchAllWhere(static::_quote_identifier($fieldname).' = ?', array($match));
         }
     }
 
@@ -477,8 +477,8 @@ 
      * @param array $params
      * @return string
      */
-    static public function createInClausePlaceholders( $params ) {
-        return implode( ',', array_fill( 0, count( $params ), '?' ) );
+    static public function createInClausePlaceholders($params) {
+        return implode(',', array_fill(0, count($params), '?'));
     }
 
     /**
@@ -487,7 +487,7 @@ 
      * @return int
      */
     static public function count() {
-        $st = static::execute( 'SELECT COUNT(*) FROM ' . static::_quote_identifier( static::$_tableName ) );
+        $st = static::execute('SELECT COUNT(*) FROM '.static::_quote_identifier(static::$_tableName));
         return $st->fetchColumn();
     }
 
@@ -498,9 +498,9 @@ 
      * @param array  $params      optional params to be escaped and injected into the SQL query (standrd PDO syntax)
      * @return integer count of rows matching conditions
      */
-    static public function countAllWhere( $SQLfragment = '', $params = array() ) {
-        $SQLfragment = self::addWherePrefix( $SQLfragment );
-        $st          = static::execute( 'SELECT COUNT(*) FROM ' . static::_quote_identifier( static::$_tableName ) . $SQLfragment, $params );
+    static public function countAllWhere($SQLfragment = '', $params = array()) {
+        $SQLfragment = self::addWherePrefix($SQLfragment);
+        $st          = static::execute('SELECT COUNT(*) FROM '.static::_quote_identifier(static::$_tableName).$SQLfragment, $params);
         return $st->fetchColumn();
     }
 
@@ -510,8 +510,8 @@ 
      * @param string $SQLfragment
      * @return string
      */
-    static protected function addWherePrefix( $SQLfragment ) {
-        return $SQLfragment ? ' WHERE ' . $SQLfragment : $SQLfragment;
+    static protected function addWherePrefix($SQLfragment) {
+        return $SQLfragment ? ' WHERE '.$SQLfragment : $SQLfragment;
     }
 
 
@@ -523,20 +523,20 @@ 
      * @param bool   $limitOne    if true the first match will be returned
      * @return mixed object[]|object of objects of calling class
      */
-    static public function fetchWhere( $SQLfragment = '', $params = array(), $limitOne = false ) {
+    static public function fetchWhere($SQLfragment = '', $params = array(), $limitOne = false) {
         $class       = get_called_class();
-        $SQLfragment = self::addWherePrefix( $SQLfragment );
+        $SQLfragment = self::addWherePrefix($SQLfragment);
         $st          = static::execute(
-            'SELECT * FROM ' . static::_quote_identifier( static::$_tableName ) . $SQLfragment . ($limitOne ? ' LIMIT 1' : ''),
+            'SELECT * FROM '.static::_quote_identifier(static::$_tableName).$SQLfragment.($limitOne ? ' LIMIT 1' : ''),
             $params
         );
-        $st->setFetchMode( \PDO::FETCH_ASSOC );
+        $st->setFetchMode(\PDO::FETCH_ASSOC);
         if ($limitOne) {
-            return new $class( $st->fetch() );
+            return new $class($st->fetch());
         }
         $results = [];
         foreach ($st->fetch() as $row) {
-            $results[] = new $class( $row );
+            $results[] = new $class($row);
         }
         return $results;
     }
@@ -548,8 +548,8 @@ 
      * @param array  $params      optional params to be escaped and injected into the SQL query (standrd PDO syntax)
      * @return object[] of objects of calling class
      */
-    static public function fetchAllWhere( $SQLfragment = '', $params = array() ) {
-        return static::fetchWhere( $SQLfragment, $params, false );
+    static public function fetchAllWhere($SQLfragment = '', $params = array()) {
+        return static::fetchWhere($SQLfragment, $params, false);
     }
 
     /**
@@ -559,8 +559,8 @@ 
      * @param array  $params      optional params to be escaped and injected into the SQL query (standrd PDO syntax)
      * @return object of calling class
      */
-    static public function fetchOneWhere( $SQLfragment = '', $params = array() ) {
-        return static::fetchWhere( $SQLfragment, $params, true );
+    static public function fetchOneWhere($SQLfragment = '', $params = array()) {
+        return static::fetchWhere($SQLfragment, $params, true);
     }
 
     /**
@@ -568,9 +568,9 @@ 
      *
      * @return boolean indicating success
      */
-    static public function deleteById( $id ) {
+    static public function deleteById($id) {
         $st = static::execute(
-            'DELETE FROM ' . static::_quote_identifier( static::$_tableName ) . ' WHERE ' . static::_quote_identifier( static::$_primary_column_name ) . ' = ? LIMIT 1',
+            'DELETE FROM '.static::_quote_identifier(static::$_tableName).' WHERE '.static::_quote_identifier(static::$_primary_column_name).' = ? LIMIT 1',
             array($id)
         );
         return ($st->rowCount() == 1);
@@ -582,7 +582,7 @@ 
      * @return boolean indicating success
      */
     public function delete() {
-        return self::deleteById( $this->{static::$_primary_column_name} );
+        return self::deleteById($this->{static::$_primary_column_name} );
     }
 
     /**
@@ -592,9 +592,9 @@ 
      * @param array  $params optional params to be escaped and injected into the SQL query (standrd PDO syntax)
      * @return \PDOStatement
      */
-    static public function deleteAllWhere( $where, $params = array() ) {
+    static public function deleteAllWhere($where, $params = array()) {
         $st = static::execute(
-            'DELETE FROM ' . static::_quote_identifier( static::$_tableName ) . ' WHERE ' . $where,
+            'DELETE FROM '.static::_quote_identifier(static::$_tableName).' WHERE '.$where,
             $params
         );
         return $st;
@@ -617,22 +617,22 @@ 
      * @param boolean $allowSetPrimaryKey if true include primary key field in insert (ie. you want to set it yourself)
      * @return boolean indicating success
      */
-    public function insert( $autoTimestamp = true, $allowSetPrimaryKey = false ) {
+    public function insert($autoTimestamp = true, $allowSetPrimaryKey = false) {
         $pk      = static::$_primary_column_name;
-        $timeStr = gmdate( 'Y-m-d H:i:s' );
-        if ($autoTimestamp && in_array( 'created_at', static::getFieldnames() )) {
+        $timeStr = gmdate('Y-m-d H:i:s');
+        if ($autoTimestamp && in_array('created_at', static::getFieldnames())) {
             $this->created_at = $timeStr;
         }
-        if ($autoTimestamp && in_array( 'updated_at', static::getFieldnames() )) {
+        if ($autoTimestamp && in_array('updated_at', static::getFieldnames())) {
             $this->updated_at = $timeStr;
         }
         $this->validate();
         if ($allowSetPrimaryKey !== true) {
             $this->$pk = null; // ensure id is null
         }
-        $set   = $this->setString( !$allowSetPrimaryKey );
-        $query = 'INSERT INTO ' . static::_quote_identifier( static::$_tableName ) . ' SET ' . $set['sql'];
-        $st    = static::execute( $query, $set['params'] );
+        $set   = $this->setString(!$allowSetPrimaryKey);
+        $query = 'INSERT INTO '.static::_quote_identifier(static::$_tableName).' SET '.$set['sql'];
+        $st    = static::execute($query, $set['params']);
         if ($st->rowCount() == 1) {
             $this->{static::$_primary_column_name} = static::$_db->lastInsertId();
             $this->clearDirtyFields();
@@ -646,13 +646,13 @@ 
      * @param boolean $autoTimestamp true by default will set updated_at field if present
      * @return boolean indicating success
      */
-    public function update( $autoTimestamp = true ) {
-        if ($autoTimestamp && in_array( 'updated_at', static::getFieldnames() )) {
-            $this->updated_at = gmdate( 'Y-m-d H:i:s' );
+    public function update($autoTimestamp = true) {
+        if ($autoTimestamp && in_array('updated_at', static::getFieldnames())) {
+            $this->updated_at = gmdate('Y-m-d H:i:s');
         }
         $this->validate();
         $set             = $this->setString();
-        $query           = 'UPDATE ' . static::_quote_identifier( static::$_tableName ) . ' SET ' . $set['sql'] . ' WHERE ' . static::_quote_identifier( static::$_primary_column_name ) . ' = ? LIMIT 1';
+        $query           = 'UPDATE '.static::_quote_identifier(static::$_tableName).' SET '.$set['sql'].' WHERE '.static::_quote_identifier(static::$_primary_column_name).' = ? LIMIT 1';
         $set['params'][] = $this->{static::$_primary_column_name};
         $st              = static::execute(
             $query,
@@ -673,9 +673,9 @@ 
      * @param array  $params array of parameters to replace the placeholders in the statement
      * @return \PDOStatement handle
      */
-    public static function execute( $query, $params = array() ) {
-        $st = static::_prepare( $query );
-        $st->execute( $params );
+    public static function execute($query, $params = array()) {
+        $st = static::_prepare($query);
+        $st->execute($params);
         return $st;
     }
 
@@ -685,10 +685,10 @@ 
      * @param string $query
      * @return \PDOStatement
      */
-    protected static function _prepare( $query ) {
+    protected static function _prepare($query) {
         if (!isset(static::$_stmt[$query])) {
             // cache prepared query if not seen before
-            static::$_stmt[$query] = static::$_db->prepare( $query );
+            static::$_stmt[$query] = static::$_db->prepare($query);
         }
         return static::$_stmt[$query]; // return cache copy
     }
@@ -714,7 +714,7 @@ 
      * @param boolean $ignorePrimary
      * @return string[string] ['sql' => string, 'params' => mixed[] ]
      */
-    protected function setString( $ignorePrimary = true ) {
+    protected function setString($ignorePrimary = true) {
         // escapes and builds mysql SET string returning false, empty string or `field` = 'val'[, `field` = 'val']...
         /**
          * @var array $fragments individual SQL assignments
@@ -728,18 +728,18 @@ 
             if ($ignorePrimary && $field == static::$_primary_column_name) {
                 continue;
             }
-            if (isset($this->$field) && $this->isFieldDirty( $field )) { // Only if dirty
+            if (isset($this->$field) && $this->isFieldDirty($field)) { // Only if dirty
                 if ($this->$field === null) {
                     // if empty set to NULL
-                    $fragments[] = static::_quote_identifier( $field ) . ' = NULL';
+                    $fragments[] = static::_quote_identifier($field).' = NULL';
                 } else {
                     // Just set value normally as not empty string with NULL allowed
-                    $fragments[] = static::_quote_identifier( $field ) . ' = ?';
+                    $fragments[] = static::_quote_identifier($field).' = ?';
                     $params[]    = $this->$field;
                 }
             }
         }
-        $sqlFragment = implode( ", ", $fragments );
+        $sqlFragment = implode(", ", $fragments);
         return [
             'sql'    => $sqlFragment,
             'params' => $params
@@ -752,9 +752,9 @@ 
      * @param string|int $dt a date string or a unix timestamp
      * @return string
      */
-    public static function datetimeToMysqldatetime( $dt ) {
-        $dt = (is_string( $dt )) ? strtotime( $dt ) : $dt;
-        return date( 'Y-m-d H:i:s', $dt );
+    public static function datetimeToMysqldatetime($dt) {
+        $dt = (is_string($dt)) ? strtotime($dt) : $dt;
+        return date('Y-m-d H:i:s', $dt);
     }
 }
 

tests/Model/CategoryTest.php

Spacing +33 added lines, -33 removed lines

@@ -13,7 +13,7 @@ 
     public static function setUpBeforeClass() {
         // connect and setup db categorytest with table categories
         try {
-            Freshsauce\Model\Model::connectDb( 'mysql:host=127.0.0.1;dbname=', 'root', '' );
+            Freshsauce\Model\Model::connectDb('mysql:host=127.0.0.1;dbname=', 'root', '');
         } catch (PDOException $e) {
             if ($e->getCode() != 0) {
                 // throw it on
@@ -35,7 +35,7 @@ 
         ];
 
         foreach ($sql_setup as $sql) {
-            Freshsauce\Model\Model::execute( $sql );
+            Freshsauce\Model\Model::execute($sql);
         }
 
     }
@@ -52,16 +52,16 @@ 
      */
     public function testCreate() {
         $_name    = 'Fiction';
-        $category = new App\Model\Category( array(
+        $category = new App\Model\Category(array(
             'name' => $_name
-        ) );
+        ));
 
         $category->save(); // no Id so will insert
 
-        $this->assertEquals( $category->name, $_name );
-        $this->assertNotEmpty( $category->id );
-        $this->assertNotEmpty( $category->created_at );
-        $this->assertNotEmpty( $category->updated_at );
+        $this->assertEquals($category->name, $_name);
+        $this->assertNotEmpty($category->id);
+        $this->assertNotEmpty($category->created_at);
+        $this->assertNotEmpty($category->updated_at);
     }
 
     /**
@@ -69,21 +69,21 @@ 
      */
     public function testCreateAndGetById() {
         $_name    = 'SciFi';
-        $category = new App\Model\Category( array(
+        $category = new App\Model\Category(array(
             'name' => $_name
-        ) );
+        ));
 
         $category->save(); // no Id so will insert
 
-        $this->assertEquals( $category->name, $_name );
-        $this->assertNotEmpty( $category->id );
+        $this->assertEquals($category->name, $_name);
+        $this->assertNotEmpty($category->id);
 
         // read category back into a new object
-        $read_category = App\Model\Category::getById( $category->id );
-        $this->assertEquals( $read_category->name, $_name );
-        $this->assertEquals( $read_category->id, $category->id );
-        $this->assertNotEmpty( $category->created_at );
-        $this->assertNotEmpty( $category->updated_at );
+        $read_category = App\Model\Category::getById($category->id);
+        $this->assertEquals($read_category->name, $_name);
+        $this->assertEquals($read_category->id, $category->id);
+        $this->assertNotEmpty($category->created_at);
+        $this->assertNotEmpty($category->updated_at);
     }
 
     /**
@@ -91,28 +91,28 @@ 
      */
     public function testCreateAndModify() {
         $_name    = 'Literature';
-        $category = new App\Model\Category( array(
+        $category = new App\Model\Category(array(
             'name' => $_name
-        ) );
+        ));
 
         $category->save(); // no Id so will insert
 
-        $this->assertEquals( $category->name, $_name );
-        $this->assertNotEmpty( $category->id );
-        $this->assertNotEmpty( $category->created_at );
-        $this->assertNotEmpty( $category->updated_at );
+        $this->assertEquals($category->name, $_name);
+        $this->assertNotEmpty($category->id);
+        $this->assertNotEmpty($category->created_at);
+        $this->assertNotEmpty($category->updated_at);
 
         $_id         = $category->id;
         $_updated_at = $category->updated_at;
 
         $_new_name      = 'Literature - great works';
         $category->name = $_new_name;
-        sleep( 1 ); // to ensure updated_at time move forward a second at least
+        sleep(1); // to ensure updated_at time move forward a second at least
         $category->save();
 
-        $this->assertEquals( $category->name, $_new_name );
-        $this->assertEquals( $category->id, $_id );
-        $this->assertNotEquals( $category->updated_at, $_updated_at );
+        $this->assertEquals($category->name, $_new_name);
+        $this->assertEquals($category->id, $_id);
+        $this->assertNotEquals($category->updated_at, $_updated_at);
 
     }
 
@@ -129,14 +129,14 @@ 
             'Cookbooks'
         ];
         foreach ($_names as $_name) {
-            $category = new App\Model\Category( array(
+            $category = new App\Model\Category(array(
                 'name' => $_name
-            ) );
+            ));
             $category->save(); // no Id so will insert
         }
-        $categories = App\Model\Category::find_by_name( $_names );
-        $this->assertNotEmpty( $categories );
-        $this->assertContainsOnlyInstancesOf( 'App\Model\Category', $categories );
-        $this->assertCount( count( $_names ), $categories );
+        $categories = App\Model\Category::find_by_name($_names);
+        $this->assertNotEmpty($categories);
+        $this->assertContainsOnlyInstancesOf('App\Model\Category', $categories);
+        $this->assertCount(count($_names), $categories);
     }
 }
\ No newline at end of file