Issue #9: Fix tests.

mortenson · Dec 28, 2022 · c30c7e5 · c30c7e5
1 parent 1fe9202
commit c30c7e5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Set up PHP
       uses: shivammathur/setup-php@v2
       with:
-          php-version: '7.4'
+          php-version: '8.1'
           tools: composer:v2
           coverage: none
       env:

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
+.phpunit.result.cache
 composer.lock
 vendor
 tests/_output/*

diff --git a/ContainerHandler.php b/ContainerHandler.php
@@ -58,7 +58,7 @@ public static function afterMethodCallAnalysis(
 
         $service = self::$containerMeta->get($serviceId);
         if ($service) {
-            $class = $service->getClassName();
+            $class = $service->getClass();
             if ($class) {
                 $codebase->classlikes->addFullyQualifiedClassName($class);
                 $return_type_candidate = new Union([new TNamedObject($class)]);

diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "psalm/plugin-symfony": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.2",
+        "phpunit/phpunit": "^7.2 || ^8.0",
         "squizlabs/php_codesniffer": "^3.3",
         "codeception/codeception": "^4.1",
         "codeception/module-phpbrowser": "^1.0.0",

diff --git a/pretest.sh b/pretest.sh
@@ -8,8 +8,8 @@ fi
 
 mkdir -p ./tests/_tmp
 cd ./tests/_tmp
-wget https://ftp.drupal.org/files/projects/drupal-9.1.5.tar.gz
-tar -xf drupal-9.1.5.tar.gz
-mv drupal-9.1.5 drupal
+wget https://ftp.drupal.org/files/projects/drupal-10.0.0.tar.gz
+tar -xf drupal-10.0.0.tar.gz
+mv drupal-10.0.0 drupal
 cd drupal
 php ../../../scripts/dump_script.php node