Merge branch 'pr/49'

Conflicts:
	README.md

Signed-off-by: Samuel Denis-D'Ortun <[email protected]>

Author: sadortun

.gitignore

@@ -1,2 +1,5 @@
 vendor/
 composer.lock*
+doctrine2-spatial.iml
+.idea*
+.idea/*

README.md

@@ -36,7 +36,11 @@ Currently the following SQL functions are supported in DQL (more coming):
 ### PostgreSQL
 * ST_Area
 * ST_AsBinary
+* ST_AsGeoJson
 * ST_AsText
+* ST_Azimuth
+* ST_Boundary
+* ST_Buffer
 * ST_Centroid
 * ST_ClosestPoint
 * ST_Contains
@@ -47,12 +51,25 @@ Currently the following SQL functions are supported in DQL (more coming):
 * ST_Disjoint
 * ST_Distance
 * ST_Envelope
+* ST_Expand
+* ST_Extent
 * ST_GeomFromText
+* ST_Intersection
+* ST_Intersects
 * ST_Length
 * ST_LineCrossingDirection
+* ST_LineInterpolatePoint
+* ST_MakeBox2D
+* ST_MakeLine
+* ST_Point
+* ST_Scale
+* ST_SetSRID
+* ST_Simplify
 * ST_StartPoint
 * ST_Summary
 * ST_Perimeter
+* ST_Touches
+* ST_Transform
 
 ### MySQL
 * Area

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_Buffer DQL function
+ */
+class STBuffer extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Buffer';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 3;
+}

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_Buffer DQL function
+ */
+class STExpand extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Expand';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_Buffer DQL function
+ */
+class STSimplify extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Simplify';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}

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

@@ -0,0 +1,19 @@
+<?php
+
+namespace CrEOF\Spatial\ORM\Query\AST\Functions\PostgreSql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_Buffer DQL function
+ */
+class STTransform extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Transform';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}