Skip to content

Commit 412e4ec

Browse files
committed
Code: polished
1 parent 1e33003 commit 412e4ec

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

src/Analyser/Database/DatabaseAnalyser.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<?php declare(strict_types = 1);
1+
<?php
2+
3+
declare(strict_types = 1);
24

35
namespace Contributte\Nextras\Orm\Generator\Analyser\Database;
46

@@ -10,7 +12,7 @@
1012
use Contributte\Nextras\Orm\Generator\Utils\ColumnTypes;
1113
use Contributte\Nextras\Orm\Generator\Utils\Helpers;
1214
use Nette\Database\Connection;
13-
use Nette\Database\ISupplementalDriver;
15+
use Nette\Database\Driver;
1416
use Nette\Utils\Strings;
1517

1618
class DatabaseAnalyser implements IAnalyser
@@ -19,7 +21,7 @@ class DatabaseAnalyser implements IAnalyser
1921
/** @var Connection */
2022
private $connection;
2123

22-
/** @var ISupplementalDriver */
24+
/** @var Driver */
2325
private $driver;
2426

2527
public function __construct(string $dns, string $username, ?string $password = null)
@@ -33,7 +35,7 @@ public function getConnection(): Connection
3335
return $this->connection;
3436
}
3537

36-
public function getDriver(): ISupplementalDriver
38+
public function getDriver(): Driver
3739
{
3840
return $this->driver;
3941
}
@@ -63,8 +65,7 @@ protected function analyseColumns(Table $table): void
6365
// Analyse columns
6466
$columns = $this->driver->getColumns($tableName);
6567

66-
foreach ($columns as $key => $col) {
67-
68+
foreach ($columns as $col) {
6869
$column = new Column();
6970
$column->setName($col['name']);
7071
$column->setNullable($col['nullable']);

src/Config/Config.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use ArrayAccess;
66
use Nette\InvalidStateException;
7+
use ReturnTypeWillChange;
78

89
class Config implements ArrayAccess
910
{
@@ -139,7 +140,8 @@ public function offsetExists($offset): bool
139140
* @return mixed
140141
* @throws InvalidStateException
141142
*/
142-
public function offsetGet($offset): mixed
143+
#[ReturnTypeWillChange]
144+
public function offsetGet($offset)
143145
{
144146
if ($this->offsetExists($offset)) {
145147
return $this->config[$offset];

src/Generator/Entity/Decorator/ColumnDocumentor.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ protected function getRealType(Column $column)
8383
switch ($column->getType()) {
8484
case ColumnTypes::TYPE_ENUM:
8585
return $column->getSubtype();
86+
8687
default:
8788
return $column->getType();
8889
}
@@ -96,6 +97,7 @@ protected function getRealDefault(Column $column)
9697
switch ($column->getType()) {
9798
case ColumnTypes::TYPE_ENUM:
9899
return 'self::' . $column->getDefault();
100+
99101
default:
100102
return $column->getDefault();
101103
}

src/Generator/Entity/Decorator/ColumnMapper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ class ColumnMapper implements IDecorator
1414
public function doDecorate(Column $column, ClassType $class, PhpNamespace $namespace): void
1515
{
1616
switch ($column->getType()) {
17-
1817
// Map: DateTime
1918
case ColumnTypes::TYPE_DATETIME:
2019
case ColumnTypes::TYPE_DATE:

0 commit comments

Comments
 (0)