.gitattributes

@@ -6,4 +6,6 @@
 .gitignore        export-ignore
 .php_cs           export-ignore
 .travis.yml       export-ignore
-phpunit.xml.dist  export-ignore
+.travis.install-mysql-5.7.sh       export-ignore
+phpunit.xml.pdo_mysql  export-ignore
+phpunit.xml.pdo_pgsql  export-ignore

.gitignore

@@ -4,6 +4,7 @@
 /vendor
 /build
 .idea
+phpunit.xml
 .php_cs.cache
 nbproject
 composer.lock

.travis.install-mysql-5.7.sh

@@ -0,0 +1,6 @@
+echo mysql-apt-config mysql-apt-config/select-server select mysql-5.7 | sudo debconf-set-selections
+wget http://dev.mysql.com/get/mysql-apt-config_0.7.3-1_all.deb
+sudo dpkg --install mysql-apt-config_0.7.3-1_all.deb
+sudo apt-get update -q
+sudo apt-get install -q -y -o Dpkg::Options::=--force-confnew mysql-server
+sudo mysql_upgrade

.travis.yml

@@ -4,13 +4,73 @@ matrix:
   fast_finish: true
   include:
     - php: 7.1
+      env:
+        - DEPENDENCIES=""
+        - DRIVER="pdo_mysql"
+        - DB=mysql_5_6
+    - php: 7.1
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - DRIVER="pdo_mysql"
+        - DB=mysql_5_6
+    - php: 7.1
+      sudo: true
+      env:
+        - DEPENDENCIES=""
+        - DRIVER="pdo_mysql"
+        - DB=mysql_5.7
+    - php: 7.1
+      sudo: true
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - DRIVER="pdo_mysql"
+        - DB=mysql_5.7
+    - php: 7.1
+      env:
+        - DEPENDENCIES=""
+        - DRIVER="pdo_pgsql"
+        - DB=postgres_9.3
+      addons:
+        postgresql: '9.3'
+    - php: 7.1
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - DRIVER="pdo_pgsql"
+        - DB=postgres_9.3
+      addons:
+        postgresql: '9.3'
+    - php: 7.1
+      env:
+        - DEPENDENCIES=""
+        - DRIVER="pdo_pgsql"
+        - DB=postgres_9.4
+      addons:
+        postgresql: '9.4'
+    - php: 7.1
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - DRIVER="pdo_pgsql"
+        - DB=postgres_9.4
+      addons:
+        postgresql: '9.4'
+    - php: 7.1
+      dist: trusty
       env:
         - DEPENDENCIES=""
         - EXECUTE_CS_CHECK=true
         - TEST_COVERAGE=true
+        - DRIVER="pdo_pgsql"
+        - DB=postgres_9.5
+      addons:
+        postgresql: '9.5'
     - php: 7.1
+      dist: trusty
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
+        - DRIVER="pdo_pgsql"
+        - DB=postgres_9.5
+      addons:
+postgresql: '9.5'
 
 cache:
   directories:
@@ -21,10 +81,14 @@ cache:
 before_script:
   - mkdir -p "$HOME/.php-cs-fixer"
   - phpenv config-rm xdebug.ini
+  - if [[ $DB == 'mysql_5.7' ]]; then bash .travis.install-mysql-5.7.sh; fi
+  - if [[ $DRIVER == 'pdo_mysql' ]]; then mysql -e 'create database snapshot_tests;'; fi
+  - if [[ $DRIVER == 'pdo_pgsql' ]]; then psql -c 'create database snapshot_tests;' -U postgres; fi
   - composer self-update
   - composer update --prefer-dist $DEPENDENCIES
 
 script:
+  - cp phpunit.xml.$DRIVER phpunit.xml
   - if [[ $TEST_COVERAGE == 'true' ]]; then php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml; else ./vendor/bin/phpunit; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run; fi
   - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/docheader check src/ tests/; fi

composer.json

