From 7de4242a6ce434d8d6400ec98c1de6de9d7e1710 Mon Sep 17 00:00:00 2001
From: Cyril VERLOOP <cyril.verloop@webqard.fr>
Date: Sat, 2 Nov 2019 16:33:11 +0100
Subject: [PATCH 1/5] Add Psalm

---
 build.xml |   8 +++
 phive.xml |   1 +
 psalm.xml | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 158 insertions(+)
 create mode 100644 psalm.xml

diff --git a/build.xml b/build.xml
index 9fa1aa4c..2c80475e 100644
--- a/build.xml
+++ b/build.xml
@@ -55,6 +55,14 @@
         </exec>
     </target>
 
+    <target name="psalm" description="Generate psalm.xml">
+        <exec executable="${basedir}/tools/psalm" output="${basedir}/build/logs/psalm.xml">
+            <arg line="--show-info=false" />
+            <arg line="--output-format=xml" />
+            <arg line="--no-progress" />
+        </exec>
+    </target>
+
     <target name="api">
         <delete dir="${basedir}/build/api" />
         <exec executable="${basedir}/phpdox" />
diff --git a/phive.xml b/phive.xml
index bc4588a0..a59c8f35 100644
--- a/phive.xml
+++ b/phive.xml
@@ -3,4 +3,5 @@
   <phar name="phploc" version="^3.0.1" installed="3.0.1" location="./tools/phploc" copy="false"/>
   <phar name="phpunit" version="^7.0" installed="7.5.3" location="./tools/phpunit" copy="false"/>
   <phar name="phpab" version="^1.25.2" installed="1.25.2" location="./tools/phpab" copy="false"/>
+  <phar name="psalm" version="^3.6.2" installed="3.6.2" location="./tools/psalm" copy="false"/>
 </phive>
