Merge pull request #411 from ergebnis/feature/synchronize

Enhancement: Synchronize with ergebnis/php-library-template
ergebnis · Dec 13, 2020 · bc45f1e · bc45f1e
2 parents 9e09ae5 + 4808fdc
commit bc45f1e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 18 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -8,7 +8,6 @@
 /composer-require-checker.json  export-ignore
 /infection.json                 export-ignore
 /Makefile                       export-ignore
-/phive.xml                      export-ignore
 /phpstan-baseline.neon          export-ignore
 /phpstan.neon                   export-ignore
 /psalm-baseline.xml             export-ignore

diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
@@ -9,7 +9,7 @@ updates:
     directory: "/"
     labels:
       - "dependency"
-    open-pull-requests-limit: 10
+    open-pull-requests-limit: 1
     package-ecosystem: "composer"
     schedule:
       interval: "daily"

diff --git a/.phive/composer-normalize b/.phive/composer-normalize
diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="composer-normalize" version="^2.9.0" installed="2.9.0" location="./.phive/composer-normalize" copy="true"/>
+  <phar name="composer-normalize" version="^2.11.0" installed="2.11.0" location="./.phive/composer-normalize" copy="true"/>
   <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
 </phive>
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -117,9 +117,6 @@
     <MixedAssignment occurrences="1">
       <code>$newLineString</code>
     </MixedAssignment>
-    <RedundantCondition occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantCondition>
   </file>
   <file src="test/Unit/Format/IndentTest.php">
     <MixedArgument occurrences="1">
@@ -136,9 +133,6 @@
       <code>\Generator&lt;array&lt;string&gt;&gt;</code>
       <code>\Generator&lt;array{0: int, 1: string, 2: string}&gt;</code>
     </MixedInferredReturnType>
-    <MoreSpecificReturnType occurrences="1">
-      <code>\Generator&lt;array{0: int, 1: string, 2: string}&gt;</code>
-    </MoreSpecificReturnType>
     <UnusedVariable occurrences="3">
       <code>$key</code>
       <code>$key</code>

diff --git a/psalm.xml b/psalm.xml
@@ -10,10 +10,6 @@
     resolveFromConfigFile="true"
     strictBinaryOperands="true"
 >
-    <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-    </issueHandlers>
-
     <plugins>
         <pluginClass class="Psalm\PhpUnitPlugin\Plugin" />
     </plugins>

diff --git a/test/Unit/phpunit.xml b/test/Unit/phpunit.xml
@@ -22,14 +22,14 @@
     stopOnSkipped="false"
     verbose="true"
 >
-    <testsuites>
-        <testsuite name="Unit Tests">
-            <directory>.</directory>
-        </testsuite>
-    </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">../../src/</directory>
         </whitelist>
     </filter>
+    <testsuites>
+        <testsuite name="Unit Tests">
+            <directory>.</directory>
+        </testsuite>
+    </testsuites>
 </phpunit>