Changed the code for point test cases

Author: p123-stack

.phpunit.result.cache

@@ -13,10 +13,6 @@
         <log type="testdox" target="php://stdout" />
     </logging>
 -->
-    <php>
-        <env name="NEO4J_ADDRESS" value="$_ENV['NEO4J_ADDRESS']" />
-        <env name="NEO4J_USERNAME" value="$_ENV['NEO4J_USERNAME']" />
-        <env name="NEO4J_PASSWORD" value="$_ENV['NEO4J_PASSWORD']" />
-    </php>
+
     <!-- No need to set sensitive information here -->
 </phpunit>

phpunit.dist.xml

@@ -29,7 +29,7 @@ public function map(array $object): mixed
         };
     }
 
-    private function parseWKT(string $wkt): Point
+    public static function parseWKT(string $wkt): Point
     {
         $sridPart = substr($wkt, 0, strpos($wkt, ';'));
         $srid = (int)str_replace('SRID=', '', $sridPart);
@@ -41,28 +41,16 @@ private function parseWKT(string $wkt): Point
         $pointPart = trim($pointPart, ' ()');
         $coordinates = explode(' ', $pointPart);
 
-        if (count($coordinates) == 2) {
-            list($longitude, $latitude) = $coordinates;
-            $x = (float)$longitude;
-            $y = (float)$latitude;
-            $z = 0.0;
-        } elseif (count($coordinates) == 3) {
-            list($longitude, $latitude, $height) = $coordinates;
-            $x = (float)$longitude;
-            $y = (float)$latitude;
-            $z = (float)$height;
+        if (count($coordinates) === 2) {
+            [$x, $y] = $coordinates;
+            $z = null;
+        } elseif (count($coordinates) === 3) {
+            [$x, $y, $z] = $coordinates;
         } else {
-            throw new InvalidArgumentException("Invalid WKT format: unable to parse coordinates.");
+            throw new \InvalidArgumentException("Invalid WKT format: unable to parse coordinates.");
         }
-        return new Point(
-            $longitude,
-            $latitude,
-            $z,
-            $x,
-            $y,
-            $z,
-            $srid
-        );
+
+        return new Point((float)$x, (float)$y, $z !== null ? (float)$z : null, $srid);
     }
 
 

src/OGM.php

@@ -3,79 +3,54 @@
 namespace Neo4j\QueryAPI\Objects;
 
 /**
- * Represents a geographical point with longitude, latitude, and SRID (Spatial Reference System Identifier).
+ * Represents a point with x, y, z coordinates, and SRID (Spatial Reference System Identifier).
  */
 class Point
 {
     /**
-     * @param float $longitude The longitude of the point.
-     * @param float $latitude The latitude of the point.
+     * @param float $x The x coordinate of the point.
+     * @param float $y The y coordinate of the point.
+     * @param float|null $z The z coordinate of the point, or null if not applicable.
      * @param int $srid The Spatial Reference System Identifier (SRID).
      */
     public function __construct(
-        public float $longitude,
-        public float $latitude,
-        public float $height,
         public float $x,
         public float $y,
-        public float $z,
-        public int   $srid,
+        public float|null $z,
+        public int $srid,
     ) {
     }
 
     /**
-     * Get the longitude of the point.
+     * Get the x coordinate of the point.
      *
-     * @return float Longitude value.
-     */
-    public function getLongitude(): float
-    {
-        return $this->longitude;
-    }
-
-    /**
-     * Get the latitude of the point.
-     *
-     * @return float Latitude value.
-     */
-    public function getLatitude(): float
-    {
-        return $this->latitude;
-    }
-    public function getHeight(): float
-    {
-        return $this->height;
-    }
-    /**
-     * Get the x of the point.
-     *
-     * @return float x value.
+     * @return float x coordinate value.
      */
     public function getX(): float
     {
         return $this->x;
     }
+
     /**
-     * Get the y of the point.
+     * Get the y coordinate of the point.
      *
-     * @return float y value.
+     * @return float y coordinate value.
      */
     public function getY(): float
     {
         return $this->y;
     }
 
     /**
-     * Get the z of the point.
+     * Get the z coordinate of the point.
      *
-     * @return float z value.
+     * @return float|null z coordinate value, or null if not applicable.
      */
-    public function getZ(): float
+    public function getZ(): float|null
     {
         return $this->z;
     }
 
-
     /**
      * Get the SRID (Spatial Reference System Identifier) of the point.
      *
@@ -89,10 +64,11 @@ public function getSrid(): int
     /**
      * Convert the Point object to a string representation.
      *
-     * @return string String representation in the format: "SRID=<srid>;POINT (<longitude> <latitude>)".
+     * @return string String representation in the format: "SRID=<srid>;POINT (<x> <y> <z>)".
      */
     public function __toString(): string
     {
-        return "SRID={$this->srid};POINT ({$this->longitude} {$this->latitude} {$this->x} {$this->y})";
+        $zValue = $this->z !== null ? " {$this->z}" : "";
+        return "SRID={$this->srid};POINT ({$this->x} {$this->y}{$zValue})";
     }
 }

src/Objects/Point.php

@@ -84,11 +84,13 @@ public function testWithWGS84_2DPoint(): void
         ]);
 
         $this->assertInstanceOf(Point::class, $point);