diff --git a/psalm.xml b/psalm.xml
new file mode 100644
index 00000000..caa13802
--- /dev/null
+++ b/psalm.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="false"
+    resolveFromConfigFile="true"
+    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"
+>
+    <projectFiles>
+        <directory name="./src/" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <LessSpecificReturnType errorLevel="info" />
+
+        <!-- level 3 issues - slightly lazy code writing, but provably low false-negatives -->
+
+        <DeprecatedMethod errorLevel="info" />
+        <DeprecatedProperty errorLevel="info" />
+        <DeprecatedClass errorLevel="info" />
+        <DeprecatedConstant errorLevel="info" />
+        <DeprecatedFunction errorLevel="info" />
+        <DeprecatedInterface errorLevel="info" />
+        <DeprecatedTrait errorLevel="info" />
+
+        <InternalMethod errorLevel="info" />
+        <InternalProperty errorLevel="info" />
+        <InternalClass errorLevel="info" />
+
+        <MissingClosureReturnType errorLevel="info" />
+        <MissingReturnType errorLevel="info" />
+        <MissingPropertyType errorLevel="info" />
+        <InvalidDocblock errorLevel="info" />
+        <MisplacedRequiredParam errorLevel="info" />
+
+        <PropertyNotSetInConstructor errorLevel="info" />
+        <MissingConstructor errorLevel="info" />
+        <MissingClosureParamType errorLevel="info" />
+        <MissingParamType errorLevel="info" />
+
+        <RedundantCondition errorLevel="info" />
+
+        <DocblockTypeContradiction errorLevel="info" />
+        <RedundantConditionGivenDocblockType errorLevel="info" />
+
+        <UnresolvableInclude errorLevel="info" />
+
+        <RawObjectIteration errorLevel="info" />
+
+        <InvalidStringClass errorLevel="info" />
+
+        <!-- level 4 issues - points to possible deficiencies in logic, higher false-positives -->
+
+        <MoreSpecificReturnType errorLevel="info" />
+        <LessSpecificReturnStatement errorLevel="info" />
+        <TypeCoercion errorLevel="info" />
+
+        <PossiblyFalseArgument errorLevel="info" />
+        <PossiblyFalseIterator errorLevel="info" />
+        <PossiblyFalseOperand errorLevel="info" />
+        <PossiblyFalsePropertyAssignmentValue errorLevel="info" />
+        <PossiblyFalseReference errorLevel="info" />
+        <PossiblyInvalidArgument errorLevel="info" />
+        <PossiblyInvalidArrayAccess errorLevel="info" />
+        <PossiblyInvalidArrayAssignment errorLevel="info" />
+        <PossiblyInvalidArrayOffset errorLevel="info" />
+        <PossiblyInvalidCast errorLevel="info" />
+        <PossiblyInvalidFunctionCall errorLevel="info" />
+        <PossiblyInvalidIterator errorLevel="info" />
+        <PossiblyInvalidMethodCall errorLevel="info" />
+        <PossiblyInvalidOperand errorLevel="info" />
+        <PossiblyInvalidPropertyAssignment errorLevel="info" />
+        <PossiblyInvalidPropertyAssignmentValue errorLevel="info" />
+        <PossiblyInvalidPropertyFetch errorLevel="info" />
+        <PossiblyNullArgument errorLevel="info" />
+        <PossiblyNullArrayAccess errorLevel="info" />
+        <PossiblyNullArrayAssignment errorLevel="info" />
+        <PossiblyNullArrayOffset errorLevel="info" />
+        <PossiblyNullFunctionCall errorLevel="info" />
+        <PossiblyNullIterator errorLevel="info" />
+        <PossiblyNullOperand errorLevel="info" />
+        <PossiblyNullPropertyAssignment errorLevel="info" />
+        <PossiblyNullPropertyAssignmentValue errorLevel="info" />
+        <PossiblyNullPropertyFetch errorLevel="info" />
+        <PossiblyNullReference errorLevel="info" />
+        <PossiblyUndefinedGlobalVariable errorLevel="info" />
+        <PossiblyUndefinedVariable errorLevel="info" />
+        <PossiblyUndefinedArrayOffset errorLevel="info" />
+        <PossiblyUndefinedMethod errorLevel="info" />
+        <PossibleRawObjectIteration errorLevel="info" />
+
+        <!-- level 5 issues - should be avoided at mosts costs... -->
+
+        <ForbiddenCode errorLevel="info" />
+        <ImplicitToStringCast errorLevel="info" />
+        <InvalidScalarArgument errorLevel="info" />
+        <InvalidToString errorLevel="info" />
+        <InvalidOperand errorLevel="info" />
+        <NoInterfaceProperties errorLevel="info" />
+        <TooManyArguments errorLevel="info" />
+        <TypeDoesNotContainType errorLevel="info" />
+        <TypeDoesNotContainNull errorLevel="info" />
+        <MissingDocblockType errorLevel="info" />
+        <ImplementedReturnTypeMismatch errorLevel="info" />
+        <ImplementedParamTypeMismatch errorLevel="info" />
+
+        <!-- level 6 issues - really bad things -->
+
+        <InvalidNullableReturnType errorLevel="info" />
+        <NullableReturnStatement errorLevel="info" />
+        <InvalidFalsableReturnType errorLevel="info" />
+        <FalsableReturnStatement errorLevel="info" />
+
+        <MoreSpecificImplementedParamType errorLevel="info" />
+        <LessSpecificImplementedReturnType errorLevel="info" />
+
+        <InvalidReturnStatement errorLevel="info" />
+        <InvalidReturnType errorLevel="info" />
+        <UndefinedThisPropertyAssignment errorLevel="info" />
+        <UndefinedInterfaceMethod errorLevel="info" />
+
+        <!-- level 7 issues - even worse -->
+
+        <UndefinedThisPropertyAssignment errorLevel="info" />
+        <UndefinedPropertyAssignment errorLevel="info" />
+        <UndefinedThisPropertyFetch errorLevel="info" />
+        <UndefinedPropertyFetch errorLevel="info" />
+
+        <InvalidReturnStatement errorLevel="info" />
+        <InvalidReturnType errorLevel="info" />
+        <InvalidArgument errorLevel="info" />
+        <InvalidPropertyAssignmentValue errorLevel="info" />
+        <InvalidArrayOffset errorLevel="info" />
+        <InvalidArrayAssignment errorLevel="info" />
+        <InvalidArrayAccess errorLevel="info" />
+        <InvalidClone errorLevel="info" />
+
+        <!-- level 8 issues - some fatal errors in PHP -->
+
+        <ReservedWord errorLevel="info" />
+        <MethodSignatureMismatch errorLevel="info" />
+        <OverriddenMethodAccess errorLevel="info" />
+        <InaccessibleProperty errorLevel="info" />
+
+    </issueHandlers>
+</psalm>

