Skip to content
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

Replaced some requirements with conflicts #29

Merged
merged 1 commit into from
May 28, 2018
+17 −12
Merged

Replaced some requirements with conflicts #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
"require": {
"php": "~7.1",
"phpstan/phpstan": "^0.10",
"doctrine/common": "^2.7",
"doctrine/orm": "^2.5",
"doctrine/collections": "^1.0",
"nikic/php-parser": "^4.0"
},
"require-dev": {
Expand All @@ -25,7 +22,15 @@
"phpstan/phpstan-phpunit": "^0.10",
"phpstan/phpstan-strict-rules": "^0.10",
"phpunit/phpunit": "^7.0",
"slevomat/coding-standard": "^4.5.2"
"slevomat/coding-standard": "^4.5.2",
"doctrine/common": "^2.7",
"doctrine/orm": "^2.5",
"doctrine/collections": "^1.0"
},
"conflict": {
"doctrine/common": "<2.7",
"doctrine/orm": "<2.5",
"doctrine/collections": "<1.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Reflection/Doctrine/DoctrineSelectableClassReflectionExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace PHPStan\Reflection\Doctrine;

class DoctrineSelectableClassReflectionExtension implements \PHPStan\Reflection\MethodsClassReflectionExtension, \PHPStan\Reflection\BrokerAwareClassReflectionExtension
class DoctrineSelectableClassReflectionExtension implements \PHPStan\Reflection\MethodsClassReflectionExtension, \PHPStan\Reflection\BrokerAwareExtension
{

/** @var \PHPStan\Broker\Broker */
Expand All @@ -15,13 +15,13 @@ public function setBroker(\PHPStan\Broker\Broker $broker): void

public function hasMethod(\PHPStan\Reflection\ClassReflection $classReflection, string $methodName): bool
{
return $classReflection->getName() === \Doctrine\Common\Collections\Collection::class
return $classReflection->getName() === 'Doctrine\Common\Collections\Collection'
&& $methodName === 'matching';
}

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

Expand Down
2 changes: 1 addition & 1 deletion src/Type/Doctrine/DoctrineSelectableDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class DoctrineSelectableDynamicReturnTypeExtension implements \PHPStan\Type\Dyna

public function getClass(): string
{
return \Doctrine\Common\Collections\Collection::class;
return 'Doctrine\Common\Collections\Collection';
}

public function isMethodSupported(MethodReflection $methodReflection): bool
Expand Down
2 changes: 1 addition & 1 deletion src/Type/Doctrine/EntityManagerFindDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class EntityManagerFindDynamicReturnTypeExtension implements \PHPStan\Type\Dynam

public function getClass(): string
{
return \Doctrine\Common\Persistence\ObjectManager::class;
return 'Doctrine\Common\Persistence\ObjectManager';
}

public function isMethodSupported(MethodReflection $methodReflection): bool
Expand Down
2 changes: 1 addition & 1 deletion src/Type/Doctrine/EntityManagerGetRepositoryDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public function __construct(string $repositoryClass)

public function getClass(): string
{
return \Doctrine\Common\Persistence\ObjectManager::class;
return 'Doctrine\Common\Persistence\ObjectManager';
}

public function isMethodSupported(MethodReflection $methodReflection): bool
Expand Down
2 changes: 1 addition & 1 deletion src/Type/Doctrine/EntityRepositoryDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class EntityRepositoryDynamicReturnTypeExtension implements \PHPStan\Type\Dynami

public function getClass(): string
{
return \Doctrine\ORM\EntityRepository::class;
return 'Doctrine\ORM\EntityRepository';
}

public function isMethodSupported(MethodReflection $methodReflection): bool
Expand Down
2 changes: 1 addition & 1 deletion src/Type/Doctrine/ObjectManagerMergeDynamicReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class ObjectManagerMergeDynamicReturnTypeExtension implements \PHPStan\Type\Dyna

public function getClass(): string
{
return \Doctrine\Common\Persistence\ObjectManager::class;
return 'Doctrine\Common\Persistence\ObjectManager';
}

public function isMethodSupported(MethodReflection $methodReflection): bool
Expand Down