Merge branch 'develop'

Author: Codeliner

Vagrantfile

@@ -36,7 +36,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
 
     config.vm.provision :docker
-    config.vm.provision :docker_compose, compose_version: "1.5.1", yml: "/vagrant/docker-compose.yml", rebuild: false, run: "always"
-    config.vm.provision "shell", inline: "cd /vagrant && docker-compose run --rm php sh bin/setup_composer.sh"
+    config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", rebuild: false, run: "always"
+    config.vm.provision "shell", inline: "cd /vagrant && docker run --rm -it --volume $(pwd):/app prooph/composer:5.6 install -o --prefer-dist"
+    config.vm.provision "shell", inline: "cd /vagrant && docker run --rm -it --volume $(pwd):/app prooph/composer:5.6 require prooph/event-store-doctrine-adapter -o --prefer-dist"
     config.vm.provision "shell", inline: "cd /vagrant && docker-compose run --rm php sh bin/setup_mysql.sh"
 end

bin/setup_composer.sh

@@ -6,19 +6,17 @@ cd $DIR
 echo "using adapter mongodb"
 touch ./config/autoload/mongo_client.local.php
 
-php composer.phar require prooph/event-store-mongodb-adapter --update-no-dev -o --prefer-dist
-
 cat > config/autoload/mongo_client.local.php << EOL
 <?php
 return [
         'mongo_client' => function () {
             //Change set up of the mongo client, if you need to configure connection settings
-            return new \MongoClient();
+            return new \MongoClient('mongodb://mongodb:27017');
         },
     ];
 EOL
 
-    cat > config/autoload/event_store.local.php << EOL
+cat > config/autoload/event_store.local.php << EOL
 <?php
 return [
     'prooph' => [

bin/setup_mongodb.sh

@@ -6,8 +6,6 @@ cd $DIR
 echo "using adapter: mysql"
 touch ./config/autoload/dbal_connection.local.php
 
-php composer.phar require prooph/event-store-doctrine-adapter --update-no-dev -o --prefer-dist
-
 cat > config/autoload/dbal_connection.local.php <<EOL
 <?php
 return [

bin/setup_mysql.sh

@@ -33,6 +33,7 @@
             \Prooph\ProophessorDo\Model\Todo\Handler\MarkTodoAsDoneHandler::class     => \Prooph\ProophessorDo\Container\Model\Todo\MarkTodoAsDoneHandlerFactory::class,
             \Prooph\ProophessorDo\Model\Todo\Handler\ReopenTodoHandler::class     => \Prooph\ProophessorDo\Container\Model\Todo\ReopenTodoHandlerFactory::class,
             \Prooph\ProophessorDo\Model\Todo\Handler\AddDeadlineToTodoHandler::class => \Prooph\ProophessorDo\Container\Model\Todo\AddDeadlineToTodoHandlerFactory::class,
+            \Prooph\ProophessorDo\Model\Todo\Handler\AddReminderToTodoHandler::class => \Prooph\ProophessorDo\Container\Model\Todo\AddReminderToTodoHandlerFactory::class,
             \Prooph\ProophessorDo\Model\Todo\TodoList::class            => \Prooph\ProophessorDo\Container\Infrastructure\Repository\EventStoreTodoListFactory::class,
             // Projections
             \Prooph\ProophessorDo\Projection\User\UserProjector::class => \Prooph\ProophessorDo\Container\Projection\User\UserProjectorFactory::class,

config/autoload/dependencies.global.php

@@ -52,6 +52,7 @@
                         \Prooph\ProophessorDo\Model\Todo\Command\MarkTodoAsDone::class => \Prooph\ProophessorDo\Model\Todo\Handler\MarkTodoAsDoneHandler::class,
                         \Prooph\ProophessorDo\Model\Todo\Command\ReopenTodo::class => \Prooph\ProophessorDo\Model\Todo\Handler\ReopenTodoHandler::class,
                         \Prooph\ProophessorDo\Model\Todo\Command\AddDeadlineToTodo::class => \Prooph\ProophessorDo\Model\Todo\Handler\AddDeadlineToTodoHandler::class,
+                        \Prooph\ProophessorDo\Model\Todo\Command\AddReminderToTodo::class => \Prooph\ProophessorDo\Model\Todo\Handler\AddReminderToTodoHandler::class,
                     ],
                 ],
             ],
@@ -79,6 +80,9 @@
                         \Prooph\ProophessorDo\Model\Todo\Event\DeadlineWasAddedToTodo::class => [
                             \Prooph\ProophessorDo\Projection\Todo\TodoProjector::class,
                         ],
+                        \Prooph\ProophessorDo\Model\Todo\Event\ReminderWasAddedToTodo::class => [
+                            \Prooph\ProophessorDo\Projection\Todo\TodoProjector::class,
+                        ],
                     ],
                 ],
             ],

config/autoload/prooph.global.php

@@ -129,5 +129,19 @@
                 ],
             ],
         ],
+        [
+            'name' => 'command::add-reminder-to-todo',
+            'path' => '/api/commands/add-reminder-to-todo',
+            'middleware' => [
+                \Prooph\ProophessorDo\Middleware\JsonPayload::class,
+                \Prooph\Psr7Middleware\CommandMiddleware::class,
+            ],
+            'allowed_methods' => ['POST'],
+            'options' => [
+                'values' => [
+                    \Prooph\Psr7Middleware\CommandMiddleware::NAME_ATTRIBUTE => \Prooph\ProophessorDo\Model\Todo\Command\AddReminderToTodo::class,
+                ],
+            ],
+        ],
     ],
 ];

config/autoload/routes.global.php

@@ -11,13 +11,12 @@ nginx:
     - dataphp
 
 php:
