Issue #3514964: clean code - shorter, public, CONST

src/Entity/CustomLanguageManager.php

@@ -6,6 +6,7 @@ use Drupal\Core\Entity\EntityBase;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Entity\ConfigurableLanguage;
+use Drupal\languagefield\Plugin\Field\FieldType\LanguageItem;
 
 /**
  * Defines the CustomLanguage entity.
@@ -15,19 +16,6 @@ use Drupal\language\Entity\ConfigurableLanguage;
  */
 class CustomLanguageManager {
 
-  const LANGUAGEFIELD_LANGCODE_MAXLENGTH = 12;
-
-  // Define own variants. Keep away from the LanguageInterface constants.
-  // LanguageInterface::STATE_CONFIGURABLE = 1; -> 'en', 'de'
-  // LanguageInterface::STATE_LOCKED = 2; -> 'und', 'zxx'
-  // LanguageInterface::STATE_ALL = 3; -> 'en', 'de', 'und', 'zxx'
-  // LanguageInterface::STATE_SITE_DEFAULT = 4; -> 'en'
-  // All predefined + custom languages.
-  const LANGUAGEFIELD_LANGUAGES_PREDEFINED = 11;
-
-  // All custom languages from languagefield.
-  const LANGUAGEFIELD_LANGUAGES_CUSTOM = 12;
-
   /**
    * The list of Custom languages.
    *
@@ -169,15 +157,15 @@ class CustomLanguageManager {
           }
           break;
 
+        case LanguageItem::LANGUAGES_CUSTOM:
         case LanguageInterface::LANGCODE_NOT_SPECIFIED:
-        case CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_CUSTOM:
         case LanguageInterface::LANGCODE_SITE_DEFAULT:
         case 'current_interface':
         case 'authors_default':
           $subsettable_languages = self::getLanguageConfigurationOptions($subset);
           break;
 
-        case CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_PREDEFINED:
+        case LanguageItem::LANGUAGES_PREDEFINED:
           // 'All predefined languages'.
           $standard_languages = \Drupal::languageManager()
             ->getStandardLanguageList();
@@ -305,7 +293,7 @@ class CustomLanguageManager {
         $values = ['authors_default' => t("Author's preferred language")];
         break;
 
-      case CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_CUSTOM:
+      case LanguageItem::LANGUAGES_CUSTOM:
         foreach (CustomLanguageManager::getCustomLanguages() as $key => $labels) {
           $values[$key] = t($labels->label());
         }

src/Form/CustomLanguageForm.php

@@ -7,7 +7,7 @@ use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Language\LanguageInterface;
-use Drupal\languagefield\Entity\CustomLanguageManager;
+use Drupal\languagefield\Plugin\Field\FieldType\LanguageItem;
 
 /**
  * Form controller for the CustomLanguage entity edit forms.
@@ -38,7 +38,7 @@ class CustomLanguageForm extends EntityForm {
       $form['langcode'] = [
         '#type' => 'textfield',
         '#title' => $this->t('Language code'),
-        '#maxlength' => CustomLanguageManager::LANGUAGEFIELD_LANGCODE_MAXLENGTH,
+        '#maxlength' => LanguageItem::LANGCODE_MAXLENGTH,
         '#required' => TRUE,
         '#default_value' => '',
         '#disabled' => FALSE,

src/Plugin/Field/FieldType/LanguageItem.php

@@ -32,6 +32,18 @@ use Drupal\languagefield\Entity\CustomLanguageManager;
  * )
  */
 class LanguageItem extends LanguageItemBase implements OptionsProviderInterface {
+  public const LANGCODE_MAXLENGTH = 12;
+
+  // Define own variants. Keep away from the LanguageInterface constants.
+  // LanguageInterface::STATE_CONFIGURABLE = 1; -> 'en', 'de'
+  // LanguageInterface::STATE_LOCKED = 2; -> 'und', 'zxx'
+  // LanguageInterface::STATE_ALL = 3; -> 'en', 'de', 'und', 'zxx'
+  // LanguageInterface::STATE_SITE_DEFAULT = 4; -> 'en'
+  // All predefined + custom languages.
+  public const LANGUAGES_PREDEFINED = 11;
+
+  // All custom languages from languagefield.
+  public const LANGUAGES_CUSTOM = 12;
 
   /**
    * {@inheritdoc}
@@ -56,8 +68,8 @@ class LanguageItem extends LanguageItemBase implements OptionsProviderInterface
    */
   public static function defaultStorageSettings(): array {
     $defaultStorageSettings = [
-      'maxlength' => CustomLanguageManager::LANGUAGEFIELD_LANGCODE_MAXLENGTH,
-      'language_range' => [CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_PREDEFINED => CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_PREDEFINED],
+      'maxlength' => LanguageItem::LANGCODE_MAXLENGTH,
+      'language_range' => [LanguageItem::LANGUAGES_PREDEFINED => LanguageItem::LANGUAGES_PREDEFINED],
       'included_languages' => [],
       'excluded_languages' => [],
       'groups' => '',
@@ -175,8 +187,8 @@ class LanguageItem extends LanguageItemBase implements OptionsProviderInterface
       '#default_value' => $settings['language_range'],
       '#options' => [
         // The following are from Languagefield.
-        CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_PREDEFINED => $this->t('All predefined languages'),
-        // self::LANGUAGEFIELD_LANGUAGES_ENABLED =>
+        LanguageItem::LANGUAGES_PREDEFINED => $this->t('All predefined languages'),
+        // self::LANGUAGES_ENABLED =>
         // $this->t('Enabled installed languages (not functioning yet)'),
         // The following are from Drupal\Core\Language\LanguageInterface.
         LanguageInterface::STATE_CONFIGURABLE => $this->t("All installed (enabled) languages (from <a href=':url_1'>Languages</a> page)",
@@ -185,7 +197,7 @@ class LanguageItem extends LanguageItemBase implements OptionsProviderInterface
             ':url_2' => $url_2,
           ]),
         // const STATE_CONFIGURABLE = 1; -> 'en', 'de'
-        CustomLanguageManager::LANGUAGEFIELD_LANGUAGES_CUSTOM => $this->t("All custom languages (from <a href=':url_2'>Custom languages</a> page)",
+        LanguageItem::LANGUAGES_CUSTOM => $this->t("All custom languages (from <a href=':url_2'>Custom languages</a> page)",
           [
             ':url_1' => $url_1,
             ':url_2' => $url_2,