From 82545ecf3bea52729ee2fe4de09070795c9b7bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= <dalibor.karlovic@sigwin.hr>
Date: Mon, 8 May 2023 16:01:28 +0200
Subject: [PATCH] infra: streamline config (#178)

* infra: streamline config

* infra: streamline config

* infra: streamline config

* infra: streamline config

* infra: streamline config
---
 .editorconfig                               | 15 +++++++++++++++
 .gitattributes                              |  4 ++--
 .gitignore                                  |  6 +++---
 phpunit.xml.dist                            |  7 +++++--
 psalm.xml.dist                              | 17 +++++++++++++----
 src/Bridge/PhpSpreadsheet/.gitattributes    |  3 +++
 src/Bridge/PhpSpreadsheet/.gitignore        |  2 +-
 src/Bridge/PhpSpreadsheet/phpstan.neon.dist |  1 +
 src/Bridge/PhpSpreadsheet/phpunit.xml.dist  |  7 +++++--
 src/Bridge/PhpSpreadsheet/psalm.xml.dist    | 11 ++++++++++-
 src/Bridge/Spout/.gitattributes             |  3 +++
 src/Bridge/Spout/.gitignore                 |  2 +-
 src/Bridge/Spout/phpstan.neon.dist          |  1 +
 src/Bridge/Spout/phpunit.xml.dist           |  7 +++++--
 src/Bridge/Spout/psalm.xml.dist             | 11 ++++++++++-
 src/Bridge/Symfony/.gitattributes           |  3 +++
 src/Bridge/Symfony/.gitignore               |  2 +-
 src/Bridge/Symfony/phpstan.neon.dist        |  1 +
 src/Bridge/Symfony/phpunit.xml.dist         |  7 +++++--
 src/Bridge/Symfony/psalm.xml.dist           | 11 ++++++++++-
 src/Xezilaires/.gitattributes               |  3 +++
 src/Xezilaires/.gitignore                   |  2 +-
 src/Xezilaires/phpunit.xml.dist             |  7 +++++--
 src/Xezilaires/psalm.xml.dist               | 11 ++++++++++-
 24 files changed, 117 insertions(+), 27 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..b258a3e
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = UTF-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{Makefile, *.mk}]
+indent_style = tab
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
index f43141c..be5c6ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,8 @@
 /docs export-ignore
-/resources export-ignore
 /src/Xezilaires/Bridge/*/Test export-ignore
 /src/Xezilaires/Test export-ignore
 /.* export-ignore
 /*dist export-ignore
+/*baseline* export-ignore
+/composer.lock export-ignore
 /Makefile export-ignore
-*.xls binary
diff --git a/.gitignore b/.gitignore
index f687f6d..6408043 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-var
-vendor
-composer.lock
+/var/
+/vendor/
+/composer.lock
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a241c7f..cde5279 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./src/bootstrap.php"
-         cacheResultFile="var/phpqa/phpunit.cache"
+         cacheResultFile="var/phpqa/phpunit.result.cache"
          colors="true"
+         convertDeprecationsToExceptions="true"
+         enforceTimeLimit="true"
          executionOrder="random"
+         failOnEmptyTestSuite="true"
          failOnRisky="true"
          failOnWarning="true"
          forceCoversAnnotation="true"
diff --git a/psalm.xml.dist b/psalm.xml.dist
index f1ab0cd..364d7af 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -1,10 +1,19 @@
 <?xml version="1.0"?>
 <psalm xmlns="https://getpsalm.org/schema/config"
        cacheDirectory="var/phpqa/psalm"
+       checkForThrowsInGlobalScope="false"
+       ensureArrayIntOffsetsExist="false"
+       ensureArrayStringOffsetsExist="false"
        errorLevel="1"
-       findUnusedVariablesAndParams="true">
+       findUnusedBaselineEntry="false"
+       findUnusedCode="false"
+       findUnusedPsalmSuppress="false"
+       findUnusedVariablesAndParams="true"
+       limitMethodComplexity="true"
+       restrictReturnTypes="false"
+       strictBinaryOperands="false">
     <projectFiles>
-        <directory name="."/>
+        <directory name="./"/>
         <ignoreFiles allowMissingFiles="true">
             <file name=".php-cs-fixer.dist.php"/>
             <file name="src/Xezilaires/Test/ExampleBundle/XezilairesExampleBundle.php"/>
@@ -12,8 +21,8 @@
             <directory name="src/Bridge/*/vendor/"/>
             <directory name="src/Xezilaires/var/"/>
             <directory name="src/Xezilaires/vendor/"/>
