Skip to content

Replaced some requirements with conflicts #3

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 1 commit into from
May 31, 2018
Merged

Replaced some requirements with conflicts #3

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
8 changes: 6 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"require": {
"php": "~7.1",
"phpstan/phpstan": "^0.10",
"dibi/dibi": "~3.0"
"nikic/php-parser": "^4.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This extension isn't actually dependent on any symbol from PHP-Parser, but I'll allow it for the sake of consistency.

},
"require-dev": {
"consistence/coding-standard": "^3.0.1",
Expand All @@ -23,7 +23,11 @@
"phpstan/phpstan-strict-rules": "^0.10",
"phpunit/phpunit": "^7.0",
"satooshi/php-coveralls": "^1.0",
"slevomat/coding-standard": "^4.5.2"
"slevomat/coding-standard": "^4.5.2",
"dibi/dibi": "~3.0"
},
"conflict": {
"dibi/dibi": "<3.0"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Reflection/Dibi/DibiFluentClassReflectionExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class DibiFluentClassReflectionExtension implements MethodsClassReflectionExtens

public function hasMethod(ClassReflection $classReflection, string $methodName): bool
{
return $classReflection->getName() === \Dibi\Fluent::class;
return $classReflection->getName() === 'Dibi\Fluent';
}

public function getMethod(ClassReflection $classReflection, string $methodName): MethodReflection
Expand Down
2 changes: 1 addition & 1 deletion src/Reflection/Dibi/DibiFluentMethodReflection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public function getVariants(): array
new FunctionVariant(
[],
true,
new ObjectType(\Dibi\Fluent::class)
new ObjectType('Dibi\Fluent')
),
];
}
Expand Down