Merge pull request #22555 from eileenmcnaughton/stricter

(NFC) Comment fixes Stricter phpcs
civicrm · Jan 18, 2022 · 4cf9137 · 4cf9137
2 parents 15c77e5 + 9b500da
commit 4cf9137
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/CRM/Extension/Manager.php b/CRM/Extension/Manager.php
@@ -566,7 +566,7 @@ public function refresh() {
   /**
    * Return current processes for given extension.
    *
-   * @param String $key extension key
+   * @param string $key extension key
    *
    * @return array
    */
@@ -578,7 +578,7 @@ public function getActiveProcesses(string $key) :Array {
    * Determine if the extension specified is currently involved in an install
    * or enable process. Just sugar code to make things more readable.
    *
-   * @param String $key extension key
+   * @param string $key extension key
    *
    * @return bool
    */

diff --git a/CRM/Utils/SameSite.php b/CRM/Utils/SameSite.php
@@ -33,7 +33,7 @@ class CRM_Utils_SameSite {
   /**
    * Determine if the current User Agent can handle the `SameSite=None` parameter.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent
    * @return bool True if the User Agent is compatible, FALSE otherwise.
    */
   public static function shouldSendSameSiteNone($userAgent) {
@@ -43,7 +43,7 @@ public static function shouldSendSameSiteNone($userAgent) {
   /**
    * Detect classes of browsers known to be incompatible.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool True if the User Agent is determined to be incompatible, FALSE otherwise.
    */
   private static function isSameSiteNoneIncompatible($userAgent) {
@@ -58,7 +58,7 @@ private static function isSameSiteNoneIncompatible($userAgent) {
    * These versions will erroneously treat cookies marked with `SameSite=None`
    * as if they were marked `SameSite=Strict`.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool
    */
   private static function hasWebKitSameSiteBug($userAgent) {
@@ -74,7 +74,7 @@ private static function hasWebKitSameSiteBug($userAgent) {
    * but with the addition of the new "None" value to the specification, this
    * behavior has been updated in newer versions of UC Browser.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool
    */
   private static function dropsUnrecognizedSameSiteCookies($userAgent) {
@@ -91,7 +91,7 @@ private static function dropsUnrecognizedSameSiteCookies($userAgent) {
    * Detect iOS version.
    *
    * @param int $major The major version to test.
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool
    */
   private static function isIosVersion($major, $userAgent) {
@@ -112,7 +112,7 @@ private static function isIosVersion($major, $userAgent) {
    *
    * @param int $major The major version to test.
    * @param int $minor The minor version to test.
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool
    */
   private static function isMacosxVersion($major, $minor, $userAgent) {
@@ -131,7 +131,7 @@ private static function isMacosxVersion($major, $minor, $userAgent) {
   /**
    * Detect MacOS Safari.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool
    */
   private static function isSafari($userAgent) {
@@ -142,7 +142,7 @@ private static function isSafari($userAgent) {
   /**
    * Detect MacOS embedded browser.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return FALSE|int
    */
   private static function isMacEmbeddedBrowser($userAgent) {
@@ -153,7 +153,7 @@ private static function isMacEmbeddedBrowser($userAgent) {
   /**
    * Detect if browser is Chromium based.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return FALSE|int
    */
   private static function isChromiumBased($userAgent) {
@@ -165,8 +165,8 @@ private static function isChromiumBased($userAgent) {
    * Detect if Chromium version meets requirements.
    *
    * @param int $major The major version to test.
-   * @param str $userAgent The User Agent.
-   * @param str $operator
+   * @param string $userAgent The User Agent.
+   * @param string $operator
    * @return bool|int
    */
   private static function isChromiumVersionAtLeast($major, $userAgent, $operator) {
@@ -184,7 +184,7 @@ private static function isChromiumVersionAtLeast($major, $userAgent, $operator)
   /**
    * Detect UCBrowser.
    *
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return FALSE|int
    */
   private static function isUcBrowser($userAgent) {
@@ -198,7 +198,7 @@ private static function isUcBrowser($userAgent) {
    * @param int $major The major version to test.
    * @param int $minor The minor version to test.
    * @param int $build The build version to test.
-   * @param str $userAgent The User Agent.
+   * @param string $userAgent The User Agent.
    * @return bool|int
    */
   private static function isUcBrowserVersionAtLeast($major, $minor, $build, $userAgent) {