#145: Fix bug with empty arguments #170

yogyrton · 2024-12-18T13:43:36Z

DenTray · 2024-12-23T11:23:28Z

src/Traits/MockTrait.php

+        if ($isClass) {
+            $reflectionMethod = new \ReflectionMethod($class, $function);
+            $parameters = $reflectionMethod->getParameters();
+            $requiredParametersCount = count(array_filter($parameters, fn($param) => !$param->isOptional()));
+        } else {
+            $parameters = $actual;
            $requiredParametersCount = count(array_filter($actual, fn ($item) => $item !== self::OPTIONAL_ARGUMENT_NAME));
+        }


let's move it to the separate method which will return [$parameters, $requiredParametersCount]

DenTray · 2024-12-23T11:24:14Z

src/Traits/MockTrait.php

@@ -134,21 +134,43 @@ protected function assertArguments(
        $expectedCount = count($expected);
        $actualCount = count($actual);

-        if ($expectedCount !== $actualCount) {
+        if ($isClass) {
+            $reflectionMethod = new \ReflectionMethod($class, $function);


Suggested change

$reflectionMethod = new \ReflectionMethod($class, $function);

$reflectionMethod = new ReflectionMethod($class, $function);

DenTray · 2024-12-23T11:24:28Z

src/Traits/MockTrait.php

+        if ($isClass) {
+            $reflectionMethod = new \ReflectionMethod($class, $function);
+            $parameters = $reflectionMethod->getParameters();
+            $requiredParametersCount = count(array_filter($parameters, fn($param) => !$param->isOptional()));


Suggested change

$requiredParametersCount = count(array_filter($parameters, fn($param) => !$param->isOptional()));

$requiredParametersCount = count(array_filter($parameters, fn ($param) => !$param->isOptional()));

DenTray · 2024-12-23T11:32:43Z

src/Traits/MockTrait.php


        $message = ($isClass)
            ? "Class '{$class}'\nMethod: '{$function}'\nMethod call index: {$callIndex}"
            : "Namespace '{$class}'\nFunction: '{$function}'\nCall index: {$callIndex}";

        foreach ($actual as $index => $argument) {
+            $expectedArgument = $expected[$index] ?? null;


as discussed, please check that this is realy need

DenTray · 2025-01-09T04:38:35Z

src/Traits/MockTrait.php

    ): void {
+        $reflection = $isClass


Suggested change

$reflection = $isClass

$reflection = ($isClass)

DenTray · 2025-01-09T04:44:32Z

src/Traits/MockTrait.php

+
+        $this->fillOptionalArguments($parameters, $actual, $expected, $isClass);
+
+        $message = $isClass


Suggested change

$message = $isClass

$message = ($isClass)

DenTray · 2025-01-09T05:05:42Z

src/Traits/MockTrait.php


+    protected function assertArgumentCount(int $expectedCount, int $actualCount, int $requiredParametersCount, string $function): void


Suggested change

protected function assertArgumentCount(int $expectedCount, int $actualCount, int $requiredParametersCount, string $function): void

protected function assertArgumentsCount(int $expectedCount, int $actualCount, int $requiredParametersCount, string $function): void

DenTray · 2025-01-09T05:12:45Z

src/Traits/MockTrait.php

        $expectedCount = count($expected);
        $actualCount = count($actual);
+        $parameters = $reflection->getParameters();


Suggested change

$parameters = $reflection->getParameters();

$reflectionArgs = $reflection->getParameters();

DenTray · 2025-01-09T05:14:46Z

src/Traits/MockTrait.php

+        $requiredParametersCount = count(array_filter($parameters, fn ($param) => !$param->isOptional()));
+
+        $this->assertArgumentCount($expectedCount, $actualCount, $requiredParametersCount, $function);


let's move counting into the assertArgumentCount function

Suggested change

$requiredParametersCount = count(array_filter($parameters, fn ($param) => !$param->isOptional()));

$this->assertArgumentCount($expectedCount, $actualCount, $requiredParametersCount, $function);

$this->assertArgumentCount($expected, $actual, $reflectionArgs, $function);

DenTray · 2025-01-09T05:23:09Z

tests/MockTraitTest.php

+        $this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired')));
+        $this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional')));
+        $this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional', 'secondOptional')));


Suggested change

$this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired')));

$this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional')));

$this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional', 'secondOptional')));

$this->assertEquals('mockFunction', $mock->mockFunction('firstRequired', 'secondRequired'));

$this->assertEquals('mockFunction', $mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional'));

$this->assertEquals('mockFunction', $mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional', 'secondOptional'));

DenTray · 2025-01-09T05:31:19Z

tests/MockTraitTest.php

+            $this->functionCall('mockFunction', ['firstRequired', 'secondRequired'], 'mockFunction'),
+        ]);
+
+        $this->assertNotEquals('result', $mock->mockFunction('firstRequired', 'secondRequired'));


Suggested change

$this->functionCall('mockFunction', ['firstRequired', 'secondRequired'], 'mockFunction'),

]);

$this->assertNotEquals('result', $mock->mockFunction('firstRequired', 'secondRequired'));

$this->functionCall('mockFunction', ['firstRequired', 'secondRequired'], 'mocked_result'),

]);

$this->assertEquals('mocked_result', $mock->mockFunction('firstRequired', 'secondRequired'));

DenTray · 2025-01-09T05:35:04Z

tests/MockTraitTest.php

+        $this->assertEquals('mockFunction', ($mock->mockFunction('firstRequired', 'secondRequired', 'firstOptional', 'secondOptional')));
+    }
+
+    public function testMockFunctionInClassWhenDifferentResult()


