Merge pull request #57 from prooph/develop

prooph/psr7-middleware and expressive 1.0

Author: Alexander Miertsch

.coveralls.yml

@@ -1,4 +1,3 @@
 # for php-coveralls
 service_name: travis-ci
-src_dir: src
 coverage_clover: build/logs/clover.xml

.php_cs

@@ -2,7 +2,7 @@
 $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->in('src')
     ->in('config')
-    ->in('view')
+    ->in('templates')
     ->in('tests')
     ->in('scripts')
     ->in('migrations');

.travis.yml

@@ -13,7 +13,7 @@ script:
   - php ./vendor/bin/phpunit --coverage-text --coverage-clover ./build/logs/clover.xml
   - ./vendor/bin/php-cs-fixer fix -v --diff --dry-run
 
-after_script:
+after_success:
   - php vendor/bin/coveralls -v
 
 notifications:

bin/migrations.php

@@ -5,7 +5,7 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
- * 
+ *
  * Date: 9/5/15 - 10:10 PM
  */
 /**
@@ -17,7 +17,7 @@
 // Setup autoloading
 require 'vendor/autoload.php';
 
-$container = require 'config/services.php';
+$container = require 'config/container.php';
 
 $cli = new \Symfony\Component\Console\Application('Doctrine Command Line Interface', \Doctrine\DBAL\Migrations\MigrationsVersion::VERSION());
 

bin/setup_mongodb.sh

@@ -4,11 +4,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
 echo "using adapter mongodb"
-touch ./config/mongo_client.local.php
+touch ./config/autoload/mongo_client.local.php
 
 php composer.phar require prooph/event-store-mongodb-adapter --update-no-dev -o --prefer-dist
 
-cat > config/mongo_client.local.php << EOL
+cat > config/autoload/mongo_client.local.php << EOL
 <?php
 return [
         'mongo_client' => function () {
@@ -18,7 +18,7 @@ return [
     ];
 EOL
 
-    cat > config/event_store.local.php << EOL
+    cat > config/autoload/event_store.local.php << EOL
 <?php
 return [
     'prooph' => [

bin/setup_mysql.sh

@@ -4,11 +4,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR
 
 echo "using adapter: mysql"
-touch ./config/dbal_connection.local.php
+touch ./config/autoload/dbal_connection.local.php
 
 php composer.phar require prooph/event-store-doctrine-adapter --update-no-dev -o --prefer-dist
 
-cat > config/dbal_connection.local.php <<EOL
+cat > config/autoload/dbal_connection.local.php <<EOL
 <?php
 return [
     'doctrine' => [
@@ -30,7 +30,7 @@ return [
  ];
 EOL
 
-cat > config/event_store.local.php <<EOL
+cat > config/autoload/event_store.local.php <<EOL
 <?php
 return [
     'prooph' => [

bin/snapshot_server.php

@@ -8,7 +8,7 @@
 
 require_once 'vendor/autoload.php';
 
-$container = require 'config/services.php';
+$container = require 'config/container.php';
 
 $context = new ZMQContext;
 $socket = new ZMQSocket($context, ZMQ::SOCKET_PULL);

composer.json

@@ -4,14 +4,25 @@
     "license": "BSD-3-Clause",
     "keywords": [
         "example",
+        "prooph",
         "proophessor",
-        "zf2"
+        "zend-expressive",
+        "cqrs",
+        "service bus",
+        "event sourcing",
+        "snapshots",
+        "integration"
     ],
     "authors": [
         {
             "name": "Alexander Miertsch",
             "email": "[email protected]",
-            "homepage": "http://www.prooph.de"
+            "homepage": "http://prooph-software.com/"
+        },
+        {
+            "name": "Sandro Keil",
+            "email": "[email protected]",
+            "homepage": "http://prooph-software.com/"
         },
         {
             "name": "Sascha-Oliver Prolic",
@@ -20,26 +31,33 @@
     ],
     "homepage": "http://getprooph.org/",
     "require": {
-        "php": "~5.5|~7.0",
-        "prooph/event-store" : "^6.0",
-        "prooph/event-sourcing" : "^4.0",
-        "prooph/service-bus" : "^5.0",
-        "prooph/event-store-bus-bridge" : "^2.0",
-        "zendframework/zend-expressive" : "^0.3",
-        "zendframework/zend-servicemanager" : "~2.6",
-        "zendframework/zend-config": "^2.5",
-        "zendframework/zend-view": "^2.5",
-        "zendframework/zend-filter": "^2.5",
+        "php": "^5.5 || ^7.0",
         "aura/router" : "^2.3",
         "doctrine/dbal": "^2.5",
         "doctrine/migrations": "^1.0",
-        "nicolopignatelli/valueobjects": "~3.0",
-        "sandrokeil/interop-config": "^0.3.1"
+        "nicolopignatelli/valueobjects": "^3.0",
+        "prooph/event-sourcing" : "^4.0",
+        "prooph/event-store" : "^6.0",
+        "prooph/event-store-bus-bridge" : "^2.0",
+        "prooph/psr7-middleware": "^0.1",
+        "prooph/service-bus" : "^5.0",
+        "roave/security-advisories": "dev-master",
+        "sandrokeil/interop-config": "^0.3.1",
+        "zendframework/zend-config": "^2.6",
+        "zendframework/zend-expressive" : "^1.0",
+        "zendframework/zend-expressive-aurarouter": "^1.0",
+        "zendframework/zend-expressive-helpers": "^2.0",
+        "zendframework/zend-expressive-zendviewrenderer": "^1.0.1",
+        "zendframework/zend-filter": "^2.6",
+        "zendframework/zend-servicemanager" : "^2.7.5 || ^3.0.3"
     },
     "require-dev" : {
-        "fabpot/php-cs-fixer": "1.7.*",
-        "phpunit/phpunit": "^4.7",
-        "symfony/stopwatch": "^2.7"
+        "fabpot/php-cs-fixer": "^1.9.3",
+        "filp/whoops": "^1.1",
+        "phpunit/phpunit": "^4.8 || ^5.2",
+        "proophsoftware/prooph-cli": "^0.1.2",
+        "symfony/stopwatch": "^2.7",
+        "satooshi/php-coveralls": "^1.0"
     },
     "suggest" : {
         "prooph/event-store-doctrine-adapter" : "^3.0 Use doctrine dbal event store adapter",

config/autoload/.gitignore

@@ -0,0 +1,2 @@
+local.php
+*.local.php

config/autoload/config.global.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'debug' => true,
+
+    'config_cache_enabled' => false,
+];