Skip to content

Commit fcfb64c

Browse files
chitoku-kchitoku-k
committed
Add type annotations in Utilities
1 parent c63f0c5 commit fcfb64c

11 files changed

Lines changed: 50 additions & 53 deletions

File tree

‎src/Core/JVM/Invoker/InvokerInterface.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
interface InvokerInterface
77
{
88
/**
9-
* @param _MethodInfo[] $methods
9+
* @param PHPJava\Kernel\Structures\_MethodInfo[] $methods
1010
*/
1111
public function __construct(JavaClassInvoker $javaClassInvoker, array $methods);
1212

@@ -15,7 +15,7 @@ public function call(string $name, ...$arguments);
1515
public function isDynamic(): bool;
1616

1717
/**
18-
* @return _MethodInfo[]
18+
* @return PHPJava\Kernel\Structures\_MethodInfo[]
1919
*/
2020
public function getList(): array;
2121

‎src/Packages/PHPJava/Extended/_Object.php‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ trait _Object
99
{
1010
private $parameters;
1111

12-
/**
13-
* _Object constructor.
14-
* @param mixed ...$parameters
15-
*/
1612
public function __construct(...$parameters)
1713
{
1814
$this->parameters = $parameters;
@@ -27,11 +23,9 @@ public function __destruct()
2723
}
2824

2925
/**
30-
* @param $name
31-
* @param $arguments
3226
* @throws NoSuchMethodException
3327
*/
34-
public function __call($name, $arguments)
28+
public function __call(string $name, array $arguments)
3529
{
3630
$defaultName = '__default_' . $name;
3731
if (method_exists($this, $defaultName)) {
@@ -45,11 +39,7 @@ public function __default_clone(): void
4539
throw new CloneNotSupportedException();
4640
}
4741

48-
/**
49-
* @param null $a
50-
* @return bool
51-
*/
52-
public function __default_equals($a = null)
42+
public function __default_equals($a = null): bool
5343
{
5444
return $this === $a;
5545
}

‎src/Packages/PHPJava/Kernel/Behavior/System.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33

44
final class System
55
{
6-
/**
7-
* @param $object
8-
*/
96
public static function identityHashCode($object): int
107
{
118
return spl_object_id($object);

‎src/Utilities/AttributionResolver.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
class AttributionResolver
88
{
99
/**
10+
* @param AttributeInfo[] $attributes
1011
* @throws UnableToFindAttributionException
1112
*/
1213
public static function resolve(array $attributes, string $attributeName)
1314
{
1415
foreach ($attributes as $attribute) {
15-
/**
16-
* @var AttributeInfo $attribute
17-
*/
1816
if ($attribute->getAttributeData() instanceof $attributeName) {
1917
return $attribute->getAttributeData();
2018
}

‎src/Utilities/ClassResolver.php‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,19 @@ class ClassResolver
2222
const RESOLVED_TYPE_CLASS = 'RESOLVED_TYPE_CLASS';
2323
const RESOLVED_TYPE_PACKAGES = 'RESOLVED_TYPE_PACKAGES';
2424

25+
/**
26+
* @var array
27+
*/
2528
private $resolves = [];
29+
30+
/**
31+
* (string|JavaClass)[][].
32+
*/
2633
private $resolvedPaths = [];
34+
35+
/**
36+
* @var array
37+
*/
2738
private $options = [];
2839

2940
public function __construct(array $options)
@@ -136,7 +147,7 @@ public function add($valuesOrResourceType = self::RESOURCE_TYPE_FILE, $value = n
136147
$this->resolves[] = [$valuesOrResourceType, $value];
137148
}
138149

139-
public static function resolveNameByPath($path)
150+
public static function resolveNameByPath($path): string
140151
{
141152
$names = explode(
142153
'.',

‎src/Utilities/DebugTool.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99

1010
class DebugTool
1111
{
12+
/**
13+
* @var Logger
14+
*/
1215
private $logger;
16+
17+
/**
18+
* @var array
19+
*/
1320
private $options = [];
1421

1522
public function __construct(string $channelName, array $options = [])

‎src/Utilities/Extractor.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@ class Extractor
99
* You need to use `getRealValue` instead of `realValue`.
1010
*
1111
* @deprecated
12-
* @param $value
13-
* @return null|array|bool|float|int|string|Type
12+
* @return null|array|bool|float|int|string
1413
*/
1514
public static function realValue($value)
1615
{
1716
return static::getRealValue($value);
1817
}
1918

19+
/**
20+
* @return null|array|bool|float|int|string
21+
*/
2022
public static function getRealValue($value)
2123
{
2224
if ($value instanceof Type) {

‎src/Utilities/Formatter.php‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@ class Formatter
1212
const USER_DEFINED_PACKAGE = 'USER_DEFINED_PACKAGE';
1313

1414
/**
15-
* @param $signature
16-
* @param int $i
1715
* @throws \PHPJava\Exceptions\TypeException
1816
*/
19-
public static function parseSignature($signature, $i = 0): array
17+
public static function parseSignature(string $signature, int $i = 0): array
2018
{
2119
$data = [];
2220
$deepArray = 0;
@@ -76,7 +74,7 @@ public static function parseSignature($signature, $i = 0): array
7674
return $data;
7775
}
7876

79-
public static function buildArgumentsSignature($signatures): string
77+
public static function buildArgumentsSignature(array $signatures): string
8078
{
8179
$string = '';
8280
foreach ($signatures as $signature) {
@@ -91,7 +89,7 @@ public static function buildArgumentsSignature($signatures): string
9189
return $string;
9290
}
9391

94-
public static function signatureConvertToAmbiguousForPHP($signatures)
92+
public static function signatureConvertToAmbiguousForPHP(array $signatures): array
9593
{
9694
$result = [];
9795
foreach ($signatures as $signature) {
@@ -115,10 +113,7 @@ public static function signatureConvertToAmbiguousForPHP($signatures)
115113
return $result;
116114
}
117115

118-
/**
119-
* @param $className
120-
*/
121-
public static function convertPHPNamespacesToJava($className): string
116+
public static function convertPHPNamespacesToJava(string $className): string
122117
{
123118
$className = str_replace('/', '\\', $className);
124119
$newClassName = explode(
@@ -136,10 +131,7 @@ public static function convertPHPNamespacesToJava($className): string
136131
return implode('.', $newClassName);
137132
}
138133

139-
/**
140-
* @param $className
141-
*/
142-
public static function convertJavaNamespaceToPHP($className): array
134+
public static function convertJavaNamespaceToPHP(string $className): array
143135
{
144136
$className = str_replace('.', '/', $className);
145137
$newClassName = explode(

‎src/Utilities/SDKVersionResolver.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55

66
class SDKVersionResolver
77
{
8-
public static function resolve($version)
8+
/**
9+
* @throws UnknownVersionException
10+
*/
11+
public static function resolve(string $version): string
912
{
1013
if (version_compare($version, '45.0', '>=') &&
1114
version_compare($version, '45.3', '<=')
@@ -56,6 +59,6 @@ public static function resolve($version)
5659
if (version_compare($version, '55.0', '<=')) {
5760
return '11';
5861
}
59-
throw new UnknownVersionException('Does not supported JDK version ' . $version);
62+
throw new UnknownVersionException('Unsupported JDK version ' . $version);
6063
}
6164
}

‎src/Utilities/SuperClassResolver.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,17 @@
66

77
class SuperClassResolver
88
{
9+
/**
10+
* PHPJava\Kernel\Structures\_MethodInfo[].
11+
*/
912
private $classes = [];
13+
14+
/**
15+
* @var \PHPJava\Core\JVM\ConstantPool
16+
*/
1017
private $constantPool;
1118

12-
public function resolveMethod($methodName, JavaClassInterface $class)
19+
public function resolveMethod(string $methodName, JavaClassInterface $class)
1320
{
1421
$cpInfo = $class->getConstantPool();
1522
if ($class->getSuperClass() instanceof JavaClassInterface) {

0 commit comments

Comments
 (0)