Suggested change

public function testMockFunctionInClassWhenDifferentResult()

public function testMockClassMethodCheckMockedResult()

DenTray · 2025-01-09T05:35:41Z

tests/MockTraitTest.php

+        $this->assertNotEquals('result', $mock->mockFunction('firstRequired', 'secondRequired'));
+    }
+
+    public function testMockFunctionInClassWhenLessRequiredParameters()


Suggested change

public function testMockFunctionInClassWhenLessRequiredParameters()

public function testMockClassMethodWhenLessRequiredParameters()

DenTray · 2025-01-09T05:36:40Z

tests/MockTraitTest.php

    }

-    public function testAssertArgumentMismatchBetweenExpectedAndActualArguments()
+    public function testMockFunctionInClassWhenMoreExpectedParameters()


Suggested change

public function testMockFunctionInClassWhenMoreExpectedParameters()

public function testMockClassMethodWhenMoreExpectedParameters()

DenTray · 2025-01-10T06:48:12Z

src/Traits/MockTrait.php

-            $requiredParametersCount = count(array_filter($actual, fn ($item) => $item !== self::OPTIONAL_ARGUMENT_NAME));
+            $this->assertFalse(
+                $expectedCount < $requiredParametersCount,
+                "Failed assert that function {$function} was called with {$expectedCount} require arguments, actually it calls with {$requiredParametersCount} require arguments."


Suggested change

"Failed assert that function {$function} was called with {$expectedCount} require arguments, actually it calls with {$requiredParametersCount} require arguments."

"Failed assert that function {$function} was called with {$expectedCount} arguments, actually it has {$requiredParametersCount} required arguments."

DenTray · 2025-01-10T07:32:47Z

src/Traits/MockTrait.php

-            ? "Class '{$class}'\nMethod: '{$function}'\nMethod call index: {$callIndex}"
-            : "Namespace '{$class}'\nFunction: '{$function}'\nCall index: {$callIndex}";
+            if (!$isClass && $actual[$index] === 'optionalParameter') {
+                $actual[$index] = $expected[$index] ?? $parameter->getDefaultValue();


please move actual args filling before the expected args filling

Suggested change

$actual[$index] = $expected[$index] ?? $parameter->getDefaultValue();

$actual[$index] = $parameter->getDefaultValue();

#145: Fix bug with empty arguments

3b159c5

yogyrton assigned DenTray Dec 18, 2024

yogyrton added 2 commits December 18, 2024 16:47

test: refactor

7c4f4a3

refactor: message

069c0ef

yogyrton mentioned this pull request Dec 20, 2024

#145: Mock class not assert arguments with the empty arg list RonasIT/laravel-empty-project#114

Closed

DenTray requested changes Dec 23, 2024

View reviewed changes

DenTray assigned yogyrton and unassigned DenTray Dec 23, 2024

yogyrton added 2 commits December 27, 2024 13:02

refactor: separate methods in assertArguments

f08e3d6

refactor: final assertArguments

fc57d8b

yogyrton assigned DenTray and unassigned yogyrton Dec 31, 2024

refactor: assertArguments

604756e

DenTray requested changes Jan 9, 2025

View reviewed changes

DenTray assigned yogyrton and unassigned DenTray Jan 9, 2025

refactor: assertArguments

106ee3f

yogyrton assigned DenTray and unassigned yogyrton Jan 9, 2025

DenTray requested changes Jan 10, 2025

View reviewed changes

DenTray assigned yogyrton and unassigned DenTray Jan 10, 2025

refactor: tests

7e66c4a

yogyrton assigned DenTray and unassigned yogyrton Jan 10, 2025

refactor: use const

4b2fcae

DenTray approved these changes Jan 10, 2025

View reviewed changes

DenTray merged commit 2f40794 into master Jan 10, 2025
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#145: Fix bug with empty arguments #170

#145: Fix bug with empty arguments #170

yogyrton commented Dec 18, 2024

DenTray Dec 23, 2024

DenTray Dec 23, 2024

DenTray Dec 23, 2024

DenTray Dec 23, 2024

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 9, 2025

DenTray Jan 10, 2025

DenTray Jan 10, 2025

	$reflectionMethod = new \ReflectionMethod($class, $function);
	$reflectionMethod = new ReflectionMethod($class, $function);

	$requiredParametersCount = count(array_filter($parameters, fn($param) => !$param->isOptional()));
	$requiredParametersCount = count(array_filter($parameters, fn ($param) => !$param->isOptional()));


		$this->fillOptionalArguments($parameters, $actual, $expected, $isClass);

		$message = $isClass


		protected function assertArgumentCount(int $expectedCount, int $actualCount, int $requiredParametersCount, string $function): void

	protected function assertArgumentCount(int $expectedCount, int $actualCount, int $requiredParametersCount, string $function): void
	protected function assertArgumentsCount(int $expectedCount, int $actualCount, int $requiredParametersCount, string $function): void

	$parameters = $reflection->getParameters();
	$reflectionArgs = $reflection->getParameters();

		$requiredParametersCount = count(array_filter($parameters, fn ($param) => !$param->isOptional()));

		$this->assertArgumentCount($expectedCount, $actualCount, $requiredParametersCount, $function);

	public function testMockFunctionInClassWhenDifferentResult()
	public function testMockClassMethodCheckMockedResult()

	public function testMockFunctionInClassWhenLessRequiredParameters()
	public function testMockClassMethodWhenLessRequiredParameters()

	public function testMockFunctionInClassWhenMoreExpectedParameters()
	public function testMockClassMethodWhenMoreExpectedParameters()

	"Failed assert that function {$function} was called with {$expectedCount} require arguments, actually it calls with {$requiredParametersCount} require arguments."
	"Failed assert that function {$function} was called with {$expectedCount} arguments, actually it has {$requiredParametersCount} required arguments."

	$actual[$index] = $expected[$index] ?? $parameter->getDefaultValue();
	$actual[$index] = $parameter->getDefaultValue();

#145: Fix bug with empty arguments #170

#145: Fix bug with empty arguments #170

Conversation

yogyrton commented Dec 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment