From dd7fd60f19bc44305dcb22d7ef4438ed53c2931c Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Fri, 14 Sep 2018 14:07:04 +0200 Subject: [PATCH] Issue #2926122 by Adameue, zaporylie, BartoszUrbaniak, borisson_, idebr: Use lower-case, PEAR style, primitive data types --- core/lib/Drupal/Core/Database/StatementPrefetch.php | 12 ++++++------ .../field/tests/src/Kernel/DisplayApiTest.php | 2 +- core/modules/locale/src/PluralFormula.php | 2 +- core/modules/simpletest/src/TestBase.php | 4 ++-- .../src/Tests/SimpleTestErrorCollectorTest.php | 2 +- .../views/src/Plugin/views/field/FieldPluginBase.php | 2 +- .../src/Plugin/views/wizard/WizardPluginBase.php | 2 +- core/modules/views/src/ViewExecutable.php | 2 +- core/modules/views_ui/src/ViewUI.php | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/core/lib/Drupal/Core/Database/StatementPrefetch.php b/core/lib/Drupal/Core/Database/StatementPrefetch.php index de60d73bf90..fb7b0b4e0a0 100644 --- a/core/lib/Drupal/Core/Database/StatementPrefetch.php +++ b/core/lib/Drupal/Core/Database/StatementPrefetch.php @@ -20,7 +20,7 @@ class StatementPrefetch implements \Iterator, StatementInterface { /** * Driver-specific options. Can be used by child classes. * - * @var Array + * @var array */ protected $driverOptions; @@ -41,14 +41,14 @@ class StatementPrefetch implements \Iterator, StatementInterface { /** * Main data store. * - * @var Array + * @var array */ protected $data = []; /** * The current row, retrieved in \PDO::FETCH_ASSOC format. * - * @var Array + * @var array */ protected $currentRow = NULL; @@ -62,7 +62,7 @@ class StatementPrefetch implements \Iterator, StatementInterface { /** * The list of column names in this result set. * - * @var Array + * @var array */ protected $columnNames = NULL; @@ -91,7 +91,7 @@ class StatementPrefetch implements \Iterator, StatementInterface { /** * Holds supplementary current fetch options (which will be used by the next fetch). * - * @var Array + * @var array */ protected $fetchOptions = [ 'class' => 'stdClass', @@ -110,7 +110,7 @@ class StatementPrefetch implements \Iterator, StatementInterface { /** * Holds supplementary default fetch options. * - * @var Array + * @var array */ protected $defaultFetchOptions = [ 'class' => 'stdClass', diff --git a/core/modules/field/tests/src/Kernel/DisplayApiTest.php b/core/modules/field/tests/src/Kernel/DisplayApiTest.php index 3cbf63eb19b..0afb23700c5 100644 --- a/core/modules/field/tests/src/Kernel/DisplayApiTest.php +++ b/core/modules/field/tests/src/Kernel/DisplayApiTest.php @@ -31,7 +31,7 @@ class DisplayApiTest extends FieldKernelTestBase { /** * The field cardinality to use in this test. * - * @var number + * @var int */ protected $cardinality; diff --git a/core/modules/locale/src/PluralFormula.php b/core/modules/locale/src/PluralFormula.php index 638d60fac86..8f1920e6493 100644 --- a/core/modules/locale/src/PluralFormula.php +++ b/core/modules/locale/src/PluralFormula.php @@ -36,7 +36,7 @@ class PluralFormula implements PluralFormulaInterface { * ], * ] * @endcode - * @var [] + * @var array */ protected $formulae; diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index 12a061fd00e..9675bdca09c 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -51,7 +51,7 @@ abstract class TestBase { /** * Current results of this test case. * - * @var Array + * @var array */ public $results = [ '#pass' => 0, @@ -63,7 +63,7 @@ abstract class TestBase { /** * Assertions thrown in that test case. * - * @var Array + * @var array */ protected $assertions = []; diff --git a/core/modules/simpletest/src/Tests/SimpleTestErrorCollectorTest.php b/core/modules/simpletest/src/Tests/SimpleTestErrorCollectorTest.php index b401fc99942..61bd5432b4d 100644 --- a/core/modules/simpletest/src/Tests/SimpleTestErrorCollectorTest.php +++ b/core/modules/simpletest/src/Tests/SimpleTestErrorCollectorTest.php @@ -24,7 +24,7 @@ class SimpleTestErrorCollectorTest extends WebTestBase { * Errors are intercepted by the overridden implementation * of Drupal\simpletest\WebTestBase::error() below. * - * @var Array + * @var array */ protected $collectedErrors = []; diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php index cbae7e0b1d0..be10f7f46f5 100644 --- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php +++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php @@ -106,7 +106,7 @@ abstract class FieldPluginBase extends HandlerBase implements FieldHandlerInterf /** * Keeps track of the last render index. * - * @var int|NULL + * @var int|null */ protected $lastRenderIndex; diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php index 890432aa84c..badfdbe3d27 100644 --- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php +++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php @@ -103,7 +103,7 @@ abstract class WizardPluginBase extends PluginBase implements WizardInterface { * By default, filters are not exposed and added to the first non-reserved * filter group. * - * @var array() + * @var array */ protected $filter_defaults = [ 'id' => NULL, diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php index 82504661f0a..27f73e153f4 100644 --- a/core/modules/views/src/ViewExecutable.php +++ b/core/modules/views/src/ViewExecutable.php @@ -114,7 +114,7 @@ class ViewExecutable { /** * Attachments to place before the view. * - * @var array() + * @var array */ public $attachment_before = []; diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php index 6b49fdc92d3..de323bd277a 100644 --- a/core/modules/views_ui/src/ViewUI.php +++ b/core/modules/views_ui/src/ViewUI.php @@ -51,7 +51,7 @@ class ViewUI implements ViewEntityInterface { * \Drupal\Core\TempStore\SharedTempStore::getMetadata(). Which can be a stdClass or * NULL. * - * @var stdClass + * @var object */ public $lock;