From 20ccae89c798277da12f362664908c2ec32db2b8 Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Sat, 14 Mar 2015 21:11:27 +0100
Subject: [PATCH 1/8] new dql functions

---
 .../ORM/Query/AST/Functions/PostgreSql/STX.php   | 16 ++++++++++++++++
 .../ORM/Query/AST/Functions/PostgreSql/STY.php   | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STX.php
 create mode 100644 lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STY.php

diff --git a/lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STX.php b/lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STX.php
new file mode 100644
index 00000000..fd23b0aa
--- /dev/null
+++ b/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;
+}
diff --git a/lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STY.php b/lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STY.php
new file mode 100644
index 00000000..0e7107f3
--- /dev/null
+++ b/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;
+}

From d81d75e5f7bb975078e21b26b6d7e136e9f49dee Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Sat, 14 Mar 2015 22:23:51 +0100
Subject: [PATCH 2/8] tests require doctrine <2.4 major versions archive tests
 folder with dependent classes

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index c979c181..8089bb2a 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     ],
     "license": "MIT",
     "require": {
-        "doctrine/orm": ">=2.1"
+        "doctrine/orm": ">=2.1,<2.4"
     },
     "require-dev": {
         "doctrine/common": ">=2.1",

From 642383b5456b992208f38b66bc8f312e53992c60 Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Sat, 14 Mar 2015 22:42:50 +0100
Subject: [PATCH 3/8] Added ST_Distance_Sphere

---
 .../Functions/PostgreSql/STDistanceSphere.php | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STDistanceSphere.php

diff --git a/lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STDistanceSphere.php b/lib/CrEOF/Spatial/ORM/Query/AST/Functions/PostgreSql/STDistanceSphere.php
new file mode 100644
index 00000000..1483758d
--- /dev/null
+++ b/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;
+}

From 69e88dda5a192f1c535f11598d17607309b7c8b3 Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Sat, 14 Mar 2015 22:48:22 +0100
Subject: [PATCH 4/8] vendor name

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8089bb2a..3b8adb90 100644
--- a/composer.json
+++ b/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"],

From 11a0d8ac33627ae70ca8f380287ebf9c12ad43e1 Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Thu, 19 Mar 2015 13:08:05 +0100
Subject: [PATCH 5/8] database port changed

---
 phpunit.xml.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 67ff94f6..a271c07e 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -31,7 +31,7 @@
         <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"/>
@@ -39,6 +39,6 @@
         <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>

From ab33729a58758cf9d5a0c3667f0df1bb70d06ed7 Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Thu, 19 Mar 2015 19:19:20 +0100
Subject: [PATCH 6/8] .

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3b8adb90..ac120a53 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "rleal/doctrine2-spatial",
+    "name": "creof/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"],
@@ -24,4 +24,4 @@
             "CrEOF\\Spatial": "lib/"
         }
     }
-}
+}
\ No newline at end of file

From 438b0fb92c0dda5d0c4f14b20085b6bb0ee41c4f Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Thu, 19 Mar 2015 20:49:38 +0100
Subject: [PATCH 7/8] :s

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ac120a53..623bdee5 100644
--- a/composer.json
+++ b/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"],

From f658a05609e64d26e6e5202676720a070103df5b Mon Sep 17 00:00:00 2001
From: Raul Leal <leal.ra@gmail.com>
Date: Sat, 11 Apr 2015 20:28:26 +0200
Subject: [PATCH 8/8] required for ConsoleRunner::createHelperSet

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 623bdee5..9aa9b0ad 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     ],
     "license": "MIT",
     "require": {
-        "doctrine/orm": ">=2.1,<2.4"
+        "doctrine/orm": ">=2.4"
     },
     "require-dev": {
         "doctrine/common": ">=2.1",
@@ -24,4 +24,4 @@
             "CrEOF\\Spatial": "lib/"
         }
     }
-}
\ No newline at end of file
+}