Code updates

Author: pfwd

notes.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * @todo Change bootstrap to routing.
+ * Alter config to including routing config
+ *
+ * @todo Question, does a Exception with a code of 404 have a header of 404?
+ * if so remove try catch
+ *
+ * @todo Check in View::Render that template exists
+ *
+ * @todo Put Connection creds into config.php
+ *
+ * @todo typo in creds
+ * @todo put DB::Connection into a try catch and catch PDOException
+ *
+ * @todo Refactor query builder so that query statements are not exposed
+ * EG QueryBuilder::where() from repository
+ * Possibly have a interface that just exposes the find*, insert, insertOrUpdate and
+ * update methods
+ *
+ * Haven't checked Helper or Manager yet!
+ *
+ * @todo Fix the failing 404 acceptance tests
+ * vendor/bin/codecept run acceptance -g page-not-found
+ * it is failing due to not running /public/404.html
+ *
+ *
+ * @todo Add abstraction layer for repositories to allow controllers to pull out
+ * repositories from a factory
+ * EG:
+ * $this->getDoctrine()->getRepository(\App\Entity\Status::class)->findAll()
+ * $this->repostioryFactory()->make(\App\Entity\Status::class)->findAll()
+ *
+ * $this->getDB()->getRepository(\App\Entity\Invoice::class)->findAll();
+ *
+ * $this->repositoryLoader->getStatus()->findAll();
+ *
+ * @todo Add abstraction layer for managers to allow controller to pull out
+ * managers from a factory
+ * $this->getDB()->getManager(\App\Entity\Status::class)->save($status);
+ *
+ *
+ *
+ */

src/DB/Builder/Builder.php

@@ -0,0 +1,46 @@
+<?php
+namespace App\DB\Builder;
+
+class Builder
+{
+ private $collections = [];
+
+ /**
+ * @param string $className
+ * @return CollectionInterface
+ */
+ public function make(string $className):CollectionInterface
+ {
+ $found = null;
+ foreach($this->collections as $collection) {
+ if($collection instanceof $className) {
+ $found = $collection;
+ break;
+ }
+ }
+
+ if(FALSE === $found instanceof CollectionInterface) {
+ $found = new $className();
+ $this->collections[] = $found;
+ }
+
+ return $found;
+ }
+
+ /**
+ * @return WhereCollection
+ */
+ public function where(): WhereCollection
+ {
+
+ return $this->make(WhereCollection::class);
+ }
+
+ /**
+ * @return FieldCollection
+ */
+ public function fields(): FieldCollection
+ {
+ return $this->make(FieldCollection::class);
+ }
+}

src/DB/Builder/CollectionInterface.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace App\DB\Builder;
+
+interface CollectionInterface
+{
+ public function set(array $data = []): CollectionInterface;
+ public function getSQL(): string;
+}

