Merge branch 'master' into v0.1

# Conflicts: # src/Tests/PersistUnit/ModelTest.php
PHPPlatform · Jun 19, 2017 · 95c236a · 95c236a
2 parents 8053498 + ecf4c5d
commit 95c236a
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 70 deletions.
diff --git a/composer.json b/composer.json
@@ -21,12 +21,11 @@
 	],
 	"require" : {
 		"php" : ">=5.3",
-        "phpunit/phpunit" : "~4.8",
-        "phpunit/dbunit" : "~1.4",
-        "php-platform/mock-config" : "~0.1",
-        "php-platform/errors" : "~0.1"
-    },
-	"require-dev" : {
+		"phpunit/phpunit" : "~4.8",
+		"phpunit/dbunit" : "~1.4",
+		"php-platform/mock-config" : "~0.1",
+		"php-platform/errors" : "~0.1",
+		"php-platform/session" : "~0.1"
 	},
 	"autoload" : {
 		"psr-4" : {