Merge pull request #93 from localheinz/feature/clean-up

localheinz · web-flow · commit 46b4f00e09a1 · 2019-12-28T00:29:49.000+01:00
Enhancement: Slightly clean up code
diff --git a/src/Extension/ObjectProphecyRevealDynamicReturnTypeExtension.php b/src/Extension/ObjectProphecyRevealDynamicReturnTypeExtension.php
@@ -26,19 +26,21 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
+        $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
+
         $calledOnType = $scope->getType($methodCall->var);
 
-        $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
+        $returnType = $parametersAcceptor->getReturnType();
 
         if (!$calledOnType instanceof ObjectProphecyType) {
-            return $parametersAcceptor->getReturnType();
+            return $returnType;
         }
 
         $types = \array_map(static function (string $class): ObjectType {
             return new ObjectType($class);
         }, $calledOnType->getProphesizedClasses());
 
-        $types[] = $parametersAcceptor->getReturnType();
+        $types[] = $returnType;
 
         return TypeCombinator::intersect(...$types);
     }
diff --git a/src/Extension/ObjectProphecyWillImplementDynamicReturnTypeExtension.php b/src/Extension/ObjectProphecyWillImplementDynamicReturnTypeExtension.php
@@ -31,37 +31,37 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 
         $calledOnType = $scope->getType($methodCall->var);
 
-        $prophecyType = $parametersAcceptor->getReturnType();
+        $returnType = $parametersAcceptor->getReturnType();
 
         if (!$calledOnType instanceof ObjectProphecyType) {
-            return $prophecyType;
+            return $returnType;
         }
 
         if (0 === \count($methodCall->args)) {
-            return $prophecyType;
+            return $returnType;
         }
 
-        $argType = $scope->getType($methodCall->args[0]->value);
+        $argumentType = $scope->getType($methodCall->args[0]->value);
 
