Merge pull request #6 from osu-wams/code_style_updates

Code style updates

osu_icon_field.install

@@ -1,6 +1,11 @@
 <?php
 
-use Drupal\Core\Database\Database;
+/**
+ * @file
+ * Install, update, and uninstall functions for the OSU Icon Field module.
+ */
+
+use Drupal\Core\Entity\SQL\SqlContentEntityStorage;
 
 /**
  * Add a new column for size to all icon fields.
@@ -23,7 +28,6 @@ function osu_icon_field_update_9001(&$sandbox) {
  * @param string $new_property
  * The Name of the new column to add.
  *
- * @return void
  * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
  * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
  */
@@ -36,7 +40,7 @@ function osu_icon_field_add_helper($field_type, $new_property) {
  $field_storage_definition = $manager->getFieldStorageDefinition($field_name, $entity_type_id);
  $storage = \Drupal::entityTypeManager()->getStorage($entity_type_id);
 
- if ($storage instanceof \Drupal\Core\Entity\SQL\SqlContentEntityStorage) {
+ if ($storage instanceof SqlContentEntityStorage) {
  $table_mapping = $storage->getTableMapping([$field_name => $field_storage_definition]);
  $tables_names = $table_mapping->getDedicatedTableNames();
  $columns = $table_mapping->getColumnNames($field_name);

osu_icon_field.libraries.yml

@@ -10,4 +10,3 @@ osu-icon:
  - core/drupal
  - core/drupalSettings
  - core/once
-

osu_icon_field.module

@@ -17,7 +17,6 @@ function osu_icon_field_theme() {
  ];
 }
 
-
 /**
  * Implements hook_page_attachments().
  */

phpcs.xml

@@ -4,7 +4,7 @@
  <file>.</file>
  <arg name="extensions" value="php,module,inc,install,test,profile,theme,info,txt,md,yml"/>
  <arg name="ignore" value="dist,node_modules,vendor"/>
- <config name="drupal_core_version" value="9"/>
+ <config name="drupal_core_version" value="10"/>
  <rule ref="Drupal">
  <exclude name="Drupal.InfoFiles.AutoAddedKeys.Version"/>
  </rule>

src/Plugin/Field/FieldFormatter/OsuIconFormatter.php

@@ -25,8 +25,8 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
  $elements = [];
 
  foreach ($items as $delta => $item) {
- $icon = isset($item->getValue('values')['value']) ? $item->getValue('values')['value'] : '';
- $iconSize = isset($item->getValue('values')['size']) ? $item->getValue('values')['size'] : '';
+ $icon = $item->getValue('values')['value'] ?? '';
+ $iconSize = $item->getValue('values')['size'] ?? '';
 
  $elements[$delta] = [
  '#theme' => 'osu_icon_field_formatter',

src/Plugin/Field/FieldType/OsuIcon.php

@@ -24,10 +24,10 @@ class OsuIcon extends FieldItemBase {
  */
  public static function schema(FieldStorageDefinitionInterface $field_definition) {
  return [
- // columns contains the values that the field will store
+ // Columns contains the values that the field will store.
  'columns' => [
  // List the values that the field will save. This
- // field will only save a single value, 'value'
+ // field will only save a single value, 'value'.
  'value' => [
  'description' => 'The icon name.',
  'type' => 'text',

src/Plugin/Field/FieldWidget/OsuIconWidget.php

@@ -5,8 +5,6 @@
 use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Field\WidgetBase;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Url;
-use Drupal\Core\Link;
 
 /**
  * A widget for OSU Icon.
@@ -25,8 +23,8 @@ class OsuIconWidget extends WidgetBase {
  * {@inheritdoc}
  */
  public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) {
- $value = isset($items[$delta]->value) ? $items[$delta]->value : '';
- $size = isset($items[$delta]->size) ? $items[$delta]->size : '';
+ $value = $items[$delta]->value ?? '';
+ $size = $items[$delta]->size ?? '';
  $element['value'] = [
  '#type' => 'textfield',
  '#title' => $this->t('Icon name'),