-  image: prooph/php:5.6-fpm-xdebug
+  image: prooph/php:5.6-fpm
   links:
     - mariadb:mariadb
+    - mongodb:mongodb
   volumes_from:
     - dataphp
-  environment:
-    - ADAPTER=mysql
 
 dataphp:
   image: debian:jessie
@@ -33,3 +32,8 @@ mariadb:
     - MYSQL_USER=dev
     - MYSQL_PASSWORD=dev
     - MYSQL_DATABASE=proophessor
+
+mongodb:
+    image: mongo
+    ports:
+      - 27017:27017

docker-compose.yml

@@ -1,28 +1,60 @@
 # Installation
-proophessor-do offers you three options to install the demo application. We support Vagrant, Docker and have manual 
+*proophessor-do* offers you three options to install the demo application. We support *Vagrant*, *Docker* and have *manual* 
 instructions.
 
+> Docker is the recommended and fastest installation method
+
 At first, please clone this repository by running `git clone https://github.com/prooph/proophessor-do.git` or download 
-it manually from GitHub. If you use a own local web server, put this project to the document root of the local web 
-server. Now navigate to the proophessor-do directory.
+it manually from GitHub. 
+
+If you use a own local web server, put this project to the document root of the local web 
+server and navigate to the proophessor-do directory and follow the *Do it manually* instructions.
 
 ## Using Docker
-First ensure [Docker](https://docs.docker.com/engine/installation/ubuntulinux/) and [Docker Compose](https://docs.docker.com/compose/install/) are installed. It's recommended to use the latest version of Docker and 
-Docker Compose. Now install the dependencies and start the containers. Docker will now download all dependencies and 
-starts the containers. This may take a while ...
+First ensure [Docker](https://docs.docker.com/engine/installation/ubuntulinux/) and [Docker Compose](https://docs.docker.com/compose/install/) 
+are installed. It's recommended to use the latest version of Docker and Docker Compose. Docker will download all 
+dependencies and starts the containers.
+
+### Step 1 - Install dependencies
+
+To ensure you have the latest Docker images for the default application execute:
+
+```bash
+$ docker pull prooph/php:5.6-fpm && docker pull prooph/composer:5.6 && docker pull prooph/nginx:www
+```
+
+Install PHP dependencies via Composer
+
+```bash
+$ docker run --rm -it --volume $(pwd):/app prooph/composer:5.6 install -o --prefer-dist
+```
+
+Now start your Docker Container so we can use Docker Compose for the next steps
 
 ```bash
-$ docker run --rm -it --volume $(pwd):/app composer/composer:master install --no-dev -o --prefer-dist --ignore-platform-reqs
 $ docker-compose up -d
 ```
 
-Call the MySQL setup script with:
+### Step 2 - Install event store adapter
+
+*prooph* offers two database adapters for `prooph/event-store` (at the moment).
+
+The read model uses MySQL so it's important to execute the MySQL setup. This configures also MySQL for the event store.
 
 ```bash
+$ docker run --rm -it --volume $(pwd):/app prooph/composer:5.6 require prooph/event-store-doctrine-adapter -o --prefer-dist
 $ docker-compose run --rm php sh bin/setup_mysql.sh
 ```
 
-Now open [http://localhost:8080](http://localhost:8080/).
+If you want to use MongoDB (only PHP 5.6 supported) for the event store execute also:
+
+```bash
+$ docker run --rm -it --volume $(pwd):/app prooph/composer:5.6 require prooph/event-store-mongodb-adapter -o --prefer-dist
+$ docker-compose run --rm php sh bin/setup_mongodb.sh
+```
+
+### Step 3 - That's it
+Now open [http://localhost:8080](http://localhost:8080/) and have fun.
 
 ## Using Vagrant
 Please install the following software if not already installed:
@@ -37,9 +69,12 @@ $: vagrant up
 
 All dependencies will be downloaded. This may take a while ...
 
-Now open [http://localhost:8080](http://localhost:8080/).
+Now open [http://localhost:8080](http://localhost:8080/) and have fun.
 
 ## Do it manually
+This is the hard way. Please ensure that you not want to use Docker. ;-)
+
+### Step 1 - Get source code
 
 `git clone https://github.com/prooph/proophessor-do.git` into the document root of a local web server.
 
@@ -54,6 +89,8 @@ Pick the one you want to play with and install it via composer.
 
 #### MongoDB Adapter
 
+> Only PHP <= 5.6 is currently supported
+
 `composer require prooph/event-store-mongodb-adapter`
 
 ### Step 3 - Configure Database
@@ -104,7 +141,7 @@ you should perform the [migrations](../migrations/) by running `php bin/migratio
 ### Step 4 - View It
 
 Open a terminal and navigate to the project root. Then start the PHP built-in web server with `php -S 0.0.0.0:8080 -t public`
-and open `http://localhost:8080/` in a browser.
+and open [http://localhost:8080](http://localhost:8080/) in a browser.
 
 *Note: You can also set the environmental variable `PROOPH_ENV` to `development`. That will forward exception messages to the client in case of an error.
 When using the built-in web server you can set the variable like so: `PROOPH_ENV=development php -S 0.0.0.0:8080 -t public`*

docs/installation.md

@@ -0,0 +1,32 @@
+<?php
+
+namespace Prooph\ProophessorDo\Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+use Prooph\ProophessorDo\Projection\Table;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20160304162921 extends AbstractMigration
+{
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $todo = $schema->getTable(Table::TODO);
+        $todo->addColumn('reminder', 'string', ['default' => null, 'notnull' => false, 'length' => 30]);
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema)
+    {
+        $todo = $schema->getTable(Table::TODO);
+        $todo->dropColumn('reminder');
+    }
+}