Commit 07bcb2dd authored by Yago Elias's avatar Yago Elias Committed by RenatoG

Issue #2888120 by Yago Elias, RenatoG: Coding standards and best practices

parent 17ba110c
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
namespace Drupal\colorbox\Form; namespace Drupal\colorbox\Form;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Form\ConfigFormBase; use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Form\FormStateInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
/** /**
* General configuration form for controlling the colorbox behaviour.. * General configuration form for controlling the colorbox behaviour..
...@@ -20,6 +23,31 @@ class ColorboxSettingsForm extends ConfigFormBase { ...@@ -20,6 +23,31 @@ class ColorboxSettingsForm extends ConfigFormBase {
*/ */
const STATE_SLIDESHOW_ENABLED = 1; const STATE_SLIDESHOW_ENABLED = 1;
/**
* Drupal\Core\Extension\ModuleHandlerInterface definition.
*
* @var \Drupal\Core\Extension\ModuleHandlerInterface
*/
private $moduleHandler;
/**
* Class constructor.
*/
public function __construct(ConfigFactoryInterface $config_factory, ModuleHandlerInterface $moduleHandler) {
parent::__construct($config_factory);
$this->moduleHandler = $moduleHandler;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('config.factory'),
$container->get('module_handler')
);
}
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
...@@ -296,8 +324,7 @@ class ColorboxSettingsForm extends ConfigFormBase { ...@@ -296,8 +324,7 @@ class ColorboxSettingsForm extends ConfigFormBase {
'#default_value' => $config->get('advanced.compression_type'), '#default_value' => $config->get('advanced.compression_type'),
]; ];
$moduleHandler = \Drupal::service('module_handler'); if (!$this->moduleHandler->moduleExists('colorbox_load') || !$this->moduleHandler->moduleExists('colorbox_inline')) {
if (!$moduleHandler->moduleExists('colorbox_load') || !$moduleHandler->moduleExists('colorbox_inline')) {
$form['colorbox_extras'] = [ $form['colorbox_extras'] = [
'#type' => 'details', '#type' => 'details',
...@@ -323,34 +350,34 @@ class ColorboxSettingsForm extends ConfigFormBase { ...@@ -323,34 +350,34 @@ class ColorboxSettingsForm extends ConfigFormBase {
$config = $this->configFactory->getEditable('colorbox.settings'); $config = $this->configFactory->getEditable('colorbox.settings');
$config $config
->set('custom.style', $form_state->getValue('colorbox_style')) ->set('custom.style', $form_state->getValue('colorbox_style'))
->set('custom.activate', $form_state->getValue('colorbox_custom_settings_activate')) ->set('custom.activate', $form_state->getValue('colorbox_custom_settings_activate'))
->set('custom.transition_type', $form_state->getValue('colorbox_transition_type')) ->set('custom.transition_type', $form_state->getValue('colorbox_transition_type'))
->set('custom.transition_speed', $form_state->getValue('colorbox_transition_speed')) ->set('custom.transition_speed', $form_state->getValue('colorbox_transition_speed'))
->set('custom.opacity', $form_state->getValue('colorbox_opacity')) ->set('custom.opacity', $form_state->getValue('colorbox_opacity'))
->set('custom.text_current', $form_state->getValue('colorbox_text_current')) ->set('custom.text_current', $form_state->getValue('colorbox_text_current'))
->set('custom.text_previous', $form_state->getValue('colorbox_text_previous')) ->set('custom.text_previous', $form_state->getValue('colorbox_text_previous'))
->set('custom.text_next', $form_state->getValue('colorbox_text_next')) ->set('custom.text_next', $form_state->getValue('colorbox_text_next'))
->set('custom.text_close', $form_state->getValue('colorbox_text_close')) ->set('custom.text_close', $form_state->getValue('colorbox_text_close'))
->set('custom.overlayclose', $form_state->getValue('colorbox_overlayclose')) ->set('custom.overlayclose', $form_state->getValue('colorbox_overlayclose'))
->set('custom.returnfocus', $form_state->getValue('colorbox_returnfocus')) ->set('custom.returnfocus', $form_state->getValue('colorbox_returnfocus'))
->set('custom.maxwidth', $form_state->getValue('colorbox_maxwidth')) ->set('custom.maxwidth', $form_state->getValue('colorbox_maxwidth'))
->set('custom.maxheight', $form_state->getValue('colorbox_maxheight')) ->set('custom.maxheight', $form_state->getValue('colorbox_maxheight'))
->set('custom.initialwidth', $form_state->getValue('colorbox_initialwidth')) ->set('custom.initialwidth', $form_state->getValue('colorbox_initialwidth'))
->set('custom.initialheight', $form_state->getValue('colorbox_initialheight')) ->set('custom.initialheight', $form_state->getValue('colorbox_initialheight'))
->set('custom.fixed', $form_state->getValue('colorbox_fixed')) ->set('custom.fixed', $form_state->getValue('colorbox_fixed'))
->set('custom.scrolling', $form_state->getValue('colorbox_scrolling')) ->set('custom.scrolling', $form_state->getValue('colorbox_scrolling'))
->set('custom.slideshow.slideshow', $form_state->getValue('colorbox_slideshow')) ->set('custom.slideshow.slideshow', $form_state->getValue('colorbox_slideshow'))
->set('custom.slideshow.auto', $form_state->getValue('colorbox_slideshowauto')) ->set('custom.slideshow.auto', $form_state->getValue('colorbox_slideshowauto'))
->set('custom.slideshow.speed', $form_state->getValue('colorbox_slideshowspeed')) ->set('custom.slideshow.speed', $form_state->getValue('colorbox_slideshowspeed'))
->set('custom.slideshow.text_start', $form_state->getValue('colorbox_text_start')) ->set('custom.slideshow.text_start', $form_state->getValue('colorbox_text_start'))
->set('custom.slideshow.text_stop', $form_state->getValue('colorbox_text_stop')) ->set('custom.slideshow.text_stop', $form_state->getValue('colorbox_text_stop'))
->set('advanced.unique_token', $form_state->getValue('colorbox_unique_token')) ->set('advanced.unique_token', $form_state->getValue('colorbox_unique_token'))
->set('advanced.mobile_detect', $form_state->getValue('colorbox_mobile_detect')) ->set('advanced.mobile_detect', $form_state->getValue('colorbox_mobile_detect'))
->set('advanced.mobile_device_width', $form_state->getValue('colorbox_mobile_device_width')) ->set('advanced.mobile_device_width', $form_state->getValue('colorbox_mobile_device_width'))
->set('advanced.caption_trim', $form_state->getValue('colorbox_caption_trim')) ->set('advanced.caption_trim', $form_state->getValue('colorbox_caption_trim'))
->set('advanced.caption_trim_length', $form_state->getValue('colorbox_caption_trim_length')) ->set('advanced.caption_trim_length', $form_state->getValue('colorbox_caption_trim_length'))
->set('advanced.compression_type', $form_state->getValue('colorbox_compression_type')); ->set('advanced.compression_type', $form_state->getValue('colorbox_compression_type'));
if ($form_state->getValue('colorbox_image_style')) { if ($form_state->getValue('colorbox_image_style')) {
$config->set('insert.image_style', $form_state->getValue('colorbox_image_style')); $config->set('insert.image_style', $form_state->getValue('colorbox_image_style'));
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace Drupal\colorbox\Plugin\Field\FieldFormatter; namespace Drupal\colorbox\Plugin\Field\FieldFormatter;
use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldDefinitionInterface;
use Drupal\Core\Link; use Drupal\Core\Link;
...@@ -44,6 +45,13 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl ...@@ -44,6 +45,13 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl
*/ */
protected $imageStyleStorage; protected $imageStyleStorage;
/**
* Drupal\Core\Extension\ModuleHandlerInterface definition.
*
* @var \Drupal\Core\Extension\ModuleHandlerInterface
*/
private $moduleHandler;
/** /**
* Constructs an ImageFormatter object. * Constructs an ImageFormatter object.
* *
...@@ -67,12 +75,15 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl ...@@ -67,12 +75,15 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl
* The image style storage. * The image style storage.
* @param \Drupal\colorbox\ElementAttachmentInterface $attachment * @param \Drupal\colorbox\ElementAttachmentInterface $attachment
* Allow the library to be attached to the page. * Allow the library to be attached to the page.
* @param Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler
* Module handler services.
*/ */
public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityStorageInterface $image_style_storage, ElementAttachmentInterface $attachment) { public function __construct($plugin_id, $plugin_definition, FieldDefinitionInterface $field_definition, array $settings, $label, $view_mode, array $third_party_settings, AccountInterface $current_user, EntityStorageInterface $image_style_storage, ElementAttachmentInterface $attachment, ModuleHandlerInterface $moduleHandler) {
parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings); parent::__construct($plugin_id, $plugin_definition, $field_definition, $settings, $label, $view_mode, $third_party_settings);
$this->currentUser = $current_user; $this->currentUser = $current_user;
$this->imageStyleStorage = $image_style_storage; $this->imageStyleStorage = $image_style_storage;
$this->attachment = $attachment; $this->attachment = $attachment;
$this->moduleHandler = $moduleHandler;
} }
/** /**
...@@ -178,10 +189,10 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl ...@@ -178,10 +189,10 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl
], ],
], ],
]; ];
if (\Drupal::moduleHandler()->moduleExists('token')) { if ($this->moduleHandler->moduleExists('token')) {
$element['colorbox_token_gallery'] = [ $element['colorbox_token_gallery'] = [
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => t('Replacement patterns'), '#title' => $this->t('Replacement patterns'),
'#theme' => 'token_tree_link', '#theme' => 'token_tree_link',
'#token_types' => [$form['#entity_type'], 'file'], '#token_types' => [$form['#entity_type'], 'file'],
'#states' => [ '#states' => [
...@@ -229,10 +240,10 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl ...@@ -229,10 +240,10 @@ class ColorboxFormatter extends ImageFormatterBase implements ContainerFactoryPl
], ],
], ],
]; ];
if (\Drupal::moduleHandler()->moduleExists('token')) { if ($this->moduleHandler->moduleExists('token')) {
$element['colorbox_token_caption'] = [ $element['colorbox_token_caption'] = [
'#type' => 'fieldset', '#type' => 'fieldset',
'#title' => t('Replacement patterns'), '#title' => $this->t('Replacement patterns'),
'#theme' => 'token_tree_link', '#theme' => 'token_tree_link',
'#token_types' => [$form['#entity_type'], 'file'], '#token_types' => [$form['#entity_type'], 'file'],
'#states' => [ '#states' => [
......
Markdown is supported
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