Doc update & code tweaks

README.md

@@ -169,3 +169,10 @@ Because of the way the test-suite is designed, in-memory sqlite does not work.
 The sqlite db must be stored in a file. This is already setup in the default pdo config.
 
 The package should work with MS Sqlserver, but the tests will only run with sqlite, mysql & postgres databases.
+
+### Branching
+
+These are the branches in this repository:
+
+- **main:** contains code for the latest major version of this package
+- **1.x:** contains code for the **1.x** version of this package

composer.json

@@ -41,7 +41,7 @@
         "rector-clear": "vendor/bin/rector --clear-cache",
         "rector": "vendor/bin/rector process src --dry-run -vvv",
         "psalm": "vendor/bin/psalm --threads=1",
-        "qa": "composer test && composer rector-clear && composer rector && composer psalm",
+        "qa": "composer test && composer rector && composer psalm",
         "gen-test-pdo-config": "@php -r \"file_exists('./tests/pdo.php') || copy('./pdo-dist.php', './tests/pdo.php');\""
     },
     "bin": [

psalm.xml

@@ -3,6 +3,9 @@
     errorLevel="1"
     resolveFromConfigFile="true"
     allowStringToStandInForClass="true"
+    findUnusedCode="true"
+    findUnusedPsalmSuppress="true"
+    findUnusedBaselineEntry="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"

tests/OtherUtilsTest.php

@@ -37,7 +37,7 @@ public function testThatGetThrowableAsStrWorksAsExpected() {
         $throwableAssertingLooper = function (\Throwable $e, string $eol, $output): void {
 
             $previous_throwable = $e; 
-            $eol = PHP_EOL;
+            $eol = ($eol === '') ? PHP_EOL : $eol;
 
             do {
                 self::assertStringContainsString("Exception / Error Code: {$previous_throwable->getCode()}", $output);