From e62e2b829646d72ad75d02aa93da0556194623aa Mon Sep 17 00:00:00 2001
From: Cyril VERLOOP <cyril.verloop@webqard.fr>
Date: Tue, 7 Jan 2020 15:49:03 +0100
Subject: [PATCH 2/5] Psalm 3.6.2 => 3.8.1.

---
 phive.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phive.xml b/phive.xml
index a59c8f35..2ad8dd7d 100644
--- a/phive.xml
+++ b/phive.xml
@@ -3,5 +3,5 @@
   <phar name="phploc" version="^3.0.1" installed="3.0.1" location="./tools/phploc" copy="false"/>
   <phar name="phpunit" version="^7.0" installed="7.5.3" location="./tools/phpunit" copy="false"/>
   <phar name="phpab" version="^1.25.2" installed="1.25.2" location="./tools/phpab" copy="false"/>
-  <phar name="psalm" version="^3.6.2" installed="3.6.2" location="./tools/psalm" copy="false"/>
+  <phar name="psalm" version="^3.8.1" installed="3.8.1" location="./tools/psalm" copy="false"/>
 </phive>

From 92cc6a7264d6e635359c44f6ed2f83ea59659e47 Mon Sep 17 00:00:00 2001
From: Cyril VERLOOP <cyril.verloop@webqard.fr>
Date: Tue, 7 Jan 2020 15:52:29 +0100
Subject: [PATCH 3/5] Add a Psalm task for console output.

---
 build.xml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2c80475e..78e51ec7 100644
--- a/build.xml
+++ b/build.xml
@@ -55,8 +55,16 @@
         </exec>
     </target>
 
-    <target name="psalm" description="Generate psalm.xml">
+    <target name="psalm" description="Display Psalm analysis">
+        <exec executable="${basedir}/tools/psalm">
+            <arg line="-c=${basedir}/psalm.xml" />
+            <arg line="--output-format=compact" />
+        </exec>
+    </target>
+
+    <target name="psalm-ci" description="Generate psalm.xml">
         <exec executable="${basedir}/tools/psalm" output="${basedir}/build/logs/psalm.xml">
+            <arg line="-c=${basedir}/psalm.xml" />
             <arg line="--show-info=false" />
             <arg line="--output-format=xml" />
             <arg line="--no-progress" />

From b90e6930cb0a9d26e4b56935a5bf08bf83393051 Mon Sep 17 00:00:00 2001
From: Cyril VERLOOP <cyril.verloop@webqard.fr>
Date: Tue, 23 Feb 2021 16:44:35 +0100
Subject: [PATCH 4/5] Psalm 3.8.1 => 4.6.1.

---
 phive.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phive.xml b/phive.xml
index 2ad8dd7d..695eac4e 100644
--- a/phive.xml
+++ b/phive.xml
@@ -3,5 +3,5 @@
   <phar name="phploc" version="^3.0.1" installed="3.0.1" location="./tools/phploc" copy="false"/>
   <phar name="phpunit" version="^7.0" installed="7.5.3" location="./tools/phpunit" copy="false"/>
   <phar name="phpab" version="^1.25.2" installed="1.25.2" location="./tools/phpab" copy="false"/>
