zortje / mvc

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;
     }
 }