Styling fixups

Author: mglaman

src/DependencyInjection/DrupalExtension.php

@@ -161,7 +161,7 @@ class: Drupal\jsonapi\Routing\JsonApiParamEnhancer
         }
     }
 
-    protected function camelize($id)
+    protected function camelize(string $id): string
     {
         return strtr(ucwords(strtr($id, ['_' => ' ', '.' => '_ ', '\\' => '_ '])), [' ' => '']);
     }

src/Drupal/Bootstrap.php

@@ -164,10 +164,10 @@ protected function addCoreNamespaces(): void
         // Add core test namespaces.
         $core_tests_dir = $this->drupalRoot . '/core/tests';
         $this->autoloader->add('Drupal\\Tests', $core_tests_dir);
-        $this->autoloader->add('Drupal\\TestSite',  $core_tests_dir);
-        $this->autoloader->add('Drupal\\KernelTests',  $core_tests_dir);
-        $this->autoloader->add('Drupal\\FunctionalTests',  $core_tests_dir);
-        $this->autoloader->add('Drupal\\FunctionalJavascriptTests',  $core_tests_dir);
+        $this->autoloader->add('Drupal\\TestSite', $core_tests_dir);
+        $this->autoloader->add('Drupal\\KernelTests', $core_tests_dir);
+        $this->autoloader->add('Drupal\\FunctionalTests', $core_tests_dir);
+        $this->autoloader->add('Drupal\\FunctionalJavascriptTests', $core_tests_dir);
     }
     protected function addModuleNamespaces(): void
     {

src/Drupal/DrupalServiceDefinition.php

@@ -4,9 +4,25 @@
 
 class DrupalServiceDefinition
 {
+
+    /**
+     * @var string
+     */
     private $id;
+
+    /**
+     * @var string|null
+     */
     private $class;
+
+    /**
+     * @var bool
+     */
     private $public;
+
+    /**
+     * @var string|null
+     */
     private $alias;
 
     public function __construct(string $id, ?string $class, bool $public = true, ?string $alias = null)
@@ -48,6 +64,4 @@ public function getAlias(): ?string
     {
         return $this->alias;
     }
-
 }
-

src/Drupal/ServiceMap.php

@@ -39,5 +39,4 @@ public function getService(string $id): ?DrupalServiceDefinition
     {
         return $this->services[$id] ?? null;
     }
-
 }

src/Drupal/ServiceMapFactory.php

@@ -4,6 +4,9 @@
 
 class ServiceMapFactory implements ServiceMapFactoryInterface
 {
+    /**
+     * @var array
+     */
     private $drupalServices;
 
     public function __construct(array $drupalServiceMap = [])
@@ -15,5 +18,4 @@ public function create(): ServiceMap
     {
         return new ServiceMap($this->drupalServices);
     }
-
 }

src/Drupal/ServiceMapFactoryInterface.php

@@ -4,7 +4,5 @@
 
 interface ServiceMapFactoryInterface
 {
-
     public function create(): ServiceMap;
-
 }

src/Type/ServiceDynamicReturnTypeExtension.php

@@ -3,6 +3,7 @@
 namespace PHPStan\Type;
 
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Analyser\Scope;
 use PHPStan\Drupal\DrupalServiceDefinition;
 use PHPStan\Drupal\ServiceMap;
@@ -43,7 +44,13 @@ public function getTypeFromMethodCall(
             return $returnType;
         }
 
-        $serviceId = (string)$methodCall->args[0]->value->value;
+        $arg1 = $methodCall->args[0]->value;
+        if (!$arg1 instanceof String_) {
+            // @todo determine what these types are.
+            return $returnType;
+        }
+
+        $serviceId = $arg1->value;
 
         if ($methodReflection->getName() === 'get') {
             $service = $this->serviceMap->getService($serviceId);
@@ -59,5 +66,4 @@ public function getTypeFromMethodCall(
 
         throw new ShouldNotHappenException();
     }
-
 }