Merge branch '1.x' into 1905-task-add-support-for-php-85

Author: norberttech

.github/workflows/test-suite.yml

@@ -8,6 +8,7 @@ on:
       - 'examples/**'
       - 'composer.lock'
       - 'composer.json'
+      - 'phpunit.xml.dist'
   push:
     branches: [ 1.x ]
     paths:
@@ -18,6 +19,7 @@ on:
       - 'examples/**'
       - 'composer.lock'
       - 'composer.json'
+      - 'phpunit.xml.dist'
   schedule:
     - cron: '0 4 * * *'
   workflow_dispatch:
@@ -50,4 +52,4 @@ jobs:
     uses: ./.github/workflows/job-mutation-tests.yml
 
   benchmark-tests:
-    uses: ./.github/workflows/job-benchmark-tests.yml
+    uses: ./.github/workflows/job-benchmark-tests.yml

CHANGELOG.md

@@ -1,6 +1,25 @@
-## [Unreleased] - 2025-10-28
+## [Unreleased] - 2025-10-31
 
 ### Added
+- [#1917](https://github.com/flow-php/flow/pull/1917) - **Add a new `HTMLType`** - [@stloyd](https://github.com/stloyd)
+
+### Changed
+- [#1932](https://github.com/flow-php/flow/pull/1932) - **Enforce passing `EntryFactory` to `array_to_row(s)` & `to_entry` functions** - [@stloyd](https://github.com/stloyd)
+- [#1929](https://github.com/flow-php/flow/pull/1929) - **Pass `EntryFactory` to the `Rows::join*()` methods** - [@stloyd](https://github.com/stloyd)
+- [#1929](https://github.com/flow-php/flow/pull/1929) - **Enforce instance of EntryFactory in the join methods** - [@stloyd](https://github.com/stloyd)
+- [#1925](https://github.com/flow-php/flow/pull/1925) - **Update Homebrew TAP formula: flow-php to version: 0.26.1** - [@norberttech](https://github.com/norberttech)
+
+### Fixed
+- [#1944](https://github.com/flow-php/flow/pull/1944) - **Incorrect library test group names** - [@stloyd](https://github.com/stloyd)
+- [#1945](https://github.com/flow-php/flow/pull/1945) - **Fixed broken `HTMLTypeTest`** - [@stloyd](https://github.com/stloyd)
+
+### Removed
+- [#1929](https://github.com/flow-php/flow/pull/1929) - **Remove `Rows::fromArray()`** - [@stloyd](https://github.com/stloyd)
+
+## [0.26.1] - 2025-10-28
+
+### Added
+- [#1924](https://github.com/flow-php/flow/pull/1924) - **TimeZioneType** - [@norberttech](https://github.com/norberttech)
 - [#1922](https://github.com/flow-php/flow/pull/1922) - **php versions constraints to each tool composer.json file** - [@norberttech](https://github.com/norberttech)
 - [#1911](https://github.com/flow-php/flow/pull/1911) - **Added missing Http adapter functions** - [@stloyd](https://github.com/stloyd)
 - [960090](https://github.com/flow-php/flow/commit/960090aa988a304b67ccf4b165c1416c56760518) - **contact link for issue type guidance** - [@norberttech](https://github.com/norberttech)

documentation/components/core/building-blocks.md

@@ -41,7 +41,7 @@ $rows = array_to_rows([
     ['id' => 2, 'name' => 'user_02', 'active' => false],
     ['id' => 3, 'name' => 'user_03', 'active' => true],
     ['id' => 4, 'name' => 'user_04', 'active' => false],
-]);
+], flow_context(config())->entryFactory());
 ```
 
 ## Entry Types

documentation/upgrading.md

@@ -5,6 +5,25 @@ Please follow the instructions for your specific version to ensure a smooth upgr
 
 ---
 
+## Upgrading from 0.26.x to 0.27.x
+
+### 1) Force `EntryFactory $entryFactory` to be required on `array_to_row` & `array_to_row(s)`
+
+Before:
+```php
+to_entry('name', 'data');
+array_to_row([]);
+array_to_rows([]);
+```
+
+After:
+
+```php
+to_entry('name', 'data', flow_context(config())->entryFactory());
+array_to_row([], flow_context(config())->entryFactory());
+array_to_rows([], flow_context(config())->entryFactory());
+```
+
 ## Upgrading from 0.16.x to 0.17.x
 
 ### 1) Removed $nullable property from all types

phpunit.xml.dist

@@ -72,10 +72,10 @@
     <testsuite name="lib-parquet-viewer-integration">
       <directory>src/lib/parquet-viewer/tests/Flow/ParquetViewer/Tests/Integration</directory>
     </testsuite>
-    <testsuite name="snappy-integration">
+    <testsuite name="lib-snappy-integration">
       <directory>src/lib/snappy/tests/Flow/Snappy/Tests/Integration</directory>
     </testsuite>
-    <testsuite name="types-unit">
+    <testsuite name="lib-types-unit">
       <directory>src/lib/types/tests/Flow/Types/Tests/Unit</directory>
     </testsuite>
     <testsuite name="bridge-filesystem-azure-unit">

rector.tests.php

@@ -27,6 +27,7 @@
 use Flow\ETL\FlowContext;
 use Flow\Types\Type\Logical\DateTimeType;
 use Flow\Types\Type\Logical\DateType;
+use Flow\Types\Type\Logical\HTMLType;
 use Flow\Types\Type\Logical\JsonType;
 use Flow\Types\Type\Logical\ListType;
 use Flow\Types\Type\Logical\MapType;
@@ -165,6 +166,7 @@
             new NewObjectToFunction(UuidType::class, 'Flow\ETL\DSL\type_uuid'),
             new NewObjectToFunction(XMLElementType::class, 'Flow\ETL\DSL\type_xml_element'),
             new NewObjectToFunction(XMLType::class, 'Flow\ETL\DSL\type_xml'),
+            new NewObjectToFunction(HTMLType::class, 'Flow\ETL\DSL\type_html'),
 
             // Extractors
             new NewObjectToFunction(CacheExtractor::class, 'from_cache'),

src/core/etl/src/Flow/ETL/Config/ConfigBuilder.php

@@ -51,10 +51,9 @@ public function __construct()
         $this->randomValueGenerator = new NativePHPRandomValueGenerator();
     }
 
-    public function build() : Config
+    public function build(EntryFactory $entryFactory = new EntryFactory()) : Config
     {
         $this->id ??= 'flow_php' . $this->randomValueGenerator->string(32);
-        $entryFactory = new EntryFactory();
         $this->serializer ??= new Base64Serializer(new NativePHPSerializer());
         $this->clock ??= SystemClock::utc();
         $this->optimizer ??= new Optimizer(

src/core/etl/src/Flow/ETL/DSL/functions.php

@@ -203,6 +203,7 @@
     UnionType
 };
 use Flow\Types\Type\Types;
+use Flow\Types\Value\HTMLDocument;
 use UnitEnum;
 
 /**
@@ -1547,7 +1548,7 @@ function number_format(ScalarFunction|int|float $value, ScalarFunction|int $deci
  * @return Entry<mixed>
  */
 #[DocumentationDSL(module: Module::CORE, type: DSLType::DATA_FRAME)]
-function to_entry(string $name, mixed $data, EntryFactory $entryFactory = new EntryFactory()) : Entry
+function to_entry(string $name, mixed $data, EntryFactory $entryFactory) : Entry
 {
     return $entryFactory->create($name, $data);
 }
@@ -1558,7 +1559,7 @@ function to_entry(string $name, mixed $data, EntryFactory $entryFactory = new En
  * @param null|Schema $schema
  */
 #[DocumentationDSL(module: Module::CORE, type: DSLType::DATA_FRAME)]
-function array_to_row(array $data, EntryFactory $entryFactory = new EntryFactory(), array|Partitions $partitions = [], ?Schema $schema = null) : Row
+function array_to_row(array $data, EntryFactory $entryFactory, array|Partitions $partitions = [], ?Schema $schema = null) : Row
 {
     $entries = [];
 
@@ -1603,7 +1604,7 @@ function array_to_row(array $data, EntryFactory $entryFactory = new EntryFactory
  * @param null|Schema $schema
  */
 #[DocumentationDSL(module: Module::CORE, type: DSLType::DATA_FRAME)]
-function array_to_rows(array $data, EntryFactory $entryFactory = new EntryFactory(), array|Partitions $partitions = [], ?Schema $schema = null) : Rows
+function array_to_rows(array $data, EntryFactory $entryFactory, array|Partitions $partitions = [], ?Schema $schema = null) : Rows
 {
     $partitions = \is_array($partitions) ? new Partitions(...$partitions) : $partitions;
 
@@ -1957,6 +1958,15 @@ function json_schema(string $name, bool $nullable = false, ?Metadata $metadata =
     return Definition::json($name, $nullable, $metadata);
 }
 
+/**
+ * @return Definition<HTMLDocument>
+ */
+#[DocumentationDSL(module: Module::CORE, type: DSLType::SCHEMA)]
+function html_schema(string $name, bool $nullable = false, ?Metadata $metadata = null) : Definition
+{
+    return Definition::html($name, $nullable, $metadata);
+}
+
 /**
  * @return Definition<\DOMDocument>
  */

src/core/etl/src/Flow/ETL/Function/AggregatingFunction.php

@@ -5,7 +5,7 @@
 namespace Flow\ETL\Function;
 
 use Flow\ETL\Row;
-use Flow\ETL\Row\Entry;
+use Flow\ETL\Row\{Entry, EntryFactory};
 
 interface AggregatingFunction
 {
@@ -14,5 +14,5 @@ public function aggregate(Row $row) : void;
     /**
      * @return Entry<mixed>
      */
-    public function result() : Entry;
+    public function result(EntryFactory $entryFactory) : Entry;
 }

src/core/etl/src/Flow/ETL/Function/Average.php

@@ -8,6 +8,7 @@
 use Flow\Calculator\{Calculator, Rounding};
 use Flow\ETL\Exception\{InvalidArgumentException, RuntimeException};
 use Flow\ETL\Row\{Entry, Reference};
+use Flow\ETL\Row\EntryFactory;
 use Flow\ETL\{Row, Rows, Window};
 
 final class Average implements AggregatingFunction, WindowFunction
@@ -65,7 +66,7 @@ public function over(Window $window) : WindowFunction
         return $this;
     }
 
-    public function result() : Entry
+    public function result(EntryFactory $entryFactory) : Entry
     {
         if (!$this->ref->hasAlias()) {
             $this->ref->as($this->ref->to() . '_avg');