Skip to content

refactoring #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 4, 2022
Merged

refactoring #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1de37e3
refactoring
staabm Jan 4, 2022
72f15b1
cs
staabm Jan 4, 2022
7436642
fix
staabm Jan 4, 2022
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
2 changes: 1 addition & 1 deletion src/DbaException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

namespace staabm\PHPStanDba;

final class DbaException extends \Exception
final class DbaException extends \RuntimeException
{
}
7 changes: 6 additions & 1 deletion src/Extensions/DeployerRunMysqlQueryDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,12 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
}

$queryReflection = new QueryReflection();
$resultType = $queryReflection->getResultType($args[0]->value, $scope, QueryReflector::FETCH_TYPE_NUMERIC);
$queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
if (null === $queryString) {
return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
}

$resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_NUMERIC);
if ($resultType instanceof ConstantArrayType) {
$builder = ConstantArrayTypeBuilder::createEmpty();
foreach ($resultType->getKeyTypes() as $keyType) {
Expand Down
14 changes: 12 additions & 2 deletions src/Extensions/MysqliQueryDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,12 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
}

$queryReflection = new QueryReflection();
$resultType = $queryReflection->getResultType($args[1]->value, $scope, QueryReflector::FETCH_TYPE_ASSOC);
$queryString = $queryReflection->resolveQueryString($args[1]->value, $scope);
if (null === $queryString) {
return ParametersAcceptorSelector::selectSingle($functionReflection->getVariants())->getReturnType();
}

$resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
if ($resultType) {
return TypeCombinator::union(
new GenericObjectType(mysqli_result::class, [$resultType]),
Expand All @@ -67,7 +72,12 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
}

$queryReflection = new QueryReflection();
$resultType = $queryReflection->getResultType($args[0]->value, $scope, QueryReflector::FETCH_TYPE_ASSOC);
$queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
if (null === $queryString) {
return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
}

$resultType = $queryReflection->getResultType($queryString, QueryReflector::FETCH_TYPE_ASSOC);
if ($resultType) {
return TypeCombinator::union(
new GenericObjectType(mysqli_result::class, [$resultType]),
Expand Down
7 changes: 6 additions & 1 deletion src/Extensions/PdoQueryDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,12 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
}

$queryReflection = new QueryReflection();
$resultType = $queryReflection->getResultType($args[0]->value, $scope, $reflectionFetchType);
$queryString = $queryReflection->resolveQueryString($args[0]->value, $scope);
if (null === $queryString) {
return $defaultReturn;
}

$resultType = $queryReflection->getResultType($queryString, $reflectionFetchType);
if ($resultType) {
return new GenericObjectType(PDOStatement::class, [$resultType]);
}
Expand Down
18 changes: 6 additions & 12 deletions src/QueryReflection/QueryReflection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public static function setupReflector(QueryReflector $reflector): void
self::$reflector = $reflector;
}

public function validateQueryString(Expr $expr, Scope $scope): ?Error
public function validateQueryString(string $queryString): ?Error
{
$queryString = $this->builtSimulatedQuery($expr, $scope);
$queryString = $this->builtSimulatedQuery($queryString);

if (null === $queryString) {
return null;
Expand All @@ -47,9 +47,9 @@ public function validateQueryString(Expr $expr, Scope $scope): ?Error
/**
* @param QueryReflector::FETCH_TYPE* $fetchType
*/
public function getResultType(Expr $expr, Scope $scope, int $fetchType): ?Type
public function getResultType(string $queryString, int $fetchType): ?Type
{
$queryString = $this->builtSimulatedQuery($expr, $scope);
$queryString = $this->builtSimulatedQuery($queryString);

if (null === $queryString) {
return null;
Expand All @@ -58,14 +58,8 @@ public function getResultType(Expr $expr, Scope $scope, int $fetchType): ?Type
return self::reflector()->getResultType($queryString, $fetchType);
}

private function builtSimulatedQuery(Expr $expr, Scope $scope): ?string
private function builtSimulatedQuery(string $queryString): ?string
{
$queryString = $this->resolveQueryString($expr, $scope);

if (null === $queryString) {
return null;
}

if ('SELECT' !== $this->getQueryType($queryString)) {
return null;
}
Expand All @@ -78,7 +72,7 @@ private function builtSimulatedQuery(Expr $expr, Scope $scope): ?string
return $queryString;
}

private function resolveQueryString(Expr $expr, Scope $scope): ?string
public function resolveQueryString(Expr $expr, Scope $scope): ?string
{
if ($expr instanceof Concat) {
$left = $expr->left;
Expand Down
7 changes: 6 additions & 1 deletion src/Rules/SyntaxErrorInQueryFunctionRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ public function processNode(Node $node, Scope $scope): array
$errors = [];

$queryReflection = new QueryReflection();
$error = $queryReflection->validateQueryString($args[$queryArgPosition]->value, $scope);
$queryString = $queryReflection->resolveQueryString($args[$queryArgPosition]->value, $scope);
if (null === $queryString) {
return $errors;
}

$error = $queryReflection->validateQueryString($queryString);
if (null !== $error) {
$errors[] = RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($node->getLine())->build();
}
Expand Down
7 changes: 6 additions & 1 deletion src/Rules/SyntaxErrorInQueryMethodRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@ public function processNode(Node $node, Scope $scope): array
$errors = [];

$queryReflection = new QueryReflection();
$error = $queryReflection->validateQueryString($args[$queryArgPosition]->value, $scope);
$queryString = $queryReflection->resolveQueryString($args[$queryArgPosition]->value, $scope);
if (null === $queryString) {
return $errors;
}

$error = $queryReflection->validateQueryString($queryString);
if (null !== $error) {
$errors[] = RuleErrorBuilder::message('Query error: '.$error->getMessage().' ('.$error->getCode().').')->line($node->getLine())->build();
}
Expand Down