From a25e8fedfb266593e725d81bd3fe38e0e6f62807 Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Thu, 23 Aug 2012 16:45:54 +0200
Subject: [PATCH] Issue #1744186 by tim.plunkett, damiankloip: Fix visibility
for plugin annotation to class property conversion.
---
lib/Drupal/views/Plugin/views/PluginBase.php | 4 ++--
lib/Drupal/views/Plugin/views/access/Permission.php | 2 +-
lib/Drupal/views/Plugin/views/access/Role.php | 2 +-
lib/Drupal/views/Plugin/views/cache/Time.php | 2 +-
.../views/Plugin/views/display/DisplayPluginBase.php | 2 +-
.../Plugin/views/exposed_form/ExposedFormPluginBase.php | 2 +-
lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php | 2 +-
lib/Drupal/views/Plugin/views/row/Fields.php | 2 +-
lib/Drupal/views/Plugin/views/row/RowPluginBase.php | 4 ++--
lib/Drupal/views/Plugin/views/row/RssFields.php | 2 +-
lib/Drupal/views/Plugin/views/style/DefaultStyle.php | 4 ++--
lib/Drupal/views/Plugin/views/style/Grid.php | 4 ++--
lib/Drupal/views/Plugin/views/style/HtmlList.php | 4 ++--
lib/Drupal/views/Plugin/views/style/Rss.php | 2 +-
lib/Drupal/views/Plugin/views/style/StylePluginBase.php | 8 ++++----
lib/Drupal/views/Plugin/views/style/Table.php | 6 +++---
16 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/lib/Drupal/views/Plugin/views/PluginBase.php b/lib/Drupal/views/Plugin/views/PluginBase.php
index 62701ffe6990..b234813f91ba 100644
--- a/lib/Drupal/views/Plugin/views/PluginBase.php
+++ b/lib/Drupal/views/Plugin/views/PluginBase.php
@@ -51,7 +51,7 @@ abstract class PluginBase extends ComponentPluginBase {
*
* @var bool
*/
- public $usesOptions = FALSE;
+ protected $usesOptions = FALSE;
/**
* Constructs a Plugin object.
@@ -462,7 +462,7 @@ function plugin_title() {
/**
* Returns the usesOptions property.
*/
- function usesOptions() {
+ public function usesOptions() {
return $this->usesOptions;
}
diff --git a/lib/Drupal/views/Plugin/views/access/Permission.php b/lib/Drupal/views/Plugin/views/access/Permission.php
index 4b589eb69dff..5019fc44a669 100644
--- a/lib/Drupal/views/Plugin/views/access/Permission.php
+++ b/lib/Drupal/views/Plugin/views/access/Permission.php
@@ -27,7 +27,7 @@ class Permission extends AccessPluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
function access($account) {
return views_check_perm($this->options['perm'], $account);
diff --git a/lib/Drupal/views/Plugin/views/access/Role.php b/lib/Drupal/views/Plugin/views/access/Role.php
index 634010cad9b3..93f59272b0af 100644
--- a/lib/Drupal/views/Plugin/views/access/Role.php
+++ b/lib/Drupal/views/Plugin/views/access/Role.php
@@ -27,7 +27,7 @@ class Role extends AccessPluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
function access($account) {
return views_check_roles(array_filter($this->options['role']), $account);
diff --git a/lib/Drupal/views/Plugin/views/cache/Time.php b/lib/Drupal/views/Plugin/views/cache/Time.php
index 95baa66dc7d5..00dfa2a1687e 100644
--- a/lib/Drupal/views/Plugin/views/cache/Time.php
+++ b/lib/Drupal/views/Plugin/views/cache/Time.php
@@ -27,7 +27,7 @@ class Time extends CachePluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
function option_definition() {
$options = parent::option_definition();
diff --git a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index e683180fc624..b35f7cb2e928 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -47,7 +47,7 @@ abstract class DisplayPluginBase extends PluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
/**
* Stores the rendered output of the display.
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index f57002530e05..a36ee66f4838 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -27,7 +27,7 @@ abstract class ExposedFormPluginBase extends PluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
/**
* Initialize the plugin.
diff --git a/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
index 1c1ce1ce8825..d5d2de5f5e59 100644
--- a/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
@@ -29,7 +29,7 @@ abstract class PagerPluginBase extends PluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
/**
* Initialize the plugin.
diff --git a/lib/Drupal/views/Plugin/views/row/Fields.php b/lib/Drupal/views/Plugin/views/row/Fields.php
index 462940967450..04bf66fa921b 100644
--- a/lib/Drupal/views/Plugin/views/row/Fields.php
+++ b/lib/Drupal/views/Plugin/views/row/Fields.php
@@ -34,7 +34,7 @@ class Fields extends RowPluginBase {
*
* @var bool
*/
- public $usesFields = TRUE;
+ protected $usesFields = TRUE;
function option_definition() {
$options = parent::option_definition();
diff --git a/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index 7474379708a2..eb6af663a795 100644
--- a/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -29,14 +29,14 @@ abstract class RowPluginBase extends PluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
/**
* Does the row plugin support to add fields to it's output.
*
* @var bool
*/
- public $usesFields = FALSE;
+ protected $usesFields = FALSE;
/**
* Initialize the row plugin.
diff --git a/lib/Drupal/views/Plugin/views/row/RssFields.php b/lib/Drupal/views/Plugin/views/row/RssFields.php
index 92b5b1e4642e..14d89c5d463d 100644
--- a/lib/Drupal/views/Plugin/views/row/RssFields.php
+++ b/lib/Drupal/views/Plugin/views/row/RssFields.php
@@ -29,7 +29,7 @@ class RssFields extends RowPluginBase {
*
* @var bool
*/
- public $usesFields = TRUE;
+ protected $usesFields = TRUE;
function option_definition() {
$options = parent::option_definition();
diff --git a/lib/Drupal/views/Plugin/views/style/DefaultStyle.php b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
index b2356ebe237a..05e2cb32e639 100644
--- a/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
+++ b/lib/Drupal/views/Plugin/views/style/DefaultStyle.php
@@ -33,14 +33,14 @@ class DefaultStyle extends StylePluginBase {
*
* @var bool
*/
- public $usesRowPlugin = TRUE;
+ protected $usesRowPlugin = TRUE;
/**
* Does the style plugin support custom css class for the rows.
*
* @var bool
*/
- public $usesRowClass = TRUE;
+ protected $usesRowClass = TRUE;
/**
* Set default options
diff --git a/lib/Drupal/views/Plugin/views/style/Grid.php b/lib/Drupal/views/Plugin/views/style/Grid.php
index 32f04c901a5b..8664deb2df97 100644
--- a/lib/Drupal/views/Plugin/views/style/Grid.php
+++ b/lib/Drupal/views/Plugin/views/style/Grid.php
@@ -31,14 +31,14 @@ class Grid extends StylePluginBase {
*
* @var bool
*/
- public $usesRowPlugin = TRUE;
+ protected $usesRowPlugin = TRUE;
/**
* Does the style plugin support custom css class for the rows.
*
* @var bool
*/
- public $usesRowClass = TRUE;
+ protected $usesRowClass = TRUE;
/**
* Set default options
diff --git a/lib/Drupal/views/Plugin/views/style/HtmlList.php b/lib/Drupal/views/Plugin/views/style/HtmlList.php
index ac3a60aeaf41..471bda748c42 100644
--- a/lib/Drupal/views/Plugin/views/style/HtmlList.php
+++ b/lib/Drupal/views/Plugin/views/style/HtmlList.php
@@ -31,14 +31,14 @@ class HtmlList extends StylePluginBase {
*
* @var bool
*/
- public $usesRowPlugin = TRUE;
+ protected $usesRowPlugin = TRUE;
/**
* Does the style plugin support custom css class for the rows.
*
* @var bool
*/
- public $usesRowClass = TRUE;
+ protected $usesRowClass = TRUE;
/**
* Set default options
diff --git a/lib/Drupal/views/Plugin/views/style/Rss.php b/lib/Drupal/views/Plugin/views/style/Rss.php
index e54c1050d642..d6a85291d8ca 100644
--- a/lib/Drupal/views/Plugin/views/style/Rss.php
+++ b/lib/Drupal/views/Plugin/views/style/Rss.php
@@ -31,7 +31,7 @@ class Rss extends StylePluginBase {
*
* @var bool
*/
- public $usesRowPlugin = TRUE;
+ protected $usesRowPlugin = TRUE;
function attach_to($display_id, $path, $title) {
$display = $this->view->display[$display_id]->handler;
diff --git a/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
index e60b2ea89831..aa9c0b09c817 100644
--- a/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
@@ -33,7 +33,7 @@ abstract class StylePluginBase extends PluginBase {
/**
* Overrides Drupal\views\Plugin\Plugin::$usesOptions.
*/
- public $usesOptions = TRUE;
+ protected $usesOptions = TRUE;
/**
* Store all available tokens row rows.
@@ -53,14 +53,14 @@ abstract class StylePluginBase extends PluginBase {
*
* @var bool
*/
- public $usesRowPlugin = FALSE;
+ protected $usesRowPlugin = FALSE;
/**
* Does the style plugin support custom css class for the rows.
*
* @var bool
*/
- public $usesRowClass = FALSE;
+ protected $usesRowClass = FALSE;
/**
* Does the style plugin for itself support to add fields to it's output.
@@ -70,7 +70,7 @@ abstract class StylePluginBase extends PluginBase {
*
* @var bool
*/
- public $usesFields = FALSE;
+ protected $usesFields = FALSE;
/**
* Initialize a style plugin.
diff --git a/lib/Drupal/views/Plugin/views/style/Table.php b/lib/Drupal/views/Plugin/views/style/Table.php
index 3a9615b4549b..d4a651655012 100644
--- a/lib/Drupal/views/Plugin/views/style/Table.php
+++ b/lib/Drupal/views/Plugin/views/style/Table.php
@@ -31,21 +31,21 @@ class Table extends StylePluginBase {
*
* @var bool
*/
- public $usesFields = TRUE;
+ protected $usesFields = TRUE;
/**
* Does the style plugin allows to use style plugins.
*
* @var bool
*/
- public $usesRowPlugin = FALSE;
+ protected $usesRowPlugin = FALSE;
/**
* Does the style plugin support custom css class for the rows.
*
* @var bool
*/
- public $usesRowClass = TRUE;
+ protected $usesRowClass = TRUE;
/**
* Contains the current active sort column.
--
GitLab