Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 46 additions & 1 deletion phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,50 @@
<file>src/</file>
<file>tests/</file>

<rule ref="Respect" />
<rule ref="Respect">
<!-- Deferred: test files have inline stub classes and snake_case conventions -->
<exclude name="PSR1.Classes.ClassDeclaration.MultipleClasses" />
<exclude name="Squiz.Classes.ClassFileName.NoMatch" />
<exclude name="SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile.MoreNamespacesInFile" />
</rule>

<!-- Deferred: long lines in test data providers -->
<rule ref="Generic.Files.LineLength.TooLong">
<exclude-pattern>tests/</exclude-pattern>
</rule>

<!-- Deferred: traversable/return type hints on test data providers -->
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification">
<exclude-pattern>tests/</exclude-pattern>
</rule>
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingAnyTypeHint">
<exclude-pattern>tests/</exclude-pattern>
</rule>

<!-- Deferred: test stubs use snake_case properties matching DB columns -->
<rule ref="Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps">
<exclude-pattern>tests/</exclude-pattern>
</rule>

<!-- Deferred: test methods use snake_case for readability -->
<rule ref="Generic.NamingConventions.CamelCapsFunctionName.ScopeNotCamelCaps">
<exclude-pattern>tests/</exclude-pattern>
</rule>
<rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
<exclude-pattern>tests/</exclude-pattern>
</rule>

<!-- Deferred: test stubs lack type hints and use multi-property declarations -->
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingAnyTypeHint">
<exclude-pattern>tests/</exclude-pattern>
</rule>
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingAnyTypeHint">
<exclude-pattern>tests/</exclude-pattern>
</rule>
<rule ref="PSR2.Classes.PropertyDeclaration.Multiple">
<exclude-pattern>tests/</exclude-pattern>
</rule>
<rule ref="Squiz.Classes.ValidClassName.NotPascalCase">
<exclude-pattern>tests/</exclude-pattern>
</rule>
</ruleset>
3 changes: 0 additions & 3 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ parameters:
- message: '/Unsafe usage of new static\(\)\./'
- message: '/Cannot unset property .+ because it might have hooks in a subclass\./'
- message: '/Array has \d+ duplicate keys/'
-
message: '/(unknown class|does not accept)/'
path: tests/Styles/
-
message: '/Parameter #1 .+ of class Respect\\Relational\\Mapper constructor expects .+, string given\./'
path: tests/MapperTest.php
33 changes: 19 additions & 14 deletions src/Db.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,21 @@
use PDO;
use PDOStatement;

use function array_map;
use function is_array;
use function is_callable;
use function is_int;
use function is_object;

final class Db
{
protected PDO $connection;
protected Sql $currentSql;
protected Sql $protoSql;

public function __call(string $methodName, array $arguments): static
{
$this->currentSql->__call($methodName, $arguments);

return $this;
}
protected Sql $protoSql;

public function __construct(PDO $connection, Sql|null $sqlPrototype = null)
public function __construct(protected PDO $connection, Sql|null $sqlPrototype = null)
{
$connection->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
$this->connection = $connection;
$this->protoSql = $sqlPrototype ?: new Sql();
$this->currentSql = clone $this->protoSql;
}
Expand Down Expand Up @@ -63,11 +61,11 @@ public function prepare(string $queryString, mixed $object = '\stdClass', array|

match (true) {
is_int($object) => $statement->setFetchMode($object),
'\stdClass' === $object || 'stdClass' === $object => $statement->setFetchMode(PDO::FETCH_OBJ),
$object === '\stdClass' || $object === 'stdClass' => $statement->setFetchMode(PDO::FETCH_OBJ),
is_callable($object) => $statement->setFetchMode(PDO::FETCH_OBJ),
is_object($object) => $statement->setFetchMode(PDO::FETCH_INTO, $object),
is_array($object) => $statement->setFetchMode(PDO::FETCH_ASSOC),
is_null($extra) => $statement->setFetchMode(PDO::FETCH_CLASS, $object),
$extra === null => $statement->setFetchMode(PDO::FETCH_CLASS, $object),
default => $statement->setFetchMode(PDO::FETCH_CLASS, $object, $extra),
};

Expand All @@ -93,8 +91,15 @@ protected function executeStatement(mixed $object = '\stdClass', mixed $extra =
protected function performFetch(string $method, mixed $object = '\stdClass', mixed $extra = null): mixed
{
$statement = $this->executeStatement($object, $extra);
$result = $statement->{$method}();

return $result;
return $statement->{$method}();
}

/** @param array<mixed> $arguments */
public function __call(string $methodName, array $arguments): static
{
$this->currentSql->__call($methodName, $arguments);

return $this;
}
}
Loading
Loading