Fix tests and improve code quality

Author: xzhayon

src/Moka/Generator/Template/ProxyClassTemplate.php

@@ -55,20 +55,20 @@ protected static function doGenerate(\ReflectionClass $class): string
         foreach ($methods as $method) {
             if (
                 !$method->isFinal() &&
-                !in_array($method->getName(), self::UNSAFE_METHODS, true)
+                !in_array($method->name, self::UNSAFE_METHODS, true)
             ) {
                 $methodsCode[] = ProxyMethodTemplate::generate($method);
             }
 
-            if ('__call' === $method->getName()) {
+            if ('__call' === $method->name) {
                 $callParameters = $method->getParameters();
                 foreach ($callParameters as $callParameter) {
                     $callParametersTypes[$callParameter->getPosition()] = (string)$callParameter->getType();
                 }
             }
         }
 
-        $mockClassName = $class->getName();
+        $mockClassName = $class->name;
         $proxyClassName = sprintf(
             self::TEMPLATE_FQCN,
             preg_replace('/\\\/', '__', $mockClassName),

src/Moka/Generator/Template/ProxyMethodTemplate.php

@@ -35,7 +35,7 @@ protected static function doGenerate(\ReflectionMethod $method): string
 
         $parameters = $method->getParameters();
         $parametersCode = [];
-        if ($parameters) {
+        if (is_array($parameters)) {
             foreach ($parameters as $parameter) {
                 $parametersCode[] = ProxyParameterTemplate::generate($parameter);
             }
@@ -50,7 +50,7 @@ protected static function doGenerate(\ReflectionMethod $method): string
             ? 'return'
             : '';
 
-        $methodName = $method->getName();
+        $methodName = $method->name;
 
         return sprintf(
             self::TEMPLATE,

src/Moka/Generator/Template/ProxyParameterTemplate.php

@@ -51,7 +51,7 @@ protected static function doGenerate(\ReflectionParameter $parameter): string
             $defaultValue = '';
         }
 
-        $name = '$' . $parameter->getName();
+        $name = '$' . $parameter->name;
 
         return sprintf(
             self::TEMPLATE,

src/Moka/Generator/Template/ProxyReturnTypeTemplate.php

@@ -32,7 +32,7 @@ protected static function doGenerate(\ReflectionMethod $method): string
             : '';
 
         $returnType = 'self' === (string)$originalReturnType
-            ? $method->getDeclaringClass()->getName()
+            ? $method->getDeclaringClass()->name
             : (string)$originalReturnType;
 
         return sprintf(

tests/AbstractTestClass.php

@@ -20,7 +20,7 @@ public function getSelf(): TestInterface
         return $this;
     }
 
-    public function getCallable(): ?callable
+    public function getCallable(): callable
     {
         return function () {
         };

tests/Generator/Template/ProxyReturnTypeTemplateTest.php

@@ -16,7 +16,7 @@ public function testGenerate()
             new \ReflectionMethod(FooTestClass::class, 'getCallable')
         );
 
-        $this->assertRegExp('/: *\? *callable/', $code);
+        $this->assertRegExp('/: *callable/', $code);
     }
 
     public function testGenerateWithSelf()
@@ -29,6 +29,6 @@ public function testGenerateWithSelf()
             new \ReflectionMethod(NewTestClass::class, 'getSelfNew')
         );
 
-        $this->assertRegExp('/: *Tests\\\NewTestClass/', $code);
+        $this->assertRegExp('/: *\? *Tests\\\NewTestClass/', $code);
     }
 }

tests/NewTestClass.php

@@ -5,7 +5,7 @@
 
 class NewTestClass extends AbstractTestClass
 {
-    public function getSelfNew(): self
+    public function getSelfNew(): ?self
     {
         return $this;
     }