From 2fb18f246f3f8d00c98efda7066d83aeb814f8f7 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Fri, 11 Mar 2016 19:40:40 -0600
Subject: [PATCH 01/12] Change Vagrantfile setup...

- homestead error; reverted to rasmus' php7dev box
- configured nginx and mysql
---
 Comment.php            | 20 ++++++++++---------
 Vagrantfile            | 45 +++++++++++++++++++++---------------------
 layout.phtml           |  4 ++--
 masterclass.nginx.conf | 32 ++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 33 deletions(-)
 create mode 100644 masterclass.nginx.conf

diff --git a/Comment.php b/Comment.php
index bff2e3c..88e71c8 100644
--- a/Comment.php
+++ b/Comment.php
@@ -1,21 +1,24 @@
 <?php
 
-class Comment {
-    
-    public function __construct($config) {
+class Comment
+{
+
+    public function __construct($config)
+    {
         $dbconfig = $config['database'];
         $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
         $this->db = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
         $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
     }
-    
-    public function create() {
-        if(!isset($_SESSION['AUTHENTICATED'])) {
+
+    public function create()
+    {
+        if (!isset($_SESSION['AUTHENTICATED'])) {
             die('not auth');
             header("Location: /");
             exit;
         }
-        
+
         $sql = 'INSERT INTO comment (created_by, created_on, story_id, comment) VALUES (?, NOW(), ?, ?)';
         $stmt = $this->db->prepare($sql);
         $stmt->execute(array(
@@ -25,5 +28,4 @@ public function create() {
         ));
         header("Location: /story/?id=" . $_POST['story_id']);
     }
-    
-}
\ No newline at end of file
+}
diff --git a/Vagrantfile b/Vagrantfile
index 5c81259..6ad8074 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,28 +1,29 @@
-require 'json'
-require 'yaml'
+## first install vagrant hostmanager:
+# `$ vagrant plugin install vagrant-hostmanager`
 
-VAGRANTFILE_API_VERSION ||= "2"
-confDir = $confDir ||= File.expand_path("vendor/laravel/homestead", File.dirname(__FILE__))
+$script = <<SCRIPT
+  echo I am provisioning...
+  date > vagrant_provisioned_at
+  echo I am setting up nginx vhost configuration ...
+  cp -rp /vagrant/masterclass.nginx.conf /etc/nginx/conf.d/
+  service nginx restart
+  echo web server is ready, access at http://dev.masterclass.com
+  echo mysql setup database dev
+  mysql -uroot -pvagrant -e 'CREATE DATABASE IF NOT EXISTS `dev` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci'
+  echo create initial mysql schema
+  mysql -uroot -pvagrant dev < /vagrant/schema.sql
+  echo Ready for mastery.
+SCRIPT
 
-homesteadYamlPath = "Homestead.yaml"
-homesteadJsonPath = "Homestead.json"
-afterScriptPath = "after.sh"
-aliasesPath = "aliases"
+Vagrant.configure(2) do |config|
+  config.vm.box = "rasmus/php7dev"
 
-require File.expand_path(confDir + '/scripts/homestead.rb')
+  config.vm.network "private_network", ip: "10.0.99.12"
+  config.hostmanager.enabled = true
+  config.hostmanager.manage_host = true
+  config.hostmanager.aliases = 'dev.masterclass.com'
 
-Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-    if File.exists? aliasesPath then
-        config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases"
-    end
+  config.vm.synced_folder ".", "/vagrant", owner: "vagrant", group: "www-data", mount_options: ['dmode=775']
 
-    if File.exists? homesteadYamlPath then
-        Homestead.configure(config, YAML::load(File.read(homesteadYamlPath)))
-    elsif File.exists? homesteadJsonPath then
-        Homestead.configure(config, JSON.parse(File.read(homesteadJsonPath)))
-    end
-
-    if File.exists? afterScriptPath then
-        config.vm.provision "shell", path: afterScriptPath
-    end
+  config.vm.provision "shell", inline: $script
 end
diff --git a/layout.phtml b/layout.phtml
index 8f7b6c4..dead198 100644
--- a/layout.phtml
+++ b/layout.phtml
@@ -4,7 +4,7 @@
     </head>
     <style>
         body {
-            font-family: Verdana;
+            font-family: Verdana, serif;
             font-size: 10pt;
         }
         
@@ -62,4 +62,4 @@
             </div>
         </div>
     </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/masterclass.nginx.conf b/masterclass.nginx.conf
new file mode 100644
index 0000000..ec8d0e5
--- /dev/null
+++ b/masterclass.nginx.conf
@@ -0,0 +1,32 @@
+server {
+    listen 80;
+    server_name dev.masterclass.com;
+    root /vagrant/public/;
+    index index.php;
+    error_log  /var/log/nginx/error.log;
+    access_log /var/log/nginx/access.log;
+    error_page   500 502 503 504  /50x.html;
+    sendfile off;
+
+    location = /50x.html {
+        root   /var/www/default;
+    }
+
+    location / {
+        try_files $uri $uri/ @rewrite;
+    }
+    location @rewrite {
+        rewrite ^(.*)$ /index.php;
+    }
+
+    location ~ \.php {
+        include                  fastcgi_params;
+        fastcgi_keep_conn on;
+        fastcgi_index            index.php;
+        fastcgi_split_path_info  ^(.+\.php)(/.+)$;
+        fastcgi_param PATH_INFO $fastcgi_path_info;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_intercept_errors on;
+        fastcgi_pass unix:/var/run/php-fpm.sock;
+    }
+}

From a70bb8135ac5b110a3af7e77f08758a4a0b4cfbe Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Sat, 12 Mar 2016 18:56:10 -0600
Subject: [PATCH 02/12] wip: organizing repo, introducing di (partially)

---
 Index.php                                     | 42 -------------
 composer.json                                 |  8 +++
 composer.lock                                 | 56 ++++++++++++++++-
 diconfig.php                                  | 21 +++++++
 public/index.php                              | 11 ++--
 Comment.php => src/Controller/Comment.php     |  4 ++
 src/Controller/Index.php                      | 47 +++++++++++++++
 Story.php => src/Controller/Story.php         |  6 +-
 User.php => src/Controller/User.php           |  6 +-
 .../MasterController.php                      | 60 +++++++++++++------
 src/Model/Story.php                           | 41 +++++++++++++
 11 files changed, 229 insertions(+), 73 deletions(-)
 delete mode 100644 Index.php
 create mode 100644 diconfig.php
 rename Comment.php => src/Controller/Comment.php (95%)
 create mode 100644 src/Controller/Index.php
 rename Story.php => src/Controller/Story.php (98%)
 rename User.php => src/Controller/User.php (99%)
 rename MasterController.php => src/MasterController.php (50%)
 create mode 100644 src/Model/Story.php

diff --git a/Index.php b/Index.php
deleted file mode 100644
index a2aded6..0000000
--- a/Index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
- 
-class Index {
-    
-    protected $db;
-    
-    public function __construct($config) {
-        $dbconfig = $config['database'];
-        $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
-        $this->db = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
-        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-    }
-    
-    public function index() {
-        
-        $sql = 'SELECT * FROM story ORDER BY created_on DESC';
-        $stmt = $this->db->prepare($sql);
-        $stmt->execute();
-        $stories = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        
-        $content = '<ol>';
-        
-        foreach($stories as $story) {
-            $comment_sql = 'SELECT COUNT(*) as `count` FROM comment WHERE story_id = ?';
-            $comment_stmt = $this->db->prepare($comment_sql);
-            $comment_stmt->execute(array($story['id']));
-            $count = $comment_stmt->fetch(PDO::FETCH_ASSOC);
-            $content .= '
-                <li>
-                <a class="headline" href="' . $story['url'] . '">' . $story['headline'] . '</a><br />
-                <span class="details">' . $story['created_by'] . ' | <a href="/story/?id=' . $story['id'] . '">' . $count['count'] . ' Comments</a> | 
-                ' . date('n/j/Y g:i a', strtotime($story['created_on'])) . '</span>
-                </li>
-            ';
-        }
-        
-        $content .= '</ol>';
-        
-        require 'layout.phtml';
-    }
-}
-
diff --git a/composer.json b/composer.json
index e8f8de7..488d2f8 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,13 @@
 {
     "require-dev": {
         "laravel/homestead": "^3.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Masterclass\\": ["./src"]
+        }
+    },
+    "require": {
+        "aura/di": "^2.2"
     }
 }
diff --git a/composer.lock b/composer.lock
index d2f831a..c9adb65 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,9 +4,59 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8f6b5ef9d063814de8f9de26782a97e2",
-    "content-hash": "a15a01a5fd255896078846f9de258084",
-    "packages": [],
+    "hash": "4b2be06a2880d32b97a327aaa04a88b1",
+    "content-hash": "0b440c1ae56784e85b0cc8a27c61a745",
+    "packages": [
+        {
+            "name": "aura/di",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/auraphp/Aura.Di.git",
+                "reference": "81d5d9c602ca292a16e32001dcbd2adab5350e28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/auraphp/Aura.Di/zipball/81d5d9c602ca292a16e32001dcbd2adab5350e28",
+                "reference": "81d5d9c602ca292a16e32001dcbd2adab5350e28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "aura": {
+                    "type": "library"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Aura\\Di\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Aura.Di Contributors",
+                    "homepage": "https://github.com/auraphp/Aura.Di/contributors"
+                }
+            ],
+            "description": "Provides a dependency injection container system with native support for constructor- and setter-based injection, lazy-loading of services, and inheritable configuration of setters and constructor params.",
+            "homepage": "https://github.com/auraphp/Aura.Di",
+            "keywords": [
+                "container",
+                "dependency injection",
+                "dependency injection container",
+                "di",
+                "di container"
+            ],
+            "time": "2016-01-21 09:34:53"
+        }
+    ],
     "packages-dev": [
         {
             "name": "laravel/homestead",
diff --git a/diconfig.php b/diconfig.php
new file mode 100644
index 0000000..2c62ab3
--- /dev/null
+++ b/diconfig.php
@@ -0,0 +1,21 @@
+<?php
+
+$di = new Aura\Di\Container(new \Aura\Di\Factory());
+
+$db = $config['database'];
+
+$dsn = sprintf('mysql:host=%s;dbname=%s', $db['host'], $db['name']);
+
+$di->params['PDO'] = [
+    'dsn' => $dsn,
+    'username' => $db['user'],
+    'passwd' => $db['pass'],
+];
+
+$di->params[Masterclass\Controller\Index::class] = [
+    'model' => $di->lazyNew(Masterclass\Model\Story::class),
+];
+
+$di->params[Masterclass\Model\Story::class] = [
+
+];
diff --git a/public/index.php b/public/index.php
index 92c2321..f17ab4a 100644
--- a/public/index.php
+++ b/public/index.php
@@ -3,12 +3,9 @@
 session_start();
 
 $config = require_once('../config.php');
-require_once '../MasterController.php';
+require_once '../vendor/autoload.php';
 
-require_once '../Comment.php';
-require_once '../User.php';
-require_once '../Story.php';
-require_once '../Index.php';
+require ('../diconfig.php');
 
-$framework = new MasterController($config);
-echo $framework->execute();
\ No newline at end of file
+$framework = new Masterclass\MasterController($di, $config);
+echo $framework->execute();
diff --git a/Comment.php b/src/Controller/Comment.php
similarity index 95%
rename from Comment.php
rename to src/Controller/Comment.php
index 88e71c8..68c5244 100644
--- a/Comment.php
+++ b/src/Controller/Comment.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Masterclass\Controller;
+
+use PDO;
+
 class Comment
 {
 
diff --git a/src/Controller/Index.php b/src/Controller/Index.php
new file mode 100644
index 0000000..d1f0634
--- /dev/null
+++ b/src/Controller/Index.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Masterclass\Controller;
+
+use Masterclass\Model\Story;
+
+class Index
+{
+    
+    protected $model;
+    
+    public function __construct(Story $model)
+    {
+        $this->model = $model;
+    }
+    
+    public function index()
+    {
+
+        $stories = $this->model->getAllStories();
+//        $sql = 'SELECT * FROM story ORDER BY created_on DESC';
+//        $stmt = $this->db->prepare($sql);
+//        $stmt->execute();
+//        $stories = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        
+        $content = '<ol>';
+        
+        foreach ($stories as $story) {
+//            $comment_sql = 'SELECT COUNT(*) as `count` FROM comment WHERE story_id = ?';
+//            $comment_stmt = $this->db->prepare($comment_sql);
+//            $comment_stmt->execute(array($story['id']));
+//            $count = $comment_stmt->fetch(PDO::FETCH_ASSOC);
+            $content .= '
+                <li>
+                <a class="headline" href="' . $story['url'] . '">' . $story['headline'] . '</a><br />
+                <a class="headline" href="' . $story['url'] . '">' . $story['headline'] . '</a><br />
+                <span class="details">' . $story['created_by'] . ' | <a href="/story/?id=' . $story['id'] . '">' . $story['count'] . ' Comments</a> |
+                ' . date('n/j/Y g:i a', strtotime($story['created_on'])) . '</span>
+                </li>
+            ';
+        }
+        
+        $content .= '</ol>';
+        
+        require '/vagrant/layout.phtml';
+    }
+}
diff --git a/Story.php b/src/Controller/Story.php
similarity index 98%
rename from Story.php
rename to src/Controller/Story.php
index 3e4eaad..1f822f5 100644
--- a/Story.php
+++ b/src/Controller/Story.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Masterclass\Controller;
+
+use PDO;
+
 class Story {
     
     public function __construct($config) {
@@ -98,4 +102,4 @@ public function create() {
         require_once 'layout.phtml';
     }
     
-}
\ No newline at end of file
+}
diff --git a/User.php b/src/Controller/User.php
similarity index 99%
rename from User.php
rename to src/Controller/User.php
index b2ca74c..12c01b1 100644
--- a/User.php
+++ b/src/Controller/User.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Masterclass\Controller;
+
+use PDO;
+
 class User {
     
     public $db;
@@ -158,4 +162,4 @@ public function logout() {
         session_destroy();
         header("Location: /");
     }
-}
\ No newline at end of file
+}
diff --git a/MasterController.php b/src/MasterController.php
similarity index 50%
rename from MasterController.php
rename to src/MasterController.php
index 895be4d..88e5ac8 100644
--- a/MasterController.php
+++ b/src/MasterController.php
@@ -1,22 +1,45 @@
 <?php
 
-class MasterController {
-    
+namespace Masterclass;
+
+use Aura\Di\Container;
+use PDO;
+
+class MasterController
+{
     private $config;
-    
-    public function __construct($config) {
-        $this->_setupConfig($config);
+
+    protected $container;
+
+    public function __construct(Container $container, $config)
+    {
+        $this->container = $container;
+        $this->config = $config;
     }
-    
-    public function execute() {
+
+    public function execute()
+    {
         $call = $this->_determineControllers();
+
+        $dbconfig = $this->config['database'];
+        $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
+        $pdo = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
+        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
+        // need this:
+//        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+
         $call_class = $call['call'];
         $class = ucfirst(array_shift($call_class));
         $method = array_shift($call_class);
-        $o = new $class($this->config);
+//        $o = new $class($pdo);
+
+        // container can instantiate class w/ required dependencies.
+        $o = $this->container->newInstance($class);
+
         return $o->$method();
     }
-    
+
     private function _determineControllers()
     {
         if (isset($_SERVER['REDIRECT_BASE'])) {
@@ -24,16 +47,15 @@ private function _determineControllers()
         } else {
             $rb = '';
         }
-        
+
         $ruri = $_SERVER['REQUEST_URI'];
         $path = str_replace($rb, '', $ruri);
         $return = array();
-        
-        foreach($this->config['routes'] as $k => $v) {
+
+        foreach ($this->config['routes'] as $k => $v) {
             $matches = array();
             $pattern = '$' . $k . '$';
-            if(preg_match($pattern, $path, $matches))
-            {
+            if (preg_match($pattern, $path, $matches)) {
                 $controller_details = $v;
                 $path_string = array_shift($matches);
                 $arguments = $matches;
@@ -41,12 +63,12 @@ private function _determineControllers()
                 $return = array('call' => $controller_method);
             }
         }
-        
+
         return $return;
     }
-    
-    private function _setupConfig($config) {
+
+    private function _setupConfig($config)
+    {
         $this->config = $config;
     }
-    
-}
\ No newline at end of file
+}
diff --git a/src/Model/Story.php b/src/Model/Story.php
new file mode 100644
index 0000000..cf337fc
--- /dev/null
+++ b/src/Model/Story.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @author Adam Altman <adam@rebilly.com>
+ * masterclass-repo
+ */
+
+namespace Masterclass\Model;
+
+use PDO;
+
+final class Story
+{
+    protected $pdo;
+
+    public function __construct(PDO $pdo)
+    {
+        $this->pdo = $pdo;
+    }
+
+    public function getAllStories()
+    {
+        $sql = 'SELECT * FROM story ORDER BY created_on DESC';
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute();
+        $stories = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        foreach ($stories as $k => $story) {
+            $comment_sql = 'SELECT count(*) as `count` FROM comment WHERE story_id = ?';
+            $comment_stmt = $this->pdo->prepare(($comment_sql));
+            $comment_stmt->execute([$story['id']]);
+            $count = $comment_stmt->fetch(PDO::FETCH_ASSOC);
+            $stories[$k]['count'] = $count['count'];
+        }
+
+        return $stories;
+    }
+
+}
+
+
+// composer require aura/di

From 2ec87142457f9f83db8329afa4ef77ae56634b66 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Sat, 12 Mar 2016 22:49:57 -0600
Subject: [PATCH 03/12] move sql to models, finish DI setup

---
 diconfig.php               |  26 ++++++
 src/Controller/Comment.php |  19 ++--
 src/Controller/Story.php   |  98 ++++++++++----------
 src/Controller/User.php    | 177 ++++++++++++++++++-------------------
 src/Model/Comment.php      |  40 +++++++++
 src/Model/Story.php        |  21 +++++
 src/Model/User.php         | 104 ++++++++++++++++++++++
 7 files changed, 328 insertions(+), 157 deletions(-)
 create mode 100644 src/Model/Comment.php
 create mode 100644 src/Model/User.php

diff --git a/diconfig.php b/diconfig.php
index 2c62ab3..0af8f5c 100644
--- a/diconfig.php
+++ b/diconfig.php
@@ -2,6 +2,8 @@
 
 $di = new Aura\Di\Container(new \Aura\Di\Factory());
 
+$di->setAutoResolve(false);
+
 $db = $config['database'];
 
 $dsn = sprintf('mysql:host=%s;dbname=%s', $db['host'], $db['name']);
@@ -10,6 +12,10 @@
     'dsn' => $dsn,
     'username' => $db['user'],
     'passwd' => $db['pass'],
+    'options' => [
+        PDO::ATTR_ERRMODE,
+        PDO::ERRMODE_EXCEPTION,
+    ],
 ];
 
 $di->params[Masterclass\Controller\Index::class] = [
@@ -17,5 +23,25 @@
 ];
 
 $di->params[Masterclass\Model\Story::class] = [
+    'pdo' => $di->lazyNew('PDO'),
+];
 
+$di->params[Masterclass\Controller\User::class] = [
+    'model' => $di->lazyNew(Masterclass\Model\User::class),
+];
+
+$di->params[Masterclass\Model\User::class] = [
+    'pdo' => $di->lazyNew('PDO'),
+];
+
+$di->params[Masterclass\Controller\Comment::class] = [
+    'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
+];
+
+$di->params[Masterclass\Model\Comment::class] = [
+    'pdo' => $di->lazyNew('PDO'),
+];
+$di->params[Masterclass\Controller\Story::class] = [
+    'story' => $di->lazyNew(Masterclass\Model\Story::class),
+    'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
 ];
diff --git a/src/Controller/Comment.php b/src/Controller/Comment.php
index 68c5244..991540c 100644
--- a/src/Controller/Comment.php
+++ b/src/Controller/Comment.php
@@ -2,17 +2,15 @@
 
 namespace Masterclass\Controller;
 
-use PDO;
+use Masterclass\Model\Comment as CommentModel;
 
 class Comment
 {
+    protected $commentModel;
 
-    public function __construct($config)
+    public function __construct(CommentModel $comment)
     {
-        $dbconfig = $config['database'];
-        $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
-        $this->db = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
-        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+        $this->commentModel = $comment;
     }
 
     public function create()
@@ -23,13 +21,12 @@ public function create()
             exit;
         }
 
-        $sql = 'INSERT INTO comment (created_by, created_on, story_id, comment) VALUES (?, NOW(), ?, ?)';
-        $stmt = $this->db->prepare($sql);
-        $stmt->execute(array(
+        $this->commentModel->addComment(
             $_SESSION['username'],
             $_POST['story_id'],
-            filter_input(INPUT_POST, 'comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS),
-        ));
+            filter_input(INPUT_POST, 'comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
+        );
+
         header("Location: /story/?id=" . $_POST['story_id']);
     }
 }
diff --git a/src/Controller/Story.php b/src/Controller/Story.php
index 1f822f5..187a41a 100644
--- a/src/Controller/Story.php
+++ b/src/Controller/Story.php
@@ -2,46 +2,44 @@
 
 namespace Masterclass\Controller;
 
-use PDO;
-
-class Story {
-    
-    public function __construct($config) {
-        $dbconfig = $config['database'];
-        $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
-        $this->db = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
-        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+use Masterclass\Model\Comment;
+use Masterclass\Model\Story as StoryModel;
+
+class Story
+{
+    protected $comment;
+    protected $story;
+
+    public function __construct(Comment $comment, StoryModel $story)
+    {
+        $this->comment = $comment;
+        $this->story = $story;
     }
-    
-    public function index() {
-        if(!isset($_GET['id'])) {
+
+    public function index()
+    {
+        if (!isset($_GET['id'])) {
             header("Location: /");
             exit;
         }
-        
-        $story_sql = 'SELECT * FROM story WHERE id = ?';
-        $story_stmt = $this->db->prepare($story_sql);
-        $story_stmt->execute(array($_GET['id']));
-        if($story_stmt->rowCount() < 1) {
+
+        $story = $this->story->loadStoryById($_GET['id']);
+
+        if (empty($story)) {
             header("Location: /");
             exit;
         }
-        
-        $story = $story_stmt->fetch(PDO::FETCH_ASSOC);
-        
-        $comment_sql = 'SELECT * FROM comment WHERE story_id = ?';
-        $comment_stmt = $this->db->prepare($comment_sql);
-        $comment_stmt->execute(array($story['id']));
-        $comment_count = $comment_stmt->rowCount();
-        $comments = $comment_stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        $comments = $this->comment->getCommentsForStoryId($_GET['id']);
+        $comment_count = count($comments);
 
         $content = '
             <a class="headline" href="' . $story['url'] . '">' . $story['headline'] . '</a><br />
             <span class="details">' . $story['created_by'] . ' | ' . $comment_count . ' Comments | 
             ' . date('n/j/Y g:i a', strtotime($story['created_on'])) . '</span>
         ';
-        
-        if(isset($_SESSION['AUTHENTICATED'])) {
+
+        if (isset($_SESSION['AUTHENTICATED'])) {
             $content .= '
             <form method="post" action="/comment/create">
             <input type="hidden" name="story_id" value="' . $_GET['id'] . '" />
@@ -50,45 +48,39 @@ public function index() {
             </form>            
             ';
         }
-        
-        foreach($comments as $comment) {
+
+        foreach ($comments as $comment) {
             $content .= '
                 <div class="comment"><span class="comment_details">' . $comment['created_by'] . ' | ' .
                 date('n/j/Y g:i a', strtotime($story['created_on'])) . '</span>
                 ' . $comment['comment'] . '</div>
             ';
         }
-        
-        require_once 'layout.phtml';
-        
+
+        require_once '/vagrant/layout.phtml';
+
     }
-    
-    public function create() {
-        if(!isset($_SESSION['AUTHENTICATED'])) {
+
+    public function create()
+    {
+        if (!isset($_SESSION['AUTHENTICATED'])) {
             header("Location: /user/login");
             exit;
         }
-        
+
         $error = '';
-        if(isset($_POST['create'])) {
-            if(!isset($_POST['headline']) || !isset($_POST['url']) ||
-               !filter_input(INPUT_POST, 'url', FILTER_VALIDATE_URL)) {
-                $error = 'You did not fill in all the fields or the URL did not validate.';       
+        if (isset($_POST['create'])) {
+            if (!isset($_POST['headline']) || !isset($_POST['url']) ||
+                !filter_input(INPUT_POST, 'url', FILTER_VALIDATE_URL)
+            ) {
+                $error = 'You did not fill in all the fields or the URL did not validate.';
             } else {
-                $sql = 'INSERT INTO story (headline, url, created_by, created_on) VALUES (?, ?, ?, NOW())';
-                $stmt = $this->db->prepare($sql);
-                $stmt->execute(array(
-                   $_POST['headline'],
-                   $_POST['url'],
-                   $_SESSION['username'],
-                ));
-                
-                $id = $this->db->lastInsertId();
+                $id = $this->story->createStory($_POST['headline'], $_POST['url'], $_SESSION['username']);
                 header("Location: /story/?id=$id");
                 exit;
             }
         }
-        
+
         $content = '
             <form method="post">
                 ' . $error . '<br />
@@ -98,8 +90,8 @@ public function create() {
                 <input type="submit" name="create" value="Create" />
             </form>
         ';
-        
-        require_once 'layout.phtml';
+
+        require_once '/vagrant/layout.phtml';
     }
-    
+
 }
diff --git a/src/Controller/User.php b/src/Controller/User.php
index 12c01b1..8a896f9 100644
--- a/src/Controller/User.php
+++ b/src/Controller/User.php
@@ -2,66 +2,63 @@
 
 namespace Masterclass\Controller;
 
-use PDO;
-
-class User {
-    
-    public $db;
-    
-    public function __construct($config) {
-        $dbconfig = $config['database'];
-        $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
-        $this->db = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
-        $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+use Masterclass\Model\User as UserModel;
+
+class User
+{
+
+    public $userModel;
+
+    public function __construct(UserModel $model)
+    {
+        $this->userModel = $model;
     }
-    
-    public function create() {
+
+    public function create()
+    {
         $error = null;
-        
+
         // Do the create
-        if(isset($_POST['create'])) {
-            if(empty($_POST['username']) || empty($_POST['email']) ||
-               empty($_POST['password']) || empty($_POST['password_check'])) {
+        if (isset($_POST['create'])) {
+            $username = $_POST['username'];
+            $password = $_POST['password'];
+            $passwordCheck = $_POST['password_check'];
+            $email = $_POST['email'];
+
+            if (empty($username)
+                || empty($email)
+                || empty($password)
+                || empty($passwordCheck)
+            ) {
                 $error = 'You did not fill in all required fields.';
             }
-            
-            if(is_null($error)) {
-                if(!filter_input(INPUT_POST, 'email', FILTER_VALIDATE_EMAIL)) {
+
+            if (is_null($error)) {
+                if (!filter_input(INPUT_POST, 'email', FILTER_VALIDATE_EMAIL)) {
                     $error = 'Your email address is invalid';
                 }
             }
-            
-            if(is_null($error)) {
-                if($_POST['password'] != $_POST['password_check']) {
+
+            if (is_null($error)) {
+                if ($password != $passwordCheck) {
                     $error = "Your passwords didn't match.";
                 }
             }
-            
-            if(is_null($error)) {
-                $check_sql = 'SELECT * FROM user WHERE username = ?';
-                $check_stmt = $this->db->prepare($check_sql);
-                $check_stmt->execute(array($_POST['username']));
-                if($check_stmt->rowCount() > 0) {
+
+            if (is_null($error)) {
+                if ($this->userModel->userExists($username)) {
                     $error = 'Your chosen username already exists. Please choose another.';
                 }
             }
-            
-            if(is_null($error)) {
-                $params = array(
-                    $_POST['username'],
-                    $_POST['email'],
-                    md5($_POST['username'] . $_POST['password']),
-                );
-            
-                $sql = 'INSERT INTO user (username, email, password) VALUES (?, ?, ?)';
-                $stmt = $this->db->prepare($sql);
-                $stmt->execute($params);
+
+            if (is_null($error)) {
+                $this->userModel->createUser($username, $email, $password);
                 header("Location: /user/login");
                 exit;
             }
         }
         // Show the create form
-        
+
         $content = '
             <form method="post">
                 ' . $error . '<br />
@@ -72,78 +69,71 @@ public function create() {
                 <input type="submit" name="create" value="Create User" />
             </form>
         ';
-        
-        require_once 'layout.phtml';
-        
+
+        require_once '/vagrant/layout.phtml';
+
     }
-    
-    public function account() {
+
+    public function account()
+    {
         $error = null;
-        if(!isset($_SESSION['AUTHENTICATED'])) {
+        if (!isset($_SESSION['AUTHENTICATED'])) {
             header("Location: /user/login");
             exit;
         }
-        
-        if(isset($_POST['updatepw'])) {
-            if(!isset($_POST['password']) || !isset($_POST['password_check']) ||
-               $_POST['password'] != $_POST['password_check']) {
-                $error = 'The password fields were blank or they did not match. Please try again.';       
-            }
-            else {
-                $sql = 'UPDATE user SET password = ? WHERE username = ?';
-                $stmt = $this->db->prepare($sql);
-                $stmt->execute(array(
-                   md5($_SESSION['username'] . $_POST['password']), // THIS IS NOT SECURE. 
-                   $_SESSION['username'],
-                ));
+
+        $username = $_SESSION['username'];
+        $password = $_POST['password'] ?? null;
+
+        if (isset($_POST['updatepw'])) {
+            if (!isset($_POST['password']) || !isset($_POST['password_check']) ||
+                $_POST['password'] != $_POST['password_check']
+            ) {
+                $error = 'The password fields were blank or they did not match. Please try again.';
+            } else {
+                $this->userModel->updatePassword($username, $password);
+                // @TODO: odd, there is no error.
                 $error = 'Your password was changed.';
             }
         }
-        
-        $dsql = 'SELECT * FROM user WHERE username = ?';
-        $stmt = $this->db->prepare($dsql);
-        $stmt->execute(array($_SESSION['username']));
-        $details = $stmt->fetch(PDO::FETCH_ASSOC);
-        
+
+        $userModel = $this->userModel->loadUserByUsername($username);
+
         $content = '
         ' . $error . '<br />
         
-        <label>Username:</label> ' . $details['username'] . '<br />
-        <label>Email:</label>' . $details['email'] . ' <br />
-        
+        <label>Username:</label> ' . $username . '<br />
+        <label>Email:</label>' . $userModel->getEmail() . ' <br />
+
          <form method="post">
                 ' . $error . '<br />
             <label>Password</label> <input type="password" name="password" value="" /><br />
             <label>Password Again</label> <input type="password" name="password_check" value="" /><br />
             <input type="submit" name="updatepw" value="Create User" />
         </form>';
-        
-        require_once 'layout.phtml';
+
+        require_once '/vagrant/layout.phtml';
     }
-    
-    public function login() {
+
+    public function login()
+    {
         $error = null;
         // Do the login
-        if(isset($_POST['login'])) {
+        if (isset($_POST['login'])) {
             $username = $_POST['user'];
             $password = $_POST['pass'];
-            $password = md5($username . $password); // THIS IS NOT SECURE. DO NOT USE IN PRODUCTION.
-            $sql = 'SELECT * FROM user WHERE username = ? AND password = ? LIMIT 1';
-            $stmt = $this->db->prepare($sql);
-            $stmt->execute(array($username, $password));
-            if($stmt->rowCount() > 0) {
-               $data = $stmt->fetch(PDO::FETCH_ASSOC); 
-               session_regenerate_id();
-               $_SESSION['username'] = $data['username'];
-               $_SESSION['AUTHENTICATED'] = true;
-               header("Location: /");
-               exit;
-            }
-            else {
+
+            if ($this->userModel->checkCredentials($username, $password)) {
+                session_regenerate_id();
+                $_SESSION['username'] = $username;
+                $_SESSION['AUTHENTICATED'] = true;
+                header("Location: /");
+                exit;
+            } else {
                 $error = 'Your username/password did not match.';
             }
         }
-        
+
         $content = '
             <form method="post">
                 ' . $error . '<br />
@@ -152,12 +142,13 @@ public function login() {
                 <input type="submit" name="login" value="Log In" />
             </form>
         ';
-        
-        require_once('layout.phtml');
-        
+
+        require_once('/vagrant/layout.phtml');
+
     }
-    
-    public function logout() {
+
+    public function logout()
+    {
         // Log out, redirect
         session_destroy();
         header("Location: /");
diff --git a/src/Model/Comment.php b/src/Model/Comment.php
new file mode 100644
index 0000000..cb3eda4
--- /dev/null
+++ b/src/Model/Comment.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Masterclass\Model;
+
+use PDO;
+
+final class Comment
+{
+    protected $pdo;
+    protected $errors = [];
+    protected $storyId;
+    protected $comment;
+
+    public function __construct(PDO $pdo)
+    {
+        $this->pdo = $pdo;
+    }
+
+    public function addComment($username, $storyId, $comment)
+    {
+        $sql = 'INSERT INTO comment (created_by, created_on, story_id, comment) VALUES (?, NOW(), ?, ?)';
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute([
+            $username,
+            $storyId,
+            $comment,
+        ]);
+    }
+
+    public function getCommentsForStoryId($storyId)
+    {
+        $comment_sql = 'SELECT * FROM comment WHERE story_id = ?';
+        $comment_stmt = $this->pdo->prepare($comment_sql);
+        $comment_stmt->execute([$storyId]);
+        $comment_count = $comment_stmt->rowCount();
+        $comments = $comment_stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        return $comments;
+    }
+}
diff --git a/src/Model/Story.php b/src/Model/Story.php
index cf337fc..f7797a0 100644
--- a/src/Model/Story.php
+++ b/src/Model/Story.php
@@ -35,6 +35,27 @@ public function getAllStories()
         return $stories;
     }
 
+    public function loadStoryById($storyId)
+    {
+        $story_sql = 'SELECT * FROM story WHERE id = ?';
+        $story_stmt = $this->pdo->prepare($story_sql);
+        $story_stmt->execute([$storyId]);
+
+        return $story_stmt->fetch(PDO::FETCH_ASSOC);
+    }
+
+    public function createStory($headline, $url, $username)
+    {
+        $sql = 'INSERT INTO story (headline, url, created_by, created_on) VALUES (?, ?, ?, NOW())';
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute([
+            $headline,
+            $url,
+            $username,
+        ]);
+
+        return $this->pdo->lastInsertId();
+    }
 }
 
 
diff --git a/src/Model/User.php b/src/Model/User.php
new file mode 100644
index 0000000..ed75ea1
--- /dev/null
+++ b/src/Model/User.php
@@ -0,0 +1,104 @@
+<?php
+
+namespace Masterclass\Model;
+
+use PDO;
+
+final class User
+{
+    protected $pdo;
+    protected $errors = [];
+    protected $username;
+    protected $email;
+
+    public function __construct(PDO $pdo)
+    {
+        $this->pdo = $pdo;
+    }
+
+    /**
+     * @param $username
+     *
+     * @return bool
+     */
+    public function userExists($username)
+    {
+        $check_sql = 'SELECT * FROM user WHERE username = ?';
+        $check_stmt = $this->pdo->prepare($check_sql);
+        $check_stmt->execute([$username]);
+
+        return (bool) $check_stmt->rowCount();
+//            $error = 'Your chosen username already exists. Please choose another.';
+    }
+
+    /**
+     * @param $username
+     *
+     * @return self
+     *
+     * @throws
+     */
+    public function loadUserByUsername($username)
+    {
+        $check_sql = 'SELECT * FROM user WHERE username = ?';
+        $check_stmt = $this->pdo->prepare($check_sql);
+        $check_stmt->execute([$username]);
+
+        if ($check_stmt->rowCount() == 0) {
+            throw new \Exception('User not found');
+        }
+
+        $row = $check_stmt->fetch(PDO::FETCH_ASSOC);
+
+        $this->username = $username;
+        $this->email = $row['email'];
+
+        return $this;
+    }
+
+    public function getUsername()
+    {
+        return $this->username;
+    }
+
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    /**
+     * @param $username
+     * @param $password
+     *
+     * @return bool
+     */
+    public function checkCredentials($username, $password)
+    {
+        $password = md5($username . $password); // THIS IS NOT SECURE. DO NOT USE IN PRODUCTION.
+        $sql = 'SELECT * FROM user WHERE username = ? AND password = ? LIMIT 1';
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute([$username, $password]);
+
+        return (bool) $stmt->rowCount();
+    }
+
+    public function createUser($username, $email, $password)
+    {
+        $params = [
+            $username,
+            $email,
+            md5($username . $password),
+        ];
+        $sql = 'INSERT INTO user (username, email, password) VALUES (?, ?, ?)';
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute($params);
+    }
+
+    public function updatePassword($username, $password)
+    {
+        $password = md5($username . $password);
+        $sql = 'UPDATE user SET password = ? WHERE username = ?';
+        $stmt = $this->pdo->prepare($sql);
+        $stmt->execute([$password, $username]);
+    }
+}

From 6d5e3538d2c1c94b00b1a03c2b5b20b77135b473 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Sat, 12 Mar 2016 23:12:21 -0600
Subject: [PATCH 04/12] Request object, and usage of it in Controller classes

---
 diconfig.php               |  8 ++++++++
 src/Controller/Comment.php |  8 ++++++--
 src/Controller/Index.php   |  9 ---------
 src/Controller/Story.php   | 12 ++++++++----
 src/Controller/User.php    | 18 +++++++++++-------
 src/Request.php            | 36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 69 insertions(+), 22 deletions(-)
 create mode 100644 src/Request.php

diff --git a/diconfig.php b/diconfig.php
index 0af8f5c..ef5a70a 100644
--- a/diconfig.php
+++ b/diconfig.php
@@ -18,6 +18,11 @@
     ],
 ];
 
+$di->params[Masterclass\Request::class] = [
+    'post' => $_POST,
+    'get' => $_GET,
+];
+
 $di->params[Masterclass\Controller\Index::class] = [
     'model' => $di->lazyNew(Masterclass\Model\Story::class),
 ];
@@ -28,6 +33,7 @@
 
 $di->params[Masterclass\Controller\User::class] = [
     'model' => $di->lazyNew(Masterclass\Model\User::class),
+    'request' => $di->lazyNew(Masterclass\Request::class),
 ];
 
 $di->params[Masterclass\Model\User::class] = [
@@ -36,6 +42,7 @@
 
 $di->params[Masterclass\Controller\Comment::class] = [
     'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
+    'request' => $di->lazyNew(Masterclass\Request::class),
 ];
 
 $di->params[Masterclass\Model\Comment::class] = [
@@ -44,4 +51,5 @@
 $di->params[Masterclass\Controller\Story::class] = [
     'story' => $di->lazyNew(Masterclass\Model\Story::class),
     'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
+    'request' => $di->lazyNew(Masterclass\Request::class),
 ];
diff --git a/src/Controller/Comment.php b/src/Controller/Comment.php
index 991540c..f3ca2ce 100644
--- a/src/Controller/Comment.php
+++ b/src/Controller/Comment.php
@@ -3,19 +3,23 @@
 namespace Masterclass\Controller;
 
 use Masterclass\Model\Comment as CommentModel;
+use Masterclass\Request;
 
 class Comment
 {
     protected $commentModel;
+    protected $request;
 
-    public function __construct(CommentModel $comment)
+    public function __construct(CommentModel $comment, Request $request)
     {
         $this->commentModel = $comment;
+        $this->request = $request;
     }
 
     public function create()
     {
         if (!isset($_SESSION['AUTHENTICATED'])) {
+            // @todo: die, redirect, exit... what is desired functionality?
             die('not auth');
             header("Location: /");
             exit;
@@ -23,7 +27,7 @@ public function create()
 
         $this->commentModel->addComment(
             $_SESSION['username'],
-            $_POST['story_id'],
+            $this->request->getPostParam('story_id'),
             filter_input(INPUT_POST, 'comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
         );
 
diff --git a/src/Controller/Index.php b/src/Controller/Index.php
index d1f0634..5257e0d 100644
--- a/src/Controller/Index.php
+++ b/src/Controller/Index.php
@@ -18,18 +18,9 @@ public function index()
     {
 
         $stories = $this->model->getAllStories();
-//        $sql = 'SELECT * FROM story ORDER BY created_on DESC';
-//        $stmt = $this->db->prepare($sql);
-//        $stmt->execute();
-//        $stories = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        
         $content = '<ol>';
         
         foreach ($stories as $story) {
-//            $comment_sql = 'SELECT COUNT(*) as `count` FROM comment WHERE story_id = ?';
-//            $comment_stmt = $this->db->prepare($comment_sql);
-//            $comment_stmt->execute(array($story['id']));
-//            $count = $comment_stmt->fetch(PDO::FETCH_ASSOC);
             $content .= '
                 <li>
                 <a class="headline" href="' . $story['url'] . '">' . $story['headline'] . '</a><br />
diff --git a/src/Controller/Story.php b/src/Controller/Story.php
index 187a41a..3a6de68 100644
--- a/src/Controller/Story.php
+++ b/src/Controller/Story.php
@@ -4,33 +4,37 @@
 
 use Masterclass\Model\Comment;
 use Masterclass\Model\Story as StoryModel;
+use Masterclass\Request;
 
 class Story
 {
     protected $comment;
     protected $story;
+    protected $request;
 
-    public function __construct(Comment $comment, StoryModel $story)
+    public function __construct(Comment $comment, StoryModel $story, Request $request)
     {
         $this->comment = $comment;
         $this->story = $story;
+        $this->request = $request;
     }
 
     public function index()
     {
-        if (!isset($_GET['id'])) {
+        $id = $this->request->getQueryParam('id');
+        if (!$id) {
             header("Location: /");
             exit;
         }
 
-        $story = $this->story->loadStoryById($_GET['id']);
+        $story = $this->story->loadStoryById($id);
 
         if (empty($story)) {
             header("Location: /");
             exit;
         }
 
-        $comments = $this->comment->getCommentsForStoryId($_GET['id']);
+        $comments = $this->comment->getCommentsForStoryId($id);
         $comment_count = count($comments);
 
         $content = '
diff --git a/src/Controller/User.php b/src/Controller/User.php
index 8a896f9..d163975 100644
--- a/src/Controller/User.php
+++ b/src/Controller/User.php
@@ -3,15 +3,18 @@
 namespace Masterclass\Controller;
 
 use Masterclass\Model\User as UserModel;
+use Masterclass\Request;
 
 class User
 {
 
-    public $userModel;
+    protected $userModel;
+    protected $request;
 
-    public function __construct(UserModel $model)
+    public function __construct(UserModel $model, Request $request)
     {
         $this->userModel = $model;
+        $this->request = $request;
     }
 
     public function create()
@@ -19,11 +22,12 @@ public function create()
         $error = null;
 
         // Do the create
-        if (isset($_POST['create'])) {
-            $username = $_POST['username'];
-            $password = $_POST['password'];
-            $passwordCheck = $_POST['password_check'];
-            $email = $_POST['email'];
+        if ($this->request->getPostParam(['create'])) {
+
+            $username = $this->request->getPostParam('username');
+            $password = $this->request->getPostParam('password'); $_POST['password'];
+            $passwordCheck = $this->request->getPostParam('password_check');
+            $email = $this->request->getPostParam('email');
 
             if (empty($username)
                 || empty($email)
diff --git a/src/Request.php b/src/Request.php
new file mode 100644
index 0000000..ff3b67e
--- /dev/null
+++ b/src/Request.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Masterclass;
+
+
+class Request
+{
+    protected $post;
+    protected $get;
+
+    public function __construct($post, $get)
+    {
+        $this->post = $post;
+        $this->get = $get;
+    }
+
+    public function getQueryParams()
+    {
+        return $this->get;
+    }
+
+    public function getPostParams()
+    {
+        return $this->post;
+    }
+
+    public function getQueryParam($paramName)
+    {
+        return $this->get[$paramName] ?? null;
+    }
+
+    public function getPostParam($paramName)
+    {
+        return $this->post[$paramName] ?? null;
+    }
+}

From 5398e6b1d6ba475abf50a57644657b06f133ff2c Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Sun, 13 Mar 2016 18:28:31 -0500
Subject: [PATCH 05/12] create DataStore interface and Mysql implementation,
 and integrate all models to use new code

---
 diconfig.php                    | 10 ++++--
 src/Controller/User.php         |  2 +-
 src/Db/Apc.php                  | 37 +++++++++++++++++++
 src/Db/Interfaces/DataStore.php | 12 +++++++
 src/Db/Mysql.php                | 64 +++++++++++++++++++++++++++++++++
 src/MasterController.php        |  9 -----
 src/Model/Comment.php           | 33 ++++++++---------
 src/Model/Story.php             | 41 +++++++++------------
 src/Model/User.php              | 52 +++++++++++++++------------
 src/Request.php                 |  4 +--
 10 files changed, 183 insertions(+), 81 deletions(-)
 create mode 100644 src/Db/Apc.php
 create mode 100644 src/Db/Interfaces/DataStore.php
 create mode 100644 src/Db/Mysql.php

diff --git a/diconfig.php b/diconfig.php
index ef5a70a..77acbe4 100644
--- a/diconfig.php
+++ b/diconfig.php
@@ -18,6 +18,10 @@
     ],
 ];
 
+$di->params[Masterclass\Db\Mysql::class] = [
+    'pdo' => $di->lazyNew('PDO'),
+];
+
 $di->params[Masterclass\Request::class] = [
     'post' => $_POST,
     'get' => $_GET,
@@ -28,7 +32,7 @@
 ];
 
 $di->params[Masterclass\Model\Story::class] = [
-    'pdo' => $di->lazyNew('PDO'),
+    'dataStore' => $di->lazyNew(Masterclass\Db\Mysql::class),
 ];
 
 $di->params[Masterclass\Controller\User::class] = [
@@ -37,7 +41,7 @@
 ];
 
 $di->params[Masterclass\Model\User::class] = [
-    'pdo' => $di->lazyNew('PDO'),
+    'dataStore' => $di->lazyNew(Masterclass\Db\Mysql::class),
 ];
 
 $di->params[Masterclass\Controller\Comment::class] = [
@@ -46,7 +50,7 @@
 ];
 
 $di->params[Masterclass\Model\Comment::class] = [
-    'pdo' => $di->lazyNew('PDO'),
+    'dataStore' => $di->lazyNew(Masterclass\Db\Mysql::class),
 ];
 $di->params[Masterclass\Controller\Story::class] = [
     'story' => $di->lazyNew(Masterclass\Model\Story::class),
diff --git a/src/Controller/User.php b/src/Controller/User.php
index d163975..abc7174 100644
--- a/src/Controller/User.php
+++ b/src/Controller/User.php
@@ -22,7 +22,7 @@ public function create()
         $error = null;
 
         // Do the create
-        if ($this->request->getPostParam(['create'])) {
+        if ($this->request->getPostParam('create')) {
 
             $username = $this->request->getPostParam('username');
             $password = $this->request->getPostParam('password'); $_POST['password'];
diff --git a/src/Db/Apc.php b/src/Db/Apc.php
new file mode 100644
index 0000000..cf3c02e
--- /dev/null
+++ b/src/Db/Apc.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Masterclass\Db;
+
+use Masterclass\Db\Interfaces\DataStore;
+
+class Apc implements DataStore
+{
+    protected $db;
+
+    public function __construct(Mysql $mysql)
+    {
+        $this->db = $mysql;
+    }
+
+    public function fetchOne($sql, array $args = [])
+    {
+        $key = md5($sql . serialize($args));
+        $value = apc_fetch($key);
+
+        if (!$value) {
+            $value = $this->db->fetchOne($sql, $args);
+            apc_store($key, $value);
+        }
+
+        return $value;
+    }
+    public function fetchAll($sql, array $args = [])
+    {
+
+    }
+    public function save($sql, array $args = [])
+    {
+
+    }
+
+}
diff --git a/src/Db/Interfaces/DataStore.php b/src/Db/Interfaces/DataStore.php
new file mode 100644
index 0000000..6d4f1b3
--- /dev/null
+++ b/src/Db/Interfaces/DataStore.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Masterclass\Db\Interfaces;
+
+interface DataStore
+{
+    public function fetchOne($sql, array $args = []);
+    public function fetchAll($sql, array $args = []);
+    public function rowCount($sql, array $args = []);
+    public function save($sql, array $args = []);
+    public function lastInsertId();
+}
diff --git a/src/Db/Mysql.php b/src/Db/Mysql.php
new file mode 100644
index 0000000..059fe5a
--- /dev/null
+++ b/src/Db/Mysql.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Masterclass\Db;
+
+use Masterclass\Db\Interfaces\DataStore;
+use PDO;
+
+class Mysql implements DataStore
+{
+    protected $pdo;
+
+    public function __construct(PDO $pdo)
+    {
+        $this->pdo = $pdo;
+    }
+
+    /**
+     * @param string $sql
+     * @param array $args
+     *
+     * @return mixed
+     */
+    public function fetchOne($sql, array $args = [])
+    {
+        $statement = $this->pdo->prepare($sql, $args);
+        $statement->execute($args);
+
+        return $statement->fetch(PDO::FETCH_ASSOC);
+    }
+
+    public function fetchAll($sql, array $args = [])
+    {
+        $statement = $this->pdo->prepare($sql, $args);
+        $statement->execute($args);
+
+        return $statement->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    /**
+     * @param $sql
+     * @param array $args
+     *
+     * @return int
+     */
+    public function rowCount($sql, array $args = [])
+    {
+        $statement = $this->pdo->prepare($sql, $args);
+        $statement->execute($args);
+
+        return $statement->rowCount();
+    }
+
+    public function save($sql, array $args = [])
+    {
+        $statement = $this->pdo->prepare($sql, $args);
+
+        return $statement->execute($args);
+    }
+
+    public function lastInsertId()
+    {
+        return $this->pdo->lastInsertId();
+    }
+}
diff --git a/src/MasterController.php b/src/MasterController.php
index 88e5ac8..686744f 100644
--- a/src/MasterController.php
+++ b/src/MasterController.php
@@ -21,18 +21,9 @@ public function execute()
     {
         $call = $this->_determineControllers();
 
-        $dbconfig = $this->config['database'];
-        $dsn = 'mysql:host=' . $dbconfig['host'] . ';dbname=' . $dbconfig['name'];
-        $pdo = new PDO($dsn, $dbconfig['user'], $dbconfig['pass']);
-        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-        // need this:
-//        $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
         $call_class = $call['call'];
         $class = ucfirst(array_shift($call_class));
         $method = array_shift($call_class);
-//        $o = new $class($pdo);
 
         // container can instantiate class w/ required dependencies.
         $o = $this->container->newInstance($class);
diff --git a/src/Model/Comment.php b/src/Model/Comment.php
index cb3eda4..f06038c 100644
--- a/src/Model/Comment.php
+++ b/src/Model/Comment.php
@@ -2,39 +2,34 @@
 
 namespace Masterclass\Model;
 
-use PDO;
+use Masterclass\Db\Interfaces\DataStore;
 
 final class Comment
 {
-    protected $pdo;
-    protected $errors = [];
     protected $storyId;
-    protected $comment;
+    protected $dataStore;
 
-    public function __construct(PDO $pdo)
+    public function __construct(DataStore $dataStore)
     {
-        $this->pdo = $pdo;
+        $this->dataStore = $dataStore;
     }
 
     public function addComment($username, $storyId, $comment)
     {
         $sql = 'INSERT INTO comment (created_by, created_on, story_id, comment) VALUES (?, NOW(), ?, ?)';
-        $stmt = $this->pdo->prepare($sql);
-        $stmt->execute([
-            $username,
-            $storyId,
-            $comment,
-        ]);
+        $this->dataStore->save(
+            $sql,
+            [
+                $username,
+                $storyId,
+                $comment,
+            ]
+        );
     }
 
     public function getCommentsForStoryId($storyId)
     {
-        $comment_sql = 'SELECT * FROM comment WHERE story_id = ?';
-        $comment_stmt = $this->pdo->prepare($comment_sql);
-        $comment_stmt->execute([$storyId]);
-        $comment_count = $comment_stmt->rowCount();
-        $comments = $comment_stmt->fetchAll(PDO::FETCH_ASSOC);
-
-        return $comments;
+        $sql = 'SELECT * FROM comment WHERE story_id = ?';
+        return $this->dataStore->fetchAll($sql, [$storyId]);
     }
 }
diff --git a/src/Model/Story.php b/src/Model/Story.php
index f7797a0..950e656 100644
--- a/src/Model/Story.php
+++ b/src/Model/Story.php
@@ -6,29 +6,25 @@
 
 namespace Masterclass\Model;
 
-use PDO;
+use Masterclass\Db\Interfaces\DataStore;
 
 final class Story
 {
-    protected $pdo;
+    protected $dataStore;
 
-    public function __construct(PDO $pdo)
+    public function __construct(DataStore $dataStore)
     {
-        $this->pdo = $pdo;
+        $this->dataStore = $dataStore;
     }
 
     public function getAllStories()
     {
         $sql = 'SELECT * FROM story ORDER BY created_on DESC';
-        $stmt = $this->pdo->prepare($sql);
-        $stmt->execute();
-        $stories = $stmt->fetchAll(PDO::FETCH_ASSOC);
+        $stories = $this->dataStore->fetchAll($sql);
 
         foreach ($stories as $k => $story) {
             $comment_sql = 'SELECT count(*) as `count` FROM comment WHERE story_id = ?';
-            $comment_stmt = $this->pdo->prepare(($comment_sql));
-            $comment_stmt->execute([$story['id']]);
-            $count = $comment_stmt->fetch(PDO::FETCH_ASSOC);
+            $count = $this->dataStore->fetchOne($comment_sql, [$story['id']]);
             $stories[$k]['count'] = $count['count'];
         }
 
@@ -38,25 +34,22 @@ public function getAllStories()
     public function loadStoryById($storyId)
     {
         $story_sql = 'SELECT * FROM story WHERE id = ?';
-        $story_stmt = $this->pdo->prepare($story_sql);
-        $story_stmt->execute([$storyId]);
 
-        return $story_stmt->fetch(PDO::FETCH_ASSOC);
+        return $this->dataStore->fetchOne($story_sql, [$storyId]);
     }
 
     public function createStory($headline, $url, $username)
     {
         $sql = 'INSERT INTO story (headline, url, created_by, created_on) VALUES (?, ?, ?, NOW())';
-        $stmt = $this->pdo->prepare($sql);
-        $stmt->execute([
-            $headline,
-            $url,
-            $username,
-        ]);
-
-        return $this->pdo->lastInsertId();
+        $this->dataStore->save(
+            $sql,
+            [
+                $headline,
+                $url,
+                $username,
+            ]
+        );
+
+        return $this->dataStore->lastInsertId();
     }
 }
-
-
-// composer require aura/di
diff --git a/src/Model/User.php b/src/Model/User.php
index ed75ea1..2f32dc2 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -2,18 +2,20 @@
 
 namespace Masterclass\Model;
 
-use PDO;
+use Masterclass\Db\Interfaces\DataStore;
+
 
 final class User
 {
-    protected $pdo;
+    protected $dataStore;
     protected $errors = [];
     protected $username;
     protected $email;
+    protected $hashedPassword;
 
-    public function __construct(PDO $pdo)
+    public function __construct(DataStore $dataStore)
     {
-        $this->pdo = $pdo;
+        $this->dataStore = $dataStore;
     }
 
     /**
@@ -24,10 +26,7 @@ public function __construct(PDO $pdo)
     public function userExists($username)
     {
         $check_sql = 'SELECT * FROM user WHERE username = ?';
-        $check_stmt = $this->pdo->prepare($check_sql);
-        $check_stmt->execute([$username]);
-
-        return (bool) $check_stmt->rowCount();
+        return (bool) $this->dataStore->rowCount($check_sql, [$username]);
 //            $error = 'Your chosen username already exists. Please choose another.';
     }
 
@@ -41,17 +40,17 @@ public function userExists($username)
     public function loadUserByUsername($username)
     {
         $check_sql = 'SELECT * FROM user WHERE username = ?';
-        $check_stmt = $this->pdo->prepare($check_sql);
-        $check_stmt->execute([$username]);
 
-        if ($check_stmt->rowCount() == 0) {
+        // @todo: double query, here and line ~48.
+        if (!$this->userExists($username)) {
             throw new \Exception('User not found');
         }
 
-        $row = $check_stmt->fetch(PDO::FETCH_ASSOC);
+        $row = $this->dataStore->fetchOne($check_sql, [$username]);
 
         $this->username = $username;
         $this->email = $row['email'];
+        $this->hashedPassword = $row['password'];
 
         return $this;
     }
@@ -74,31 +73,38 @@ public function getEmail()
      */
     public function checkCredentials($username, $password)
     {
-        $password = md5($username . $password); // THIS IS NOT SECURE. DO NOT USE IN PRODUCTION.
-        $sql = 'SELECT * FROM user WHERE username = ? AND password = ? LIMIT 1';
-        $stmt = $this->pdo->prepare($sql);
-        $stmt->execute([$username, $password]);
+//        $password = md5($username . $password); // THIS IS NOT SECURE. DO NOT USE IN PRODUCTION.
+//        $sql = 'SELECT * FROM user WHERE username = ? AND password = ? LIMIT 1';
 
-        return (bool) $stmt->rowCount();
+        $this->loadUserByUsername($username);
+
+        return password_verify($password, $this->hashedPassword);
     }
 
     public function createUser($username, $email, $password)
     {
+        $this->setPassword($password);
         $params = [
             $username,
             $email,
-            md5($username . $password),
+            $this->hashedPassword,
         ];
         $sql = 'INSERT INTO user (username, email, password) VALUES (?, ?, ?)';
-        $stmt = $this->pdo->prepare($sql);
-        $stmt->execute($params);
+        $this->dataStore->save($sql, $params);
     }
 
     public function updatePassword($username, $password)
     {
-        $password = md5($username . $password);
+        $this->setPassword($password);
         $sql = 'UPDATE user SET password = ? WHERE username = ?';
-        $stmt = $this->pdo->prepare($sql);
-        $stmt->execute([$password, $username]);
+        $this->dataStore->save($sql, [$this->hashedPassword, $username]);
+    }
+
+    protected function setPassword($password)
+    {
+        if (empty($password)) {
+            throw new \Exception('Password is required');
+        }
+        $this->hashedPassword = password_hash($password, PASSWORD_BCRYPT);
     }
 }
diff --git a/src/Request.php b/src/Request.php
index ff3b67e..b10f907 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -26,11 +26,11 @@ public function getPostParams()
 
     public function getQueryParam($paramName)
     {
-        return $this->get[$paramName] ?? null;
+        return is_string($paramName) ? $this->get[$paramName] ?? null : null;
     }
 
     public function getPostParam($paramName)
     {
-        return $this->post[$paramName] ?? null;
+        return is_string($paramName) ? $this->post[$paramName] ?? null : null;
     }
 }

From 27a6c33671289100d3c420de3cf23e8236305000 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Sun, 13 Mar 2016 18:31:17 -0500
Subject: [PATCH 06/12] clean out unused MasterController code

---
 src/MasterController.php | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/MasterController.php b/src/MasterController.php
index 686744f..1f88205 100644
--- a/src/MasterController.php
+++ b/src/MasterController.php
@@ -3,7 +3,6 @@
 namespace Masterclass;
 
 use Aura\Di\Container;
-use PDO;
 
 class MasterController
 {
@@ -33,14 +32,7 @@ public function execute()
 
     private function _determineControllers()
     {
-        if (isset($_SERVER['REDIRECT_BASE'])) {
-            $rb = $_SERVER['REDIRECT_BASE'];
-        } else {
-            $rb = '';
-        }
-
-        $ruri = $_SERVER['REQUEST_URI'];
-        $path = str_replace($rb, '', $ruri);
+        $path = $_SERVER['REQUEST_URI'];
         $return = array();
 
         foreach ($this->config['routes'] as $k => $v) {
@@ -48,8 +40,6 @@ private function _determineControllers()
             $pattern = '$' . $k . '$';
             if (preg_match($pattern, $path, $matches)) {
                 $controller_details = $v;
-                $path_string = array_shift($matches);
-                $arguments = $matches;
                 $controller_method = explode('/', $controller_details);
                 $return = array('call' => $controller_method);
             }
@@ -57,9 +47,4 @@ private function _determineControllers()
 
         return $return;
     }
-
-    private function _setupConfig($config)
-    {
-        $this->config = $config;
-    }
 }

From 9967ca410d5649df846c425352de896c3e4490f8 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Sun, 13 Mar 2016 20:54:03 -0500
Subject: [PATCH 07/12] Add fast-route, and RouteMap class, and refactor
 MasterController.  Remove unused dependencies.

---
 composer.json            |   6 +-
 composer.lock            | 210 ++++-----------------------------------
 diconfig.php             |  21 ++++
 src/MasterController.php |  33 ++----
 src/Request.php          |  14 ++-
 src/RouteMap.php         |  58 +++++++++++
 6 files changed, 120 insertions(+), 222 deletions(-)
 create mode 100644 src/RouteMap.php

diff --git a/composer.json b/composer.json
index 488d2f8..bb3888c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,13 +1,11 @@
 {
-    "require-dev": {
-        "laravel/homestead": "^3.0"
-    },
     "autoload": {
         "psr-4": {
             "Masterclass\\": ["./src"]
         }
     },
     "require": {
-        "aura/di": "^2.2"
+        "aura/di": "^2.2",
+        "nikic/fast-route": "^0.7.0"
     }
 }
diff --git a/composer.lock b/composer.lock
index c9adb65..0a7c09d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "4b2be06a2880d32b97a327aaa04a88b1",
-    "content-hash": "0b440c1ae56784e85b0cc8a27c61a745",
+    "hash": "8ad16b1e525fe87a2a3d14564eae5a07",
+    "content-hash": "e6c21f578f166f25391791cc586f9dc3",
     "packages": [
         {
             "name": "aura/di",
@@ -55,224 +55,52 @@
                 "di container"
             ],
             "time": "2016-01-21 09:34:53"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "laravel/homestead",
-            "version": "v3.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/laravel/homestead.git",
-                "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/laravel/homestead/zipball/705449c3dbedbded4bd4f3ed725303c69253cad4",
-                "reference": "705449c3dbedbded4bd4f3ed725303c69253cad4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/console": "~2.3|~3.0",
-                "symfony/process": "~2.3|~3.0"
-            },
-            "bin": [
-                "homestead"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Laravel\\Homestead\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Taylor Otwell",
-                    "email": "taylorotwell@gmail.com"
-                }
-            ],
-            "description": "A virtual machine for web artisans.",
-            "time": "2016-02-16 22:31:00"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
-                "reference": "2ed5e2706ce92313d120b8fe50d1063bcfd12e04",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-02-28 16:24:34"
         },
         {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.1.1",
+            "name": "nikic/fast-route",
+            "version": "v0.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "1289d16209491b584839022f29257ad859b8532d"
+                "url": "https://github.com/nikic/FastRoute.git",
+                "reference": "8164b4a0d8afde4eae5f1bfc39084972ba23ad36"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d",
-                "reference": "1289d16209491b584839022f29257ad859b8532d",
+                "url": "https://api.github.com/repos/nikic/FastRoute/zipball/8164b4a0d8afde4eae5f1bfc39084972ba23ad36",
+                "reference": "8164b4a0d8afde4eae5f1bfc39084972ba23ad36",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
+                "php": ">=5.4.0"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
+                    "FastRoute\\": "src/"
                 },
                 "files": [
-                    "bootstrap.php"
+                    "src/functions.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "MIT"
+                "BSD-3-Clause"
             ],
             "authors": [
                 {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Nikita Popov",
+                    "email": "nikic@php.net"
                 }
             ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
+            "description": "Fast request router for PHP",
             "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-01-20 09:13:37"
-        },
-        {
-            "name": "symfony/process",
-            "version": "v3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/process.git",
-                "reference": "dfecef47506179db2501430e732adbf3793099c8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/dfecef47506179db2501430e732adbf3793099c8",
-                "reference": "dfecef47506179db2501430e732adbf3793099c8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Process\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
+                "router",
+                "routing"
             ],
-            "description": "Symfony Process Component",
-            "homepage": "https://symfony.com",
-            "time": "2016-02-02 13:44:19"
+            "time": "2015-12-20 19:50:12"
         }
     ],
+    "packages-dev": [],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/diconfig.php b/diconfig.php
index 77acbe4..17e6a2b 100644
--- a/diconfig.php
+++ b/diconfig.php
@@ -1,5 +1,7 @@
 <?php
 
+use Masterclass\Controller;
+
 $di = new Aura\Di\Container(new \Aura\Di\Factory());
 
 $di->setAutoResolve(false);
@@ -25,6 +27,7 @@
 $di->params[Masterclass\Request::class] = [
     'post' => $_POST,
     'get' => $_GET,
+    'server' => $_SERVER,
 ];
 
 $di->params[Masterclass\Controller\Index::class] = [
@@ -57,3 +60,21 @@
     'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
     'request' => $di->lazyNew(Masterclass\Request::class),
 ];
+
+$di->params[Masterclass\RouteMap::class] = [
+    'dispatcher' => FastRoute\simpleDispatcher(function(FastRoute\RouteCollector $r) {
+        $r->addRoute('GET', '/', Controller\Index::class . ':index');
+        $r->addRoute('GET', '/story/[{id:\d+}]', Controller\Story::class . ':index');
+        $r->addRoute('GET', '/story/create', Controller\Story::class . ':create');
+        $r->addRoute('POST', '/story/create', Controller\Story::class . ':create');
+        $r->addRoute('POST', '/comment/create', Controller\Comment::class . ':create');
+        $r->addRoute('GET', '/user/create', Controller\User::class . ':create');
+        $r->addRoute('POST', '/user/create', Controller\User::class . ':create');
+        $r->addRoute('GET', '/user/account', Controller\User::class . ':account');
+        $r->addRoute('POST', '/user/account', Controller\User::class . ':account');
+        $r->addRoute('GET', '/user/login', Controller\User::class . ':login');
+        $r->addRoute('POST', '/user/login', Controller\User::class . ':login');
+        $r->addRoute('GET', '/user/logout', Controller\User::class . ':logout');
+    }),
+    'request' => $di->lazyNew(Masterclass\Request::class),
+];
diff --git a/src/MasterController.php b/src/MasterController.php
index 1f88205..42c76e8 100644
--- a/src/MasterController.php
+++ b/src/MasterController.php
@@ -3,6 +3,7 @@
 namespace Masterclass;
 
 use Aura\Di\Container;
+use FastRoute\Dispatcher;
 
 class MasterController
 {
@@ -18,33 +19,13 @@ public function __construct(Container $container, $config)
 
     public function execute()
     {
-        $call = $this->_determineControllers();
+        $routeMap = $this->container->newInstance(RouteMap::class);
+        $dispatchDetail = $routeMap->handle();
 
-        $call_class = $call['call'];
-        $class = ucfirst(array_shift($call_class));
-        $method = array_shift($call_class);
+        $controller = $this->container->newInstance($dispatchDetail['class']);
+        $method = $dispatchDetail['method'];
+        $vars = $dispatchDetail['vars'];
 
-        // container can instantiate class w/ required dependencies.
-        $o = $this->container->newInstance($class);
-
-        return $o->$method();
-    }
-
-    private function _determineControllers()
-    {
-        $path = $_SERVER['REQUEST_URI'];
-        $return = array();
-
-        foreach ($this->config['routes'] as $k => $v) {
-            $matches = array();
-            $pattern = '$' . $k . '$';
-            if (preg_match($pattern, $path, $matches)) {
-                $controller_details = $v;
-                $controller_method = explode('/', $controller_details);
-                $return = array('call' => $controller_method);
-            }
-        }
-
-        return $return;
+        return $controller->$method($vars);
     }
 }
diff --git a/src/Request.php b/src/Request.php
index b10f907..c2b7741 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -7,11 +7,13 @@ class Request
 {
     protected $post;
     protected $get;
+    protected $server;
 
-    public function __construct($post, $get)
+    public function __construct($post, $get, $server)
     {
         $this->post = $post;
         $this->get = $get;
+        $this->server = $server;
     }
 
     public function getQueryParams()
@@ -24,6 +26,11 @@ public function getPostParams()
         return $this->post;
     }
 
+    public function getServerParams()
+    {
+        return $this->server;
+    }
+
     public function getQueryParam($paramName)
     {
         return is_string($paramName) ? $this->get[$paramName] ?? null : null;
@@ -33,4 +40,9 @@ public function getPostParam($paramName)
     {
         return is_string($paramName) ? $this->post[$paramName] ?? null : null;
     }
+
+    public function getServerParam($paramName)
+    {
+        return is_string($paramName) ? $this->server[$paramName] ?? null : null;
+    }
 }
diff --git a/src/RouteMap.php b/src/RouteMap.php
new file mode 100644
index 0000000..d0b3243
--- /dev/null
+++ b/src/RouteMap.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @author Adam Altman <adam@rebilly.com>
+ * masterclass-repo
+ */
+
+namespace Masterclass;
+
+
+use FastRoute\Dispatcher;
+
+class RouteMap
+{
+    protected $dispatcher;
+    protected $request;
+
+    public function __construct(Dispatcher $dispatcher, Request $request)
+    {
+        $this->dispatcher = $dispatcher;
+        $this->request = $request;
+    }
+
+
+    public function handle()
+    {
+
+        $httpMethod = $this->request->getServerParam('REQUEST_METHOD');
+        $uri = rawurldecode(parse_url($this->request->getServerParam('REQUEST_URI'), PHP_URL_PATH));
+
+        $routeInfo = $this->dispatcher->dispatch($httpMethod, $uri);
+        switch ($routeInfo[0]) {
+            case Dispatcher::NOT_FOUND:
+                // ... 404 Not Found
+                header("HTTP/1.1 404 Not Found");
+                exit;
+                break;
+            case Dispatcher::METHOD_NOT_ALLOWED:
+                $allowedMethods = $routeInfo[1];
+                // ... 405 Method Not Allowed
+                header("HTTP/1.1 405 Method Not Allowed");
+                exit;
+                break;
+            case Dispatcher::FOUND:
+                $handler = explode(':', $routeInfo[1]);
+                $vars = $routeInfo[2];
+                // ... call $handler with $vars
+                $class = $handler[0];
+                $method = $handler[1];
+                return [
+                    'class' => $class,
+                    'method' => $method,
+                    'vars' => $vars,
+                ];
+                break;
+        }
+
+    }
+}

From c23878b60c4dfb93ae3ae62b307eb30b851d19ff Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Mon, 14 Mar 2016 07:33:39 -0500
Subject: [PATCH 08/12] improve di config to set and get request service

---
 diconfig.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/diconfig.php b/diconfig.php
index 17e6a2b..4f376aa 100644
--- a/diconfig.php
+++ b/diconfig.php
@@ -29,6 +29,7 @@
     'get' => $_GET,
     'server' => $_SERVER,
 ];
+$di->set('request', $di->lazyNew(Masterclass\Request::class));
 
 $di->params[Masterclass\Controller\Index::class] = [
     'model' => $di->lazyNew(Masterclass\Model\Story::class),
@@ -40,7 +41,7 @@
 
 $di->params[Masterclass\Controller\User::class] = [
     'model' => $di->lazyNew(Masterclass\Model\User::class),
-    'request' => $di->lazyNew(Masterclass\Request::class),
+    'request' => $di->get('request'),
 ];
 
 $di->params[Masterclass\Model\User::class] = [
@@ -49,7 +50,7 @@
 
 $di->params[Masterclass\Controller\Comment::class] = [
     'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
-    'request' => $di->lazyNew(Masterclass\Request::class),
+    'request' => $di->get('request'),
 ];
 
 $di->params[Masterclass\Model\Comment::class] = [
@@ -58,7 +59,7 @@
 $di->params[Masterclass\Controller\Story::class] = [
     'story' => $di->lazyNew(Masterclass\Model\Story::class),
     'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
-    'request' => $di->lazyNew(Masterclass\Request::class),
+    'request' => $di->get('request'),
 ];
 
 $di->params[Masterclass\RouteMap::class] = [
@@ -76,5 +77,5 @@
         $r->addRoute('POST', '/user/login', Controller\User::class . ':login');
         $r->addRoute('GET', '/user/logout', Controller\User::class . ':logout');
     }),
-    'request' => $di->lazyNew(Masterclass\Request::class),
+    'request' => $di->get('request'),
 ];

From 8d06c1a2daa6f7ee64effd7afd0116c253f66763 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Tue, 15 Mar 2016 07:58:02 -0500
Subject: [PATCH 09/12] WIP: applied some improvements based on comments stop
 using global POST, GET, SERVER outside of the Request object.

- reduced usage of globals
- mostly finished Apc implementation
- changed the DataStore interface slightly
- temporarily worsened the Request object
---
 src/Controller/Comment.php      |  4 +--
 src/Controller/Story.php        | 14 +++++----
 src/Controller/User.php         | 16 ++++++-----
 src/Db/Apc.php                  | 51 +++++++++++++++++++++++++++++++--
 src/Db/Interfaces/DataStore.php |  3 +-
 src/Db/Mysql.php                |  9 +++++-
 src/Request.php                 | 44 ++++++++++++++++++++++++++++
 src/RouteMap.php                |  1 +
 8 files changed, 122 insertions(+), 20 deletions(-)

diff --git a/src/Controller/Comment.php b/src/Controller/Comment.php
index f3ca2ce..441b77d 100644
--- a/src/Controller/Comment.php
+++ b/src/Controller/Comment.php
@@ -19,8 +19,6 @@ public function __construct(CommentModel $comment, Request $request)
     public function create()
     {
         if (!isset($_SESSION['AUTHENTICATED'])) {
-            // @todo: die, redirect, exit... what is desired functionality?
-            die('not auth');
             header("Location: /");
             exit;
         }
@@ -28,7 +26,7 @@ public function create()
         $this->commentModel->addComment(
             $_SESSION['username'],
             $this->request->getPostParam('story_id'),
-            filter_input(INPUT_POST, 'comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
+            $this->request->getSanitizedValue($this->request->getPostParam('comment'))
         );
 
         header("Location: /story/?id=" . $_POST['story_id']);
diff --git a/src/Controller/Story.php b/src/Controller/Story.php
index 3a6de68..d4edd01 100644
--- a/src/Controller/Story.php
+++ b/src/Controller/Story.php
@@ -46,7 +46,7 @@ public function index()
         if (isset($_SESSION['AUTHENTICATED'])) {
             $content .= '
             <form method="post" action="/comment/create">
-            <input type="hidden" name="story_id" value="' . $_GET['id'] . '" />
+            <input type="hidden" name="story_id" value="' . $id . '" />
             <textarea cols="60" rows="6" name="comment"></textarea><br />
             <input type="submit" name="submit" value="Submit Comment" />
             </form>            
@@ -73,13 +73,17 @@ public function create()
         }
 
         $error = '';
-        if (isset($_POST['create'])) {
-            if (!isset($_POST['headline']) || !isset($_POST['url']) ||
-                !filter_input(INPUT_POST, 'url', FILTER_VALIDATE_URL)
+        if ($this->request->getPostParam('create') !== null) {
+            $headline = $this->request->getPostParam('headline');
+            $url = $this->request->getPostParam('url');
+
+            if (empty($headline)
+                || empty($url)
+                || !$this->request->validateUrl($url)
             ) {
                 $error = 'You did not fill in all the fields or the URL did not validate.';
             } else {
-                $id = $this->story->createStory($_POST['headline'], $_POST['url'], $_SESSION['username']);
+                $id = $this->story->createStory($headline, $url, $_SESSION['username']);
                 header("Location: /story/?id=$id");
                 exit;
             }
diff --git a/src/Controller/User.php b/src/Controller/User.php
index abc7174..e2d9392 100644
--- a/src/Controller/User.php
+++ b/src/Controller/User.php
@@ -38,7 +38,7 @@ public function create()
             }
 
             if (is_null($error)) {
-                if (!filter_input(INPUT_POST, 'email', FILTER_VALIDATE_EMAIL)) {
+                if (!$this->request->validateEmail($email)) {
                     $error = 'Your email address is invalid';
                 }
             }
@@ -87,11 +87,13 @@ public function account()
         }
 
         $username = $_SESSION['username'];
-        $password = $_POST['password'] ?? null;
+        $password = $this->request->getPostParam('password') ?? null;
 
-        if (isset($_POST['updatepw'])) {
-            if (!isset($_POST['password']) || !isset($_POST['password_check']) ||
-                $_POST['password'] != $_POST['password_check']
+        if ($this->request->getPostParam('updatepw') !== null) {
+            $passwordCheck = $this->request->getPostParam('password_check');
+            if (empty($password)
+                || empty($passwordCheck)
+                || $password != $passwordCheck
             ) {
                 $error = 'The password fields were blank or they did not match. Please try again.';
             } else {
@@ -124,8 +126,8 @@ public function login()
         $error = null;
         // Do the login
         if (isset($_POST['login'])) {
-            $username = $_POST['user'];
-            $password = $_POST['pass'];
+            $username = $this->request->getPostParam('user');
+            $password = $this->request->getPostParam('pass');
 
             if ($this->userModel->checkCredentials($username, $password)) {
                 session_regenerate_id();
diff --git a/src/Db/Apc.php b/src/Db/Apc.php
index cf3c02e..b24714b 100644
--- a/src/Db/Apc.php
+++ b/src/Db/Apc.php
@@ -7,10 +7,12 @@
 class Apc implements DataStore
 {
     protected $db;
+    protected $ttl;
 
-    public function __construct(Mysql $mysql)
+    public function __construct(Mysql $mysql, int $ttl = 60)
     {
         $this->db = $mysql;
+        $this->ttl = $ttl;
     }
 
     public function fetchOne($sql, array $args = [])
@@ -20,18 +22,61 @@ public function fetchOne($sql, array $args = [])
 
         if (!$value) {
             $value = $this->db->fetchOne($sql, $args);
-            apc_store($key, $value);
+            apc_store($key, $value, $this->ttl);
         }
 
         return $value;
     }
+
     public function fetchAll($sql, array $args = [])
     {
+        $key = md5($sql . serialize($args));
+        $value = apc_fetch($key);
+
+        if (!$value) {
+            $value = $this->db->fetchAll($sql, $args);
+            apc_store($key, $value, $this->ttl);
+        }
 
+        return $value;
     }
-    public function save($sql, array $args = [])
+
+    public function rowCount($sql, array $args = [])
     {
+        $key = md5('rowCount' . $sql . serialize($args));
+        $value = apc_fetch($key);
 
+        if (!$value) {
+            $value = $this->db->rowCount($sql, $args);
+            apc_store($key, $value, $this->ttl);
+        }
+
+        return $value;
+    }
+
+    public function insert($sql, array $args = [])
+    {
+        return $this->db->insert($sql, $args);
+        // no cache to invalidate
     }
 
+    /**
+     * @TODO - this should invalidate the corresponding select cache
+     * set default to 60 second ttl to compensate.
+     *
+     * @param $sql
+     * @param array $args
+     *
+     * @return bool
+     */
+    public function update($sql, array $args = [])
+    {
+        return $this->db->update($sql, $args);
+        // @todo
+    }
+
+    public function lastInsertId()
+    {
+        return $this->db->lastInsertId();
+    }
 }
diff --git a/src/Db/Interfaces/DataStore.php b/src/Db/Interfaces/DataStore.php
index 6d4f1b3..da359fd 100644
--- a/src/Db/Interfaces/DataStore.php
+++ b/src/Db/Interfaces/DataStore.php
@@ -7,6 +7,7 @@ interface DataStore
     public function fetchOne($sql, array $args = []);
     public function fetchAll($sql, array $args = []);
     public function rowCount($sql, array $args = []);
-    public function save($sql, array $args = []);
+    public function insert($sql, array $args = []);
+    public function update($sql, array $args = []);
     public function lastInsertId();
 }
diff --git a/src/Db/Mysql.php b/src/Db/Mysql.php
index 059fe5a..02ef488 100644
--- a/src/Db/Mysql.php
+++ b/src/Db/Mysql.php
@@ -50,7 +50,14 @@ public function rowCount($sql, array $args = [])
         return $statement->rowCount();
     }
 
-    public function save($sql, array $args = [])
+    public function insert($sql, array $args = [])
+    {
+        $statement = $this->pdo->prepare($sql, $args);
+
+        return $statement->execute($args);
+    }
+
+    public function update($sql, array $args = [])
     {
         $statement = $this->pdo->prepare($sql, $args);
 
diff --git a/src/Request.php b/src/Request.php
index c2b7741..34fed68 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -45,4 +45,48 @@ public function getServerParam($paramName)
     {
         return is_string($paramName) ? $this->server[$paramName] ?? null : null;
     }
+
+    /**
+     * @deprecated
+     *
+     * @TODO This may violate SRP.  Here for convenience temporarily.
+     *
+     * @param string $value
+     *
+     * @return mixed
+     */
+    public function getSanitizedValue(string $value)
+    {
+        // original:
+        // filter_input(INPUT_POST, 'comment', FILTER_SANITIZE_FULL_SPECIAL_CHARS)
+        return filter_var($value, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+    }
+
+    /**
+     * @deprecated
+     *
+     * @TODO This may violate SRP.  Here for convenience temporarily.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    public function validateUrl(string $value)
+    {
+        return filter_var($value, FILTER_VALIDATE_URL) !== false;
+    }
+
+    /**
+     * @deprecated
+     *
+     * @TODO This may violate SRP.  Here for convenience temporarily.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    public function validateEmail(string $value)
+    {
+        return filter_var($value, FILTER_VALIDATE_EMAIL) !== false;
+    }
 }
diff --git a/src/RouteMap.php b/src/RouteMap.php
index d0b3243..75dce01 100644
--- a/src/RouteMap.php
+++ b/src/RouteMap.php
@@ -38,6 +38,7 @@ public function handle()
                 $allowedMethods = $routeInfo[1];
                 // ... 405 Method Not Allowed
                 header("HTTP/1.1 405 Method Not Allowed");
+                header($allowedMethods);
                 exit;
                 break;
             case Dispatcher::FOUND:

From a937e7abb1c33cfddbbced103aa439e1b0fcabd4 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Tue, 15 Mar 2016 08:31:28 -0500
Subject: [PATCH 10/12] Improve the use of the router, and invert dependency
 into MasterController

---
 public/index.php         |  8 +++++++-
 src/MasterController.php | 18 ++++++++----------
 src/RouteDestination.php | 32 ++++++++++++++++++++++++++++++++
 src/RouteMap.php         | 10 ++++++----
 4 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 src/RouteDestination.php

diff --git a/public/index.php b/public/index.php
index f17ab4a..c9a6c9a 100644
--- a/public/index.php
+++ b/public/index.php
@@ -7,5 +7,11 @@
 
 require ('../diconfig.php');
 
-$framework = new Masterclass\MasterController($di, $config);
+/**
+ * @var \Masterclass\RouteMap $routeMap
+ */
+$routeMap = $this->container->newInstance(Masterclass\RouteMap::class);
+$destination = $routeMap->handle();
+
+$framework = new Masterclass\MasterController($di, $config, $destination);
 echo $framework->execute();
diff --git a/src/MasterController.php b/src/MasterController.php
index 42c76e8..d4fd5f6 100644
--- a/src/MasterController.php
+++ b/src/MasterController.php
@@ -7,25 +7,23 @@
 
 class MasterController
 {
-    private $config;
-
+    protected $config;
     protected $container;
+    protected $destination;
 
-    public function __construct(Container $container, $config)
+    public function __construct(Container $container, $config, RouteDestination $destination)
     {
         $this->container = $container;
         $this->config = $config;
+        $this->destination = $destination;
     }
 
     public function execute()
     {
-        $routeMap = $this->container->newInstance(RouteMap::class);
-        $dispatchDetail = $routeMap->handle();
-
-        $controller = $this->container->newInstance($dispatchDetail['class']);
-        $method = $dispatchDetail['method'];
-        $vars = $dispatchDetail['vars'];
+        $controller = $this->container->newInstance($this->destination->getClass());
+        $method = $this->destination->getMethod();
+        $args = $this->destination->getArgs();
 
-        return $controller->$method($vars);
+        return $controller->$method($args);
     }
 }
diff --git a/src/RouteDestination.php b/src/RouteDestination.php
new file mode 100644
index 0000000..be76cee
--- /dev/null
+++ b/src/RouteDestination.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Masterclass;
+
+
+class RouteDestination
+{
+
+    protected $class;
+    protected $method;
+    protected $args;
+
+    public function __construct(array $routeInfo)
+    {
+        extract($routeInfo);
+    }
+
+    public function getClass()
+    {
+        return $this->class;
+    }
+
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+    public function getArgs()
+    {
+        return $this->args;
+    }
+}
diff --git a/src/RouteMap.php b/src/RouteMap.php
index 75dce01..fe3c872 100644
--- a/src/RouteMap.php
+++ b/src/RouteMap.php
@@ -20,7 +20,9 @@ public function __construct(Dispatcher $dispatcher, Request $request)
         $this->request = $request;
     }
 
-
+    /**
+     * @return RouteDestination
+     */
     public function handle()
     {
 
@@ -47,11 +49,11 @@ public function handle()
                 // ... call $handler with $vars
                 $class = $handler[0];
                 $method = $handler[1];
-                return [
+                return new RouteDestination([
                     'class' => $class,
                     'method' => $method,
-                    'vars' => $vars,
-                ];
+                    'args' => $vars,
+                ]);
                 break;
         }
 

From df393f0f784520e378144edbee806c0408a333cc Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Tue, 15 Mar 2016 08:46:00 -0500
Subject: [PATCH 11/12] bug fixes: broke the router, save was replaced but
 usage of it wasn't (fixed now), make apc update safer

---
 public/index.php         | 3 +--
 src/Db/Apc.php           | 8 +++++---
 src/Model/Comment.php    | 2 +-
 src/Model/Story.php      | 2 +-
 src/Model/User.php       | 7 ++-----
 src/RouteDestination.php | 6 ++++--
 src/RouteMap.php         | 6 +-----
 7 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/public/index.php b/public/index.php
index c9a6c9a..ed46b35 100644
--- a/public/index.php
+++ b/public/index.php
@@ -10,8 +10,7 @@
 /**
  * @var \Masterclass\RouteMap $routeMap
  */
-$routeMap = $this->container->newInstance(Masterclass\RouteMap::class);
+$routeMap = $di->newInstance(Masterclass\RouteMap::class);
 $destination = $routeMap->handle();
-
 $framework = new Masterclass\MasterController($di, $config, $destination);
 echo $framework->execute();
diff --git a/src/Db/Apc.php b/src/Db/Apc.php
index b24714b..8ffd264 100644
--- a/src/Db/Apc.php
+++ b/src/Db/Apc.php
@@ -61,8 +61,10 @@ public function insert($sql, array $args = [])
     }
 
     /**
-     * @TODO - this should invalidate the corresponding select cache
-     * set default to 60 second ttl to compensate.
+     * This should invalidate the corresponding select cache.
+     * First, I set default store to 60 second ttl to compensate.
+     * Then, I decided to invalidate all cache upon an update.
+     * Certainly, a better solution must exist.
      *
      * @param $sql
      * @param array $args
@@ -71,8 +73,8 @@ public function insert($sql, array $args = [])
      */
     public function update($sql, array $args = [])
     {
+        apc_clear_cache('user');
         return $this->db->update($sql, $args);
-        // @todo
     }
 
     public function lastInsertId()
diff --git a/src/Model/Comment.php b/src/Model/Comment.php
index f06038c..f8ba3bc 100644
--- a/src/Model/Comment.php
+++ b/src/Model/Comment.php
@@ -17,7 +17,7 @@ public function __construct(DataStore $dataStore)
     public function addComment($username, $storyId, $comment)
     {
         $sql = 'INSERT INTO comment (created_by, created_on, story_id, comment) VALUES (?, NOW(), ?, ?)';
-        $this->dataStore->save(
+        $this->dataStore->insert(
             $sql,
             [
                 $username,
diff --git a/src/Model/Story.php b/src/Model/Story.php
index 950e656..548d476 100644
--- a/src/Model/Story.php
+++ b/src/Model/Story.php
@@ -41,7 +41,7 @@ public function loadStoryById($storyId)
     public function createStory($headline, $url, $username)
     {
         $sql = 'INSERT INTO story (headline, url, created_by, created_on) VALUES (?, ?, ?, NOW())';
-        $this->dataStore->save(
+        $this->dataStore->insert(
             $sql,
             [
                 $headline,
diff --git a/src/Model/User.php b/src/Model/User.php
index 2f32dc2..da2fc4e 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -73,9 +73,6 @@ public function getEmail()
      */
     public function checkCredentials($username, $password)
     {
-//        $password = md5($username . $password); // THIS IS NOT SECURE. DO NOT USE IN PRODUCTION.
-//        $sql = 'SELECT * FROM user WHERE username = ? AND password = ? LIMIT 1';
-
         $this->loadUserByUsername($username);
 
         return password_verify($password, $this->hashedPassword);
@@ -90,14 +87,14 @@ public function createUser($username, $email, $password)
             $this->hashedPassword,
         ];
         $sql = 'INSERT INTO user (username, email, password) VALUES (?, ?, ?)';
-        $this->dataStore->save($sql, $params);
+        $this->dataStore->insert($sql, $params);
     }
 
     public function updatePassword($username, $password)
     {
         $this->setPassword($password);
         $sql = 'UPDATE user SET password = ? WHERE username = ?';
-        $this->dataStore->save($sql, [$this->hashedPassword, $username]);
+        $this->dataStore->update($sql, [$this->hashedPassword, $username]);
     }
 
     protected function setPassword($password)
diff --git a/src/RouteDestination.php b/src/RouteDestination.php
index be76cee..f4ada15 100644
--- a/src/RouteDestination.php
+++ b/src/RouteDestination.php
@@ -10,9 +10,11 @@ class RouteDestination
     protected $method;
     protected $args;
 
-    public function __construct(array $routeInfo)
+    public function __construct($class, $method, $args)
     {
-        extract($routeInfo);
+        $this->class = $class;
+        $this->method = $method;
+        $this->args = $args;
     }
 
     public function getClass()
diff --git a/src/RouteMap.php b/src/RouteMap.php
index fe3c872..f323597 100644
--- a/src/RouteMap.php
+++ b/src/RouteMap.php
@@ -49,11 +49,7 @@ public function handle()
                 // ... call $handler with $vars
                 $class = $handler[0];
                 $method = $handler[1];
-                return new RouteDestination([
-                    'class' => $class,
-                    'method' => $method,
-                    'args' => $vars,
-                ]);
+                return new RouteDestination($class, $method, $vars);
                 break;
         }
 

From 4fb4e8ad70ad40032cf8944645687d52d7086833 Mon Sep 17 00:00:00 2001
From: Adam Altman <adam@ilabsinc.com>
Date: Wed, 16 Mar 2016 00:20:23 -0500
Subject: [PATCH 12/12] Add the domain... it's a work in progress

---
 composer.json                                 |    3 +
 composer.lock                                 | 1100 ++++++++++++++++-
 diconfig.php                                  |   20 +-
 src/Controller/Comment.php                    |    2 +-
 src/Controller/Index.php                      |    4 +-
 src/Controller/Story.php                      |    6 +-
 src/Controller/User.php                       |    2 +-
 src/Db/Apc.php                                |    2 +-
 src/Db/{Interfaces => }/DataStore.php         |    8 +-
 src/Db/Mysql.php                              |    2 +-
 src/Domain/DomainEvent.php                    |   32 +
 src/Domain/Story/Comment.php                  |   61 +
 src/Domain/Story/CommentCollection.php        |   25 +
 src/Domain/Story/CommentCreated.php           |   10 +
 src/Domain/Story/CommentDataStore.php         |    9 +
 src/Domain/Story/InvalidComment.php           |   10 +
 src/Domain/Story/InvalidStory.php             |   10 +
 src/Domain/Story/Story.php                    |   71 ++
 src/Domain/Story/StoryCreated.php             |   10 +
 src/Domain/Story/StoryDataStore.php           |   14 +
 src/Domain/Story/StoryId.php                  |   32 +
 src/Domain/User/UserId.php                    |   37 +
 src/Domain/Value.php                          |   24 +
 src/Domain/ValueObject.php                    |   22 +
 ...{Comment.php => CommentMysqlDataStore.php} |    5 +-
 .../{Story.php => StoryMysqlDataStore.php}    |   20 +-
 .../{User.php => UserMysqlDataStore.php}      |    4 +-
 27 files changed, 1513 insertions(+), 32 deletions(-)
 rename src/Db/{Interfaces => }/DataStore.php (72%)
 create mode 100644 src/Domain/DomainEvent.php
 create mode 100644 src/Domain/Story/Comment.php
 create mode 100644 src/Domain/Story/CommentCollection.php
 create mode 100644 src/Domain/Story/CommentCreated.php
 create mode 100644 src/Domain/Story/CommentDataStore.php
 create mode 100644 src/Domain/Story/InvalidComment.php
 create mode 100644 src/Domain/Story/InvalidStory.php
 create mode 100644 src/Domain/Story/Story.php
 create mode 100644 src/Domain/Story/StoryCreated.php
 create mode 100644 src/Domain/Story/StoryDataStore.php
 create mode 100644 src/Domain/Story/StoryId.php
 create mode 100644 src/Domain/User/UserId.php
 create mode 100644 src/Domain/Value.php
 create mode 100644 src/Domain/ValueObject.php
 rename src/Model/{Comment.php => CommentMysqlDataStore.php} (84%)
 rename src/Model/{Story.php => StoryMysqlDataStore.php} (76%)
 rename src/Model/{User.php => UserMysqlDataStore.php} (97%)

diff --git a/composer.json b/composer.json
index bb3888c..1afe99b 100644
--- a/composer.json
+++ b/composer.json
@@ -7,5 +7,8 @@
     "require": {
         "aura/di": "^2.2",
         "nikic/fast-route": "^0.7.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^5.2"
     }
 }
diff --git a/composer.lock b/composer.lock
index 0a7c09d..9465b10 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "8ad16b1e525fe87a2a3d14564eae5a07",
-    "content-hash": "e6c21f578f166f25391791cc586f9dc3",
+    "hash": "8f0c78e69a72434a398a84d53a0f3c93",
+    "content-hash": "a585dff8984856a16dcf3fc48d975b6c",
     "packages": [
         {
             "name": "aura/di",
@@ -100,7 +100,1101 @@
             "time": "2015-12-20 19:50:12"
         }
     ],
-    "packages-dev": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e3abefcd7f106677fd352cd7c187d6c969aa9ddc",
+                "reference": "e3abefcd7f106677fd352cd7c187d6c969aa9ddc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2015-11-07 22:20:37"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3c91bdf81797d725b14cb62906f9a4ce44235972",
+                "reference": "3c91bdf81797d725b14cb62906f9a4ce44235972",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2016-02-15 07:46:21"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "fe33716763b604ade4cb442c0794f5bd5ad73004"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/fe33716763b604ade4cb442c0794f5bd5ad73004",
+                "reference": "fe33716763b604ade4cb442c0794f5bd5ad73004",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "^1.4.2",
+                "sebastian/code-unit-reverse-lookup": "~1.0",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0|~2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~5"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-03-03 08:49:08"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-06-21 13:08:43"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2015-06-21 08:01:12"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-09-15 10:49:45"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.2.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "6f0948bab32270352f97d1913d82a49338dcb0da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6f0948bab32270352f97d1913d82a49338dcb0da",
+                "reference": "6f0948bab32270352f97d1913d82a49338dcb0da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "^3.3.0",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/phpunit-mock-objects": ">=3.0.5",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-03-15 05:59:58"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "49bc700750196c04dd6bc2c4c99cb632b893836b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/49bc700750196c04dd6bc2c4c99cb632b893836b",
+                "reference": "49bc700750196c04dd6bc2c4c99cb632b893836b",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.6",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-12-08 08:47:06"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2016-02-13 06:45:14"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-07-26 15:48:44"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+                "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-02-26 18:40:46"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2015-06-21 07:55:53"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-11-11 19:50:13"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28 20:34:47"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
+                "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-02-04 12:56:52"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/b5ba64cd67ecd6887f63868fa781ca094bd1377c",
+                "reference": "b5ba64cd67ecd6887f63868fa781ca094bd1377c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-02-23 15:16:06"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],
diff --git a/diconfig.php b/diconfig.php
index 4f376aa..a2b55fc 100644
--- a/diconfig.php
+++ b/diconfig.php
@@ -1,8 +1,10 @@
 <?php
 
 use Masterclass\Controller;
+use Aura\Di\Container;
+use Aura\Di\Factory;
 
-$di = new Aura\Di\Container(new \Aura\Di\Factory());
+$di = new Container(new Factory());
 
 $di->setAutoResolve(false);
 
@@ -32,33 +34,33 @@
 $di->set('request', $di->lazyNew(Masterclass\Request::class));
 
 $di->params[Masterclass\Controller\Index::class] = [
-    'model' => $di->lazyNew(Masterclass\Model\Story::class),
+    'model' => $di->lazyNew(Masterclass\Model\StoryMysqlDataStore::class),
 ];
 
-$di->params[Masterclass\Model\Story::class] = [
+$di->params[Masterclass\Model\StoryMysqlDataStore::class] = [
     'dataStore' => $di->lazyNew(Masterclass\Db\Mysql::class),
 ];
 
 $di->params[Masterclass\Controller\User::class] = [
-    'model' => $di->lazyNew(Masterclass\Model\User::class),
+    'model' => $di->lazyNew(Masterclass\Model\UserMysqlDataStore::class),
     'request' => $di->get('request'),
 ];
 
-$di->params[Masterclass\Model\User::class] = [
+$di->params[Masterclass\Model\UserMysqlDataStore::class] = [
     'dataStore' => $di->lazyNew(Masterclass\Db\Mysql::class),
 ];
 
 $di->params[Masterclass\Controller\Comment::class] = [
-    'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
+    'comment' => $di->lazyNew(Masterclass\Model\CommentMysqlDataStore::class),
     'request' => $di->get('request'),
 ];
 
-$di->params[Masterclass\Model\Comment::class] = [
+$di->params[Masterclass\Model\CommentMysqlDataStore::class] = [
     'dataStore' => $di->lazyNew(Masterclass\Db\Mysql::class),
 ];
 $di->params[Masterclass\Controller\Story::class] = [
-    'story' => $di->lazyNew(Masterclass\Model\Story::class),
-    'comment' => $di->lazyNew(Masterclass\Model\Comment::class),
+    'story' => $di->lazyNew(Masterclass\Model\StoryMysqlDataStore::class),
+    'comment' => $di->lazyNew(Masterclass\Model\CommentMysqlDataStore::class),
     'request' => $di->get('request'),
 ];
 
diff --git a/src/Controller/Comment.php b/src/Controller/Comment.php
index 441b77d..bb07219 100644
--- a/src/Controller/Comment.php
+++ b/src/Controller/Comment.php
@@ -2,7 +2,7 @@
 
 namespace Masterclass\Controller;
 
-use Masterclass\Model\Comment as CommentModel;
+use Masterclass\Model\CommentMysqlDataStore as CommentModel;
 use Masterclass\Request;
 
 class Comment
diff --git a/src/Controller/Index.php b/src/Controller/Index.php
index 5257e0d..caf0642 100644
--- a/src/Controller/Index.php
+++ b/src/Controller/Index.php
@@ -2,14 +2,14 @@
 
 namespace Masterclass\Controller;
 
-use Masterclass\Model\Story;
+use Masterclass\Model\StoryMysqlDataStore;
 
 class Index
 {
     
     protected $model;
     
-    public function __construct(Story $model)
+    public function __construct(StoryMysqlDataStore $model)
     {
         $this->model = $model;
     }
diff --git a/src/Controller/Story.php b/src/Controller/Story.php
index d4edd01..5b16d98 100644
--- a/src/Controller/Story.php
+++ b/src/Controller/Story.php
@@ -2,8 +2,8 @@
 
 namespace Masterclass\Controller;
 
-use Masterclass\Model\Comment;
-use Masterclass\Model\Story as StoryModel;
+use Masterclass\Model\CommentMysqlDataStore;
+use Masterclass\Model\StoryMysqlDataStore as StoryModel;
 use Masterclass\Request;
 
 class Story
@@ -12,7 +12,7 @@ class Story
     protected $story;
     protected $request;
 
-    public function __construct(Comment $comment, StoryModel $story, Request $request)
+    public function __construct(CommentMysqlDataStore $comment, StoryModel $story, Request $request)
     {
         $this->comment = $comment;
         $this->story = $story;
diff --git a/src/Controller/User.php b/src/Controller/User.php
index e2d9392..898abb4 100644
--- a/src/Controller/User.php
+++ b/src/Controller/User.php
@@ -2,7 +2,7 @@
 
 namespace Masterclass\Controller;
 
-use Masterclass\Model\User as UserModel;
+use Masterclass\Model\UserMysqlDataStore as UserModel;
 use Masterclass\Request;
 
 class User
diff --git a/src/Db/Apc.php b/src/Db/Apc.php
index 8ffd264..296fd22 100644
--- a/src/Db/Apc.php
+++ b/src/Db/Apc.php
@@ -2,7 +2,7 @@
 
 namespace Masterclass\Db;
 
-use Masterclass\Db\Interfaces\DataStore;
+use Masterclass\Db\DataStore;
 
 class Apc implements DataStore
 {
diff --git a/src/Db/Interfaces/DataStore.php b/src/Db/DataStore.php
similarity index 72%
rename from src/Db/Interfaces/DataStore.php
rename to src/Db/DataStore.php
index da359fd..5693b02 100644
--- a/src/Db/Interfaces/DataStore.php
+++ b/src/Db/DataStore.php
@@ -1,7 +1,13 @@
 <?php
 
-namespace Masterclass\Db\Interfaces;
+namespace Masterclass\Db;
 
+/**
+ * Interface DataStore.
+ *
+ * @Todo: This is pretty tightly coupled to $sql. Reconsider.
+ *
+ */
 interface DataStore
 {
     public function fetchOne($sql, array $args = []);
diff --git a/src/Db/Mysql.php b/src/Db/Mysql.php
index 02ef488..c91674e 100644
--- a/src/Db/Mysql.php
+++ b/src/Db/Mysql.php
@@ -2,7 +2,7 @@
 
 namespace Masterclass\Db;
 
-use Masterclass\Db\Interfaces\DataStore;
+use Masterclass\Db\DataStore;
 use PDO;
 
 class Mysql implements DataStore
diff --git a/src/Domain/DomainEvent.php b/src/Domain/DomainEvent.php
new file mode 100644
index 0000000..befeb01
--- /dev/null
+++ b/src/Domain/DomainEvent.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Masterclass\Domain;
+
+
+class DomainEvent
+{
+
+    protected $name;
+    protected $data;
+
+    public function __construct(string $name, array $data)
+    {
+        $this->name = $name;
+        $this->data = $data;
+    }
+
+    public function __toString()
+    {
+        return $this->getName();
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function getData()
+    {
+        return $this->data;
+    }
+}
diff --git a/src/Domain/Story/Comment.php b/src/Domain/Story/Comment.php
new file mode 100644
index 0000000..a879cf2
--- /dev/null
+++ b/src/Domain/Story/Comment.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+use DateTime;
+use Masterclass\Domain\User\UserId;
+use Masterclass\Domain\Value;
+use Masterclass\Domain\ValueObject;
+
+class Comment extends ValueObject implements Value
+{
+    protected $createdByUserId;
+    protected $createdOn;
+    protected $storyId;
+    protected $text;
+
+    public function __construct(UserId $createdByUserId, DateTime $createdOn, StoryId $storyId, string $text)
+    {
+        $this->createdByUserId = $createdByUserId;
+        $this->createdOn = $createdOn;
+        $this->storyId = $storyId;
+        $this->setText($text);
+    }
+
+    public function setText($text)
+    {
+        $text = filter_var($text, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        if (mb_strlen($text) > 5000) {
+            throw new InvalidComment('Comments limited to 5000 characters');
+        }
+        $this->text = $text;
+    }
+
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    public function getStoryId()
+    {
+        return $this->storyId;
+    }
+
+    public function getCreatedOn()
+    {
+        return $this->createdOn;
+    }
+
+    public function getCreatedBy()
+    {
+        return $this->createdByUserId;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function equals(Value $value)
+    {
+        return $value instanceof self && (string) $value === (string) $this;
+    }
+}
diff --git a/src/Domain/Story/CommentCollection.php b/src/Domain/Story/CommentCollection.php
new file mode 100644
index 0000000..292d45f
--- /dev/null
+++ b/src/Domain/Story/CommentCollection.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+class CommentCollection
+{
+    protected $comments;
+
+    public function __construct(Comment ...$comments)
+    {
+        foreach ($comments as $comment) {
+            $this->comments[] = $comment;
+        }
+    }
+
+    public function getComments()
+    {
+        return $this->getComments();
+    }
+
+    public function addComment(Comment $comment)
+    {
+        $this->comments[] = $comment;
+    }
+}
diff --git a/src/Domain/Story/CommentCreated.php b/src/Domain/Story/CommentCreated.php
new file mode 100644
index 0000000..7011e45
--- /dev/null
+++ b/src/Domain/Story/CommentCreated.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+use Masterclass\Domain\DomainEvent;
+
+class CommentCreated extends DomainEvent
+{
+    const NAME = 'CommentCreated';
+}
diff --git a/src/Domain/Story/CommentDataStore.php b/src/Domain/Story/CommentDataStore.php
new file mode 100644
index 0000000..99c9e46
--- /dev/null
+++ b/src/Domain/Story/CommentDataStore.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+interface CommentDataStore
+{
+    public function addComment($username, $storyId, $comment);
+    public function getCommentsForStoryId($storyId);
+}
diff --git a/src/Domain/Story/InvalidComment.php b/src/Domain/Story/InvalidComment.php
new file mode 100644
index 0000000..b75c328
--- /dev/null
+++ b/src/Domain/Story/InvalidComment.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+use InvalidArgumentException;
+
+class InvalidComment extends InvalidArgumentException
+{
+
+}
diff --git a/src/Domain/Story/InvalidStory.php b/src/Domain/Story/InvalidStory.php
new file mode 100644
index 0000000..67dfd3d
--- /dev/null
+++ b/src/Domain/Story/InvalidStory.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+use InvalidArgumentException;
+
+class InvalidStory extends InvalidArgumentException
+{
+
+}
diff --git a/src/Domain/Story/Story.php b/src/Domain/Story/Story.php
new file mode 100644
index 0000000..6c50395
--- /dev/null
+++ b/src/Domain/Story/Story.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+use DateTime;
+use Masterclass\Domain\User\UserId;
+use Masterclass\Domain\Value;
+use Masterclass\Domain\ValueObject;
+
+class Story extends ValueObject implements Value
+{
+    protected $storyId;
+    protected $headline;
+    protected $url;
+    protected $createdByUserId;
+    protected $createdOn;
+    protected $commentCollection;
+
+    public function __construct(
+        StoryId $id,
+        string $headline,
+        string $url,
+        UserId $createdByUserId,
+        DateTime $createdOn,
+        CommentCollection $commentCollection
+    ) {
+        $this->storyId = $id;
+        $this->headline = $this->setHeadline($headline);
+        $this->url = $this->setUrl($url);
+        $this->createdByUserId = $createdByUserId;
+        $this->createdOn = $createdOn;
+        $this->commentCollection = $commentCollection;
+    }
+
+    public function addComment(Comment $comment)
+    {
+        $this->commentCollection->addComment($comment);
+    }
+
+    public function getId()
+    {
+        return $this->storyId;
+    }
+
+    protected function setHeadline($headline)
+    {
+        $headline = filter_var($headline, FILTER_SANITIZE_FULL_SPECIAL_CHARS);
+        if ($headline === '') {
+            throw new InvalidStory('Headline must be set');
+        }
+
+        if (mb_strlen($headline) > 500) {
+            throw new InvalidStory('Headline must be 500 characters or less');
+        }
+
+        $this->headline = $headline;
+    }
+
+    protected function setUrl($url)
+    {
+        if (filter_var($url, FILTER_VALIDATE_URL) === false) {
+            throw new InvalidStory('URL is invalid');
+        }
+        $this->url = $url;
+    }
+
+    public function equals(Value $value)
+    {
+        return $value instanceof self && (string) $value === (string) $this;
+    }
+}
diff --git a/src/Domain/Story/StoryCreated.php b/src/Domain/Story/StoryCreated.php
new file mode 100644
index 0000000..4159e21
--- /dev/null
+++ b/src/Domain/Story/StoryCreated.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+use Masterclass\Domain\DomainEvent;
+
+class StoryCreated extends DomainEvent
+{
+    const NAME = 'StoryCreated';
+}
diff --git a/src/Domain/Story/StoryDataStore.php b/src/Domain/Story/StoryDataStore.php
new file mode 100644
index 0000000..397e01f
--- /dev/null
+++ b/src/Domain/Story/StoryDataStore.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+
+interface StoryDataStore
+{
+
+    public function getAllStories();
+    public function loadStoryById($storyId);
+    public function createStory($headline, $url, $username);
+
+    public function getNextId();
+}
diff --git a/src/Domain/Story/StoryId.php b/src/Domain/Story/StoryId.php
new file mode 100644
index 0000000..97ef743
--- /dev/null
+++ b/src/Domain/Story/StoryId.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Masterclass\Domain\Story;
+
+
+use Masterclass\Domain\Value;
+use Masterclass\Domain\ValueObject;
+
+class StoryId extends ValueObject implements Value
+{
+    protected $id;
+
+    public function __construct(int $id)
+    {
+        $this->setId($id);
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    protected function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    public function equals(Value $value)
+    {
+        return $value instanceof self && (string) $value === (string) $this->id;
+    }
+}
diff --git a/src/Domain/User/UserId.php b/src/Domain/User/UserId.php
new file mode 100644
index 0000000..5cfd2d6
--- /dev/null
+++ b/src/Domain/User/UserId.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Masterclass\Domain\User;
+
+
+use Masterclass\Domain\Value;
+use Masterclass\Domain\ValueObject;
+
+class UserId extends ValueObject implements Value
+{
+    protected $id;
+
+    /**
+     * UserId constructor.
+     *
+     * @param int $id (It seems it must be an int, as it's a mysql autoincrement int.)
+     */
+    public function __construct(int $id)
+    {
+        $this->setId($id);
+    }
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    protected function setId($id)
+    {
+        $this->id = $id;
+    }
+
+    public function equals(Value $value)
+    {
+        return $value instanceof self && (string) $value === (string) $this->id;
+    }
+}
diff --git a/src/Domain/Value.php b/src/Domain/Value.php
new file mode 100644
index 0000000..8508dca
--- /dev/null
+++ b/src/Domain/Value.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Masterclass\Domain;
+
+
+interface Value
+{
+
+    /**
+     * String representation of value.
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Compares value with another object and returns bool.
+     *
+     * @param Value $value
+     *
+     * @return bool
+     */
+    public function equals(Value $value);
+}
diff --git a/src/Domain/ValueObject.php b/src/Domain/ValueObject.php
new file mode 100644
index 0000000..0fe4518
--- /dev/null
+++ b/src/Domain/ValueObject.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Masterclass\Domain;
+
+
+abstract class ValueObject implements Value
+{
+    public function __toString()
+    {
+        return var_export($this, true);
+    }
+
+    /**
+     * Value objects are immutable.  They are equal if their attributes are the same.
+     * Implement this method according to the specifics of the value object.
+     *
+     * @param Value $value
+     *
+     * @return bool
+     */
+    abstract public function equals(Value $value);
+}
diff --git a/src/Model/Comment.php b/src/Model/CommentMysqlDataStore.php
similarity index 84%
rename from src/Model/Comment.php
rename to src/Model/CommentMysqlDataStore.php
index f8ba3bc..956374d 100644
--- a/src/Model/Comment.php
+++ b/src/Model/CommentMysqlDataStore.php
@@ -2,9 +2,10 @@
 
 namespace Masterclass\Model;
 
-use Masterclass\Db\Interfaces\DataStore;
+use Masterclass\Db\DataStore;
+use Masterclass\Domain\Story\CommentDataStore;
 
-final class Comment
+final class CommentMysqlDataStore implements CommentDataStore
 {
     protected $storyId;
     protected $dataStore;
diff --git a/src/Model/Story.php b/src/Model/StoryMysqlDataStore.php
similarity index 76%
rename from src/Model/Story.php
rename to src/Model/StoryMysqlDataStore.php
index 548d476..1082b13 100644
--- a/src/Model/Story.php
+++ b/src/Model/StoryMysqlDataStore.php
@@ -1,14 +1,11 @@
 <?php
-/**
- * @author Adam Altman <adam@rebilly.com>
- * masterclass-repo
- */
 
 namespace Masterclass\Model;
 
-use Masterclass\Db\Interfaces\DataStore;
+use Masterclass\Db\DataStore;
+use Masterclass\Domain\Story\StoryDataStore;
 
-final class Story
+final class StoryMysqlDataStore implements StoryDataStore
 {
     protected $dataStore;
 
@@ -52,4 +49,15 @@ public function createStory($headline, $url, $username)
 
         return $this->dataStore->lastInsertId();
     }
+
+    /**
+     * This could be a problem with concurrency.
+     * We could change to use a uuid4 snowflake as the id.
+     *
+     * @return mixed
+     */
+    public function getNextId()
+    {
+        return $this->dataStore->lastInsertId() + 1;
+    }
 }
diff --git a/src/Model/User.php b/src/Model/UserMysqlDataStore.php
similarity index 97%
rename from src/Model/User.php
rename to src/Model/UserMysqlDataStore.php
index da2fc4e..39edfdb 100644
--- a/src/Model/User.php
+++ b/src/Model/UserMysqlDataStore.php
@@ -2,10 +2,10 @@
 
 namespace Masterclass\Model;
 
-use Masterclass\Db\Interfaces\DataStore;
+use Masterclass\Db\DataStore;
 
 
-final class User
+final class UserMysqlDataStore
 {
     protected $dataStore;
     protected $errors = [];