PHP 8.1 Implementation

Author: byjg

.github/workflows/phpunit.yml

@@ -16,10 +16,9 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "8.3"
           - "8.2"
           - "8.1"
-          - "8.0"
-          - "7.4"
 
     steps:
       - uses: actions/checkout@v4

.vscode/launch.json

@@ -6,12 +6,17 @@
       "ByJG\\AnyDataset\\Core\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {
-    "php": ">=7.4",
-    "byjg/xmlutil": "4.9.*",
-    "byjg/serializer": "4.9.*"
+    "php": ">=8.1",
+    "byjg/xmlutil": "^5.0",
+    "byjg/serializer": "^5.0"
   },
   "suggest": {
     "ext-dom": "*"

composer.json

@@ -2,7 +2,7 @@
 
 namespace ByJG\AnyDataset\Core;
 
-use ByJG\Serializer\SerializerObject;
+use ByJG\Serializer\Serialize;
 
 class Row
 {
@@ -33,7 +33,7 @@ public function __construct($instance = [])
         if (is_array($instance)) {
             $this->row = $instance;
         } else {
-            $this->row = SerializerObject::instance($instance)->serialize();
+            $this->row = Serialize::from($instance)->toArray();
         }
 
         $this->acceptChanges();

src/Row.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\AnyDataset\Dataset;
+namespace Tests;
 
 use ByJG\AnyDataset\Core\AnyDataset;
 use ByJG\AnyDataset\Core\Enum\Relation;

tests/AnyDatasetTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\AnyDataset\Dataset;
+namespace Tests;
 
 use ByJG\AnyDataset\Core\IteratorFilter;
 use ByJG\AnyDataset\Core\IteratorFilterXPathFormatter;

tests/IteratorFilterTest.php

@@ -1,12 +1,11 @@
 <?php
 
-namespace Tests\AnyDataset\Dataset;
+namespace Tests;
 
 use ByJG\AnyDataset\Core\AnyDataset;
-use ByJG\Serializer\SerializerObject;
+use ByJG\Serializer\Serialize;
 use PHPUnit\Framework\TestCase;
-
-require_once "Sample/SampleModel.php";
+use Tests\Sample\SampleModel;
 
 class ModelTest extends TestCase
 {
@@ -16,7 +15,7 @@ public function testBindSingleRow()
         $sr->addField("id", 10);
         $sr->addField("name", "Testing");
 
-        $object = new \Tests\AnyDataset\Sample\SampleModel($sr->toArray());
+        $object = new SampleModel($sr->toArray());
 
         $this->assertEquals(10, $object->Id);
         $this->assertEquals("Testing", $object->getName());
@@ -31,7 +30,7 @@ public function testBindIterator()
         $sr->addField("name", "Testing");
         $anydata->appendRow($sr);
 
-        $object = new \Tests\AnyDataset\Sample\SampleModel($anydata->getIterator()->moveNext()->toArray());
+        $object = new SampleModel($anydata->getIterator()->moveNext()->toArray());
 
         $this->assertEquals(10, $object->Id);
         $this->assertEquals("Testing", $object->getName());
@@ -46,8 +45,8 @@ public function testBind_Iterator2()
         $anydata->addField('Id', 20);
         $anydata->addField('Name', 'Gilberto');
 
-        $object1 = new \Tests\AnyDataset\Sample\SampleModel();
-        $object1->bindFrom( $anydata->getIterator()->moveNext()->toArray() );
+        $object1 = new SampleModel();
+        $object1->copyFrom( $anydata->getIterator()->moveNext()->toArray() );
         $this->assertEquals(10, $object1->Id);
         $this->assertEquals('Joao', $object1->getName());
     }
@@ -64,8 +63,8 @@ public function testIterator()
 
         $iterator = $model->getIterator();
 
-        $object = new SerializerObject($iterator->toArray());
-        $result = $object->serialize();
+        $object = Serialize::from($iterator->toArray());
+        $result = $object->toArray();
 
         $this->assertEquals(
             [

tests/ModelTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\AnyDataset\Dataset;
+namespace Tests;
 
 use ByJG\AnyDataset\Core\Row;
 use ByJG\AnyDataset\Core\RowValidator;

tests/RowOutputTest.php

@@ -1,19 +1,16 @@
 <?php
 
-namespace Tests\AnyDataset\Dataset;
+namespace Tests;
 
 use ByJG\AnyDataset\Core\Formatter\JsonFormatter;
 use ByJG\AnyDataset\Core\Formatter\XmlFormatter;
 use ByJG\AnyDataset\Core\Row;
 use PHPUnit\Framework\TestCase;
-use Tests\AnyDataset\Sample\ModelGetter;
-use Tests\AnyDataset\Sample\ModelPublic;
 use ByJG\Util\XmlUtil;
 use stdClass;
-
-require_once "Sample/ModelPublic.php";
-require_once "Sample/ModelGetter.php";
-require_once "Sample/ModelPropertyPattern.php";
+use Tests\Sample\ModelGetter;
+use Tests\Sample\ModelPropertyPattern;
+use Tests\Sample\ModelPublic;
 
 class RowTest extends TestCase
 {
@@ -302,7 +299,7 @@ public function testConstructor_Array()
 
     public function testConstructor_PropertyPattern()
     {
-        $model = new \Tests\AnyDataset\Sample\ModelPropertyPattern();
+        $model = new ModelPropertyPattern();
         $model->setIdModel(10);
         $model->setClientName("Testing");
 

tests/RowTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\AnyDataset\Dataset;
+namespace Tests;
 
 use ByJG\AnyDataset\Core\Row;
 use ByJG\AnyDataset\Core\RowValidator;