#2440 - Mass code cleanup

src/Backend/Backend.php

@@ -13,7 +13,6 @@
 
 namespace Zephir\Backend;
 
-use Zephir\Class\Definition\Definition;
 use Zephir\Class\Method\Method;
 use Zephir\Code\Printer;
 use Zephir\CompilationContext;
@@ -512,7 +511,7 @@ public function assignArrayMulti(
     ): void {
         [$keys, $offsetItems, $numberParams] = $this->resolveOffsetExprs($offsetExprs, $compilationContext);
 
-        $symbol  = $this->resolveValue($symbolVariable, $compilationContext, true);
+        $symbol  = $this->resolveValue($symbolVariable, $compilationContext);
         $varCode = $this->getVariableCode($variable);
         $compilationContext->codePrinter->output(
             sprintf(
@@ -617,14 +616,6 @@ public function assignStaticPropertyArrayMulti(
         );
     }
 
-    /**
-     * @param Variable             $variable
-     * @param string|Variable|null $value
-     * @param CompilationContext   $context
-     * @param bool                 $useCodePrinter
-     *
-     * @return string
-     */
     public function assignString(
         Variable $variable,
         $value,
@@ -642,10 +633,6 @@ public function assignString(
 
     /**
      * Assigns a zval to another.
-     *
-     * @param Variable           $variable
-     * @param string             $code
-     * @param CompilationContext $context
      */
     public function assignZval(Variable $variable, $code, CompilationContext $context): void
     {
@@ -998,15 +985,6 @@ public function fetchGlobal(Variable $globalVar, CompilationContext $compilation
         return $output;
     }
 
-    /**
-     * @param Variable           $symbolVariable
-     * @param Variable           $variableVariable
-     * @param Variable|string    $property
-     * @param bool               $readOnly
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
     public function fetchProperty(
         Variable $symbolVariable,
         Variable $variableVariable,
@@ -1048,12 +1026,6 @@ public function fetchProperty(
     }
 
     /**
-     * @param Variable           $symbolVariable
-     * @param Definition         $classDefinition
-     * @param                    $property
-     * @param bool               $readOnly
-     * @param CompilationContext $context
-     *
      * @throws Exception
      */
     public function fetchStaticProperty(
@@ -1376,12 +1348,6 @@ public function getInternalKernelPath(): string
         return $this->kernelsPath;
     }
 
-    /**
-     * @param Method             $method
-     * @param CompilationContext $context
-     *
-     * @return string
-     */
     public function getInternalSignature(Method $method, CompilationContext $context): string
     {
         if ($method->isInitializer() && !$method->isStatic()) {
@@ -1426,12 +1392,6 @@ public function getInternalSignature(Method $method, CompilationContext $context
         return "void {$method->getInternalName()}({$signaturePattern})";
     }
 
-    /**
-     * @param string             $type
-     * @param CompilationContext $compilationContext
-     *
-     * @return Variable
-     */
     public function getScalarTempVariable(
         string $type,
         CompilationContext $compilationContext,
@@ -1553,12 +1513,6 @@ public function getTypeDefinition($type): array
     }
 
     /**
-     * @param Variable $variableVariable
-     * @param string   $operator
-     * @param string   $value
-     *
-     * @return string
-     *
      * @throws CompilerException
      */
     public function getTypeofCondition(
@@ -1763,7 +1717,7 @@ public function onPreInitVar(Method $method): string
         return '';
     }
 
-    public function propertyIsset(Variable $var, $key)
+    public function propertyIsset(Variable $var, $key): CompiledExpression
     {
         return new CompiledExpression(
             'bool',
@@ -1773,11 +1727,6 @@ public function propertyIsset(Variable $var, $key)
     }
 
     /**
-     * @param                    $value
-     * @param CompilationContext $context
-     *
-     * @return bool|string|Variable
-     *
      * @throws CompilerException
      */
     public function resolveValue($value, CompilationContext $context): Variable | bool | string
@@ -1920,14 +1869,6 @@ public function updateArray(
         }
     }
 
-    /**
-     * @param Variable           $variable
-     * @param string|Variable    $property
-     * @param mixed              $value
-     * @param CompilationContext $context
-     *
-     * @return void
-     */
     public function updateProperty(Variable $variable, $property, $value, CompilationContext $context): void
     {
         $value = $this->resolveValue($value, $context);
@@ -2040,11 +1981,6 @@ protected function returnHelper(
     /**
      * Resolve expressions.
      *
-     * @param CompiledExpression[]|string[] $offsetExprs
-     * @param CompilationContext            $compilationContext
-     *
-     * @return array
-     *
      * @throws CompilerException
      */
     private function resolveOffsetExprs(array $offsetExprs, CompilationContext $compilationContext): array

src/Backend/FcallManager.php

@@ -137,11 +137,7 @@ public function genFcallCode(): void
     }
 
     /**
-     * @param bool $static
-     * @param int  $doReturn tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int  $paramCount
-     *
-     * @return string
+     * tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
      */
     public function getMacro(bool $static, int $doReturn, int $paramCount): string
     {

src/Backend/FcallManagerInterface.php

@@ -19,12 +19,6 @@ public function genFcallCode(): void;
 
     /**
      * Resolve internal fcall attributes to a suitable macro and ensure that it's generated during compilation.
-     *
-     * @param bool $static
-     * @param int  $doReturn tri-state: 0 -> no return value, 1 -> do return, 2 -> do return to given variable
-     * @param int  $paramCount
-     *
-     * @return string
      */
     public function getMacro(bool $static, int $doReturn, int $paramCount): string;
 }

src/Backend/VariablesManager.php

@@ -39,12 +39,6 @@ class VariablesManager
      * Shouldn't called directly.
      *
      * TODO: Figure out why it never reached during generation.
-     *
-     * @param Variable $variable
-     * @param array    $value
-     * @param Context  $context
-     *
-     * @return void
      */
     public function initializeDefaults(Variable $variable, array $value, Context $context): void
     {

src/Cache/SlotsCache.php

@@ -51,10 +51,6 @@ public static function getExistingMethodSlot(Method $method): int
 
     /**
      * Returns or creates a cache slot for a function.
-     *
-     * @param string $functionName
-     *
-     * @return int
      */
     public static function getFunctionSlot(string $functionName): int
     {

src/Class/Definition/Definition.php

@@ -58,70 +58,62 @@ final class Definition extends AbstractDefinition
      * Contains "abstract" in the definition
      */
     protected bool $abstract = false;
-    /**
-     * @var AliasManager|null
-     */
+
     protected ?AliasManager $aliasManager = null;
-    /**
-     * @var Compiler
-     */
+
     protected Compiler $compiler;
     /**
      * @var Constant[]
      */
     protected array $constants = [];
-    /**
-     * @var int
-     */
+
     protected int $dependencyRank = 0;
-    /**
-     * @var string
-     */
+
     protected string $docBlock = '';
+
     /**
      * Name of inherited class
      */
     protected ?string $extendsClass = null;
+
     /**
      * Definition object of inherited class
      */
     protected ?AbstractDefinition $extendsClassDefinition = null;
+
     /**
      * When class is from external dependency
      */
     protected bool $external = false;
+
     /**
      * Contains "final" in the definition
      */
     protected bool $final = false;
-    /**
-     * @var array
-     */
+
     protected array $implementedInterfaceDefinitions = [];
+
     /**
      * List of implemented interfaces of current class
      */
     protected array $interfaces = [];
-    /**
-     * @var bool
-     */
+
     protected bool $isBundled = false;
+
     /**
      * @var Method[]
      */
     protected array $methods = [];
-    /**
-     * @var array
-     */
+
     protected array $originalNode = [];
-    /**
-     * @var Docblock|null
-     */
+
     protected ?Docblock $parsedDocblock = null;
+
     /**
      * @var Property[]
      */
     protected array $properties = [];
+
     /**
      * Class short name
      *
@@ -130,14 +122,17 @@ final class Definition extends AbstractDefinition
      * @see Definition::name
      */
     protected string $shortName;
+
     /**
      * Definition type
      */
     protected string $type = self::TYPE_CLASS;
 
-    public function __construct(protected string $namespace, string $name, ?string $shortName = null)
-    {
-        $this->name      = $name;
+    public function __construct(
+        protected string $namespace,
+        protected string $name,
+        ?string $shortName = null,
+    ) {
         $this->shortName = $shortName ?: $name;
     }
 
@@ -888,7 +883,7 @@ public function getExtendsClass(): ?string
      */
     public function getExtendsClassDefinition(): ?AbstractDefinition
     {
-        if (!$this->extendsClassDefinition && $this->extendsClass && $this->compiler) {
+        if (!$this->extendsClassDefinition && $this->extendsClass) {
             $this->setExtendsClassDefinition($this->compiler->getClassDefinition($this->extendsClass));
         }
 
@@ -1060,10 +1055,6 @@ public function getProperties(): array
 
     /**
      * Returns a method definition by its name.
-     *
-     * @param string $propertyName
-     *
-     * @return Property|null
      */
     public function getProperty(string $propertyName): ?Property
     {
@@ -1139,10 +1130,6 @@ public function hasConstant(string $name): bool
 
     /**
      * Checks if the class implements a specific name.
-     *
-     * @param string $methodName
-     *
-     * @return bool
      */
     public function hasMethod(string $methodName): bool
     {

src/Class/Method/Method.php

@@ -58,11 +58,12 @@
 class Method
 {
     public bool $optimizable = true;
+
     /**
      * Call Gatherer Pass.
      */
     protected ?CallGathererPass $callGathererPass = null;
-    protected ?Definition       $classDefinition  = null;
+
     /**
      * Whether the method is abstract or not.
      */
@@ -130,17 +131,16 @@ class Method
     protected bool $void = false;
 
     public function __construct(
-        Definition $classDefinition,
-        protected array $visibility,
-        protected string $name,
+        protected ?Definition $classDefinition = null,
+        protected array $visibility = [],
+        protected string $name = '',
         protected ?Parameters $parameters = null,
         protected ?StatementsBlock $statements = null,
         protected ?string $docblock = null,
         ?array $returnType = null,
         protected ?array $expression = [],
         array $staticVariables = [],
     ) {
-        $this->classDefinition = $classDefinition;
         $this->staticVariables = $staticVariables;
 
         $this->checkVisibility($visibility, $name, $expression);

src/Class/Method/Parameters.php

@@ -52,9 +52,6 @@ public function __construct(private array $parameters)
         }
     }
 
-    /**
-     * @return int
-     */
     public function count(): int
     {
         return count($this->parameters);