Merge branch 'feature/php85'

Author: Katalystical

.github/workflows/unittest.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         operating-system:
-          - 'ubuntu-20.04'
+          - 'ubuntu-22.04'
         php-versions:
           - 7.3
           - 7.4
@@ -24,6 +24,7 @@ jobs:
           - 8.2
           - 8.3
           - 8.4
+          - 8.5
         phpunit-versions: ['latest']
     env:
       extensions: mbstring, intl, xml, gmp, bcmath, snappy-kjdev/php-ext-snappy@0.2.2

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.3 - 2026-02-21]
+### Added
+- PHP 8.5 support, CI adapted
+### Fixed
+- Reading and writing data columns with field name "0"
+- Deprecation warnings on PHP 8.5
+
 ## [0.7.2 - 2025-03-29]
 ### Added
 - PHP 8.4 support, CI adapted

composer.json

@@ -10,7 +10,7 @@
         }
     ],
     "require": {
-        "php" : ">=7.3 <=8.4.99",
+        "php" : ">=7.3 <=8.5.99",
         "ext-gmp" : "*",
         "ext-bcmath" : "*",
         "ext-zlib": "*",

src/file/ThriftFooter.php

@@ -211,7 +211,10 @@ protected function _CreateModelSchema(?array $path, array &$container, int $chil
           array_merge(
             $path ?? [], // Fallback to empty array as path
             $se->path ?? [ $se->name ] // NOTE: fallback to array-ified $se->name
-          )
+          ),
+          function ($v) {
+            return $v !== null;
+          }
         )
       ));
 

src/helper/ArrayToDataColumnsConverter.php

@@ -167,7 +167,7 @@ protected static function processDataRecursively(array $array, array $path, arra
       //
       // Maximum recursion level
       //
-      if($key) {
+      if($key !== null) {
         //
         // Explicit key
         //

src/helper/DataColumnsToArrayConverter.php

@@ -279,7 +279,7 @@ protected function buildData(DataField $df, array &$result, array $path, array $
         // for performance reasons, we directly set the field's value per row
         //
         $key = $path[0] ?? null;
-        if($key) {
+        if($key !== null) {
           foreach($data as $index => $value) {
             $result[$index][$key] = $value;
           }

src/values/primitives/NanoTime.php

@@ -92,7 +92,7 @@ public static function DateTimeImmutableFromNanoTimeBytes($data, int $offset) :
     // $ms = $timeOfDayNanos / (double)1000000;
     // $microseconds = (int)($ms / 1000);
 
-    $microseconds = (int) ($timeOfDayNanos / (double)1000);
+    $microseconds = (int) ($timeOfDayNanos / (float)1000);
 
     $result = new \DateTime();
     $result
@@ -121,7 +121,7 @@ public static function getDateTimeObject(NanoTime $nanoTime)
     // $ms = $nanoTime->_timeOfDayNanos / (double)1000000;
     // $microseconds = (int)($ms / 1000);
 
-    $microseconds = (int) ($nanoTime->_timeOfDayNanos / (double)1000);
+    $microseconds = (int) ($nanoTime->_timeOfDayNanos / (float)1000);
 
     $result = new \DateTime();
     $result

tests/EndToEndTypeTest.php

@@ -43,7 +43,7 @@ public function endToEndTestDataProvider(): array {
       ],
       "double" => [
         'field'         => DataField::createFromType("double", 'double'),
-        'expectedValue' => (double)10.44
+        'expectedValue' => (float)10.44
       ],
       "simple DateTime" => [
         'field'           => DataField::createFromType('datetime', \DateTimeImmutable::class),

tests/SchemaTest.php

@@ -5,6 +5,10 @@
 use Exception;
 
 use codename\parquet\ParquetReader;
+use codename\parquet\ParquetOptions;
+
+use codename\parquet\helper\ParquetDataWriter;
+use codename\parquet\helper\ParquetDataIterator;
 
 use codename\parquet\data\Schema;
 use codename\parquet\data\DataType;
@@ -386,4 +390,42 @@ public function testBackwardCompatListWithOneArray(): void {
     $rg = $reader->OpenRowGroupReader(0);
     $values4 = $rg->ReadColumn($schema->fields[4]);
   }
+
+  public function testIndexedColumnNames(): void
+  {
+    $schema = new Schema([
+      DataField::createFromType('0', 'integer'),
+      DataField::createFromType('1', 'string')
+    ]);
+
+    $handle = fopen('php://memory', 'r+');
+    $instance = new ParquetDataWriter($handle, $schema);
+
+    for ($i=0; $i < 4; $i++) {
+      $instance->put([
+        '0' => $i,
+        '1' => 'id#'.$i,
+      ]);
+    }
+    $instance->finish();
+
+    fseek($handle, 0, SEEK_SET);
+
+    $reader = new ParquetReader($handle);
+    $this->assertEquals(1, $reader->getRowGroupCount());
+
+    fseek($handle, 0, SEEK_SET);
+
+    // Re-read data
+    $iterator = ParquetDataIterator::fromHandle($handle);
+
+    $cnt = 0;
+    foreach($iterator as $i => $data) {
+      $this->assertEquals($i, $data['0']);
+      $this->assertEquals('id#'.$i, $data['1']);
+      $cnt++;
+    }
+    $this->assertEquals(4, $cnt);
+
+  }
 }