zortje / mvc

src/Model/Table/Entity/Entity.php

Indentation +161 added lines, -161 removed lines

@@ -13,165 +13,165 @@
 abstract class Entity
 {
 
-    /**
-     * @var array Columns
-     */
-    protected static $columns = [];
-
-    /**
-     * @var array Internal entity properties
-     */
-    protected $properties = [];
-
-    /**
-     * Get entity columns
-     *
-     * @return array Entity columns
-     */
-    public static function getColumns()
-    {
-        $columns = array_merge([
-            'id' => 'integer'
-        ], static::$columns);
-
-        $columns = array_merge($columns, [
-            'modified' => 'DateTime',
-            'created'  => 'DateTime'
-        ]);
-
-        return $columns;
-    }
-
-    /**
-     * Set entity property
-     *
-     * @param string                                          $key   Entity property name
-     * @param object|integer|double|string|array|boolean|null $value Entity property value
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
-     */
-    public function set($key, $value)
-    {
-        if (!isset(self::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([get_class($this), $key]);
-        }
-
-        $this->properties[$key] = $this->validatePropertyForValue($key, $value);
-    }
-
-    /**
-     * Get entity property
-     *
-     * @param string $key Entity property
-     *
-     * @return object|integer|double|string|array|boolean|null Entity property value for given key
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     */
-    public function get($key)
-    {
-        if (!isset(self::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([get_class($this), $key]);
-        }
-
-        return $this->properties[$key];
-    }
-
-    /**
-     * Return table structur for saving
-     * Example: `['table_field_name' => $this->fieldName]`
-     *
-     * @param bool $includeId Should the ID column be included
-     *
-     * @return array
-     */
-    public function toArray($includeId)
-    {
-        $array = [];
-
-        foreach (self::getColumns() as $column => $type) {
-            if ($column === 'id' && !$includeId) {
-                continue;
-            }
-
-            $property = new EntityProperty($type);
-
-            $value = $this->get($column);
-            $value = $property->formatValueForDatabase($value);
-
-            $array[":$column"] = $value;
-        }
-
-        return $array;
-    }
-
-    /**
-     * Validate property for given value
-     *
-     * @param string $key   Entity property name
-     * @param mixed  $value Entity property value
-     *
-     * @return object|integer|double|string|array|boolean|null Value
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
-     */
-    protected function validatePropertyForValue($key, $value)
-    {
-        if (!isset(self::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([get_class($this), $key]);
-        }
-
-        /**
-         * Allow NULL
-         */
-        if (!is_null($value)) {
-            $valueType = gettype($value);
-
-            /**
-             * Get class if object
-             */
-            if ($valueType === 'object') {
-                $valueType = get_class($value);
-            }
-
-            /**
-             * Handle alias types
-             */
-            $columnType = self::getColumns()[$key];
-
-            switch ($columnType) {
-                case 'Date':
-                    $columnType = 'DateTime';
-                    break;
-            }
-
-            /**
-             * Validate type
-             */
-            if ($valueType !== $columnType) {
-                throw new InvalidValueTypeForEntityPropertyException([
-                    get_class($this),
-                    $key,
-                    $valueType,
-                    $columnType
-                ]);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * @param int       $id
-     * @param \DateTime $modified
-     * @param \DateTime $created
-     */
-    public function __construct($id, \DateTime $modified, \DateTime $created)
-    {
-        $this->set('id', $id);
-        $this->set('modified', $modified);
-        $this->set('created', $created);
-    }
+	/**
+	 * @var array Columns
+	 */
+	protected static $columns = [];
+
+	/**
+	 * @var array Internal entity properties
+	 */
+	protected $properties = [];
+
+	/**
+	 * Get entity columns
+	 *
+	 * @return array Entity columns
+	 */
+	public static function getColumns()
+	{
+		$columns = array_merge([
+			'id' => 'integer'
+		], static::$columns);
+
+		$columns = array_merge($columns, [
+			'modified' => 'DateTime',
+			'created'  => 'DateTime'
+		]);
+
+		return $columns;
+	}
+
+	/**
+	 * Set entity property
+	 *
+	 * @param string                                          $key   Entity property name
+	 * @param object|integer|double|string|array|boolean|null $value Entity property value
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
+	 */
+	public function set($key, $value)
+	{
+		if (!isset(self::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([get_class($this), $key]);
+		}
+
+		$this->properties[$key] = $this->validatePropertyForValue($key, $value);
+	}
+
+	/**
+	 * Get entity property
+	 *
+	 * @param string $key Entity property
+	 *
+	 * @return object|integer|double|string|array|boolean|null Entity property value for given key
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 */
+	public function get($key)
+	{
+		if (!isset(self::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([get_class($this), $key]);
+		}
+
+		return $this->properties[$key];
+	}
+
+	/**
+	 * Return table structur for saving
+	 * Example: `['table_field_name' => $this->fieldName]`
+	 *
+	 * @param bool $includeId Should the ID column be included
+	 *
+	 * @return array
+	 */
+	public function toArray($includeId)
+	{
+		$array = [];
+
+		foreach (self::getColumns() as $column => $type) {
+			if ($column === 'id' && !$includeId) {
+				continue;
+			}
+
+			$property = new EntityProperty($type);
+
+			$value = $this->get($column);
+			$value = $property->formatValueForDatabase($value);
+
+			$array[":$column"] = $value;
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Validate property for given value
+	 *
+	 * @param string $key   Entity property name
+	 * @param mixed  $value Entity property value
+	 *
+	 * @return object|integer|double|string|array|boolean|null Value
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
+	 */
+	protected function validatePropertyForValue($key, $value)
+	{
+		if (!isset(self::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([get_class($this), $key]);
+		}
+
+		/**
+		 * Allow NULL
+		 */
+		if (!is_null($value)) {
+			$valueType = gettype($value);
+
+			/**
+			 * Get class if object
+			 */
+			if ($valueType === 'object') {
+				$valueType = get_class($value);
+			}
+
+			/**
+			 * Handle alias types
+			 */
+			$columnType = self::getColumns()[$key];
+
+			switch ($columnType) {
+				case 'Date':
+					$columnType = 'DateTime';
+					break;
+			}
+
+			/**
+			 * Validate type
+			 */
+			if ($valueType !== $columnType) {
+				throw new InvalidValueTypeForEntityPropertyException([
+					get_class($this),
+					$key,
+					$valueType,
+					$columnType
+				]);
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @param int       $id
+	 * @param \DateTime $modified
+	 * @param \DateTime $created
+	 */
+	public function __construct($id, \DateTime $modified, \DateTime $created)
+	{
+		$this->set('id', $id);
+		$this->set('modified', $modified);
+		$this->set('created', $created);
+	}
 }

Braces +7 added lines, -14 removed lines

@@ -10,8 +10,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity
  */
-abstract class Entity
-{
+abstract class Entity {
 
     /**
      * @var array Columns
@@ -28,8 +27,7 @@ 
      *
      * @return array Entity columns
      */
-    public static function getColumns()
-    {
+    public static function getColumns() {
         $columns = array_merge([
             'id' => 'integer'
         ], static::$columns);
@@ -51,8 +49,7 @@ 
      * @throws InvalidEntityPropertyException If entity does not have that property
      * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
      */
-    public function set($key, $value)
-    {
+    public function set($key, $value) {
         if (!isset(self::getColumns()[$key])) {
             throw new InvalidEntityPropertyException([get_class($this), $key]);
         }
@@ -69,8 +66,7 @@ 
      *
      * @throws InvalidEntityPropertyException If entity does not have that property
      */
-    public function get($key)
-    {
+    public function get($key) {
         if (!isset(self::getColumns()[$key])) {
             throw new InvalidEntityPropertyException([get_class($this), $key]);
         }
@@ -86,8 +82,7 @@ 
      *
      * @return array
      */
-    public function toArray($includeId)
-    {
+    public function toArray($includeId) {
         $array = [];
 
         foreach (self::getColumns() as $column => $type) {
@@ -117,8 +112,7 @@ 
      * @throws InvalidEntityPropertyException If entity does not have that property
      * @throws InvalidValueTypeForEntityPropertyException If value is of the wrong type
      */
-    protected function validatePropertyForValue($key, $value)
-    {
+    protected function validatePropertyForValue($key, $value) {
         if (!isset(self::getColumns()[$key])) {
             throw new InvalidEntityPropertyException([get_class($this), $key]);
         }
@@ -168,8 +162,7 @@ 
      * @param \DateTime $modified
      * @param \DateTime $created
      */
-    public function __construct($id, \DateTime $modified, \DateTime $created)
-    {
+    public function __construct($id, \DateTime $modified, \DateTime $created) {
         $this->set('id', $id);
         $this->set('modified', $modified);
         $this->set('created', $created);

src/Model/Table/Entity/EntityFactory.php

Indentation +45 added lines, -45 removed lines

@@ -10,49 +10,49 @@
 class EntityFactory
 {
 
-    /**
-     * @var String Entity class
-     */
-    protected $entityClass;
-
-    /**
-     * @param array $array
-     *
-     * @return object
-     */
-    public function createFromArray(array $array)
-    {
-        /**
-         * @var Entity $entity
-         */
-        $reflector = new \ReflectionClass($this->entityClass);
-
-        $entity = $reflector->newInstanceWithoutConstructor();
-
-        $columns = $entity::getColumns();
-        unset($columns['id'], $columns['modified'], $columns['created']);
-
-        $arguments = [];
-
-        foreach ($columns as $column => $type) {
-            $property = new EntityProperty($type);
-
-            $arguments[$column] = $property->formatValueForEntity($array[$column]);
-        }
-
-        $entity = $reflector->newInstanceArgs($arguments);
-        $entity->set('id', (int) $array['id']);
-        $entity->set('modified', new \DateTime($array['modified']));
-        $entity->set('created', new \DateTime($array['created']));
-
-        return $entity;
-    }
-
-    /**
-     * @param string $entityClass
-     */
-    public function __construct($entityClass)
-    {
-        $this->entityClass = $entityClass;
-    }
+	/**
+	 * @var String Entity class
+	 */
+	protected $entityClass;
+
+	/**
+	 * @param array $array
+	 *
+	 * @return object
+	 */
+	public function createFromArray(array $array)
+	{
+		/**
+		 * @var Entity $entity
+		 */
+		$reflector = new \ReflectionClass($this->entityClass);
+
+		$entity = $reflector->newInstanceWithoutConstructor();
+
+		$columns = $entity::getColumns();
+		unset($columns['id'], $columns['modified'], $columns['created']);
+
+		$arguments = [];
+
+		foreach ($columns as $column => $type) {
+			$property = new EntityProperty($type);
+
+			$arguments[$column] = $property->formatValueForEntity($array[$column]);
+		}
+
+		$entity = $reflector->newInstanceArgs($arguments);
+		$entity->set('id', (int) $array['id']);
+		$entity->set('modified', new \DateTime($array['modified']));
+		$entity->set('created', new \DateTime($array['created']));
+
+		return $entity;
+	}
+
+	/**
+	 * @param string $entityClass
+	 */
+	public function __construct($entityClass)
+	{
+		$this->entityClass = $entityClass;
+	}
 }

Braces +3 added lines, -6 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity
  */
-class EntityFactory
-{
+class EntityFactory {
 
     /**
      * @var String Entity class
@@ -20,8 +19,7 @@ 
      *
      * @return object
      */
-    public function createFromArray(array $array)
-    {
+    public function createFromArray(array $array) {
         /**
          * @var Entity $entity
          */
@@ -51,8 +49,7 @@ 
     /**
      * @param string $entityClass
      */
-    public function __construct($entityClass)
-    {
+    public function __construct($entityClass) {
         $this->entityClass = $entityClass;
     }
 }

src/Model/Table/Entity/EntityProperty.php

Indentation +62 added lines, -62 removed lines

@@ -10,75 +10,75 @@
 class EntityProperty
 {
 
-    /**
-     * @var string Entity property type
-     */
-    protected $type;
+	/**
+	 * @var string Entity property type
+	 */
+	protected $type;
 
-    /**
-     * Format value according to entity property type
-     *
-     * @param mixed $value Value
-     *
-     * @return mixed Value
-     */
-    public function formatValueForEntity($value)
-    {
-        switch ($this->type) {
-            case 'string':
-                $value = "$value";
-                break;
+	/**
+	 * Format value according to entity property type
+	 *
+	 * @param mixed $value Value
+	 *
+	 * @return mixed Value
+	 */
+	public function formatValueForEntity($value)
+	{
+		switch ($this->type) {
+			case 'string':
+				$value = "$value";
+				break;
 
-            case 'integer':
-                $value = (int) $value;
-                break;
+			case 'integer':
+				$value = (int) $value;
+				break;
 
-            case 'float':
-                $value = (float) $value;
-                break;
+			case 'float':
+				$value = (float) $value;
+				break;
 
-            case 'Date':
-            case 'DateTime':
-                $value = new \DateTime($value);
-                break;
-        }
+			case 'Date':
+			case 'DateTime':
+				$value = new \DateTime($value);
+				break;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Format value for insertion into the database
-     *
-     * @param mixed $value Value
-     *
-     * @return mixed Value
-     */
-    public function formatValueForDatabase($value)
-    {
-        switch ($this->type) {
-            case 'Date':
-                /**
-                 * @var \DateTime $value
-                 */
-                $value = $value->format('Y-m-d');
-                break;
+	/**
+	 * Format value for insertion into the database
+	 *
+	 * @param mixed $value Value
+	 *
+	 * @return mixed Value
+	 */
+	public function formatValueForDatabase($value)
+	{
+		switch ($this->type) {
+			case 'Date':
+				/**
+				 * @var \DateTime $value
+				 */
+				$value = $value->format('Y-m-d');
+				break;
 
-            case 'DateTime':
-                /**
-                 * @var \DateTime $value
-                 */
-                $value = $value->format('Y-m-d H:i:s');
-                break;
-        }
+			case 'DateTime':
+				/**
+				 * @var \DateTime $value
+				 */
+				$value = $value->format('Y-m-d H:i:s');
+				break;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * @param string $type
-     */
-    public function __construct($type)
-    {
-        $this->type = $type;
-    }
+	/**
+	 * @param string $type
+	 */
+	public function __construct($type)
+	{
+		$this->type = $type;
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity
  */
-class EntityProperty
-{
+class EntityProperty {
 
     /**
      * @var string Entity property type
@@ -22,8 +21,7 @@ 
      *
      * @return mixed Value
      */
-    public function formatValueForEntity($value)
-    {
+    public function formatValueForEntity($value) {
         switch ($this->type) {
             case 'string':
                 $value = "$value";
@@ -53,8 +51,7 @@ 
      *
      * @return mixed Value
      */
-    public function formatValueForDatabase($value)
-    {
+    public function formatValueForDatabase($value) {
         switch ($this->type) {
             case 'Date':
                 /**
@@ -77,8 +74,7 @@ 
     /**
      * @param string $type
      */
-    public function __construct($type)
-    {
+    public function __construct($type) {
         $this->type = $type;
     }
 }

src/Model/Table/Entity/Exception/EntityClassNonexistentException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class EntityClassNonexistentException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Subclass %s defined entity class %s is nonexistent';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Subclass %s defined entity class %s is nonexistent';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity\Exception
  */
-class EntityClassNonexistentException extends Exception
-{
+class EntityClassNonexistentException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }

src/Model/Table/Entity/Exception/EntityClassNotDefinedException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class EntityClassNotDefinedException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Subclass %s does not have a entity class defined';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Subclass %s does not have a entity class defined';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity\Exception
  */
-class EntityClassNotDefinedException extends Exception
-{
+class EntityClassNotDefinedException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }

src/Model/Table/Entity/Exception/InvalidEntityPropertyException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class InvalidEntityPropertyException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Entity %s does not have a property named %s';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Entity %s does not have a property named %s';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity\Exception
  */
-class InvalidEntityPropertyException extends Exception
-{
+class InvalidEntityPropertyException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }

src/Model/Table/Entity/Exception/InvalidValueTypeForEntityPropertyException.php

Indentation +11 added lines, -11 removed lines

@@ -12,16 +12,16 @@
 class InvalidValueTypeForEntityPropertyException extends Exception
 {
 
-    /**
-     * {@inheritdoc}
-     */
-    protected $template = 'Entity %s property %s is of type %s and not %s';
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $template = 'Entity %s property %s is of type %s and not %s';
 
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

Braces +2 added lines, -4 removed lines

@@ -9,8 +9,7 @@ 
  *
  * @package Zortje\MVC\Model\Table\Entity\Exception
  */
-class InvalidValueTypeForEntityPropertyException extends Exception
-{
+class InvalidValueTypeForEntityPropertyException extends Exception {
 
     /**
      * {@inheritdoc}
@@ -20,8 +19,7 @@ 
     /**
      * {@inheritdoc}
      */
-    public function __construct($message)
-    {
+    public function __construct($message) {
         parent::__construct($message);
     }
 }

src/Model/Table/Table.php

Indentation +170 added lines, -170 removed lines

@@ -18,174 +18,174 @@
 abstract class Table
 {
 
-    /**
-     * @var \PDO Connection
-     */
-    protected $pdo;
-
-    /**
-     * @var string Table name
-     */
-    protected $tableName;
-
-    /**
-     * @var String Entity class
-     */
-    protected $entityClass;
-
-    /**
-     * @var SQLCommand SQL Command
-     */
-    protected $sqlCommand;
-
-    /**
-     * Get table name
-     *
-     * @return string Table name
-     */
-    public function getTableName()
-    {
-        return $this->tableName;
-    }
-
-    /**
-     * Find all entities
-     *
-     * @return Entity[] Entities
-     */
-    public function findAll()
-    {
-        $stmt = $this->pdo->prepare($this->sqlCommand->selectFrom());
-        $stmt->execute();
-
-        return $this->createEntitiesFromStatement($stmt);
-    }
-
-    /**
-     * Find all entities where key is equal to the given value
-     *
-     * @param $key
-     * @param $value
-     *
-     * @throws InvalidEntityPropertyException If entity does not have that property
-     *
-     * @return Entity[] Entities
-     */
-    public function findBy($key, $value)
-    {
-        /**
-         * Check if entity have the property
-         */
-        $reflector = new \ReflectionClass($this->entityClass);
-
-        $entity = $reflector->newInstanceWithoutConstructor();
-
-        if (!isset($entity::getColumns()[$key])) {
-            throw new InvalidEntityPropertyException([$this->entityClass, $key]);
-        }
-
-        /**
-         * Execute with key-value condition
-         */
-        $stmt = $this->pdo->prepare($this->sqlCommand->selectFromWhere($key));
-        $stmt->execute([":$key" => $value]);
-
-        return $this->createEntitiesFromStatement($stmt);
-    }
-
-    /**
-     * Insert entity into dabase
-     *
-     * @param Entity $entity Entity
-     *
-     * @return int Inserted entity ID
-     */
-    public function insert(Entity $entity)
-    {
-        $stmt = $this->pdo->prepare($this->sqlCommand->insertInto());
-
-        $now = new \DateTime();
-        $now = $now->format('Y-m-d H:i:s');
-
-        $array = array_merge($entity->toArray(false), [
-            'modified' => $now,
-            'created'  => $now
-        ]);
-
-        $stmt->execute($array);
-
-        return (int) $this->pdo->lastInsertId();
-    }
-
-    public function update(Entity $entity)
-    {
-        // @todo Implement
-    }
-
-    public function delete(Entity $entity)
-    {
-        // @todo Implement
-    }
-
-    /**
-     * Creates an array of Entity objects from statement
-     *
-     * @param \PDOStatement $statement
-     *
-     * @return Entity[] Entities from statement
-     */
-    protected function createEntitiesFromStatement(\PDOStatement $statement)
-    {
-        $entities = [];
-
-        $entityFactory = new EntityFactory($this->entityClass);
-
-        foreach ($statement as $row) {
-            $entities[] = $entityFactory->createFromArray($row);
-        }
-
-        return $entities;
-    }
-
-    /**
-     * Create SQLCommand for this Table with provided Entity
-     *
-     * @return SQLCommand
-     */
-    protected function createCommand()
-    {
-        $reflector = new \ReflectionClass($this->entityClass);
-
-        $entity = $reflector->newInstanceWithoutConstructor();
-
-        $columns = $entity::getColumns();
-
-        return new SQLCommand($this->tableName, $columns);
-    }
-
-    /**
-     * @param \PDO $pdo
-     *
-     * @throws TableNameNotDefinedException If table name is not defined in subclass
-     * @throws EntityClassNotDefinedException If entity class is not defined in subclass
-     * @throws EntityClassNonexistentException If entity class is nonexistent
-     */
-    public function __construct(\PDO $pdo)
-    {
-        if (is_null($this->tableName)) {
-            throw new TableNameNotDefinedException([get_class($this)]);
-        }
-
-        if (is_null($this->entityClass)) {
-            throw new EntityClassNotDefinedException([get_class($this)]);
-        } elseif (!class_exists($this->entityClass)) {
-            throw new EntityClassNonexistentException([get_class($this), $this->entityClass]);
-        }
-
-        // @todo should check if `$this->entityClass` is subclass of Entity class
-
-        $this->pdo = $pdo;
-
-        $this->sqlCommand = $this->createCommand();
-    }
+	/**
+	 * @var \PDO Connection
+	 */
+	protected $pdo;
+
+	/**
+	 * @var string Table name
+	 */
+	protected $tableName;
+
+	/**
+	 * @var String Entity class
+	 */
+	protected $entityClass;
+
+	/**
+	 * @var SQLCommand SQL Command
+	 */
+	protected $sqlCommand;
+
+	/**
+	 * Get table name
+	 *
+	 * @return string Table name
+	 */
+	public function getTableName()
+	{
+		return $this->tableName;
+	}
+
+	/**
+	 * Find all entities
+	 *
+	 * @return Entity[] Entities
+	 */
+	public function findAll()
+	{
+		$stmt = $this->pdo->prepare($this->sqlCommand->selectFrom());
+		$stmt->execute();
+
+		return $this->createEntitiesFromStatement($stmt);
+	}
+
+	/**
+	 * Find all entities where key is equal to the given value
+	 *
+	 * @param $key
+	 * @param $value
+	 *
+	 * @throws InvalidEntityPropertyException If entity does not have that property
+	 *
+	 * @return Entity[] Entities
+	 */
+	public function findBy($key, $value)
+	{
+		/**
+		 * Check if entity have the property
+		 */
+		$reflector = new \ReflectionClass($this->entityClass);
+
+		$entity = $reflector->newInstanceWithoutConstructor();
+
+		if (!isset($entity::getColumns()[$key])) {
+			throw new InvalidEntityPropertyException([$this->entityClass, $key]);
+		}
+
+		/**
+		 * Execute with key-value condition
+		 */
+		$stmt = $this->pdo->prepare($this->sqlCommand->selectFromWhere($key));
+		$stmt->execute([":$key" => $value]);
+
+		return $this->createEntitiesFromStatement($stmt);
+	}
+
+	/**
+	 * Insert entity into dabase
+	 *
+	 * @param Entity $entity Entity
+	 *
+	 * @return int Inserted entity ID
+	 */
+	public function insert(Entity $entity)
+	{
+		$stmt = $this->pdo->prepare($this->sqlCommand->insertInto());
+
+		$now = new \DateTime();
+		$now = $now->format('Y-m-d H:i:s');
+
+		$array = array_merge($entity->toArray(false), [
+			'modified' => $now,
+			'created'  => $now
+		]);
+
+		$stmt->execute($array);
+
+		return (int) $this->pdo->lastInsertId();
+	}
+
+	public function update(Entity $entity)
+	{
+		// @todo Implement
+	}
+
+	public function delete(Entity $entity)
+	{
+		// @todo Implement
+	}
+
+	/**
+	 * Creates an array of Entity objects from statement
+	 *
+	 * @param \PDOStatement $statement
+	 *
+	 * @return Entity[] Entities from statement
+	 */
+	protected function createEntitiesFromStatement(\PDOStatement $statement)
+	{
+		$entities = [];
+
+		$entityFactory = new EntityFactory($this->entityClass);
+
+		foreach ($statement as $row) {
+			$entities[] = $entityFactory->createFromArray($row);
+		}
+
+		return $entities;
+	}
+
+	/**
+	 * Create SQLCommand for this Table with provided Entity
+	 *
+	 * @return SQLCommand
+	 */
+	protected function createCommand()
+	{
+		$reflector = new \ReflectionClass($this->entityClass);
+
+		$entity = $reflector->newInstanceWithoutConstructor();
+
+		$columns = $entity::getColumns();
+
+		return new SQLCommand($this->tableName, $columns);
+	}
+
+	/**
+	 * @param \PDO $pdo
+	 *
+	 * @throws TableNameNotDefinedException If table name is not defined in subclass
+	 * @throws EntityClassNotDefinedException If entity class is not defined in subclass
+	 * @throws EntityClassNonexistentException If entity class is nonexistent
+	 */
+	public function __construct(\PDO $pdo)
+	{
+		if (is_null($this->tableName)) {
+			throw new TableNameNotDefinedException([get_class($this)]);
+		}
+
+		if (is_null($this->entityClass)) {
+			throw new EntityClassNotDefinedException([get_class($this)]);
+		} elseif (!class_exists($this->entityClass)) {
+			throw new EntityClassNonexistentException([get_class($this), $this->entityClass]);
+		}
+
+		// @todo should check if `$this->entityClass` is subclass of Entity class
+
+		$this->pdo = $pdo;
+
+		$this->sqlCommand = $this->createCommand();
+	}
 }

Braces +10 added lines, -20 removed lines

@@ -15,8 +15,7 @@ 
  *
  * @package Zortje\MVC\Model\Table
  */
-abstract class Table
-{
+abstract class Table {
 
     /**
      * @var \PDO Connection
@@ -43,8 +42,7 @@ 
      *
      * @return string Table name
      */
-    public function getTableName()
-    {
+    public function getTableName() {
         return $this->tableName;
     }
 
@@ -53,8 +51,7 @@ 
      *
      * @return Entity[] Entities
      */
-    public function findAll()
-    {
+    public function findAll() {
         $stmt = $this->pdo->prepare($this->sqlCommand->selectFrom());
         $stmt->execute();
 
@@ -71,8 +68,7 @@ 
      *
      * @return Entity[] Entities
      */
-    public function findBy($key, $value)
-    {
+    public function findBy($key, $value) {
         /**
          * Check if entity have the property
          */
@@ -100,8 +96,7 @@ 
      *
      * @return int Inserted entity ID
      */
-    public function insert(Entity $entity)
-    {
+    public function insert(Entity $entity) {
         $stmt = $this->pdo->prepare($this->sqlCommand->insertInto());
 
         $now = new \DateTime();
@@ -117,13 +112,11 @@ 
         return (int) $this->pdo->lastInsertId();
     }
 
-    public function update(Entity $entity)
-    {
+    public function update(Entity $entity) {
         // @todo Implement
     }
 
-    public function delete(Entity $entity)
-    {
+    public function delete(Entity $entity) {
         // @todo Implement
     }
 
@@ -134,8 +127,7 @@ 
      *
      * @return Entity[] Entities from statement
      */
-    protected function createEntitiesFromStatement(\PDOStatement $statement)
-    {
+    protected function createEntitiesFromStatement(\PDOStatement $statement) {
         $entities = [];
 
         $entityFactory = new EntityFactory($this->entityClass);
@@ -152,8 +144,7 @@ 
      *
      * @return SQLCommand
      */
-    protected function createCommand()
-    {
+    protected function createCommand() {
         $reflector = new \ReflectionClass($this->entityClass);
 
         $entity = $reflector->newInstanceWithoutConstructor();
@@ -170,8 +161,7 @@ 
      * @throws EntityClassNotDefinedException If entity class is not defined in subclass
      * @throws EntityClassNonexistentException If entity class is nonexistent
      */
-    public function __construct(\PDO $pdo)
-    {
+    public function __construct(\PDO $pdo) {
         if (is_null($this->tableName)) {
             throw new TableNameNotDefinedException([get_class($this)]);
         }

src/View/Render/HtmlRender.php

Indentation +60 added lines, -60 removed lines

@@ -10,75 +10,75 @@
 class HtmlRender
 {
 
-    /**
-     * @var array View variables
-     */
-    protected $variables;
+	/**
+	 * @var array View variables
+	 */
+	protected $variables;
 
-    /**
-     * Render files
-     *
-     * First file in array is rendered first and key is set in variables array for use by following files
-     *
-     * @param array $files Files to render
-     *
-     * @return string Output
-     */
-    public function render($files)
-    {
-        $output = '';
+	/**
+	 * Render files
+	 *
+	 * First file in array is rendered first and key is set in variables array for use by following files
+	 *
+	 * @param array $files Files to render
+	 *
+	 * @return string Output
+	 */
+	public function render($files)
+	{
+		$output = '';
 
-        foreach ($files as $outputName => $file) {
-            $output = $this->renderFile($file);
+		foreach ($files as $outputName => $file) {
+			$output = $this->renderFile($file);
 
-            $this->variables[$outputName] = $output;
-        }
+			$this->variables[$outputName] = $output;
+		}
 
-        return $output;
-    }
+		return $output;
+	}
 
-    /**
-     * Render file
-     *
-     * @param string $file File to render
-     *
-     * @return string Output
-     */
-    protected function renderFile($file)
-    {
-        if (!is_readable($file)) {
-            throw new \InvalidArgumentException(sprintf('File "%s" is nonexistent (Working directory: %s)', $file, getcwd()));
-        }
+	/**
+	 * Render file
+	 *
+	 * @param string $file File to render
+	 *
+	 * @return string Output
+	 */
+	protected function renderFile($file)
+	{
+		if (!is_readable($file)) {
+			throw new \InvalidArgumentException(sprintf('File "%s" is nonexistent (Working directory: %s)', $file, getcwd()));
+		}
 
-        /**
-         * Start the output buffer and require file
-         */
-        ob_start();
+		/**
+		 * Start the output buffer and require file
+		 */
+		ob_start();
 
-        /**
-         * Prepare set variables for the view
-         *
-         * @todo Helpers, `$this->loadHelpers();`
-         */
-        foreach ($this->variables as $variable => $value) {
-            $$variable = $value;
-        }
+		/**
+		 * Prepare set variables for the view
+		 *
+		 * @todo Helpers, `$this->loadHelpers();`
+		 */
+		foreach ($this->variables as $variable => $value) {
+			$$variable = $value;
+		}
 
-        require $file;
+		require $file;
 
-        /**
-         * Clean the output buffer and return
-         */
-        $output = ob_get_clean();
+		/**
+		 * Clean the output buffer and return
+		 */
+		$output = ob_get_clean();
 
-        return $output;
-    }
+		return $output;
+	}
 
-    /**
-     * @param array $variables
-     */
-    public function __construct($variables)
-    {
-        $this->variables = $variables;
-    }
+	/**
+	 * @param array $variables
+	 */
+	public function __construct($variables)
+	{
+		$this->variables = $variables;
+	}
 }

Braces +4 added lines, -8 removed lines

@@ -7,8 +7,7 @@ 
  *
  * @package Zortje\View\Render
  */
-class HtmlRender
-{
+class HtmlRender {
 
     /**
      * @var array View variables
@@ -24,8 +23,7 @@ 
      *
      * @return string Output
      */
-    public function render($files)
-    {
+    public function render($files) {
         $output = '';
 
         foreach ($files as $outputName => $file) {
@@ -44,8 +42,7 @@ 
      *
      * @return string Output
      */
-    protected function renderFile($file)
-    {
+    protected function renderFile($file) {
         if (!is_readable($file)) {
             throw new \InvalidArgumentException(sprintf('File "%s" is nonexistent (Working directory: %s)', $file, getcwd()));
         }
@@ -77,8 +74,7 @@ 
     /**
      * @param array $variables
      */
-    public function __construct($variables)
-    {
+    public function __construct($variables) {
         $this->variables = $variables;
     }
 }