summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2018-09-14 12:07:04 (GMT)
committerAlex Pott2018-09-14 12:07:13 (GMT)
commitace96040c4258c6d01a4f13cce633a9d1918e02f (patch)
tree9b7cfbad56f55d668f9b2e5075909aa62efa81df
parent277a7055e88494c4a948c4780dcd45cd8ef70aa7 (diff)
Issue #2926122 by Adameue, zaporylie, BartoszUrbaniak, borisson_, idebr: Use lower-case, PEAR style, primitive data types
(cherry picked from commit dd7fd60f19bc44305dcb22d7ef4438ed53c2931c)
-rw-r--r--core/lib/Drupal/Core/Database/StatementPrefetch.php12
-rw-r--r--core/modules/field/tests/src/Kernel/DisplayApiTest.php2
-rw-r--r--core/modules/locale/src/PluralFormula.php2
-rw-r--r--core/modules/simpletest/src/TestBase.php4
-rw-r--r--core/modules/simpletest/src/Tests/SimpleTestErrorCollectorTest.php2
-rw-r--r--core/modules/views/src/Plugin/views/field/FieldPluginBase.php2
-rw-r--r--core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php2
-rw-r--r--core/modules/views/src/ViewExecutable.php2
-rw-r--r--core/modules/views_ui/src/ViewUI.php2
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 de60d73..fb7b0b4 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 3cbf63e..0afb237 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 638d60f..8f1920e 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 12a061f..9675bdc 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 b401fc9..61bd543 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 cbae7e0..be10f7f 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 890432a..badfdbe 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 8250466..27f73e1 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 6b49fdc..de323bd 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;