Merge pull request #691 from DiamondLightSource/improve/make_php_lint…

…_active Make psalm passing part of the build Only changes build proces
DiamondLightSource · Nov 2, 2023 · c82aac0 · c82aac0
2 parents 4b7047c + a250c12
commit c82aac0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,9 +61,8 @@ jobs:
           php_version: 7.3
           version: 9
 
-      # Note, lint errors are being escaped here - so this will report, but not cause the build to fail
       - name: Run Psalm
-        run: psalm --output-format=github || exit 0
+        run: psalm --output-format=github
 
   js_build:
     name: JavaScript build, test and lint

diff --git a/api/src/Authentication/Type/LDAP.php b/api/src/Authentication/Type/LDAP.php
@@ -30,6 +30,9 @@ function authenticate($login, $password)
 
         if ($conn) {
             // Tested against LDAP version 3 (could add support for older versions here)
+            /**
+             * @psalm-suppress UndefinedConstant
+             */
             ldap_set_option($conn, LDAP_OPT_PROTOCOL_VERSION, 3);
 
             // use a secure connection for LDAP, if configured this way (default is unsecured as this was the historical setting)

diff --git a/api/src/Page.php b/api/src/Page.php
@@ -923,6 +923,9 @@ function _ldap_search($search, $email = False)
         if ($ds)
         {
             // Explictly set the protocol version to prevent bind errors
+            /**
+             * @psalm-suppress UndefinedConstant
+             */
             ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
             $r = ldap_bind($ds);
             $sr = ldap_search($ds, $ldap_search, $search);