Skip to content
Snippets Groups Projects
Verified Commit 58c6687a authored by Dave Long's avatar Dave Long
Browse files

Issue #3464595 by quietone: Fix DrupalPractice.Objects.GlobalFunction in ListBuilders 

(cherry picked from commit 0b17a574)
parent 224c7ea5
No related branches found
No related tags found
2 merge requests!11185Issue #3477324 by andypost, alexpott: Fix usage of str_getcsv() and fgetcsv() for PHP 8.4,!9944Issue #3483353: Consider making the createCopy config action optionally fail...
Pipeline #261841 passed with warnings
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#261843

    Hide whitespace changes
    Inline Side-by-side
    Showing
    with 36 additions and 35 deletions
    core/modules/comment/src/CommentTypeListBuilder.php
    + 3
    − 3
    View file @ 58c6687a
    ...@@ -58,9 +58,9 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -58,9 +58,9 @@ public function getDefaultOperations(EntityInterface $entity) {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['type'] = t('Comment type'); $header['type'] = $this->t('Comment type');
    $header['description'] = t('Description'); $header['description'] = $this->t('Description');
    $header['target'] = t('Target entity type'); $header['target'] = $this->t('Target entity type');
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    } }
    ......
    core/modules/contact/src/ContactFormListBuilder.php
    + 6
    − 6
    View file @ 58c6687a
    ...@@ -16,9 +16,9 @@ class ContactFormListBuilder extends ConfigEntityListBuilder { ...@@ -16,9 +16,9 @@ class ContactFormListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['form'] = t('Form'); $header['form'] = $this->t('Form');
    $header['recipients'] = t('Recipients'); $header['recipients'] = $this->t('Recipients');
    $header['selected'] = t('Selected'); $header['selected'] = $this->t('Selected');
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    } }
    ...@@ -29,8 +29,8 @@ public function buildRow(EntityInterface $entity) { ...@@ -29,8 +29,8 @@ public function buildRow(EntityInterface $entity) {
    // Special case the personal form. // Special case the personal form.
    if ($entity->id() == 'personal') { if ($entity->id() == 'personal') {
    $row['form'] = $entity->label(); $row['form'] = $entity->label();
    $row['recipients'] = t('Selected user'); $row['recipients'] = $this->t('Selected user');
    $row['selected'] = t('No'); $row['selected'] = $this->t('No');
    } }
    else { else {
    $row['form'] = $entity->toLink(NULL, 'canonical')->toString(); $row['form'] = $entity->toLink(NULL, 'canonical')->toString();
    ...@@ -40,7 +40,7 @@ public function buildRow(EntityInterface $entity) { ...@@ -40,7 +40,7 @@ public function buildRow(EntityInterface $entity) {
    '#context' => ['list_style' => 'comma-list'], '#context' => ['list_style' => 'comma-list'],
    ]; ];
    $default_form = \Drupal::config('contact.settings')->get('default_form'); $default_form = \Drupal::config('contact.settings')->get('default_form');
    $row['selected'] = ($default_form == $entity->id() ? t('Yes') : t('No')); $row['selected'] = ($default_form == $entity->id() ? $this->t('Yes') : $this->t('No'));
    } }
    return $row + parent::buildRow($entity); return $row + parent::buildRow($entity);
    } }
    ......
    core/modules/image/src/ImageStyleListBuilder.php
    + 1
    − 1
    View file @ 58c6687a
    ...@@ -34,7 +34,7 @@ public function buildRow(EntityInterface $entity) { ...@@ -34,7 +34,7 @@ public function buildRow(EntityInterface $entity) {
    */ */
    public function getDefaultOperations(EntityInterface $entity) { public function getDefaultOperations(EntityInterface $entity) {
    $flush = [ $flush = [
    'title' => t('Flush'), 'title' => $this->t('Flush'),
    'weight' => 200, 'weight' => 200,
    'url' => $entity->toUrl('flush-form'), 'url' => $entity->toUrl('flush-form'),
    ]; ];
    ......
    core/modules/language/src/LanguageListBuilder.php
    + 4
    − 4
    View file @ 58c6687a
    ...@@ -103,8 +103,8 @@ public function getFormId() { ...@@ -103,8 +103,8 @@ public function getFormId() {
    */ */
    public function buildHeader() { public function buildHeader() {
    $header = [ $header = [
    'label' => t('Name'), 'label' => $this->t('Name'),
    'default' => t('Default'), 'default' => $this->t('Default'),
    ] + parent::buildHeader(); ] + parent::buildHeader();
    return $header; return $header;
    } }
    ...@@ -117,7 +117,7 @@ public function buildRow(EntityInterface $entity) { ...@@ -117,7 +117,7 @@ public function buildRow(EntityInterface $entity) {
    $row['default'] = [ $row['default'] = [
    '#type' => 'radio', '#type' => 'radio',
    '#parents' => ['site_default_language'], '#parents' => ['site_default_language'],
    '#title' => t('Set @title as default', ['@title' => $entity->label()]), '#title' => $this->t('Set @title as default', ['@title' => $entity->label()]),
    '#title_display' => 'invisible', '#title_display' => 'invisible',
    '#return_value' => $entity->id(), '#return_value' => $entity->id(),
    '#id' => 'edit-site-default-language-' . $entity->id(), '#id' => 'edit-site-default-language-' . $entity->id(),
    ...@@ -136,7 +136,7 @@ public function buildForm(array $form, FormStateInterface $form_state) { ...@@ -136,7 +136,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    $form = parent::buildForm($form, $form_state); $form = parent::buildForm($form, $form_state);
    $form[$this->entitiesKey]['#languages'] = $this->entities; $form[$this->entitiesKey]['#languages'] = $this->entities;
    $form['actions']['submit']['#value'] = t('Save configuration'); $form['actions']['submit']['#value'] = $this->t('Save configuration');
    return $form; return $form;
    } }
    ......
    core/modules/menu_ui/src/MenuListBuilder.php
    + 5
    − 5
    View file @ 58c6687a
    ...@@ -23,9 +23,9 @@ class MenuListBuilder extends ConfigEntityListBuilder { ...@@ -23,9 +23,9 @@ class MenuListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['title'] = t('Title'); $header['title'] = $this->t('Title');
    $header['description'] = [ $header['description'] = [
    'data' => t('Description'), 'data' => $this->t('Description'),
    'class' => [RESPONSIVE_PRIORITY_MEDIUM], 'class' => [RESPONSIVE_PRIORITY_MEDIUM],
    ]; ];
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    ...@@ -50,9 +50,9 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -50,9 +50,9 @@ public function getDefaultOperations(EntityInterface $entity) {
    $operations = parent::getDefaultOperations($entity); $operations = parent::getDefaultOperations($entity);
    if (isset($operations['edit'])) { if (isset($operations['edit'])) {
    $operations['edit']['title'] = t('Edit menu'); $operations['edit']['title'] = $this->t('Edit menu');
    $operations['add'] = [ $operations['add'] = [
    'title' => t('Add link'), 'title' => $this->t('Add link'),
    'weight' => 20, 'weight' => 20,
    'url' => $entity->toUrl('add-link-form'), 'url' => $entity->toUrl('add-link-form'),
    'query' => [ 'query' => [
    ...@@ -61,7 +61,7 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -61,7 +61,7 @@ public function getDefaultOperations(EntityInterface $entity) {
    ]; ];
    } }
    if (isset($operations['delete'])) { if (isset($operations['delete'])) {
    $operations['delete']['title'] = t('Delete menu'); $operations['delete']['title'] = $this->t('Delete menu');
    } }
    return $operations; return $operations;
    } }
    ......
    core/modules/node/src/NodeTypeListBuilder.php
    + 2
    − 2
    View file @ 58c6687a
    ...@@ -17,9 +17,9 @@ class NodeTypeListBuilder extends ConfigEntityListBuilder { ...@@ -17,9 +17,9 @@ class NodeTypeListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['title'] = t('Name'); $header['title'] = $this->t('Name');
    $header['description'] = [ $header['description'] = [
    'data' => t('Description'), 'data' => $this->t('Description'),
    'class' => [RESPONSIVE_PRIORITY_MEDIUM], 'class' => [RESPONSIVE_PRIORITY_MEDIUM],
    ]; ];
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    ......
    core/modules/responsive_image/src/ResponsiveImageStyleListBuilder.php
    + 2
    − 2
    View file @ 58c6687a
    ...@@ -14,7 +14,7 @@ class ResponsiveImageStyleListBuilder extends ConfigEntityListBuilder { ...@@ -14,7 +14,7 @@ class ResponsiveImageStyleListBuilder extends ConfigEntityListBuilder {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['label'] = t('Label'); $header['label'] = $this->t('Label');
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    } }
    ...@@ -32,7 +32,7 @@ public function buildRow(EntityInterface $entity) { ...@@ -32,7 +32,7 @@ public function buildRow(EntityInterface $entity) {
    public function getDefaultOperations(EntityInterface $entity) { public function getDefaultOperations(EntityInterface $entity) {
    $operations = parent::getDefaultOperations($entity); $operations = parent::getDefaultOperations($entity);
    $operations['duplicate'] = [ $operations['duplicate'] = [
    'title' => t('Duplicate'), 'title' => $this->t('Duplicate'),
    'weight' => 15, 'weight' => 15,
    'url' => $entity->toUrl('duplicate-form'), 'url' => $entity->toUrl('duplicate-form'),
    ]; ];
    ......
    core/modules/taxonomy/src/VocabularyListBuilder.php
    + 9
    − 9
    View file @ 58c6687a
    ...@@ -109,7 +109,7 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -109,7 +109,7 @@ public function getDefaultOperations(EntityInterface $entity) {
    $operations = parent::getDefaultOperations($entity); $operations = parent::getDefaultOperations($entity);
    if (isset($operations['edit'])) { if (isset($operations['edit'])) {
    $operations['edit']['title'] = t('Edit vocabulary'); $operations['edit']['title'] = $this->t('Edit vocabulary');
    } }
    if (isset($operations['delete'])) { if (isset($operations['delete'])) {
    $operations['delete']['title'] = $this->t('Delete vocabulary'); $operations['delete']['title'] = $this->t('Delete vocabulary');
    ...@@ -117,7 +117,7 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -117,7 +117,7 @@ public function getDefaultOperations(EntityInterface $entity) {
    if ($entity->access('access taxonomy overview')) { if ($entity->access('access taxonomy overview')) {
    $operations['list'] = [ $operations['list'] = [
    'title' => t('List terms'), 'title' => $this->t('List terms'),
    'weight' => 0, 'weight' => 0,
    'url' => $entity->toUrl('overview-form'), 'url' => $entity->toUrl('overview-form'),
    ]; ];
    ...@@ -126,7 +126,7 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -126,7 +126,7 @@ public function getDefaultOperations(EntityInterface $entity) {
    $taxonomy_term_access_control_handler = $this->entityTypeManager->getAccessControlHandler('taxonomy_term'); $taxonomy_term_access_control_handler = $this->entityTypeManager->getAccessControlHandler('taxonomy_term');
    if ($taxonomy_term_access_control_handler->createAccess($entity->id())) { if ($taxonomy_term_access_control_handler->createAccess($entity->id())) {
    $operations['add'] = [ $operations['add'] = [
    'title' => t('Add terms'), 'title' => $this->t('Add terms'),
    'weight' => 10, 'weight' => 10,
    'url' => Url::fromRoute('entity.taxonomy_term.add_form', ['taxonomy_vocabulary' => $entity->id()]), 'url' => Url::fromRoute('entity.taxonomy_term.add_form', ['taxonomy_vocabulary' => $entity->id()]),
    ]; ];
    ...@@ -139,11 +139,11 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -139,11 +139,11 @@ public function getDefaultOperations(EntityInterface $entity) {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['label'] = t('Vocabulary name'); $header['label'] = $this->t('Vocabulary name');
    $header['description'] = t('Description'); $header['description'] = $this->t('Description');
    if ($this->currentUser->hasPermission('administer vocabularies') && !empty($this->weightKey)) { if ($this->currentUser->hasPermission('administer vocabularies') && !empty($this->weightKey)) {
    $header['weight'] = t('Weight'); $header['weight'] = $this->t('Weight');
    } }
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    ...@@ -179,12 +179,12 @@ public function render() { ...@@ -179,12 +179,12 @@ public function render() {
    $create_access = $access_control_handler->createAccess(NULL, NULL, [], TRUE); $create_access = $access_control_handler->createAccess(NULL, NULL, [], TRUE);
    $this->renderer->addCacheableDependency($build['table'], $create_access); $this->renderer->addCacheableDependency($build['table'], $create_access);
    if ($create_access->isAllowed()) { if ($create_access->isAllowed()) {
    $build['table']['#empty'] = t('No vocabularies available. <a href=":link">Add vocabulary</a>.', [ $build['table']['#empty'] = $this->t('No vocabularies available. <a href=":link">Add vocabulary</a>.', [
    ':link' => Url::fromRoute('entity.taxonomy_vocabulary.add_form')->toString(), ':link' => Url::fromRoute('entity.taxonomy_vocabulary.add_form')->toString(),
    ]); ]);
    } }
    else { else {
    $build['table']['#empty'] = t('No vocabularies available.'); $build['table']['#empty'] = $this->t('No vocabularies available.');
    } }
    } }
    ...@@ -197,7 +197,7 @@ public function render() { ...@@ -197,7 +197,7 @@ public function render() {
    public function buildForm(array $form, FormStateInterface $form_state) { public function buildForm(array $form, FormStateInterface $form_state) {
    $form = parent::buildForm($form, $form_state); $form = parent::buildForm($form, $form_state);
    $form['vocabularies']['#attributes'] = ['id' => 'taxonomy']; $form['vocabularies']['#attributes'] = ['id' => 'taxonomy'];
    $form['actions']['submit']['#value'] = t('Save'); $form['actions']['submit']['#value'] = $this->t('Save');
    return $form; return $form;
    } }
    ......
    core/modules/user/src/RoleListBuilder.php
    + 2
    − 2
    View file @ 58c6687a
    ...@@ -65,7 +65,7 @@ public function getFormId() { ...@@ -65,7 +65,7 @@ public function getFormId() {
    * {@inheritdoc} * {@inheritdoc}
    */ */
    public function buildHeader() { public function buildHeader() {
    $header['label'] = t('Name'); $header['label'] = $this->t('Name');
    return $header + parent::buildHeader(); return $header + parent::buildHeader();
    } }
    ...@@ -85,7 +85,7 @@ public function getDefaultOperations(EntityInterface $entity) { ...@@ -85,7 +85,7 @@ public function getDefaultOperations(EntityInterface $entity) {
    if ($entity->hasLinkTemplate('edit-permissions-form')) { if ($entity->hasLinkTemplate('edit-permissions-form')) {
    $operations['permissions'] = [ $operations['permissions'] = [
    'title' => t('Edit permissions'), 'title' => $this->t('Edit permissions'),
    'weight' => 20, 'weight' => 20,
    'url' => $entity->toUrl('edit-permissions-form'), 'url' => $entity->toUrl('edit-permissions-form'),
    ]; ];
    ......
    core/modules/user/src/UserListBuilder.php
    + 1
    − 1
    View file @ 58c6687a
    ...@@ -144,7 +144,7 @@ public function buildRow(EntityInterface $entity) { ...@@ -144,7 +144,7 @@ public function buildRow(EntityInterface $entity) {
    CacheableMetadata::createFromObject($last_access)->applyTo($row['access']['data']); CacheableMetadata::createFromObject($last_access)->applyTo($row['access']['data']);
    } }
    else { else {
    $row['access']['data']['#markup'] = t('never'); $row['access']['data']['#markup'] = $this->t('never');
    } }
    return $row + parent::buildRow($entity); return $row + parent::buildRow($entity);
    } }
    ......
    core/phpcs.xml.dist
    + 1
    − 0
    View file @ 58c6687a
    ...@@ -169,6 +169,7 @@ ...@@ -169,6 +169,7 @@
    <rule ref="DrupalPractice.InfoFiles.NamespacedDependency"/> <rule ref="DrupalPractice.InfoFiles.NamespacedDependency"/>
    <rule ref="DrupalPractice.Objects.GlobalFunction"> <rule ref="DrupalPractice.Objects.GlobalFunction">
    <include-pattern>*/Plugin/*</include-pattern> <include-pattern>*/Plugin/*</include-pattern>
    <include-pattern>*/ListBuilder/*</include-pattern>
    </rule> </rule>
    <!-- Generic sniffs --> <!-- Generic sniffs -->
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment