Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NFC] fix comment blocks capitalising null #14306

Merged
merged 1 commit into from
May 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions CRM/Case/XMLRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ class CRM_Case_XMLRepository {
protected $xml = [];

/**
* @var array|NULL
* @var array|null
*/
protected $hookCache = NULL;

/**
* @var array|NULL symbolic names of case-types
* Symbolic names of case-types.
*
* @var array|null
*/
protected $allCaseTypes = NULL;

Expand Down
11 changes: 8 additions & 3 deletions CRM/Core/CodeGen/Main.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,18 @@ class CRM_Core_CodeGen_Main {
public $database;

/**
* @var string|NULL path in which to store a marker that indicates the last execution of
* GenCode. If a matching marker already exists, GenCode doesn't run.
* Path in which to store a marker that indicates the last execution of GenCode.
*
* If a matching marker already exists, GenCode doesn't run.
*
* @var string|null
*/
public $digestPath;

/**
* @var string|NULL a digest of the inputs to the code-generator (eg the properties and source files)
* Digest of the inputs to the code-generator (eg the properties and source files).
*
* @var string|null
*/
public $sourceDigest;

Expand Down
12 changes: 6 additions & 6 deletions CRM/Core/Component/Info.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@
*
* @package CRM
* @copyright CiviCRM LLC (c) 2004-2019
* $Id$
*
*/
abstract class CRM_Core_Component_Info {

Expand Down Expand Up @@ -79,14 +77,16 @@ abstract class CRM_Core_Component_Info {
const COMPONENT_MENU_XML = 'Menu';

/**
* Stores component information.
* @var array component settings as key/value pairs
* Component settings as key/value pairs.
*
* @var array
*/
public $info;

/**
* Stores component keyword.
* @var string name of component keyword
* Component keyword.
*
* @var string
*/
protected $keyword;

Expand Down
17 changes: 10 additions & 7 deletions CRM/Report/Form.php
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ class CRM_Report_Form extends CRM_Core_Form {

/**
* Variables to hold the acl inner join and where clause
* @var string|NULL
* @var string|null
*/
protected $_aclFrom = NULL;
protected $_aclWhere = NULL;
Expand Down Expand Up @@ -358,7 +358,7 @@ class CRM_Report_Form extends CRM_Core_Form {
*
* (it's unclear if this could be merged with outputMode at this stage)
*
* @var string|NULL
* @var string|null
*/
protected $_format;

Expand All @@ -380,21 +380,24 @@ class CRM_Report_Form extends CRM_Core_Form {
public $_havingClauses = [];

/**
* DashBoardRowCount Dashboard row count
* @var Integer
* DashBoardRowCount Dashboard row count.
*
* @var int
*/
public $_dashBoardRowCount;

/**
* Is this being called without a form controller (ie. the report is being render outside the normal form
* - e.g the api is retrieving the rows
* - e.g the api is retrieving the rows.
*
* @var bool
*/
public $noController = FALSE;

/**
* Variable to hold the currency alias
* @var string|NULL
* Variable to hold the currency alias.
*
* @var string|null
*/
protected $_currencyColumn = NULL;

Expand Down
4 changes: 2 additions & 2 deletions Civi/ActionSchedule/Mapping.php
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,14 @@ public function __construct($params) {

/**
* Date filter -- the field name.
* @var string|NULL
* @var string|null
* Ex: 'event_start_date'
*/
private $entity_date_start;

/**
* Date filter -- the field name.
* @var string|NULL
* @var string|null
* Ex: 'event_end_date'.
*/
private $entity_date_end;
Expand Down
2 changes: 1 addition & 1 deletion Civi/Angular/AngularLoader.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class AngularLoader {
protected $modules;

/**
* @var array|NULL
* @var array|null
*/
protected $crmApp = NULL;

Expand Down
4 changes: 3 additions & 1 deletion Civi/Angular/Manager.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ class Manager {
protected $res = NULL;

/**
* @var array|NULL
* Modules.
*
* @var array|null
* Each item has some combination of these keys:
* - ext: string
* The Civi extension which defines the Angular module.
Expand Down
2 changes: 1 addition & 1 deletion Civi/Core/SettingsBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class SettingsBag {
* The result of combining default values, mandatory
* values, and user values.
*
* @var array|NULL
* @var array|null
* Array(string $settingName => mixed $value).
*/
protected $combined;
Expand Down
2 changes: 1 addition & 1 deletion Civi/Core/SettingsManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class SettingsManager {
protected $bagsByContact = [];

/**
* @var array|NULL
* @var array|null
* Array(string $entity => array(string $settingName => mixed $value)).
* Ex: $mandatory['domain']['uploadDir'].
* NULL means "autoload from $civicrm_setting".
Expand Down
2 changes: 1 addition & 1 deletion Civi/Core/SqlTriggers.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SqlTriggers {
/**
* The name of the output file.
*
* @var string|NULL
* @var string|null
*/
private $file = NULL;

Expand Down
2 changes: 1 addition & 1 deletion Civi/Test/CiviEnvBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class CiviEnvBuilder {
private $steps = [];

/**
* @var string|NULL
* @var string|null
* A digest of the values in $steps.
*/
private $targetSignature = NULL;
Expand Down