Skip to content

Handle all hydration mode in QueryResultDynamicReturnTypeExtension #412

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 12 commits into from
Apr 5, 2023
Merged

Handle all hydration mode in QueryResultDynamicReturnTypeExtension #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
39e4b77
Use ReflectionProvider instead of Broker
staabm Mar 6, 2023
271db64
Drop inline `@var`
staabm Mar 6, 2023
8d660e9
ClassMetadataInfo - idGenerator property can be null
ondrejmirtes Mar 10, 2023
3dbb999
Fix DoctrineSelectableClassReflectionExtension
ondrejmirtes Mar 10, 2023
8c22f24
Bleeding edge - BetterReflectionProvider
ondrejmirtes Mar 15, 2023
62bd362
Revert "Bleeding edge - BetterReflectionProvider"
ondrejmirtes Mar 17, 2023
fbf55c3
Update metcalfc/changelog-generator action to v4.1.0
renovate[bot] Mar 20, 2023
41c5663
Update PHPCS
staabm Mar 22, 2023
13c649f
Update dependency slevomat/coding-standard to v8.9.0
renovate[bot] Mar 27, 2023
11b14c4
Update build-cs
renovate[bot] Apr 3, 2023
c546058
Improve QueryResultDynamicReturnTypeExtension
VincentLanglet Dec 26, 2022
cdb0ba7
Solve phpstan deprecation
VincentLanglet Feb 25, 2023
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 .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- name: Generate changelog
id: changelog
uses: metcalfc/changelog-generator@v4.0.1
uses: metcalfc/changelog-generator@v4.1.0
with:
myToken: ${{ secrets.PHPSTAN_BOT_TOKEN }}

Expand Down
8 changes: 4 additions & 4 deletions build-cs/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"require-dev": {
"consistence-community/coding-standard": "^3.11",
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
"slevomat/coding-standard": "^7.0",
"squizlabs/php_codesniffer": "^3.6.2"
"consistence-community/coding-standard": "^3.11.0",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0.0",
"slevomat/coding-standard": "^8.8.0",
"squizlabs/php_codesniffer": "^3.5.3"
},
"config": {
"allow-plugins": {
Expand Down
119 changes: 64 additions & 55 deletions build-cs/composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions extension.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ parameters:
- stubs/Collections/ReadableCollection.stub
- stubs/Collections/Selectable.stub
- stubs/ORM/AbstractQuery.stub
- stubs/ORM/Id/AbstractIdGenerator.stub
- stubs/ORM/Mapping/ClassMetadata.stub
- stubs/ORM/Mapping/ClassMetadataInfo.stub
- stubs/ORM/ORMException.stub
Expand Down
15 changes: 7 additions & 8 deletions src/Reflection/Doctrine/DoctrineSelectableClassReflectionExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@

namespace PHPStan\Reflection\Doctrine;

use PHPStan\Broker\Broker;
use PHPStan\Reflection\BrokerAwareExtension;
use PHPStan\Reflection\ClassReflection;
use PHPStan\Reflection\MethodReflection;
use PHPStan\Reflection\MethodsClassReflectionExtension;
use PHPStan\Reflection\ReflectionProvider;

class DoctrineSelectableClassReflectionExtension implements MethodsClassReflectionExtension, BrokerAwareExtension
class DoctrineSelectableClassReflectionExtension implements MethodsClassReflectionExtension
{

/** @var Broker */
private $broker;
/** @var ReflectionProvider */
private $reflectionProvider;

public function setBroker(Broker $broker): void
public function __construct(ReflectionProvider $reflectionProvider)
{
$this->broker = $broker;
$this->reflectionProvider = $reflectionProvider;
}

public function hasMethod(ClassReflection $classReflection, string $methodName): bool
Expand All @@ -27,7 +26,7 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):

public function getMethod(ClassReflection $classReflection, string $methodName): MethodReflection
{
$selectableReflection = $this->broker->getClass('Doctrine\Common\Collections\Selectable');
$selectableReflection = $this->reflectionProvider->getClass('Doctrine\Common\Collections\Selectable');
return $selectableReflection->getNativeMethod($methodName);
}

Expand Down
Loading