Update dependency support

- Workaround for TreeBuilder deprecation in Symfony 4.3+
- Add psalm-baseline to circumvent deprecation warnings

Author: iquito

composer.json

@@ -29,7 +29,7 @@
         "symfony/finder": "^4.0",
         "symfony/config": "^4.0",
         "squirrelphp/queries-bundle": "^0.8",
-        "squirrelphp/entities": "^0.5"
+        "squirrelphp/entities": "^0.5.3"
     },
     "require-dev": {
         "captainhook/plugin-composer": "^4.0",
@@ -56,9 +56,11 @@
     },
     "scripts": {
         "phpstan": "vendor/bin/phpstan analyse src --level=7",
-        "psalm": "vendor/bin/psalm",
+        "psalm": "vendor/bin/psalm --show-info=false",
+        "psalm_base": "vendor/bin/psalm --set-baseline=psalm-baseline.xml",
         "phpunit": "vendor/bin/phpunit --colors=always",
         "phpcs": "vendor/bin/phpcs --standard=ruleset.xml --extensions=php --ignore=tests/TestEntities,tests/TestEntities2 src tests",
+        "phpcsfix": "vendor/bin/phpcbf --standard=ruleset.xml --extensions=php --ignore=tests/TestEntities,tests/TestEntities2 src tests",
         "codecoverage": "vendor/bin/phpunit --coverage-html tests/_reports"
     }
 }

psalm-baseline.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="3.4.7@caf7737bbe5a5e9cbdfcc1ada83ea576ca07c9ff" php-version="php:7.3.5; bcmath:7.3.5; bz2:7.3.5; calendar:7.3.5; Core:7.3.5; ctype:7.3.5; curl:7.3.5; date:7.3.5; dom:20031129; exif:7.3.5; fileinfo:7.3.5; filter:7.3.5; ftp:7.3.5; gd:7.3.5; gettext:7.3.5; hash:7.3.5; iconv:7.3.5; imagick:3.4.4; imap:7.3.5; intl:7.3.5; json:1.7.0; libxml:7.3.5; mailparse:3.0.3; mbstring:7.3.5; mysqli:7.3.5; mysqlnd:mysqlnd 5.0.12-dev - 20150407 - $Id: 7cc7cc96e675f6d72e5cf0f267f48e167c2abb23 $; openssl:7.3.5; pcntl:7.3.5; pcre:7.3.5; PDO:7.3.5; pdo_mysql:7.3.5; pdo_pgsql:7.3.5; pdo_sqlite:7.3.5; pgsql:7.3.5; Phar:7.3.5; posix:7.3.5; Reflection:7.3.5; session:7.3.5; SimpleXML:7.3.5; soap:7.3.5; sockets:7.3.5; SPL:7.3.5; sqlite3:7.3.5; standard:7.3.5; sysvsem:7.3.5; sysvshm:7.3.5; tokenizer:7.3.5; xml:7.3.5; xmlreader:7.3.5; xmlrpc:7.3.5; xmlwriter:7.3.5; xsl:7.3.5; Zend OPcache:7.3.5; Zend OPcache:7.3.5; zip:1.15.4; zlib:7.3.5">
+  <file src="src/DependencyInjection/Configuration.php">
+    <DeprecatedMethod occurrences="1">
+      <code>root</code>
+    </DeprecatedMethod>
+  </file>
+</files>

psalm.xml

@@ -4,6 +4,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />

src/DependencyInjection/Configuration.php

@@ -22,8 +22,14 @@ public function __construct(string $alias)
      */
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
-        $rootNode = $treeBuilder->root($this->alias);
+        $treeBuilder = new TreeBuilder($this->alias);
+
+        // Symfony 4.2+ (where root() method is deprecated)
+        if (method_exists($treeBuilder, 'getRootNode')) {
+            $rootNode = $treeBuilder->getRootNode();
+        } else { // Symfony 4.1 and below (where one needs to use the root() method)
+            $rootNode = $treeBuilder->root($this->alias);
+        }
 
         /**
          * The only configuration options are:

src/DependencyInjection/SquirrelEntitiesExtension.php

@@ -87,7 +87,7 @@ public function getAlias()
     private function findEntitiesAndProcess(ContainerBuilder $container, ?array $config): void
     {
         // No directories defined - this is mandatory
-        if (\count($config['directories'] ?? []) === 0) {
+        if (!isset($config) || \count($config['directories'] ?? []) === 0) {
             return;
         }