infra: streamline config (#178)

* infra: streamline config * infra: streamline config * infra: streamline config * infra: streamline config * infra: streamline config
sigwinhq · May 8, 2023 · 82545ec · 82545ec
1 parent 8329d2e
commit 82545ec
Show file tree

Hide file tree

Showing 24 changed files with 117 additions and 27 deletions.
diff --git a/.editorconfig 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
@@ -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
@@ -1,3 +1,3 @@
-var
-vendor
-composer.lock
+/var/
+/vendor/
+/composer.lock
diff --git 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
@@ -1,19 +1,28 @@
 <?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"/>
             <directory name="src/Bridge/*/var/"/>
             <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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,3 +1,3 @@
-/vendor/
 /var/
+/vendor/
 /composer.lock
diff --git 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
@@ -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>