@@ -25,36 +25,36 @@
     "prefer-stable": true,
     "require": {
         "php": "^7.1",
-        "prooph/event-sourcing" : "5.0.x-dev"
+        "prooph/event-sourcing" : "^5.0.0-beta"
     },
     "require-dev": {
         "container-interop/container-interop": "^1.1",
-        "sandrokeil/interop-config": "^1.0",
-        "phpunit/phpunit": "^5.6",
-        "phpunit/phpunit-mock-objects": "^3.3.1",
-        "phpspec/prophecy": "dev-patch-1 as 1.6.1",
+        "sandrokeil/interop-config": "^2.0.1",
+        "phpunit/phpunit": "^5.7.3",
+        "phpspec/prophecy": "dev-patch-1 as 1.6.2",
         "prooph/php-cs-fixer-config": "^0.1.1",
         "satooshi/php-coveralls": "^1.0",
-        "zendframework/zend-servicemanager": "~2.6",
+        "sebastian/comparator": "^1.2.2",
+        "zendframework/zend-servicemanager": "^3.1",
         "malukenho/docheader": "^0.1.4"
     },
     "suggest" : {
-        "prooph/pdo-event-store": "For usage with MySQL or Postgres as event store",
-        "prooph/service-bus" : "Message bus facade to connect the event store with messaging systems",
+        "prooph/pdo-event-store": "^1.0 For usage with MySQL or Postgres as event store",
+        "prooph/snapshotter": "^2.0 Taking snapshots with ease",
         "container-interop/container-interop": "For usage of provided factories",
         "sandrokeil/interop-config": "For usage of provided factories"
     },
     "conflict": {
-        "sandrokeil/interop-config": "<1.0"
+        "sandrokeil/interop-config": "<2.0.1"
     },
     "autoload": {
         "psr-4": {
-            "Prooph\\PDOSnapshotStore\\": "src/"
+            "Prooph\\PDO\\SnapshotStore\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "ProophTest\\PDOSnapshotStore\\": "tests/"
+            "ProophTest\\PDO\\SnapshotStore\\": "tests/"
         }
     },
     "extra": {

phpunit.xml.dist → phpunit.xml.pdo_mysql

@@ -20,4 +20,13 @@
             <directory>./src/</directory>
         </whitelist>
     </filter>
+
+    <php>
+        <var name="db_type" value="pdo_mysql"/>
+        <var name="db_host" value="127.0.0.1" />
+        <var name="db_username" value="root" />
+        <var name="db_password" value="" />
+        <var name="db_name" value="snapshot_tests" />
+        <var name="db_port" value="3306"/>
+    </php>
 </phpunit>

phpunit.xml.pdo_pgsql

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuite name="Prooph PDO Snapshot Store Test Suite">
+        <directory>./tests</directory>
+    </testsuite>
+
+    <filter>
+        <whitelist>
+            <directory>./src/</directory>
+        </whitelist>
+    </filter>
+
+    <php>
+        <var name="db_type" value="pdo_pgsql"/>
+        <var name="db_host" value="localhost" />
+        <var name="db_username" value="postgres" />
+        <var name="db_password" value="" />
+        <var name="db_name" value="snapshot_tests" />
+        <var name="db_port" value="5432"/>
+    </php>
+</phpunit>

scripts/mysql_snapshot_table.sql

@@ -0,0 +1,8 @@
+CREATE TABLE `snapshots` (
+  `aggregate_id` VARCHAR(150) NOT NULL,
+  `aggregate_type` VARCHAR(150) NOT NULL,
+  `last_version` INT(11) NOT NULL,
+  `created_at` CHAR(26) NOT NULL,
+  `aggregate_root` BLOB,
+  UNIQUE KEY `ix_aggregate_id` (`aggregate_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin;

scripts/postgres_snapshot_table.sql

@@ -0,0 +1,8 @@
+CREATE TABLE snapshots (
+  aggregate_id VARCHAR(150) NOT NULL,
+  aggregate_type VARCHAR(150) NOT NULL,
+  last_version INT NOT NULL,
+  created_at CHAR(26) NOT NULL,
+  aggregate_root BYTEA,
+  UNIQUE (aggregate_id)
+);

src/Container/PDOSnapshotStoreFactory.php

@@ -0,0 +1,121 @@
+<?php
+/**
+ * This file is part of the prooph/pdo-snapshot-store.
+ * (c) 2016-2016 prooph software GmbH <contact@prooph.de>
+ * (c) 2016-2016 Sascha-Oliver Prolic <saschaprolic@googlemail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Prooph\PDO\SnapshotStore\Container;
+
+use Interop\Config\ConfigurationTrait;
+use Interop\Config\ProvidesDefaultOptions;
+use Interop\Config\RequiresConfigId;
+use Interop\Container\ContainerInterface;
+use PDO;
+use Prooph\PDO\SnapshotStore\PDOSnapshotStore;
+
+class PDOSnapshotStoreFactory implements ProvidesDefaultOptions, RequiresConfigId
+{
+    use ConfigurationTrait;
+
+    /**
+     * @var string
+     */
+    private $configId;
+
+    /**
+     * @var array
+     */
+    private $driverSchemeAliases = [
+        'pdo_mysql' => 'mysql',
+        'pdo_pgsql' => 'pgsql',
+    ];
+
+    private $driverSchemeSeparators = [
+        'pdo_mysql' => ';',
+        'pdo_pgsql' => ' ',
+    ];
+
+    /**
+     * Creates a new instance from a specified config, specifically meant to be used as static factory.
+     *
+     * In case you want to use another config key than provided by the factories, you can add the following factory to
+     * your config:
+     *
+     * <code>
+     * <?php
+     * return [
+     *     PDOSnapshotStore::class => [PDOSnapshotStoreFactory::class, 'service_name'],
+     * ];
+     * </code>
+     *
+     * @throws \InvalidArgumentException
+     */
+    public static function __callStatic(string $name, array $arguments): PDOSnapshotStore
+    {
+        if (! isset($arguments[0]) || ! $arguments[0] instanceof ContainerInterface) {
+            throw new \InvalidArgumentException(
+                sprintf('The first argument must be of type %s', ContainerInterface::class)
+            );
+        }
+
+        return (new static($name))->__invoke($arguments[0]);
+    }
+
+    public function __invoke(ContainerInterface $container): PDOSnapshotStore
+    {
+        $config = $container->get('config');
+        $config = $this->options($config, $this->configId);
+
+        if (isset($config['connection_service'])) {
+            $connection = $container->get($config['connection_service']);
+        } else {
+            $separator = $this->driverSchemeSeparators[$config['connection_options']['driver']];
+            $dsn = $this->driverSchemeAliases[$config['connection_options']['driver']] . ':';
+            $dsn .= 'host=' . $config['connection_options']['host'] . $separator;
+            $dsn .= 'port=' . $config['connection_options']['port'] . $separator;
+            $dsn .= 'dbname=' . $config['connection_options']['dbname'] . $separator;
+            $dsn = rtrim($dsn);
+            $user = $config['connection_options']['user'];
+            $password = $config['connection_options']['password'];
+            $connection = new PDO($dsn, $user, $password);
+        }
+
+        return new PDOSnapshotStore(
+            $connection,
+            $config['snapshot_table_map'],
+            $config['default_snapshot_table_name']
+        );
+    }
+
+    public function __construct(string $configId = 'default')
+    {
+        $this->configId = $configId;
+    }
+
+    public function dimensions(): iterable
+    {
+        return ['prooph', 'pdo_snapshot_store'];
+    }
+
+    public function defaultOptions(): iterable
+    {
+        return [
+            'connection_options' => [
+                'driver' => 'pdo_mysql', // or use pdo_pgsql
+                'user' => 'root',
+                'password' => '',
+                'host' => '127.0.0.1',
+                'dbname' => 'snapshot_store',
+                'port' => 3306, // or use 5432 for pgsql (default)
+            ],
+            'snapshot_table_map' => [],
+            'default_snapshot_table_name' => 'snapshots',
+        ];
+    }
+}