Addition of 'void' Return Type Declaration in AbstractSpatialDQLFunction

.travis.yml

@@ -3,18 +3,26 @@ language: php
 sudo: false
 
 php:
-  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
   - hhvm
 
 env:
   - ORM=2.3
   - ORM=2.4
   - ORM=2.5
 
+addons:
+  postgresql: 9.6
+  apt:
+    packages:
+    - postgresql-9.6-postgis-2.3
+
+
 before_script:
   - composer self-update
   - cp ./tests/travis/composer.orm$ORM.json ./composer.json

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

@@ -4,10 +4,10 @@
 
 Use these instructions if you're using Doctrine with Symfony2 , otherwise the OrmTest.php test class shows their use with Doctrine alone.
 
-Require the `CrEOF/spatial2-doctrine` package in your composer.json and update
+Require the `CrEOF/doctrine2-spatial` package in your composer.json and update
 your dependencies.
 
-    $ composer require CrEOF/spatial2-doctrine
+    $ composer require CrEOF/doctrine2-spatial
 
 ## composer.json
 

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

@@ -66,8 +66,10 @@ abstract class AbstractSpatialDQLFunction extends FunctionNode
 
     /**
      * @param Parser $parser
+     *
+     * @return void
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
         $lexer = $parser->getLexer();
 
@@ -94,19 +96,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 +113,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/STDistanceSphere.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Copyright (C) 2013 Christian Bieg
+ *
+ * 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;
+
+/**
+ * STDistance DQL function
+ *
+ * @author  Christian Bieg <[email protected]>
+ * @license http://dlambert.mit-license.org MIT
+ */
+class STDistanceSphere extends AbstractSpatialDQLFunction {
+
+    protected $platforms = array('mysql');
+    protected $functionName = 'ST_Distance_SPHERE';
+    protected $minGeomExpr = 2;
+    protected $maxGeomExpr = 2;
+
+}

lib/CrEOF/Spatial/ORM/Query/AST/Functions/MySql/STGeomFromText

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (C) 2020 Dezandee Charles-emmanuel
+ *
+ * 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;
+
+/**
+ * STGeomFromText DQL function
+ *
+ * @author  Dezandee Charles-emmanuel <[email protected]>
+ */
+class STGeomFromText extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_GEOMFROMTEXT';
+
+    protected $minGeomExpr = 1;
+
+    protected $maxGeomExpr = 1;
+}

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

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright (C) 2012 Christian Bieg
+ *
+ * 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_GeomFromText DQL function
+ *
+ * @author  Christian Bieg <[email protected]>
+ */
+class STGeomFromText extends AbstractSpatialDQLFunction
+{
+    protected $platforms = array('mysql');
+
+    protected $functionName = 'ST_GeomFromText';
+
+    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;
+}