Run stricter phpcs on Civi dir

diff --git a/Civi/API/Exception/NotImplementedException.php b/Civi/API/Exception/NotImplementedException.php
index b8f253f13ebdde72c4fecf7fc514335a2621ba3b..6deb57071d804fecda1b4e86097af15190df75b4 100644 (file)
--- a/Civi/API/Exception/NotImplementedException.php
+++ b/Civi/API/Exception/NotImplementedException.php
@@ -16,7 +16,7 @@ class NotImplementedException extends \API_Exception {
    *   Extra params to return. eg an extra array of ids. It is not mandatory,
    *   but can help the computer using the api. Keep in mind the api consumer
    *   isn't to be trusted. eg. the database password is NOT a good extra data.
-   * @param \Exception|NULL $previous
+   * @param \Exception|null $previous
    *   A previous exception which caused this new exception.
    */
   public function __construct($message, $extraParams = [], \Exception $previous = NULL) {

diff --git a/Civi/API/Exception/UnauthorizedException.php b/Civi/API/Exception/UnauthorizedException.php
index 4e3bdbf7379e38a517b723f1a97385843dd876df..12e44bda3de5d4404db085b7275bdac0e2b8b159 100644 (file)
--- a/Civi/API/Exception/UnauthorizedException.php
+++ b/Civi/API/Exception/UnauthorizedException.php
@@ -16,7 +16,7 @@ class UnauthorizedException extends \API_Exception {
    *   Extra params to return. eg an extra array of ids. It is not mandatory,
    *   but can help the computer using the api. Keep in mind the api consumer
    *   isn't to be trusted. eg. the database password is NOT a good extra data.
-   * @param \Exception|NULL $previous
+   * @param \Exception|null $previous
    *   A previous exception which caused this new exception.
    */
   public function __construct($message, $extraParams = [], \Exception $previous = NULL) {

diff --git a/Civi/API/Subscriber/DynamicFKAuthorization.php b/Civi/API/Subscriber/DynamicFKAuthorization.php
index a4b92bd3ef92a8fcae781e6eedd446c770aad9b3..225a00b402c7505df179750c61807041606f8e7c 100644 (file)
--- a/Civi/API/Subscriber/DynamicFKAuthorization.php
+++ b/Civi/API/Subscriber/DynamicFKAuthorization.php
@@ -119,7 +119,7 @@ class DynamicFKAuthorization implements EventSubscriberInterface {
    *   See docblock in DynamicFKAuthorization::$lookupDelegateSql.
    * @param string $lookupCustomFieldSql
    *   See docblock in DynamicFKAuthorization::$lookupCustomFieldSql.
-   * @param array|NULL $allowedDelegates
+   * @param array|null $allowedDelegates
    *   e.g. "civicrm_mailing","civicrm_activity"; NULL to allow any.
    */
   public function __construct($kernel, $entityName, $actions, $lookupDelegateSql, $lookupCustomFieldSql, $allowedDelegates = NULL) {

diff --git a/Civi/Api4/Event/ValidateValuesEvent.php b/Civi/Api4/Event/ValidateValuesEvent.php
index 8368a97ca5f7f85e9dcd664ab31eef833f816197..20b3c7de1380394b66656d97c468230f3648b6a7 100644 (file)
--- a/Civi/Api4/Event/ValidateValuesEvent.php
+++ b/Civi/Api4/Event/ValidateValuesEvent.php
@@ -124,7 +124,7 @@ class ValidateValuesEvent extends GenericHookEvent {
    *   If the error is multi-field (e.g. mismatched password-confirmation), then use an array.
    *   If the error is independent of any field, then use [].
    * @param string $name
-   * @param string|NULL $message
+   * @param string|null $message
    * @return $this
    */
   public function addError($recordKey, $field, string $name, string $message = NULL): self {

diff --git a/Civi/Api4/Service/Schema/Joinable/Joinable.php b/Civi/Api4/Service/Schema/Joinable/Joinable.php
index 6b5aed9e8242c073b0ac369e1d1aa70ad1a857fa..076707504e1aaf41d662d626ed01125cf45fe077 100644 (file)
--- a/Civi/Api4/Service/Schema/Joinable/Joinable.php
+++ b/Civi/Api4/Service/Schema/Joinable/Joinable.php
@@ -244,7 +244,7 @@ class Joinable {
   }
 
   /**
-   * @param int|NULL $serialize
+   * @param int|null $serialize
    *
    * @return $this
    */

diff --git a/Civi/Core/AssetBuilder.php b/Civi/Core/AssetBuilder.php
index aa40a097f47a3a57b7ecf65b8060589cb6e76b5d..a67569364debdeeb9d3142d667f46911db5fa458 100644 (file)
--- a/Civi/Core/AssetBuilder.php
+++ b/Civi/Core/AssetBuilder.php
@@ -241,7 +241,7 @@ class AssetBuilder {
   /**
    * Determine the local path of a cache file.
    *
-   * @param string|NULL $fileName
+   * @param string|null $fileName
    *   Ex: 'angular.abcd1234abcd1234.json'.
    * @return string
    *   URL.
@@ -257,7 +257,7 @@ class AssetBuilder {
   /**
    * Determine the URL of a cache file.
    *
-   * @param string|NULL $fileName
+   * @param string|null $fileName
    *   Ex: 'angular.abcd1234abcd1234.json'.
    * @return string
    *   URL.

diff --git a/Civi/Core/Paths.php b/Civi/Core/Paths.php
index aaab990d388d2c86fcf79271a9a675b461326be6..478141eb12063358f25cbd5ca4fa2dc3cb907ba2 100644 (file)
--- a/Civi/Core/Paths.php
+++ b/Civi/Core/Paths.php
@@ -232,7 +232,7 @@ class Paths {
    *   The result data may not meet the preference -- if the setting
    *   refers to an external domain, then the result will be
    *   absolute (regardless of preference).
-   * @param bool|NULL $ssl
+   * @param bool|null $ssl
    *   NULL to autodetect. TRUE to force to SSL.
    * @return FALSE|string
    *   The URL for $value (string), or FALSE if the $value is not specified.

diff --git a/Civi/Core/SqlTrigger/StaticTriggers.php b/Civi/Core/SqlTrigger/StaticTriggers.php
index e7e7a501650531aaf5d6a5d46a0e3da17e80c758..c9867ed85f24b6951dbb459a71c31448f8f44fbe 100644 (file)
--- a/Civi/Core/SqlTrigger/StaticTriggers.php
+++ b/Civi/Core/SqlTrigger/StaticTriggers.php
@@ -58,7 +58,7 @@ class StaticTriggers {
    *
    * @param array $info
    *   See hook_civicrm_triggerInfo.
-   * @param string|NULL $tableFilter
+   * @param string|null $tableFilter
    *   See hook_civicrm_triggerInfo.
    */
   public function alterTriggerInfo(&$info, $tableFilter = NULL) {

diff --git a/Civi/Core/SqlTrigger/TimestampTriggers.php b/Civi/Core/SqlTrigger/TimestampTriggers.php
index f7730e940c958da34974ee3da0a0a10403a609f0..606bf0c737885ae6ba5c3faacb5100e9601ebfd6 100644 (file)
--- a/Civi/Core/SqlTrigger/TimestampTriggers.php
+++ b/Civi/Core/SqlTrigger/TimestampTriggers.php
@@ -119,7 +119,7 @@ class TimestampTriggers {
    *
    * @param array $info
    *   See hook_civicrm_triggerInfo.
-   * @param string|NULL $tableFilter
+   * @param string|null $tableFilter
    *   See hook_civicrm_triggerInfo.
    */
   public function alterTriggerInfo(&$info, $tableFilter = NULL) {

diff --git a/Civi/Crypto/CryptoRegistry.php b/Civi/Crypto/CryptoRegistry.php
index 393e234b974881f183c713ff149b279aeb3107b1..27f0a9de8f418bde414ebddcbc75d4c9b4c102cd 100644 (file)
--- a/Civi/Crypto/CryptoRegistry.php
+++ b/Civi/Crypto/CryptoRegistry.php
@@ -193,7 +193,7 @@ class CryptoRegistry {
   /**
    * @param CipherSuiteInterface $cipherSuite
    *   The encryption/decryption callback/handler
-   * @param string[]|NULL $names
+   * @param string[]|null $names
    *   Symbolic names. Ex: 'aes-cbc'
    *   If NULL, probe $cipherSuite->getNames()
    */

diff --git a/Civi/Schema/Traits/GuiSpecTrait.php b/Civi/Schema/Traits/GuiSpecTrait.php
index 1a1db81e42106448b682b8a5f135402fb7b78698..1a084f8fc249f3be5f8249df1e936fe885c86e17 100644 (file)
--- a/Civi/Schema/Traits/GuiSpecTrait.php
+++ b/Civi/Schema/Traits/GuiSpecTrait.php
@@ -104,14 +104,14 @@ trait GuiSpecTrait {
   }
 
   /**
-   * @param string|NULL $helpPre
+   * @param string|null $helpPre
    */
   public function setHelpPre($helpPre) {
     $this->helpPre = is_string($helpPre) && strlen($helpPre) ? $helpPre : NULL;
   }
 
   /**
-   * @param string|NULL $helpPost
+   * @param string|null $helpPost
    */
   public function setHelpPost($helpPost) {
     $this->helpPost = is_string($helpPost) && strlen($helpPost) ? $helpPost : NULL;

diff --git a/Civi/Test.php b/Civi/Test.php
index a0d67697470284b41d3fd5fc4909198b8659d3d0..3deca30fbc2862b12cc7a928e51e2eb83de0918b 100644 (file)
--- a/Civi/Test.php
+++ b/Civi/Test.php
@@ -50,7 +50,7 @@ class Test {
   /**
    * Get the data source used for testing.
    *
-   * @param string|NULL $part
+   * @param string|null $part
    *   One of NULL, 'hostspec', 'port', 'username', 'password', 'database'.
    * @return string|array|NULL
    *   If $part is omitted, return full DSN array.

diff --git a/Civi/Test/EventCheck.php b/Civi/Test/EventCheck.php
index 6254201ed2458a7ac3f4ad2022dd379daf556497..d60a5e01d840efd2c06833ede2d1c7ca210d66ae 100644 (file)
--- a/Civi/Test/EventCheck.php
+++ b/Civi/Test/EventCheck.php
@@ -27,7 +27,7 @@ class EventCheck extends Assert {
   /**
    * Determine whether this check should be used during the current test.
    *
-   * @param \PHPUnit\Framework\Test|NULL $test
+   * @param \PHPUnit\Framework\Test|null $test
    *
    * @return bool|string
    *   FALSE: The check will be completely skipped.
@@ -46,7 +46,7 @@ class EventCheck extends Assert {
   }
 
   /**
-   * @param \PHPUnit\Framework\Test|NULL $test
+   * @param \PHPUnit\Framework\Test|null $test
    */
   public function setTest($test): void {
     $this->test = $test;
@@ -61,7 +61,7 @@ class EventCheck extends Assert {
    *   Ex: [`array`, `NULL`, `CRM_Core_DAO`]
    * @param mixed $value
    *   The variable to check
-   * @param string|NULL $msg
+   * @param string|null $msg
    * @see \CRM_Utils_Type::validatePhpType
    */
   public function assertType($types, $value, ?string $msg = NULL) {

diff --git a/Civi/Test/HttpTestTrait.php b/Civi/Test/HttpTestTrait.php
index 18f1dad11569fd190d3b43defe95330c0c93e423..99e6eb122eff169e6cd1c0cfbda75ff4db0a576a 100644 (file)
--- a/Civi/Test/HttpTestTrait.php
+++ b/Civi/Test/HttpTestTrait.php
@@ -117,7 +117,7 @@ trait HttpTestTrait {
 
   /**
    * @param $expectCode
-   * @param \Psr\Http\Message\ResponseInterface|NULL $response
+   * @param \Psr\Http\Message\ResponseInterface|null $response
    *   If NULL, then it uses the last response.
    *
    * @return $this
@@ -132,7 +132,7 @@ trait HttpTestTrait {
 
   /**
    * @param $expectType
-   * @param \Psr\Http\Message\ResponseInterface|NULL $response
+   * @param \Psr\Http\Message\ResponseInterface|null $response
    *   If NULL, then it uses the last response.
    *
    * @return $this
@@ -146,7 +146,7 @@ trait HttpTestTrait {
   }
 
   /**
-   * @param \Psr\Http\Message\ResponseInterface|NULL $response
+   * @param \Psr\Http\Message\ResponseInterface|null $response
    * @return \Psr\Http\Message\ResponseInterface
    */
   protected function resolveResponse($response) {

diff --git a/Civi/Token/Event/TokenRegisterEvent.php b/Civi/Token/Event/TokenRegisterEvent.php
index 730ddb616c87c662f83d0be2d0b10eb15ec18264..f46e207a876831a4bd9cef4b2afea72ade7763e1 100644 (file)
--- a/Civi/Token/Event/TokenRegisterEvent.php
+++ b/Civi/Token/Event/TokenRegisterEvent.php
@@ -51,7 +51,7 @@ class TokenRegisterEvent extends TokenEvent {
    * Register a new token.
    *
    * @param array|string $paramsOrField
-   * @param NULL|string $label
+   * @param null|string $label
    * @return TokenRegisterEvent
    */
   public function register($paramsOrField, $label = NULL) {

diff --git a/Civi/Token/TokenProcessor.php b/Civi/Token/TokenProcessor.php
index 93c1e01c1ab2c6b59d9ee0a93b1184eb6bf8334e..97e4bd3647542819f3d283d459f5ff791fb707b8 100644 (file)
--- a/Civi/Token/TokenProcessor.php
+++ b/Civi/Token/TokenProcessor.php
@@ -165,7 +165,7 @@ class TokenProcessor {
   /**
    * Add a row of data.
    *
-   * @param array|NULL $context
+   * @param array|null $context
    *   Optionally, initialize the context for this row.
    *   Ex: ['contact_id' => 123].
    * @return TokenRow
@@ -283,7 +283,7 @@ class TokenProcessor {
    *
    * @param string $field
    *   Ex: 'contactId'.
-   * @param string|NULL $subfield
+   * @param string|null $subfield
    * @return array
    *   Ex: [12, 34, 56].
    */

diff --git a/Civi/WorkflowMessage/FieldSpec.php b/Civi/WorkflowMessage/FieldSpec.php
index 7e7b4ffe13b798917f06c00c602c3e938da64647..7672ed880263438f0df597c14c32c119fe8c00bf 100644 (file)
--- a/Civi/WorkflowMessage/FieldSpec.php
+++ b/Civi/WorkflowMessage/FieldSpec.php
@@ -69,7 +69,7 @@ class FieldSpec {
   /**
    * Enable export/import in alternative scopes.
    *
-   * @param string|array|NULL $scope
+   * @param string|array|null $scope
    *   Ex: 'tplParams'
    *   Ex: 'tplParams as foo_bar'
    *   Ex: 'tplParams as contact_id, TokenProcessor as contactId'