-            <directory name="vendor/"/>
             <directory name="var/"/>
+            <directory name="vendor/"/>
         </ignoreFiles>
     </projectFiles>
 
@@ -50,7 +59,7 @@
     </issueHandlers>
 
     <plugins>
-        <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+        <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin"/>
     </plugins>
 </psalm>
diff --git a/src/Bridge/PhpSpreadsheet/.gitattributes b/src/Bridge/PhpSpreadsheet/.gitattributes
index 54d42ed..77beec9 100644
--- a/src/Bridge/PhpSpreadsheet/.gitattributes
+++ b/src/Bridge/PhpSpreadsheet/.gitattributes
@@ -1,3 +1,6 @@
 /Test export-ignore
 /.* export-ignore
 /*dist export-ignore
+/*baseline* export-ignore
+/composer.lock export-ignore
+/Makefile export-ignore
diff --git a/src/Bridge/PhpSpreadsheet/.gitignore b/src/Bridge/PhpSpreadsheet/.gitignore
index 24ecf9d..6408043 100644
--- a/src/Bridge/PhpSpreadsheet/.gitignore
+++ b/src/Bridge/PhpSpreadsheet/.gitignore
@@ -1,3 +1,3 @@
-/vendor/
 /var/
+/vendor/
 /composer.lock
diff --git a/src/Bridge/PhpSpreadsheet/phpstan.neon.dist b/src/Bridge/PhpSpreadsheet/phpstan.neon.dist
index e23661f..bf4315b 100644
--- a/src/Bridge/PhpSpreadsheet/phpstan.neon.dist
+++ b/src/Bridge/PhpSpreadsheet/phpstan.neon.dist
@@ -2,6 +2,7 @@ includes:
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
+    - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-symfony/extension.neon
 parameters:
     tmpDir: %currentWorkingDirectory%/var/phpqa/phpstan
     level: max
diff --git a/src/Bridge/PhpSpreadsheet/phpunit.xml.dist b/src/Bridge/PhpSpreadsheet/phpunit.xml.dist
index c7ad42b..8cb9cf3 100644
--- a/src/Bridge/PhpSpreadsheet/phpunit.xml.dist
+++ b/src/Bridge/PhpSpreadsheet/phpunit.xml.dist
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.cache"
+         cacheResultFile="var/phpqa/phpunit.result.cache"
          colors="true"
+         convertDeprecationsToExceptions="true"
+         enforceTimeLimit="true"
          executionOrder="random"
+         failOnEmptyTestSuite="true"
          failOnRisky="true"
          failOnWarning="true"
          forceCoversAnnotation="true"
diff --git a/src/Bridge/PhpSpreadsheet/psalm.xml.dist b/src/Bridge/PhpSpreadsheet/psalm.xml.dist
index d6bd97e..7c13dde 100644
--- a/src/Bridge/PhpSpreadsheet/psalm.xml.dist
+++ b/src/Bridge/PhpSpreadsheet/psalm.xml.dist
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
 <psalm xmlns="https://getpsalm.org/schema/config"
        cacheDirectory="var/phpqa/psalm"
+       checkForThrowsInGlobalScope="true"
+       ensureArrayIntOffsetsExist="true"
+       ensureArrayStringOffsetsExist="false"
        errorLevel="1"
-       findUnusedVariablesAndParams="true">
+       findUnusedBaselineEntry="false"
+       findUnusedCode="false"
+       findUnusedPsalmSuppress="true"
+       findUnusedVariablesAndParams="true"
+       limitMethodComplexity="true"
+       restrictReturnTypes="false"
+       strictBinaryOperands="false">
     <projectFiles>
         <directory name="."/>
         <ignoreFiles>
diff --git a/src/Bridge/Spout/.gitattributes b/src/Bridge/Spout/.gitattributes
index 54d42ed..77beec9 100644
--- a/src/Bridge/Spout/.gitattributes
+++ b/src/Bridge/Spout/.gitattributes
@@ -1,3 +1,6 @@
 /Test export-ignore
 /.* export-ignore
 /*dist export-ignore
+/*baseline* export-ignore
+/composer.lock export-ignore
+/Makefile export-ignore
diff --git a/src/Bridge/Spout/.gitignore b/src/Bridge/Spout/.gitignore
index 24ecf9d..6408043 100644
--- a/src/Bridge/Spout/.gitignore
+++ b/src/Bridge/Spout/.gitignore
@@ -1,3 +1,3 @@
-/vendor/
 /var/
+/vendor/
 /composer.lock
diff --git a/src/Bridge/Spout/phpstan.neon.dist b/src/Bridge/Spout/phpstan.neon.dist
index 0e68c1b..4a8735d 100644
--- a/src/Bridge/Spout/phpstan.neon.dist
+++ b/src/Bridge/Spout/phpstan.neon.dist
@@ -2,6 +2,7 @@ includes:
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
+    - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-symfony/extension.neon
 parameters:
     checkMissingIterableValueType: false
     checkGenericClassInNonGenericObjectType: false
diff --git a/src/Bridge/Spout/phpunit.xml.dist b/src/Bridge/Spout/phpunit.xml.dist
index 3d60f76..bd50df9 100644
--- a/src/Bridge/Spout/phpunit.xml.dist
+++ b/src/Bridge/Spout/phpunit.xml.dist
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.cache"
+         cacheResultFile="var/phpqa/phpunit.result.cache"
          colors="true"
+         convertDeprecationsToExceptions="true"
+         enforceTimeLimit="true"
          executionOrder="random"
+         failOnEmptyTestSuite="true"
          failOnRisky="true"
          failOnWarning="true"
          forceCoversAnnotation="true"
diff --git a/src/Bridge/Spout/psalm.xml.dist b/src/Bridge/Spout/psalm.xml.dist
index 523e251..8eed5e2 100644
--- a/src/Bridge/Spout/psalm.xml.dist
+++ b/src/Bridge/Spout/psalm.xml.dist
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
 <psalm xmlns="https://getpsalm.org/schema/config"
        cacheDirectory="var/phpqa/psalm"
+       checkForThrowsInGlobalScope="true"
+       ensureArrayIntOffsetsExist="true"
+       ensureArrayStringOffsetsExist="false"
        errorLevel="1"
-       findUnusedVariablesAndParams="true">
+       findUnusedBaselineEntry="false"
+       findUnusedCode="false"
+       findUnusedPsalmSuppress="false"
+       findUnusedVariablesAndParams="true"
+       limitMethodComplexity="true"
+       restrictReturnTypes="false"
+       strictBinaryOperands="false">
     <projectFiles>
         <directory name="."/>
         <ignoreFiles>
diff --git a/src/Bridge/Symfony/.gitattributes b/src/Bridge/Symfony/.gitattributes
index 54d42ed..77beec9 100644
--- a/src/Bridge/Symfony/.gitattributes
+++ b/src/Bridge/Symfony/.gitattributes
@@ -1,3 +1,6 @@
 /Test export-ignore
 /.* export-ignore
 /*dist export-ignore
+/*baseline* export-ignore
+/composer.lock export-ignore
+/Makefile export-ignore
diff --git a/src/Bridge/Symfony/.gitignore b/src/Bridge/Symfony/.gitignore
index 24ecf9d..6408043 100644
--- a/src/Bridge/Symfony/.gitignore
+++ b/src/Bridge/Symfony/.gitignore
@@ -1,3 +1,3 @@
-/vendor/
 /var/
+/vendor/
 /composer.lock
diff --git a/src/Bridge/Symfony/phpstan.neon.dist b/src/Bridge/Symfony/phpstan.neon.dist
index 9232943..112260c 100644
--- a/src/Bridge/Symfony/phpstan.neon.dist
+++ b/src/Bridge/Symfony/phpstan.neon.dist
@@ -2,6 +2,7 @@ includes:
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-deprecation-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-strict-rules/rules.neon
     - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-phpunit/extension.neon
+    - /tools/.composer/vendor-bin/phpstan/vendor/phpstan/phpstan-symfony/extension.neon
 parameters:
     checkMissingIterableValueType: false
     tmpDir: %currentWorkingDirectory%/var/phpqa/phpstan
diff --git a/src/Bridge/Symfony/phpunit.xml.dist b/src/Bridge/Symfony/phpunit.xml.dist
index 3df4f1e..fb2fab5 100644
--- a/src/Bridge/Symfony/phpunit.xml.dist
+++ b/src/Bridge/Symfony/phpunit.xml.dist
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.cache"
+         cacheResultFile="var/phpqa/phpunit.result.cache"
          colors="true"
+         convertDeprecationsToExceptions="true"
+         enforceTimeLimit="true"
          executionOrder="random"
+         failOnEmptyTestSuite="true"
          failOnRisky="true"
          failOnWarning="true"
          forceCoversAnnotation="true"
diff --git a/src/Bridge/Symfony/psalm.xml.dist b/src/Bridge/Symfony/psalm.xml.dist
index 3194650..55d4b69 100644
--- a/src/Bridge/Symfony/psalm.xml.dist
+++ b/src/Bridge/Symfony/psalm.xml.dist
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
 <psalm xmlns="https://getpsalm.org/schema/config"
        cacheDirectory="var/phpqa/psalm"
+       checkForThrowsInGlobalScope="true"
+       ensureArrayIntOffsetsExist="false"
+       ensureArrayStringOffsetsExist="true"
        errorLevel="1"
-       findUnusedVariablesAndParams="true">
+       findUnusedBaselineEntry="true"
+       findUnusedCode="false"
+       findUnusedPsalmSuppress="false"
+       findUnusedVariablesAndParams="true"
+       limitMethodComplexity="true"
+       restrictReturnTypes="true"
+       strictBinaryOperands="false">
     <projectFiles>
         <directory name="."/>
         <ignoreFiles>
diff --git a/src/Xezilaires/.gitattributes b/src/Xezilaires/.gitattributes
index 54d42ed..77beec9 100644
--- a/src/Xezilaires/.gitattributes
+++ b/src/Xezilaires/.gitattributes
@@ -1,3 +1,6 @@
 /Test export-ignore
 /.* export-ignore
 /*dist export-ignore
+/*baseline* export-ignore
+/composer.lock export-ignore
+/Makefile export-ignore
diff --git a/src/Xezilaires/.gitignore b/src/Xezilaires/.gitignore
index 24ecf9d..6408043 100644
--- a/src/Xezilaires/.gitignore
+++ b/src/Xezilaires/.gitignore
@@ -1,3 +1,3 @@
-/vendor/
 /var/
+/vendor/
 /composer.lock
diff --git a/src/Xezilaires/phpunit.xml.dist b/src/Xezilaires/phpunit.xml.dist
index f7c47a4..0fe98bc 100644
--- a/src/Xezilaires/phpunit.xml.dist
+++ b/src/Xezilaires/phpunit.xml.dist
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          beStrictAboutChangesToGlobalState="true"
          beStrictAboutCoversAnnotation="true"
          beStrictAboutOutputDuringTests="true"
          beStrictAboutResourceUsageDuringSmallTests="true"
          beStrictAboutTodoAnnotatedTests="true"
          bootstrap="./vendor/autoload.php"
-         cacheResultFile="var/phpqa/phpunit.cache"
+         cacheResultFile="var/phpqa/phpunit.result.cache"
          colors="true"
+         convertDeprecationsToExceptions="true"
+         enforceTimeLimit="true"
          executionOrder="random"
+         failOnEmptyTestSuite="true"
          failOnRisky="true"
          failOnWarning="true"
          forceCoversAnnotation="true"
diff --git a/src/Xezilaires/psalm.xml.dist b/src/Xezilaires/psalm.xml.dist
index 0a8cb86..e845a10 100644
--- a/src/Xezilaires/psalm.xml.dist
+++ b/src/Xezilaires/psalm.xml.dist
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
 <psalm xmlns="https://getpsalm.org/schema/config"
        cacheDirectory="var/phpqa/psalm"
+       checkForThrowsInGlobalScope="true"
+       ensureArrayIntOffsetsExist="true"
+       ensureArrayStringOffsetsExist="false"
        errorLevel="1"
-       findUnusedVariablesAndParams="true">
+       findUnusedBaselineEntry="false"
+       findUnusedCode="false"
+       findUnusedPsalmSuppress="false"
+       findUnusedVariablesAndParams="false"
+       limitMethodComplexity="true"
+       restrictReturnTypes="false"
+       strictBinaryOperands="false">
     <projectFiles>
         <directory name="."/>
         <ignoreFiles>