PHPStan Fixes

Author: csev

src/Google/GoogleClassroom.php

@@ -9,7 +9,7 @@ class GoogleClassroom {
 
     /**
      * Returns an authorized Clasroom API client.
-     * @return Google_Client the authorized client object
+     * @return \Google_Client the authorized client object
      */
     public static function getClient($accessTokenStr, $user_id=false) {
         global $CFG, $PDOX;

src/UI/CrudForm.php

@@ -93,7 +93,7 @@ public static function insertForm($fields, $from_location, $titles=false, $field
      *
      * @param $fields An array of fields to be inserted.  These items must be
      * in the $_POST data as well.
-     * @return int Returns the constant for SUCCESS, FAIL, or NONE
+     * @return array|int Returns the fetched row array or the constant for SUCCESS, FAIL, or NONE
      */
     public static function handleInsert($tablename, $fields) {
         global $PDOX;

src/Util/LTI13.php

@@ -1266,7 +1266,7 @@ public static function build_jwt_html($launch_url, $jws, $dodebug=true, $extra=f
      * @param string $publicKey Returned public key
      * @param string $privateKey Returned private key
      *
-     * @return string or true If there was an error, we return it, on success return true
+     * @return string|true If there was an error, we return it, on success return true
      */
     // https://stackoverflow.com/questions/6648337/generate-ssh-keypair-form-php
     public static function generatePKCS8Pair(&$publicKey, &$privateKey) {

src/Util/U.php

@@ -700,7 +700,7 @@ public static function createGUID() {
     }
 
     public static function isGUIDValid($guid) {
-        return (preg_match("/^(\{)?[a-f\d]{8}(-[a-f\d]{4}){4}[a-f\d]{8}(?(1)\})$/i", $guid)
+        return (preg_match("/^(\{)?[a-f\d]{8}(-[a-f\d]{4}){3}-[a-f\d]{12}(?(1)\})$/i", $guid)
     ? true : false);
     }
 
@@ -737,7 +737,7 @@ public static function strlen($string) : int {
         if ( $string === false ) return 0;
         if ( $string === NULL ) return 0;
         if ( is_numeric($string) ) $string = $string . '';
-        if ( $string instanceof Stringable ) $string = $string . '';
+        if ( $string instanceof \Stringable ) $string = $string . '';
         if ( !is_string($string) ) return 0;
         return strlen($string);
     }

util/unsubscribe.php

@@ -64,7 +64,7 @@
 </p>
 <form method="post" action="unsubscribe.php">
   <input type="hidden" name="id" value="<?php echo($id); ?>">
-  <input type="hidden" name="token" value="<?php echo(htmlencode($token)); ?>">
+  <input type="hidden" name="token" value="<?php echo(htmlent_utf8($token)); ?>">
   <input type="submit" value="Unsubscribe">
 </form>
 <p>