diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php index aaa6e490..45972413 100644 --- a/src/Dibi/Reflection/Column.php +++ b/src/Dibi/Reflection/Column.php @@ -21,8 +21,8 @@ use Dibi; * @property-read string $type * @property-read mixed $nativeType * @property-read int|null $size - * @property-read bool|null $nullable - * @property-read bool|null $autoIncrement + * @property-read bool $nullable + * @property-read bool $autoIncrement * @property-read mixed $default */ class Column @@ -94,15 +94,15 @@ class Column } - public function isNullable(): ?bool + public function isNullable(): bool { - return isset($this->info['nullable']) ? (bool) $this->info['nullable'] : null; + return !empty($this->info['nullable']); } - public function isAutoIncrement(): ?bool + public function isAutoIncrement(): bool { - return isset($this->info['autoincrement']) ? (bool) $this->info['autoincrement'] : null; + return !empty($this->info['autoincrement']); } diff --git a/tests/dibi/Result.meta.phpt b/tests/dibi/Result.meta.phpt index 3fe404e2..253ab3b5 100644 --- a/tests/dibi/Result.meta.phpt +++ b/tests/dibi/Result.meta.phpt @@ -45,14 +45,14 @@ Assert::null($columns[0]->getVendorInfo('xxx')); if (!in_array($config['system'], ['sqlite', 'sqlsrv'], true)) { Assert::same('i', $columns[0]->getType()); } -Assert::null($columns[0]->isNullable()); +Assert::false($columns[0]->isNullable()); Assert::same('xXx', $columns[3]->getName()); Assert::null($columns[3]->getTableName()); if (!in_array($config['system'], ['sqlite', 'sqlsrv'], true)) { Assert::same('i', $columns[0]->getType()); } -Assert::null($columns[3]->isNullable()); +Assert::false($columns[3]->isNullable()); Assert::same('xXx', $info->getColumn('xxx')->getName()); Assert::same('xXx', $info->getColumn('xXx')->getName());