Skip to content

Commit 6e0ae41

Browse files
committed
only validates __callStatic methods now
1 parent 9f45510 commit 6e0ae41

File tree

3 files changed

+2
-126
lines changed

3 files changed

+2
-126
lines changed

src/Reflection/Money/MoneyMethodReflection.php

-77
This file was deleted.

src/Reflection/Money/MoneyMethodsReflectionExtension.php

+2-11
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,11 @@ public function hasMethod(ClassReflection $classReflection, string $methodName):
1717

1818
$currencies = Currency::getCurrencies();
1919

20-
return ($classReflection->getNativeReflection()->hasMethod($methodName) || array_key_exists($methodName, $currencies));
20+
return array_key_exists($methodName, $currencies);
2121
}
2222

2323
public function getMethod(ClassReflection $classReflection, string $methodName): MethodReflection
2424
{
25-
$currencies = Currency::getCurrencies();
26-
27-
if (array_key_exists($methodName, $currencies)) {
28-
return new MoneyStaticMethodReflection($classReflection, $methodName);
29-
}
30-
31-
$method = $classReflection->getNativeReflection()->getMethod($methodName);
32-
33-
return new MoneyMethodReflection($classReflection, $methodName, $method->isStatic(), $method->isPrivate());
25+
return new MoneyStaticMethodReflection($classReflection, $methodName);
3426
}
35-
3627
}

tests/Reflection/Money/MoneyMethodsReflectionExtensionTest.php

-38
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ protected function setUp(): void
1616
$this->extension = new MoneyMethodsReflectionExtension();
1717
}
1818

19-
public function testHasMethod(): void
20-
{
21-
$classReflection = $this->broker->getClass('Money\Money');
22-
$this->assertTrue($this->extension->hasMethod($classReflection, 'getUnits'));
23-
}
24-
2519
public function testHasStaticMethod(): void
2620
{
2721
$classReflection = $this->broker->getClass('Money\Money');
@@ -34,38 +28,6 @@ public function testInvalidMethod(): void
3428
$this->assertFalse($this->extension->hasMethod($classReflection, 'ZZZ'));
3529
}
3630

37-
public function testHasPrivateMethod(): void
38-
{
39-
$classReflection = $this->broker->getClass('Money\Money');
40-
$this->assertTrue($this->extension->hasMethod($classReflection, 'assertSameCurrency'));
41-
}
42-
43-
public function testGetPublicMethod(): void
44-
{
45-
$classReflection = $this->broker->getClass('Money\Money');
46-
$methodReflection = $this->extension->getMethod($classReflection, 'getUnits');
47-
48-
$this->assertEquals('getUnits', $methodReflection->getName());
49-
$this->assertEquals($classReflection, $methodReflection->getDeclaringClass());
50-
$this->assertFalse($methodReflection->isStatic());
51-
$this->assertFalse($methodReflection->isVariadic());
52-
$this->assertFalse($methodReflection->isPrivate());
53-
$this->assertTrue($methodReflection->isPublic());
54-
}
55-
56-
public function testGetPrivateMethod(): void
57-
{
58-
$classReflection = $this->broker->getClass('Money\Money');
59-
$methodReflection = $this->extension->getMethod($classReflection, 'assertSameCurrency');
60-
61-
$this->assertEquals('assertSameCurrency', $methodReflection->getName());
62-
$this->assertEquals($classReflection, $methodReflection->getDeclaringClass());
63-
$this->assertFalse($methodReflection->isStatic());
64-
$this->assertFalse($methodReflection->isVariadic());
65-
$this->assertTrue($methodReflection->isPrivate());
66-
$this->assertFalse($methodReflection->isPublic());
67-
}
68-
6931
public function testGetStaticMethod(): void
7032
{
7133
$classReflection = $this->broker->getClass('Money\Money');

0 commit comments

Comments
 (0)