-        $this->assertEquals(1.2, $point->getLongitude());
-        $this->assertEquals(3.4, $point->getLatitude());
+        $this->assertEquals(1.2, $point->getX()); // x is longitude
+        $this->assertEquals(3.4, $point->getY()); // y is latitude
+        $this->assertNull($point->getZ()); // Ensure z is null for 2D point
         $this->assertEquals(4326, $point->getSrid());
     }
 
+
     public function testWithWGS84_3DPoint(): void
     {
         // Simulate mapping the raw WKT data into the Point object
@@ -98,9 +100,9 @@ public function testWithWGS84_3DPoint(): void
         ]);
 
         $this->assertInstanceOf(Point::class, $point);
-        $this->assertEquals(12.34, $point->getLongitude());
-        $this->assertEquals(56.78, $point->getLatitude());
-        $this->assertEquals(100.5, $point->getHeight());
+        $this->assertEquals(12.34, $point->getX());
+        $this->assertEquals(56.78, $point->getY());
+        $this->assertEquals(100.5, $point->getZ());
         $this->assertEquals(4979, $point->getSrid());
     }
 

src/Objects/Point_3D.php

@@ -82,7 +82,7 @@ private function createSubset(array $expected, array $actual): array
 
     public static function queryProvider(): array
     {
-        $decodedBinary = base64_decode('U29tZSByYW5kb20gYmluYXJ5IGRhdGE=');
+
         return [
             'testWithExactNames' => [
                 'MATCH (n:Person) WHERE n.name IN $names RETURN n.name',

tests/Integration/Neo4jOGMTest.php

@@ -20,7 +20,6 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        // Use environment variables from phpunit.xml
         $this->address = getenv('NEO4J_ADDRESS');
         $this->username = getenv('NEO4J_USERNAME');
         $this->password = getenv('NEO4J_PASSWORD');
@@ -32,26 +31,24 @@ public function testCorrectClientSetup(): void
 
         $this->assertInstanceOf(Neo4jQueryAPI::class, $neo4jQueryAPI);
 
-        // Use Reflection to get the client property
         $clientReflection = new \ReflectionClass(Neo4jQueryAPI::class);
         $clientProperty = $clientReflection->getProperty('client');
-        // Make private property accessible
         $client = $clientProperty->getValue($neo4jQueryAPI);
 
         $this->assertInstanceOf(Client::class, $client);
 
         $config = $client->getConfig();
         $this->assertEquals(rtrim($this->address, '/'), $config['base_uri']);
         $this->assertEquals('Basic ' . base64_encode("{$this->username}:{$this->password}"), $config['headers']['Authorization']);
-        $this->assertEquals('application/json', $config['headers']['Content-Type']);
+        $this->assertEquals('application/vnd.neo4j.query', $config['headers']['Content-Type']);
     }
 
     /**
      * @throws GuzzleException
      */
     public function testRunSuccess(): void
     {
-        // Mock a successful response from Neo4j server
+
         $mock = new MockHandler([
             new Response(200, ['X-Foo' => 'Bar'], '{"hello":"world"}'),
         ]);
@@ -61,16 +58,12 @@ public function testRunSuccess(): void
 
         $neo4jQueryAPI = new Neo4jQueryAPI($client);
 
-        // Use a sample Cypher query to run on the Neo4j server
         $cypherQuery = 'MATCH (n:Person) RETURN n LIMIT 5';
 
-        // Execute the query and capture the result
+
         $result = $neo4jQueryAPI->run($cypherQuery, []);
 
-        // Output for debugging
-        print_r($result);
 
-        // Verify the response matches the expected output
         $this->assertEquals(['hello' => 'world'], $result);
     }
 }