Merging changes

Author: Jon West

INSTALL.md

@@ -3,7 +3,7 @@
 ## composer.json
     "require": {
     	...
-        "slavenin/doctrine2-spatial": "dev-master"
+        "ddproxy/doctrine2-spatial": "dev-master"
 
 You will also have to change the version requirement of doctrine to at least 2.1:
 
@@ -49,4 +49,4 @@ Example:
 	    protected $minGeomExpr = 2;
 		/*max params  count*/
 		protected $maxGeomExpr = 2;
-	}
+	}

README.md

@@ -2,7 +2,16 @@
 
 Doctrine2 multi-platform support for spatial types and functions. Currently MySQL and PostgreSQL with PostGIS are supported. Could potentially add support for other platforms if an interest is expressed.
 
-This package is a refactor/continuation of my [doctrine2-mysql-spatial](https://github.com/djlambert/doctrine2-mysql-spatial) package.
+This package is a refactor/continuation of djlamberts [doctrine2-spatial](https://github.com/djlambert/doctrine2-spatial) package.
+
+# Symfony2 Install
+
+## composer.json
+    "require": {
+    	...
+        "ddproxy/doctrine2-spatial": "dev-master"
+
+# Package details
 
 ## Types
 The following SQL/OpenGIS types have been implemented as PHP objects and accompanying Doctrine types:

lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STMakeEnvelope.php

@@ -39,7 +39,7 @@ class STMakeEnvelope extends AbstractSpatialDQLFunction
 
     protected $functionName = 'ST_MakeEnvelope';
 
-    protected $minGeomExpr = 5;
+    protected $minGeomExpr = 4;
 
     protected $maxGeomExpr = 5;
 }