Issue #2919482: Clean code - phpcs, shorthand ?? code

modules/workflow_access/src/Form/WorkflowAccessRoleForm.php

@@ -78,9 +78,9 @@ class WorkflowAccessRoleForm extends WorkflowConfigTransitionFormBase {
       $count = 0;
       foreach (workflow_access_get_workflow_access_by_sid($sid) as $rid => $access) {
         $count++;
-        $view[$rid] = ($access['grant_view']) ? $rid : 0;
-        $update[$rid] = ($access['grant_update']) ? $rid : 0;
-        $delete[$rid] = ($access['grant_delete']) ? $rid : 0;
+        $view[$rid] = $access['grant_view'] ? $rid : 0;
+        $update[$rid] = $access['grant_update'] ? $rid : 0;
+        $delete[$rid] = $access['grant_delete'] ? $rid : 0;
       }
       // Allow view grants by default for anonymous and authenticated users,
       // if no grants were set up earlier.

modules/workflow_access/workflow_access.module

@@ -167,7 +167,7 @@ function workflow_access_node_access_records(NodeInterface $node) {
     // Get 'author' of this entity. Some entities (e.g., taxonomy_term)
     // do not have a uid. But then again: node_access is only for nodes...
     /** @var \Drupal\node\NodeInterface $translation */
-    $uid = ($translation->getOwnerId()) ? (int) $translation->getOwnerId() : 0;
+    $uid = (int) $translation->getOwnerId() ?? 0;
 
     $workflow_transitions = [];
     if (isset($translation->workflow_transitions)) {

src/Element/WorkflowTransitionElement.php

@@ -519,7 +519,7 @@ class WorkflowTransitionElement extends FormElement {
     $fields = WorkflowManager::getAttachedFields('workflow_transition', $transition->bundle());
     /** @var \Drupal\Core\Field\Entity\BaseFieldOverride $field */
     foreach ($fields as $field_name => $field) {
-      $user_input = isset($form_state->getUserInput()[$field_name]) ? $form_state->getUserInput()[$field_name] : [];
+      $user_input = $form_state->getUserInput()[$field_name] ?? [];
       if (isset($item[$field_name])) {
         // On Workflow Form (e.g., history tab, block).
         // @todo In latest tests, this line seems not necessary.
@@ -548,7 +548,7 @@ class WorkflowTransitionElement extends FormElement {
    * {@inheritdoc}
    */
   public function getInfo() {
-    $class = get_class($this);
+    $class = static::class;
     return [
       '#input' => TRUE,
       '#return_value' => 1,

src/Entity/Workflow.php

@@ -432,8 +432,8 @@ class Workflow extends ConfigEntityBase implements WorkflowInterface {
     $config_transitions = [];
 
     // Get filters on 'from' states, 'to' states, roles.
-    $from_sid = isset($conditions['from_sid']) ? $conditions['from_sid'] : FALSE;
-    $to_sid = isset($conditions['to_sid']) ? $conditions['to_sid'] : FALSE;
+    $from_sid = $conditions['from_sid'] ?? FALSE;
+    $to_sid = $conditions['to_sid'] ?? FALSE;
 
     // Get valid states + creation state.
     $states = $this->getStates('CREATION');

src/Entity/WorkflowInterface.php

@@ -149,8 +149,8 @@ interface WorkflowInterface {
    * @param array|null $ids
    *   Array of Transitions IDs. If NULL, show all transitions.
    * @param array $conditions
-   *   $conditions['from_sid'] : if provided, a 'from' State ID.
-   *   $conditions['to_sid'] : if provided, a 'to' state ID.
+   *   $conditions['from_sid']: if provided, a 'from' State ID.
+   *   $conditions['to_sid']: if provided, a 'to' state ID.
    *
    * @return \Drupal\workflow\Entity\WorkflowConfigTransition[]
    */

src/Entity/WorkflowScheduledTransition.php

@@ -220,7 +220,7 @@ class WorkflowScheduledTransition extends WorkflowTransition {
   public static function baseFieldDefinitions(EntityTypeInterface $entity_type) {
     $fields = [];
 
-    // Add the specific ID-field : tid vs. hid.
+    // Add the specific ID-field: tid vs. hid.
     $fields['tid'] = BaseFieldDefinition::create('integer')
       ->setLabel(t('Transition ID'))
       ->setDescription(t('The transition ID.'))

src/Entity/WorkflowState.php

@@ -119,7 +119,7 @@ class WorkflowState extends ConfigEntityBase {
    */
   public function __construct(array $values = [], $entityType = 'workflow_state') {
     // Please be aware that $entity_type_id and $entityType are different things!
-    $sid = isset($values['id']) ? $values['id'] : '';
+    $sid = $values['id'] ?? '';
 
     // Keep official name and external name equal. Both are required.
     // @todo Still needed? test import, manual creation, programmatic creation, etc.

src/Entity/WorkflowTransition.php

@@ -178,12 +178,12 @@ class WorkflowTransition extends ContentEntityBase implements WorkflowTransition
    */
   public function setValues($to_sid, $uid = NULL, $timestamp = NULL, $comment = '', $force_create = FALSE) {
     // Normally, the values are passed in an array, and set in parent::__construct, but we do it ourselves.
-    $uid = ($uid === NULL) ? workflow_current_user()->id() : $uid;
+    $uid = $uid ?? workflow_current_user()->id();
     $from_sid = $this->getFromSid();
 
     $this->set('to_sid', $to_sid);
     $this->setOwnerId($uid);
-    $this->setTimestamp($timestamp == NULL ? \Drupal::time()->getRequestTime() : $timestamp);
+    $this->setTimestamp($timestamp ?? \Drupal::time()->getRequestTime());
     $this->setComment($comment);
 
     // If constructor is called with new() and arguments.
@@ -1103,8 +1103,8 @@ class WorkflowTransition extends ContentEntityBase implements WorkflowTransition
       '%sid2' => ($to_sid || !$this->getToState()) ? $to_sid : $this->getToState()->label(),
       '%entity_id' => $this->getTargetEntityId(),
       '%entity_label' => $entity ? $entity->label() : '',
-      '@entity_type' => ($entity) ? $entity->getEntityTypeId() : '',
-      '@entity_type_label' => ($entity) ? $entity->getEntityType()->getLabel() : '',
+      '@entity_type' => $entity ? $entity->getEntityTypeId() : '',
+      '@entity_type_label' => $entity ? $entity->getEntityType()->getLabel() : '',
       'link' => ($this->getTargetEntityId() && $this->getTargetEntity()->hasLinkTemplate('canonical')) ? $this->getTargetEntity()->toLink($this->t('View'))->toString() : '',
     ];
     ($type == 'error') ? \Drupal::logger('workflow')->error($message, $t_args)

src/Plugin/Action/WorkflowStateActionBase.php

@@ -87,7 +87,7 @@ abstract class WorkflowStateActionBase extends ConfigurableActionBase implements
       return NULL;
     }
 
-    $to_sid = isset($config['to_sid']) ? $config['to_sid'] : '';
+    $to_sid = $config['to_sid'] ?? '';
     // Get the Comment. Parse the $comment variables.
     $comment_string = $this->configuration['comment'];
     $comment = $this->t($comment_string, [

src/Plugin/Field/FieldType/WorkflowItem.php

@@ -68,7 +68,7 @@ class WorkflowItem extends ListItemBase {
     $definition['settings']['target_type'] = 'workflow_transition';
     // Definitions vary by entity type and bundle, so key them accordingly.
     $key = $definition['settings']['target_type'] . ':';
-    $key .= isset($definition['settings']['target_bundle']) ? $definition['settings']['target_bundle'] : '';
+    $key .= $definition['settings']['target_bundle'] ?? '';
 
     if (!isset($propertyDefinitions[$key])) {
 
@@ -241,7 +241,7 @@ class WorkflowItem extends ListItemBase {
         '#rows' => count($allowed_values),
         '#access' => ($wid) ? TRUE : FALSE, // User can see the data,
         '#disabled' => TRUE, // .. but cannot change them.
-        '#element_validate' => [[get_class($this), 'validateAllowedValues']],
+        '#element_validate' => [[static::class, 'validateAllowedValues']],
 
         '#field_has_data' => $has_data,
         '#field_name' => $this->getFieldDefinition()->getName(),

src/Plugin/views/filter/WorkflowState.php

@@ -23,7 +23,7 @@ class WorkflowState extends ManyToOne {
    */
   public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
     parent::init($view, $display, $options);
-    $wid = isset($this->definition['wid']) ? $this->definition['wid'] : '';
+    $wid = $this->definition['wid'] ?? '';
     $grouped = isset($options['group_info']['widget']) ? $options['group_info']['widget'] == 'select' : FALSE;
     $this->valueOptions = workflow_get_workflow_state_names($wid, $grouped);
   }

src/WorkflowStateListBuilder.php

@@ -260,7 +260,7 @@ class WorkflowStateListBuilder extends DraggableListBuilder {
     // @todo D8: enable WorkflowState machine_name as interactive element.
     foreach ($form_state->getValue($this->entitiesKey) as $sid => $value) {
       /** @var \Drupal\workflow\Entity\WorkflowState $state */
-      $state = isset($this->entities[$sid]) ? $this->entities[$sid] : NULL;
+      $state = $this->entities[$sid] ?? NULL;
 
       // State is de-activated (reassigning current content).
       if ($state && $state->isActive() && !$value['status']) {

src/WorkflowTypeAttributeTrait.php

@@ -93,7 +93,7 @@ trait WorkflowTypeAttributeTrait {
     }
     elseif (is_object($value)) {
       // In WorkflowTransition.
-      $wid = isset($value->getValue()[0]['target_id']) ? $value->getValue()[0]['target_id'] : '';
+      $wid = $value->getValue()[0]['target_id'] ?? '';
       $this->wid = $wid;
     }
     else {

templates/workflow-transition--full.html.twig

@@ -73,7 +73,7 @@
     </div>
 
     {% if comment %}
-      <div{{ field_attributes.addClass(field_classes) }}>
+      <div{{ field_attributes.addfield_classes) }}>
         <div{{ label_attributes.addClass(title_classes) }}>{% trans %}Comment{% endtrans %}</div>
         <div{{ value_attributes.addClass(item_classes) }}>{{ comment }}</div>
       </div>