Fixing merge conflicts (1/3)

private property replace into a protected property. removing final key words. Removing references to alexandret package for merge in creof project.
creof · Jun 4, 2020 · 628894c · 628894c
1 parent 0d4c1af
commit 628894c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "alexandret/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"],

diff --git a/docs/Installation.rst b/docs/Installation.rst
@@ -4,19 +4,19 @@ Installation
 Installation via composer
 -------------------------
 
-Add the `alexandret/spatial2-doctrine` package in your composer.json.
+Add the `creof/spatial2-doctrine` package in your composer.json.
 
 .. code-block:: bash
 
-    $ composer require alexandret/doctrine2-spatial
+    $ composer require creof/doctrine2-spatial
 
 Or you can edit directly `composer.json` file by adding this line on your requirements:
 
 .. code-block:: javascript
 
     "require": {
     	...
-        "alexandret/doctrine2-spatial": "^2.0"
+        "creof/doctrine2-spatial": "^2.0"
 
 Be careful, the version 2.0.0 will only be available at the end of march 2020.
 

diff --git a/lib/CrEOF/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php b/lib/CrEOF/Spatial/ORM/Query/AST/Functions/AbstractSpatialDQLFunction.php
@@ -59,7 +59,7 @@ abstract class AbstractSpatialDQLFunction extends FunctionNode
     /**
      * @var Node[]
      */
-    private $geometryExpression = [];
+    protected $geometryExpression = [];
 
     /**
      * Get the SQL.
@@ -117,7 +117,7 @@ public function parse(Parser $parser)
      *
      * @since 2.0 This function replace the protected property geomExpr which is now private.
      */
-    final protected function addGeometryExpression(Node $expression): self
+    protected function addGeometryExpression(Node $expression): self
     {
         $this->geometryExpression[] = $expression;
 
@@ -138,7 +138,7 @@ abstract protected function getFunctionName(): string;
      *
      * @return Node[]
      */
-    final protected function getGeometryExpressions(): array
+    protected function getGeometryExpressions(): array
     {
         return $this->geometryExpression;
     }

diff --git a/tests/travis/composer.orm2.8.json b/tests/travis/composer.orm2.8.json
@@ -1,5 +1,5 @@
 {
-    "name": "alexandret/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"],