Draft: Add holtkamp mysql 80 support

.travis.yml

@@ -8,6 +8,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 env:

doc/configuration.md

@@ -12,11 +12,10 @@ Add the types and functions you need to your Symfony configuration file. The doc
 	    orm:
 	        dql:
 	            numeric_functions:
-	                numeric_functions:
-					st_contains:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\STContains
-					contains:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\Contains
-					st_area:         CrEOF\Spatial\ORM\Query\AST\Functions\MySql\Area
-					st_geomfromtext: CrEOF\Spatial\ORM\Query\AST\Functions\MySql\GeomFromText
-					st_intersects:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\STIntersects
-                	st_buffer:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\STBuffer
-					point: CrEOF\Spatial\ORM\Query\AST\Functions\MySql\Point
+			st_contains:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\STContains
+			contains:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\Contains
+			st_area:         CrEOF\Spatial\ORM\Query\AST\Functions\MySql\Area
+			st_geomfromtext: CrEOF\Spatial\ORM\Query\AST\Functions\MySql\GeomFromText
+			st_intersects:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\STIntersects
+			st_buffer:     CrEOF\Spatial\ORM\Query\AST\Functions\MySql\STBuffer
+			point: CrEOF\Spatial\ORM\Query\AST\Functions\MySql\Point

doc/install.md

@@ -7,7 +7,7 @@ Use these instructions if you're using Doctrine with Symfony2 , otherwise the Or
 Require the `CrEOF/spatial2-doctrine` package in your composer.json and update
 your dependencies.
 
-    $ composer require CrEOF/spatial2-doctrine
+    $ composer require CrEOF/doctrine2-spatial
 
 ## composer.json
 

lib/CrEOF/Spatial/DBAL/Platform/MySql.php

@@ -25,6 +25,7 @@
 
 use CrEOF\Spatial\DBAL\Types\AbstractSpatialType;
 use CrEOF\Spatial\PHP\Types\Geography\GeographyInterface;
+use CrEOF\Spatial\DBAL\Types\GeographyType;
 
 /**
  * MySql spatial platform
@@ -34,6 +35,22 @@
  */
 class MySql extends AbstractPlatform
 {
+    /**
+     * For Geographic types MySQL follows the WKT specifications and returns (latitude,longitude) while (x,y) / (longitude,latitude) is expected.
+     *
+     * Using the following option the preferred axis-order can be indicated.
+     *
+     * @var string
+     */
+    const AXIS_ORDER_OPTION = 'axis-order=long-lat';
+
+    /**
+     * Optionally a SRID can be set to be used for Geographic types.
+     *
+     * @var int|null
+     */
+    public static $srid;
+
     /**
      * Gets the SQL declaration snippet for a field of this type.
      *
@@ -58,7 +75,9 @@ public function getSQLDeclaration(array $fieldDeclaration)
      */
     public function convertToPHPValueSQL(AbstractSpatialType $type, $sqlExpr)
     {
-        return sprintf('AsBinary(%s)', $sqlExpr);
+        return $type instanceof GeographyType
+            ? sprintf('ST_AsBinary(%s, "%s")', $sqlExpr, self::AXIS_ORDER_OPTION)
+            : sprintf('ST_AsBinary(%s)', $sqlExpr);
     }
 
     /**
@@ -69,6 +88,9 @@ public function convertToPHPValueSQL(AbstractSpatialType $type, $sqlExpr)
      */
     public function convertToDatabaseValueSQL(AbstractSpatialType $type, $sqlExpr)
     {
-        return sprintf('GeomFromText(%s)', $sqlExpr);
+        return $type instanceof GeographyType && is_int(self::$srid)
+            ? sprintf('ST_GeomFromText(%s, %d)', $sqlExpr, self::$srid)
+            : sprintf('ST_GeomFromText(%s)', $sqlExpr);
     }
+
 }

lib/CrEOF/Spatial/DBAL/Types/Geography/MultiPolygonType.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (C) 2015 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\DBAL\Types\Geography;
+
+use CrEOF\Spatial\DBAL\Types\GeographyType;
+
+/**
+ * Doctrine MULTIPOLYGON type
+ *
+ * @author  Derek J. Lambert <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class MultiPolygonType extends GeographyType
+{
+
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php

@@ -94,19 +94,12 @@ public function getSql(SqlWalker $sqlWalker)
     {
         $this->validatePlatform($sqlWalker->getConnection()->getDatabasePlatform());
 
-        $result = sprintf('%s(', $this->functionName);
-
-        for ($i = 0, $size = count($this->geomExpr); $i < $size;) {
-            $result .= $this->geomExpr[$i]->dispatch($sqlWalker);
-
-            if (++$i < $size) {
-                $result .= ', ';
-            }
+        $arguments = array();
+        foreach ($this->geomExpr as $expression) {
+            $arguments[] = $expression->dispatch($sqlWalker);
         }
 
-        $result .= ')';
-
-        return $result;
+        return sprintf('%s(%s)', $this->functionName, implode(', ', $arguments));
     }
 
     /**
@@ -118,8 +111,10 @@ protected function validatePlatform(AbstractPlatform $platform)
     {
         $platformName = $platform->getName();
 
-        if (isset($this->platforms) && ! in_array($platformName, $this->platforms)) {
-            throw new UnsupportedPlatformException(sprintf('DBAL platform "%s" is not currently supported.', $platformName));
+        if (isset($this->platforms) && !in_array($platformName, $this->platforms)) {
+            throw new UnsupportedPlatformException(
+                sprintf('DBAL platform "%s" is not currently supported.', $platformName)
+            );
         }
     }
 }

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/STSRID.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2013 luca capra
+ *
+ * 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\MySql;
+
+use CrEOF\Spatial\ORM\Query\AST\Functions\AbstractSpatialDQLFunction;
+
+/**
+ * ST_SRID DQL function
+ *
+ * @author  luca capra <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class STSRID extends AbstractSpatialDQLFunction {
+
+    protected $platforms = array('mysql');
+    protected $functionName = 'ST_SRID';
+    protected $minGeomExpr = 1;
+    protected $maxGeomExpr = 2;
+
+}

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

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (C) 2016 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;
+
+/**
+ * Geometry DQL function
+ *
+ * @author  Derek J. Lambert <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class Geometry extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'geometry';
+
+    protected $minGeomExpr = 1;
+
+    protected $maxGeomExpr = 1;
+}

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

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright (C) 2016 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;
+
+/**
+ * ST_Collect DQL function
+ *
+ * @author  Derek J. Lambert <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class STCollect extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Collect';
+
+    protected $minGeomExpr = 1;
+
+    protected $maxGeomExpr = 2;
+}

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

@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * Copyright (C) 2017 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;
+
+/**
+ * ST_Overlaps DQL function.
+ *
+ * @author  Dragos Protung
+ * @license http://mit-license.org MIT
+ */
+class STOverlaps extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('postgresql');
+
+    protected $functionName = 'ST_Overlaps';
+
+    protected $minGeomExpr = 2;
+
+    protected $maxGeomExpr = 2;
+}