src/DB/Builder/FieldCollection.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\DB\Builder;
+
+class FieldCollection implements CollectionInterface
+{
+ /**
+ * @var array
+ */
+ private $fields = [];
+
+ /**
+ * @param string $name
+ * @return FieldCollection
+ */
+ public function add(string $name): FieldCollection
+ {
+ $this->fields[] = $name;
+ return $this;
+ }
+
+ /**
+ * @param array $fields
+ * @return FieldCollection
+ */
+ public function set(array $fields = []):CollectionInterface
+ {
+ $this->fields = [];
+ for ($i = 0; $i < count($fields); $i++) {
+ $this->add($fields[$i]);
+ }
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSQL(): string
+ {
+ $sql = '*';
+ if(count($this->fields) > 0) {
+ $sql = '';
+ for ($i = 0; $i < count($this->fields); $i++) {
+ if ($i > 0) {
+ $sql .= ", ";
+ }
+ $sql .= "`" . $this->fields[$i] . "`";
+ }
+ }
+ return $sql;
+ }
+
+}

src/DB/Builder/WhereCollection.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\DB\Builder;
+
+class WhereCollection implements CollectionInterface
+{
+ /**
+ * @var array
+ */
+ private $whereClause = [];
+
+ /**
+ * @param string $field
+ * @param $value
+ * @return WhereCollection
+ */
+ public function add(string $field, $value): WhereCollection
+ {
+ $this->whereClause[$field] = $value;
+ return $this;
+ }
+
+ /**
+ * @param array $where
+ * @return WhereCollection
+ */
+ public function set(array $where = []): CollectionInterface
+ {
+ $this->whereClause = $where;
+
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSQL(): string
+ {
+ $sql = '';
+ $counter = 0;
+ $count = count($this->whereClause);
+
+ if($count > 0) {
+ $sql.='WHERE ';
+ }
+ foreach ($this->whereClause as $field => $value) {
+ $counter++;
+ $sql .= '`' . $field . '` =:' . $field;
+
+ if ($counter < $count) {
+ $sql .= ' AND ';
+ }
+
+ }
+ return $sql;
+ }
+
+}

src/DB/QueryBuilder.php

@@ -2,8 +2,9 @@
 
 namespace App\DB;
 
-class QueryBuilder
+class QueryBuilder extends QueryCreate implements QueryBuilderInterface
 {
+
  /**
  * @param array $data
  * @param string $table

src/DB/QueryBuilderInterface.php

@@ -0,0 +1,10 @@
+<?php
+namespace App\DB;
+
+interface QueryBuilderInterface
+{
+ public function select(string $tableName, array $fields = []): QueryBuilderInterface;
+ public function andWhere(string $fieldName, $value): QueryBuilderInterface;
+ public function getSQL():string;
+
+}

src/DB/QueryCreate.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\DB;
+
+use App\DB\Builder\Builder;
+
+class QueryCreate implements QueryBuilderInterface
+{
+ private $builder;
+
+ public function __construct(Builder $builder)
+ {
+ $this->builder = $builder;
+ }
+
+ private $sql = '';
+
+ /**
+ * @param string $tableName
+ * @param array $fields
+ * @return QueryBuilderInterface
+ */
+ public function select(string $tableName, array $fields = []): QueryBuilderInterface
+ {
+ $fieldCollection = $this->builder->fields()->set($fields);
+
+ $this->sql.= "SELECT " . $fieldCollection->getSQL() . " FROM `" . $tableName . "` ";
+
+ return $this;
+ }
+
+
+
+ /**
+ * @param string $field
+ * @param $value
+ * @return QueryBuilderInterface
+ */
+ public function andWhere(string $field, $value): QueryBuilderInterface
+ {
+ $this->builder->where()->add($field, $value);
+
+ $this->sql.=$this->builder->where()->getSQL();
+
+ return $this;
+ }
+
+ /**
+ * @return string
+ */
+ public function getSQL(): string
+ {
+ return trim($this->sql);
+ }
+
+
+}

src/Manager/CustomerManager.php

@@ -3,6 +3,7 @@
 namespace App\Manager;
 
 use App\Entity\Customer;
+use App\Hydration\CustomerHydrator;
 use App\Repository\CustomerRepository;
 
 class CustomerManager extends AbstractManager
@@ -37,7 +38,16 @@ public function findOne(int $id): ?Customer
  */
  public function findAll(): array
  {
- return $this->repository->findAll();
+ $results = [];
+ $rows = $this->repository->findAll('customer');
+
+ if (is_array($rows)) {
+ foreach ($rows as $row) {
+ $results[] = CustomerHydrator::hydrate($row);
+ }
+ }
+
+ return $results;
  }
 
  /**

src/Manager/InvoiceItemManager.php

@@ -3,6 +3,7 @@
 namespace App\Manager;
 
 use App\Entity\InvoiceItem;
+use App\Hydration\InvoiceItemHydrator;
 use App\Repository\InvoiceItemRepository;
 
 class InvoiceItemManager extends AbstractManager
@@ -37,14 +38,23 @@ public function findOne(int $id): ?InvoiceItem
  */
  public function findAll(): array
  {
- return $this->repository->findAll();
+ $results = [];
+ $rows = $this->repository->findAll('invoice_item');
+
+ if (is_array($rows)) {
+ foreach ($rows as $row) {
+ $results[] = InvoiceItemHydrator::hydrate($row);
+ }
+ }
+
+ return $results;
  }
 
  /**
  * @param int $id
  * @return array
  */
- public function findAllByInvoiceID(int $id):array
+ public function findAllByInvoiceID(int $id): array
  {
  return $this->repository->findAllByInvoiceID($id);
  }