misc

Author: asika32764

packages/database/src/Driver/Pdo/PdoMysqlConnection.php

@@ -32,9 +32,9 @@ public static function prepareDbOptions(DriverOptions $options): DriverOptions
             }
         } else {
             if (strtolower($params['charset']) === 'utf8mb4') {
-                $options->driverOptions[\PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
+                $options->driverOptions[Mysql::ATTR_INIT_COMMAND] = 'SET NAMES utf8mb4';
             } elseif (strtolower($params['charset']) === 'utf8') {
-                $options->driverOptions[\PDO::MYSQL_ATTR_INIT_COMMAND] = 'SET NAMES utf8';
+                $options->driverOptions[Mysql::ATTR_INIT_COMMAND] = 'SET NAMES utf8';
             }
         }
 
@@ -45,7 +45,7 @@ public function disableBufferedQuery(bool $buffered = true): static
     {
         $pdo = $this->get();
 
-        $pdo?->setAttribute(\PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$buffered);
+        $pdo?->setAttribute(Mysql::ATTR_USE_BUFFERED_QUERY, !$buffered);
 
         return $this;
     }

packages/database/src/Manager/WriterManager.php

@@ -220,10 +220,16 @@ public function upsert(
         string $table,
         array|object $data,
         array|string $keys,
+        array $options = [],
     ): StatementInterface {
         $keys = (array) $keys;
 
         $platformName = $this->db->getPlatform()->getName();
+        $updateNulls = $options['updateNulls'] ?? false;
+
+        if (!$updateNulls) {
+            $data = array_filter($data, fn($v) => $v !== null);
+        }
 
         $query = $this->db->createQuery();
 

packages/filter/src/Rule/IPV6.php

@@ -25,6 +25,7 @@ public function getRegex(): string
     public function test(mixed $value, bool $strict = false): bool
     {
         return filter_var(
+            $value,
             FILTER_VALIDATE_IP,
             FILTER_FLAG_IPV6
         );

packages/orm/src/EntityMapper.php

@@ -996,7 +996,7 @@ function () use ($initData, $data, $item, $options, $condFields, $conditions) {
 
     public function upsert(
         array|object $item,
-        ?array $condFields = null,
+        array|string|null $condFields = null,
         ORMOptions $options = new ORMOptions()
     ): ?StatementInterface {
         if ($item === []) {
@@ -1005,12 +1005,11 @@ public function upsert(
 
         $metadata = $this->getMetadata();
 
-        $updateNulls = true;
+        $updateNulls = $options->updateNulls;
 
-        // $updateNulls = $options->updateNulls;
-        // if ($this->metadata::isEntity($item)) {
-        //     $updateNulls = true;
-        // }
+        if ($this->metadata::isEntity($item)) {
+            $updateNulls = true;
+        }
 
         if (!$condFields) {
             $condFields = $this->getKeys();
@@ -1044,6 +1043,9 @@ public function upsert(
                 $metadata->getTableName(),
                 $data,
                 $condFields,
+                [
+                    'updateNulls' => $updateNulls,
+                ]
             );
         }
 
@@ -1740,7 +1742,12 @@ public function toEntity(array|object $data): object
         }
 
         if (is_object($data)) {
-            $data = ReflectAccessor::getPropertiesValues($data);
+            if (EntityMetadata::isEntity($data)) {
+                // Keep B/C that we must extract protected props from old entities.
+                $data = ReflectAccessor::getPropertiesValues($data);
+            } else {
+                $data = TypeCast::toArray($data);
+            }
         }
 
         // Only ORM has Hydrator, we must call ORM to do this.

packages/orm/src/ORM.php

@@ -75,7 +75,7 @@ class ORM implements EventAwareInterface
      *
      * @param  DatabaseAdapter  $db
      */
-    public function __construct(protected DatabaseAdapter $db)
+    public function __construct(public protected(set) DatabaseAdapter $db)
     {
         $this->entityMetadataCollection = new EntityMetadataCollection($this);
 

packages/orm/src/ORMProxyTrait.php

@@ -384,7 +384,7 @@ public function updateOneOrCreate(
     public function upsert(
         string $entityClass,
         array|object $item,
-        ?array $condFields = null,
+        array|string|null $condFields = null,
         ORMOptions $options = new ORMOptions()
     ): ?StatementInterface {
         return $this->mapper($entityClass)->upsert($item, $condFields, $options);

packages/session/src/Bridge/PhpBridge.php

@@ -230,6 +230,13 @@ public function writeClose(bool $unset = true): bool
         return $r;
     }
 
+    public function write(): bool
+    {
+        $data = $this->encodeData($this->storage);
+
+        return $this->handler->write($this->getId(), $data);
+    }
+
     /**
      * Close without write, only for Session::fork().
      *