Update build-cs

Author: ondrejmirtes

.github/workflows/build.yml

@@ -56,7 +56,7 @@ jobs:
         with:
           repository: "phpstan/build-cs"
           path: "build-cs"
-          ref: "1.x"
+          ref: "2.x"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"

Makefile

@@ -13,7 +13,7 @@ lint:
 .PHONY: cs-install
 cs-install:
 	git clone https://github.com/phpstan/build-cs.git || true
-	git -C build-cs fetch origin && git -C build-cs reset --hard origin/1.x
+	git -C build-cs fetch origin && git -C build-cs reset --hard origin/2.x
 	composer install --working-dir build-cs
 
 .PHONY: cs

src/Mockery/PhpDoc/TypeNodeResolverExtension.php

@@ -14,8 +14,7 @@
 class TypeNodeResolverExtension implements \PHPStan\PhpDoc\TypeNodeResolverExtension, TypeNodeResolverAwareExtension
 {
 
-	/** @var TypeNodeResolver */
-	private $typeNodeResolver;
+	private TypeNodeResolver $typeNodeResolver;
 
 	public function setTypeNodeResolver(TypeNodeResolver $typeNodeResolver): void
 	{

src/Mockery/Reflection/StubMethodReflection.php

@@ -15,11 +15,9 @@
 class StubMethodReflection implements MethodReflection
 {
 
-	/** @var ClassReflection */
-	private $declaringClass;
+	private ClassReflection $declaringClass;
 
-	/** @var string */
-	private $name;
+	private string $name;
 
 	public function __construct(ClassReflection $declaringClass, string $name)
 	{
@@ -68,7 +66,7 @@ public function getVariants(): array
 				TemplateTypeMap::createEmpty(),
 				[],
 				true,
-				new ObjectType('Mockery\\Expectation')
+				new ObjectType('Mockery\\Expectation'),
 			),
 		];
 	}

src/Mockery/Reflection/StubMethodsClassReflectionExtension.php

@@ -11,11 +11,9 @@
 class StubMethodsClassReflectionExtension implements MethodsClassReflectionExtension
 {
 
-	/** @var ReflectionProvider */
-	private $reflectionProvider;
+	private ReflectionProvider $reflectionProvider;
 
-	/** @var string */
-	private $stubInterfaceName;
+	private string $stubInterfaceName;
 
 	public function __construct(ReflectionProvider $reflectionProvider, string $stubInterfaceName)
 	{

src/Mockery/Type/StubDynamicReturnTypeExtension.php

@@ -15,11 +15,9 @@
 class StubDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
-	/** @var string */
-	private $stubInterfaceName;
+	private string $stubInterfaceName;
 
-	/** @var string */
-	private $stubMethodName;
+	private string $stubMethodName;
 
 	public function __construct(string $stubInterfaceName, string $stubMethodName)
 	{
@@ -40,9 +38,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
 		$calledOnType = $scope->getType($methodCall->var)->getObjectClassNames();
-		$names = array_values(array_filter($calledOnType, static function (string $name) {
-			return $name !== 'Mockery\\MockInterface';
-		}));
+		$names = array_values(array_filter($calledOnType, static fn (string $name) => $name !== 'Mockery\\MockInterface'));
 		if (count($names) !== 1) {
 			return null;
 		}

tests/Mockery/MockeryBarTest.php

@@ -60,9 +60,7 @@ public function testShouldNotHaveReceived(): void
 		$this->fooSpy->shouldNotHaveReceived(null)->withArgs(['bar']);
 		$this->fooSpy->doBar('ccc');
 		$this->fooSpy->shouldNotHaveReceived('doBar', ['ddd']);
-		$this->fooSpy->shouldNotHaveReceived('doBar', static function (string $arg): bool {
-			return $arg !== 'ccc';
-		});
+		$this->fooSpy->shouldNotHaveReceived('doBar', static fn (string $arg): bool => $arg !== 'ccc');
 	}
 
 	public function testShouldHaveReceived(): void
@@ -72,9 +70,7 @@ public function testShouldHaveReceived(): void
 		$this->fooSpy->shouldHaveReceived('doFoo')->once();
 		$this->fooSpy->doBar('ccc');
 		$this->fooSpy->shouldHaveReceived('doBar', ['ccc']);
-		$this->fooSpy->shouldHaveReceived('doBar', static function (string $arg): bool {
-			return $arg === 'ccc';
-		});
+		$this->fooSpy->shouldHaveReceived('doBar', static fn (string $arg): bool => $arg === 'ccc');
 	}
 
 }