Misc smaller changes

A few random bits which fell between the cracks with the shish/safe merge
thecodingmachine · Dec 3, 2024 · d3a05e4 · d3a05e4
1 parent 40474de
commit d3a05e4
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 24 deletions.
diff --git a/generator/src/Parameter.php b/generator/src/Parameter.php
@@ -10,15 +10,11 @@
 
 class Parameter
 {
-    /**
-     * @var PhpStanType
-     */
-    private $type;
+    private readonly PhpStanType $type;
 
     public function __construct(private \SimpleXMLElement $parameter, ?PhpStanFunction $phpStanFunction, int $position)
     {
         $phpStanParam = $phpStanFunction ? $phpStanFunction->getParameter($this->getParameterName(), $position) : null;
-
         $this->type = $phpStanParam ? $phpStanParam->getType() : new PhpStanType($this->parameter->type->__toString()); //todo: is this if useful?
     }
 

diff --git a/generator/src/PhpStanFunctions/PhpStanFunction.php b/generator/src/PhpStanFunctions/PhpStanFunction.php
@@ -6,10 +6,7 @@
 
 class PhpStanFunction
 {
-    /**
-     * @var PhpStanType
-     */
-    private $returnType;
+    private readonly PhpStanType $returnType;
 
     /**
      * @var PhpStanParameter[]
@@ -24,6 +21,7 @@ public function __construct(array $signature)
         if (count($signature) < 1) {
             throw new \RuntimeException('Invalid signatures');
         }
+
         $this->returnType = new PhpStanType(\array_shift($signature));
         foreach ($signature as $name => $type) {
             $param = new PhpStanParameter($name, $type);

diff --git a/generator/src/PhpStanFunctions/PhpStanParameter.php b/generator/src/PhpStanFunctions/PhpStanParameter.php
@@ -8,8 +8,8 @@
 
 class PhpStanParameter
 {
-    private string $name;
-    private PhpStanType $type;
+    private readonly string $name;
+    private readonly PhpStanType $type;
 
     public function __construct(string $name, string $type)
     {

diff --git a/generator/src/WritePhpFunction.php b/generator/src/WritePhpFunction.php
@@ -93,19 +93,12 @@ private function writePhpFunction(): string
 
     private function generateExceptionCode(string $moduleName, Method $method) : string
     {
-        switch ($method->getErrorType()) {
-            case Method::FALSY_TYPE:
-                $errorValue = 'false';
-                break;
-            case Method::NULLSY_TYPE:
-                $errorValue = 'null';
-                break;
-            case Method::EMPTY_TYPE:
-                $errorValue = "''";
-                break;
-            default:
-                throw new \LogicException("Method doesn't have an error type");
-        }
+        $errorValue = match ($method->getErrorType()) {
+            Method::FALSY_TYPE => 'false',
+            Method::NULLSY_TYPE => 'null',
+            Method::EMPTY_TYPE => "''",
+            default => throw new \LogicException("Method doesn't have an error type"),
+        };
 
         // Special case for CURL: we need the first argument of the method if this is a resource.
         if ($moduleName === 'Curl') {