-  <phar name="psalm" version="^3.8.1" installed="3.8.1" location="./tools/psalm" copy="false"/>
+  <phar name="psalm" version="^4.6.1" installed="4.6.1" location="./tools/psalm" copy="false"/>
 </phive>

From 6b017eedf2691d0e8c2bb6a6690597e6dc5ec35a Mon Sep 17 00:00:00 2001
From: Cyril VERLOOP <cyril.verloop@webqard.fr>
Date: Tue, 23 Feb 2021 16:52:37 +0100
Subject: [PATCH 5/5] Generating new config file for Psalm.

---
 psalm.xml | 138 +-----------------------------------------------------
 1 file changed, 2 insertions(+), 136 deletions(-)

diff --git a/psalm.xml b/psalm.xml
index caa13802..7c0333df 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -1,149 +1,15 @@
 <?xml version="1.0"?>
 <psalm
-    totallyTyped="false"
+    errorLevel="7"
     resolveFromConfigFile="true"
     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"
 >
     <projectFiles>
-        <directory name="./src/" />
+        <directory name="src" />
         <ignoreFiles>
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
-
-    <issueHandlers>
-        <LessSpecificReturnType errorLevel="info" />
-
-        <!-- level 3 issues - slightly lazy code writing, but provably low false-negatives -->
-
-        <DeprecatedMethod errorLevel="info" />
-        <DeprecatedProperty errorLevel="info" />
-        <DeprecatedClass errorLevel="info" />
-        <DeprecatedConstant errorLevel="info" />
-        <DeprecatedFunction errorLevel="info" />
-        <DeprecatedInterface errorLevel="info" />
-        <DeprecatedTrait errorLevel="info" />
-
-        <InternalMethod errorLevel="info" />
-        <InternalProperty errorLevel="info" />
-        <InternalClass errorLevel="info" />
-
-        <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
-        <MissingPropertyType errorLevel="info" />
-        <InvalidDocblock errorLevel="info" />
-        <MisplacedRequiredParam errorLevel="info" />
-
-        <PropertyNotSetInConstructor errorLevel="info" />
-        <MissingConstructor errorLevel="info" />
-        <MissingClosureParamType errorLevel="info" />
-        <MissingParamType errorLevel="info" />
-
-        <RedundantCondition errorLevel="info" />
-
-        <DocblockTypeContradiction errorLevel="info" />
-        <RedundantConditionGivenDocblockType errorLevel="info" />
-
-        <UnresolvableInclude errorLevel="info" />
-
-        <RawObjectIteration errorLevel="info" />
-
-        <InvalidStringClass errorLevel="info" />
-
-        <!-- level 4 issues - points to possible deficiencies in logic, higher false-positives -->
-
-        <MoreSpecificReturnType errorLevel="info" />
-        <LessSpecificReturnStatement errorLevel="info" />
-        <TypeCoercion errorLevel="info" />
-
-        <PossiblyFalseArgument errorLevel="info" />
-        <PossiblyFalseIterator errorLevel="info" />
-        <PossiblyFalseOperand errorLevel="info" />
-        <PossiblyFalsePropertyAssignmentValue errorLevel="info" />
-        <PossiblyFalseReference errorLevel="info" />
-        <PossiblyInvalidArgument errorLevel="info" />
-        <PossiblyInvalidArrayAccess errorLevel="info" />
-        <PossiblyInvalidArrayAssignment errorLevel="info" />
-        <PossiblyInvalidArrayOffset errorLevel="info" />
-        <PossiblyInvalidCast errorLevel="info" />
-        <PossiblyInvalidFunctionCall errorLevel="info" />
-        <PossiblyInvalidIterator errorLevel="info" />
-        <PossiblyInvalidMethodCall errorLevel="info" />
-        <PossiblyInvalidOperand errorLevel="info" />
-        <PossiblyInvalidPropertyAssignment errorLevel="info" />
-        <PossiblyInvalidPropertyAssignmentValue errorLevel="info" />
-        <PossiblyInvalidPropertyFetch errorLevel="info" />
-        <PossiblyNullArgument errorLevel="info" />
-        <PossiblyNullArrayAccess errorLevel="info" />
-        <PossiblyNullArrayAssignment errorLevel="info" />
-        <PossiblyNullArrayOffset errorLevel="info" />
-        <PossiblyNullFunctionCall errorLevel="info" />
-        <PossiblyNullIterator errorLevel="info" />
-        <PossiblyNullOperand errorLevel="info" />
-        <PossiblyNullPropertyAssignment errorLevel="info" />
-        <PossiblyNullPropertyAssignmentValue errorLevel="info" />
-        <PossiblyNullPropertyFetch errorLevel="info" />
-        <PossiblyNullReference errorLevel="info" />
-        <PossiblyUndefinedGlobalVariable errorLevel="info" />
-        <PossiblyUndefinedVariable errorLevel="info" />
-        <PossiblyUndefinedArrayOffset errorLevel="info" />
-        <PossiblyUndefinedMethod errorLevel="info" />
-        <PossibleRawObjectIteration errorLevel="info" />
-
-        <!-- level 5 issues - should be avoided at mosts costs... -->
-
-        <ForbiddenCode errorLevel="info" />
-        <ImplicitToStringCast errorLevel="info" />
-        <InvalidScalarArgument errorLevel="info" />
-        <InvalidToString errorLevel="info" />
-        <InvalidOperand errorLevel="info" />
-        <NoInterfaceProperties errorLevel="info" />
-        <TooManyArguments errorLevel="info" />
-        <TypeDoesNotContainType errorLevel="info" />
-        <TypeDoesNotContainNull errorLevel="info" />
-        <MissingDocblockType errorLevel="info" />
-        <ImplementedReturnTypeMismatch errorLevel="info" />
-        <ImplementedParamTypeMismatch errorLevel="info" />
-
-        <!-- level 6 issues - really bad things -->
-
-        <InvalidNullableReturnType errorLevel="info" />
-        <NullableReturnStatement errorLevel="info" />
-        <InvalidFalsableReturnType errorLevel="info" />
-        <FalsableReturnStatement errorLevel="info" />
-
-        <MoreSpecificImplementedParamType errorLevel="info" />
-        <LessSpecificImplementedReturnType errorLevel="info" />
-
-        <InvalidReturnStatement errorLevel="info" />
-        <InvalidReturnType errorLevel="info" />
-        <UndefinedThisPropertyAssignment errorLevel="info" />
-        <UndefinedInterfaceMethod errorLevel="info" />
-
-        <!-- level 7 issues - even worse -->
-
-        <UndefinedThisPropertyAssignment errorLevel="info" />
-        <UndefinedPropertyAssignment errorLevel="info" />
-        <UndefinedThisPropertyFetch errorLevel="info" />
-        <UndefinedPropertyFetch errorLevel="info" />
-
-        <InvalidReturnStatement errorLevel="info" />
-        <InvalidReturnType errorLevel="info" />
-        <InvalidArgument errorLevel="info" />
-        <InvalidPropertyAssignmentValue errorLevel="info" />
-        <InvalidArrayOffset errorLevel="info" />
-        <InvalidArrayAssignment errorLevel="info" />
-        <InvalidArrayAccess errorLevel="info" />
-        <InvalidClone errorLevel="info" />
-
-        <!-- level 8 issues - some fatal errors in PHP -->
-
-        <ReservedWord errorLevel="info" />
-        <MethodSignatureMismatch errorLevel="info" />
-        <OverriddenMethodAccess errorLevel="info" />
-        <InaccessibleProperty errorLevel="info" />
-
-    </issueHandlers>
 </psalm>