Merge pull request #1089 from wagnert/master

Switch to appserver-io/console 3.0 to add command to load Doctrine Fi…

.travis.yml

@@ -15,9 +15,10 @@ before_install:
   - pecl install xdebug-2.5.5
   - phpenv rehash
   - wget https://scrutinizer-ci.com/ocular.phar
+  - wget https://getcomposer.org/composer.phar
 
 script:
-  - composer update
+  - php -d memory_limit=-1 composer.phar update
   - vendor/bin/robo build
   - php ocular.phar code-coverage:upload --format=php-clover $TRAVIS_BUILD_DIR/target/reports/unit/clover.xml
 

CHANGELOG.md

@@ -1,3 +1,14 @@
+Version 1.1.5-beta7
+
+## Bugfixes
+
+* None
+
+## Features
+
+* Switch to appserver-io/console 3.0 to add command to load Doctrine Fixtures
+* Temporary persist entity manager names in PersistenceManager instance to allow loading an applications default entity manager by name
+
 Version 1.1.5-beta6
 
 ## Bugfixes

build.default.properties

@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.5-beta6
+release.version = 1.1.5-beta7
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

composer.json

@@ -10,6 +10,7 @@
         "react/socket": "0.4.*",
         "react/socket-client": "0.5.0",
         "doctrine/orm": "2.5.*",
+        "doctrine/doctrine-fixtures-bundle" : "2.4.1",
         "league/event": "2.1.*",
         "symfony/var-dumper": "3.4.7",
         "zendframework/zend-diactoros" : "1.4.*",
@@ -29,7 +30,7 @@
         "appserver-io/logger": "1.0.*",
         "appserver-io/fastcgi" : "2.0.*",
         "appserver-io/routlt": "2.2.0-beta9",
-        "appserver-io/console": "2.0.*",
+        "appserver-io/console": "3.0.*",
         "appserver-io/storage": "2.0.*",
         "appserver-io/messaging": "3.0.*",
         "appserver-io/microcron": "1.0.*",