Fix #19328: Passing null to parameter #1 ($string) of type string is …

…deprecated in `yii\db\oci\Schema` Co-authored-by: Kevin Desmettre <kdesmettre@oph74.fr>
yiisoft · Apr 6, 2022 · 9f6d24d · 9f6d24d
1 parent 10f6045
commit 9f6d24d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
@@ -14,6 +14,7 @@ Yii Framework 2 Change Log
 - Enh #19309: Optimize `yii\base\Model::attributes()` (WinterSilence)
 - Bug #19322: Revert force setting value to empty string in case it's `null` in `yii\validators\FilterValidator::validateAttribute()` (bizley)
 - Bug #19329: Fix `yii\web\GroupUrlRule` to properly normalize prefix (bizley)
+- Bug #19328: Passing null to parameter #1 ($string) of type string is deprecated in `yii\db\oci\Schema` (Arkeins)
 
 
 2.0.45 February 11, 2022

diff --git a/framework/db/oci/Schema.php b/framework/db/oci/Schema.php
@@ -411,7 +411,7 @@ protected function createColumn($column)
         $c->phpType = $this->getColumnPhpType($c);
 
         if (!$c->isPrimaryKey) {
-            if (stripos($column['DATA_DEFAULT'], 'timestamp') !== false) {
+            if (stripos((string) $column['DATA_DEFAULT'], 'timestamp') !== false) {
                 $c->defaultValue = null;
             } else {
                 $defaultValue = $column['DATA_DEFAULT'];
@@ -594,9 +594,9 @@ protected function extractColumnType($column, $dbType, $precision, $scale, $leng
      */
     protected function extractColumnSize($column, $dbType, $precision, $scale, $length)
     {
-        $column->size = trim($length) === '' ? null : (int) $length;
-        $column->precision = trim($precision) === '' ? null : (int) $precision;
-        $column->scale = trim($scale) === '' ? null : (int) $scale;
+        $column->size = trim((string) $length) === '' ? null : (int) $length;
+        $column->precision = trim((string) $precision) === '' ? null : (int) $precision;
+        $column->scale = trim((string) $scale) === '' ? null : (int) $scale;
     }
 
     /**