From e0a0e5cbfe8b13b7ccf8db9856786f125dbe626f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sun, 13 Dec 2020 08:48:52 +0100
Subject: [PATCH] Enhancement: Synchronize with ergebnis/php-library-template

---
 .gitattributes                                |  1 -
 .../actions/composer/composer/install/run.sh  |  6 +--
 .github/dependabot.yaml                       |  2 +-
 .phive/phars.xml                              |  4 ++
 Makefile                                      |  2 +-
 phpstan.neon                                  |  6 +++
 psalm-baseline.xml                            | 38 +------------------
 psalm.xml                                     |  4 --
 8 files changed, 16 insertions(+), 47 deletions(-)
 create mode 100644 .phive/phars.xml

diff --git a/.gitattributes b/.gitattributes
index d62bb983..4ce803a8 100644
--- 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/actions/composer/composer/install/run.sh b/.github/actions/composer/composer/install/run.sh
index 3cc3df12..a052ba6a 100755
--- a/.github/actions/composer/composer/install/run.sh
+++ b/.github/actions/composer/composer/install/run.sh
@@ -3,19 +3,19 @@
 dependencies="${COMPOSER_INSTALL_DEPENDENCIES}"
 
 if [[ ${dependencies} == "lowest" ]]; then
-  composer update --no-interaction --no-progress --no-suggest --prefer-lowest
+  composer update --no-interaction --no-progress --prefer-lowest
 
   exit $?
 fi
 
 if [[ ${dependencies} == "locked" ]]; then
-  composer install --no-interaction --no-progress --no-suggest
+  composer install --no-interaction --no-progress
 
   exit $?
 fi
 
 if [[ ${dependencies} == "highest" ]]; then
-  composer update --no-interaction --no-progress --no-suggest
+  composer update --no-interaction --no-progress
 
   exit $?
 fi
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index eb22ef0e..32e57df9 100644
--- 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/phars.xml b/.phive/phars.xml
new file mode 100644
index 00000000..b7a46302
--- /dev/null
+++ b/.phive/phars.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="composer-require-checker" version="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
+</phive>
diff --git a/Makefile b/Makefile
index 3fc5a040..bfc3ea21 100644
--- a/Makefile
+++ b/Makefile
@@ -54,4 +54,4 @@ tests: vendor ## Runs auto-review, unit, and integration tests with phpunit/phpu
 
 vendor: composer.json composer.lock
 	composer validate --strict
-	COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} composer install --no-interaction --no-progress --no-suggest
+	COMPOSER_ROOT_VERSION=${COMPOSER_ROOT_VERSION} composer install --no-interaction --no-progress
diff --git a/phpstan.neon b/phpstan.neon
index 16497600..36d5dd50 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -3,17 +3,23 @@ includes:
 
 parameters:
 	checkMissingIterableValueType: false
+
 	ergebnis:
 		classesAllowedToBeExtended:
 			- InvalidArgumentException
 			- LogicException
 			- ParseError
 			- RuntimeException
+
 	excludes_analyse:
 		- %currentWorkingDirectory%/test/Fixture/
+
 	inferPrivatePropertyTypeFromConstructor: true
+
 	level: max
+
 	paths:
 		- src/
 		- test/
+
 	tmpDir: .build/phpstan/
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 5722d340..2c477128 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -16,9 +16,7 @@
     </MissingConstructor>
   </file>
   <file src="test/Unit/ConstructTest.php">
-    <RedundantCondition occurrences="4">
-      <code>assertInstanceOf</code>
-      <code>assertInstanceOf</code>
+    <RedundantCondition occurrences="2">
       <code>assertIsArray</code>
       <code>assertIsArray</code>
     </RedundantCondition>
@@ -32,38 +30,4 @@
       <code>\Generator&lt;array{0: string, 1:Construct[]}&gt;</code>
     </MixedInferredReturnType>
   </file>
-  <file src="test/Unit/Exception/DirectoryDoesNotExistTest.php">
-    <RedundantCondition occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantConditionGivenDocblockType>
-  </file>
-  <file src="test/Unit/Exception/MultipleDefinitionsFoundTest.php">
-    <RedundantCondition occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantConditionGivenDocblockType>
-  </file>
-  <file src="test/Unit/Exception/ParseErrorTest.php">
-    <RedundantCondition occurrences="2">
-      <code>assertInstanceOf</code>
-      <code>assertInstanceOf</code>
-    </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="2">
-      <code>assertInstanceOf</code>
-      <code>assertInstanceOf</code>
-    </RedundantConditionGivenDocblockType>
-  </file>
-  <file src="test/Unit/Exception/ShouldNotHappenTest.php">
-    <RedundantCondition occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantCondition>
-    <RedundantConditionGivenDocblockType occurrences="1">
-      <code>assertInstanceOf</code>
-    </RedundantConditionGivenDocblockType>
-  </file>
 </files>
diff --git a/psalm.xml b/psalm.xml
index a4c89a87..c41d418f 100644
--- 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>