Clean up for merge

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "creof/doctrine2-spatial",
+    "name": "rleal/doctrine2-spatial",
     "type": "library",
     "description": "Doctrine2 multi-platform support for spatial types and functions",
     "keywords": ["orm", "dbal", "database", "postgresql", "mysql", "opengis", "postgis", "gis", "spatial", "geometry", "geography"],
@@ -11,7 +11,7 @@
     ],
     "license": "MIT",
     "require": {
-        "doctrine/orm": ">=2.1"
+        "doctrine/orm": ">=2.4"
     },
     "require-dev": {
         "doctrine/common": ">=2.1",

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

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (C) 2012 Derek J. Lambert
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+class STDistanceSphere extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Distance_Sphere';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+class STX extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_X';
+
+    protected $minGeomExpr = 1;
+
+    protected $maxGeomExpr = 1;
+}

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

@@ -0,0 +1,16 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+class STY extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Y';
+
+    protected $minGeomExpr = 1;
+
+    protected $maxGeomExpr = 1;
+}

phpunit.xml.dist

@@ -31,14 +31,14 @@
         <var name="db_username" value="postgres" />
         <var name="db_password" value="" />
         <var name="db_name" value="spatial_tests" />
-        <var name="db_port" value="5432" />
+        <var name="db_port" value="5433" />
 
         <!-- Database for temporary connections (i.e. to drop/create the main database) -->
         <var name="tmpdb_type" value="pdo_pgsql"/>
         <var name="tmpdb_host" value="localhost"/>
         <var name="tmpdb_username" value="postgres"/>
         <var name="tmpdb_password" value=""/>
         <var name="tmpdb_name" value="doctrine_tests_tmp"/>
-        <var name="tmpdb_port" value="5432"/>
+        <var name="tmpdb_port" value="5433"/>
     </php>
 </phpunit>