-        if (!($argType instanceof ConstantStringType)) {
-            return $prophecyType;
+        if (!$argumentType instanceof ConstantStringType) {
+            return $returnType;
         }
 
-        $class = $argType->getValue();
+        $className = $argumentType->getValue();
 
-        if (!($prophecyType instanceof TypeWithClassName)) {
+        if (!$returnType instanceof TypeWithClassName) {
             throw new ShouldNotHappenException();
         }
 
-        if ('static' === $class) {
-            return $prophecyType;
+        if ('static' === $className) {
+            return $returnType;
         }
 
-        if ('self' === $class && null !== $scope->getClassReflection()) {
-            $class = $scope->getClassReflection()->getName();
+        if ('self' === $className && null !== $scope->getClassReflection()) {
+            $className = $scope->getClassReflection()->getName();
         }
 
-        $calledOnType->addProphesizedClass($class);
+        $calledOnType->addProphesizedClass($className);
 
         return $calledOnType;
     }
diff --git a/src/Extension/ProphetProphesizeDynamicReturnTypeExtension.php b/src/Extension/ProphetProphesizeDynamicReturnTypeExtension.php
@@ -35,32 +35,33 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
     public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
     {
         $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());
-        $prophecyType = $parametersAcceptor->getReturnType();
+
+        $returnType = $parametersAcceptor->getReturnType();
 
         if (0 === \count($methodCall->args)) {
-            return $prophecyType;
+            return $returnType;
         }
 
-        $argType = $scope->getType($methodCall->args[0]->value);
+        $argumentType = $scope->getType($methodCall->args[0]->value);
 
-        if (!($argType instanceof ConstantStringType)) {
-            return $prophecyType;
+        if (!$argumentType instanceof ConstantStringType) {
+            return $returnType;
         }
 
-        $class = $argType->getValue();
+        $className = $argumentType->getValue();
 
-        if (!($prophecyType instanceof TypeWithClassName)) {
+        if (!$returnType instanceof TypeWithClassName) {
             throw new ShouldNotHappenException();
         }
 
-        if ('static' === $class) {
-            return $prophecyType;
+        if ('static' === $className) {
+            return $returnType;
         }
 
-        if ('self' === $class && null !== $scope->getClassReflection()) {
-            $class = $scope->getClassReflection()->getName();
+        if ('self' === $className && null !== $scope->getClassReflection()) {
+            $className = $scope->getClassReflection()->getName();
         }
 
-        return new ObjectProphecyType($class);
+        return new ObjectProphecyType($className);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,19 +26,21 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`26`	`26`
`27`	`27`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`28`	`28`	`{`
	`29`	`+ $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());`
	`30`	`+`
`29`	`31`	`$calledOnType = $scope->getType($methodCall->var);`
`30`	`32`
`31`		`- $parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());`
	`33`	`+ $returnType = $parametersAcceptor->getReturnType();`
`32`	`34`
`33`	`35`	`if (!$calledOnType instanceof ObjectProphecyType) {`
`34`		`- return $parametersAcceptor->getReturnType();`
	`36`	`+ return $returnType;`
`35`	`37`	`}`
`36`	`38`
`37`	`39`	`$types = \array_map(static function (string $class): ObjectType {`
`38`	`40`	`return new ObjectType($class);`
`39`	`41`	`}, $calledOnType->getProphesizedClasses());`
`40`	`42`
`41`		`- $types[] = $parametersAcceptor->getReturnType();`
	`43`	`+ $types[] = $returnType;`
`42`	`44`
`43`	`45`	`return TypeCombinator::intersect(...$types);`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,37 +31,37 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`31`	`31`
`32`	`32`	`$calledOnType = $scope->getType($methodCall->var);`
`33`	`33`
`34`		`- $prophecyType = $parametersAcceptor->getReturnType();`
	`34`	`+ $returnType = $parametersAcceptor->getReturnType();`
`35`	`35`
`36`	`36`	`if (!$calledOnType instanceof ObjectProphecyType) {`
`37`		`- return $prophecyType;`
	`37`	`+ return $returnType;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (0 === \count($methodCall->args)) {`
`41`		`- return $prophecyType;`
	`41`	`+ return $returnType;`
`42`	`42`	`}`
`43`	`43`
`44`		`- $argType = $scope->getType($methodCall->args[0]->value);`
	`44`	`+ $argumentType = $scope->getType($methodCall->args[0]->value);`
`45`	`45`
`46`		`- if (!($argType instanceof ConstantStringType)) {`
`47`		`- return $prophecyType;`
	`46`	`+ if (!$argumentType instanceof ConstantStringType) {`
	`47`	`+ return $returnType;`
`48`	`48`	`}`
`49`	`49`
`50`		`- $class = $argType->getValue();`
	`50`	`+ $className = $argumentType->getValue();`
`51`	`51`
`52`		`- if (!($prophecyType instanceof TypeWithClassName)) {`
	`52`	`+ if (!$returnType instanceof TypeWithClassName) {`
`53`	`53`	`throw new ShouldNotHappenException();`
`54`	`54`	`}`
`55`	`55`
`56`		`- if ('static' === $class) {`
`57`		`- return $prophecyType;`
	`56`	`+ if ('static' === $className) {`
	`57`	`+ return $returnType;`
`58`	`58`	`}`
`59`	`59`
`60`		`- if ('self' === $class && null !== $scope->getClassReflection()) {`
`61`		`- $class = $scope->getClassReflection()->getName();`
	`60`	`+ if ('self' === $className && null !== $scope->getClassReflection()) {`
	`61`	`+ $className = $scope->getClassReflection()->getName();`
`62`	`62`	`}`
`63`	`63`
`64`		`- $calledOnType->addProphesizedClass($class);`
	`64`	`+ $calledOnType->addProphesizedClass($className);`
`65`	`65`
`66`	`66`	`return $calledOnType;`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,32 +35,33 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`35`	`35`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`36`	`36`	`{`
`37`	`37`	`$parametersAcceptor = ParametersAcceptorSelector::selectSingle($methodReflection->getVariants());`
`38`		`- $prophecyType = $parametersAcceptor->getReturnType();`
	`38`	`+`
	`39`	`+ $returnType = $parametersAcceptor->getReturnType();`
`39`	`40`
`40`	`41`	`if (0 === \count($methodCall->args)) {`
`41`		`- return $prophecyType;`
	`42`	`+ return $returnType;`
`42`	`43`	`}`
`43`	`44`
`44`		`- $argType = $scope->getType($methodCall->args[0]->value);`
	`45`	`+ $argumentType = $scope->getType($methodCall->args[0]->value);`
`45`	`46`
`46`		`- if (!($argType instanceof ConstantStringType)) {`
`47`		`- return $prophecyType;`
	`47`	`+ if (!$argumentType instanceof ConstantStringType) {`
	`48`	`+ return $returnType;`
`48`	`49`	`}`
`49`	`50`
`50`		`- $class = $argType->getValue();`
	`51`	`+ $className = $argumentType->getValue();`
`51`	`52`
`52`		`- if (!($prophecyType instanceof TypeWithClassName)) {`
	`53`	`+ if (!$returnType instanceof TypeWithClassName) {`
`53`	`54`	`throw new ShouldNotHappenException();`
`54`	`55`	`}`
`55`	`56`
`56`		`- if ('static' === $class) {`
`57`		`- return $prophecyType;`
	`57`	`+ if ('static' === $className) {`
	`58`	`+ return $returnType;`
`58`	`59`	`}`
`59`	`60`
`60`		`- if ('self' === $class && null !== $scope->getClassReflection()) {`
`61`		`- $class = $scope->getClassReflection()->getName();`
	`61`	`+ if ('self' === $className && null !== $scope->getClassReflection()) {`
	`62`	`+ $className = $scope->getClassReflection()->getName();`
`62`	`63`	`}`
`63`	`64`
`64`		`- return new ObjectProphecyType($class);`
	`65`	`+ return new ObjectProphecyType($className);`
`65`	`66`	`}`
`66`	`67`	`}`