Replaced some requirements with conflicts

phpstan · May 31, 2018 · 4d59abd · 4d59abd
1 parent 920fd64
commit 4d59abd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
 	"require": {
 		"php": "~7.1",
 		"phpstan/phpstan": "^0.10",
-		"dibi/dibi": "~3.0"
+		"nikic/php-parser": "^4.0"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^3.0.1",
@@ -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": {

diff --git a/src/Reflection/Dibi/DibiFluentClassReflectionExtension.php b/src/Reflection/Dibi/DibiFluentClassReflectionExtension.php
@@ -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

diff --git a/src/Reflection/Dibi/DibiFluentMethodReflection.php b/src/Reflection/Dibi/DibiFluentMethodReflection.php
@@ -62,7 +62,7 @@ public function getVariants(): array
 			new FunctionVariant(
 				[],
 				true,
-				new ObjectType(\Dibi\Fluent::class)
+				new ObjectType('Dibi\Fluent')
 			),
 		];
 	}
-Original file 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 @@