diff --git a/src/Plugin/Field/FieldFormatter/VideoEmbedPlayerFormatter.php b/src/Plugin/Field/FieldFormatter/VideoEmbedPlayerFormatter.php index 17852b8..a1fc460 100644 --- a/src/Plugin/Field/FieldFormatter/VideoEmbedPlayerFormatter.php +++ b/src/Plugin/Field/FieldFormatter/VideoEmbedPlayerFormatter.php @@ -41,7 +41,7 @@ class VideoEmbedPlayerFormatter extends FormatterBase implements ContainerFactor foreach ($items as $delta => $item) { $file = File::load($item->target_id); if(!$file) continue; - $metadata = isset($item->data) ? unserialize($item->data) : array(); + $metadata = isset($item->data) ? unserialize($item->data) : []; $scheme = file_uri_scheme($file->getFileUri()); $provider = $this->providerManager->loadProviderFromStream($scheme, $file, $metadata); if($provider){ diff --git a/src/Plugin/Field/FieldFormatter/VideoEmbedThumbnailFormatter.php b/src/Plugin/Field/FieldFormatter/VideoEmbedThumbnailFormatter.php index 9df9c6a..02c311b 100644 --- a/src/Plugin/Field/FieldFormatter/VideoEmbedThumbnailFormatter.php +++ b/src/Plugin/Field/FieldFormatter/VideoEmbedThumbnailFormatter.php @@ -55,7 +55,7 @@ class VideoEmbedThumbnailFormatter extends FormatterBase implements ContainerFac $element = []; foreach ($items as $delta => $item) { $file = File::load($item->target_id); - $metadata = isset($item->data) ? unserialize($item->data) : array(); + $metadata = isset($item->data) ? unserialize($item->data) : []; $scheme = file_uri_scheme($file->getFileUri()); $provider = $this->providerManager->loadProviderFromStream($scheme, $file, $metadata, $widget_settings); $url = FALSE; diff --git a/src/Plugin/Field/FieldFormatter/VideoPlayerFormatter.php b/src/Plugin/Field/FieldFormatter/VideoPlayerFormatter.php index c2d1fdd..7637b9e 100644 --- a/src/Plugin/Field/FieldFormatter/VideoPlayerFormatter.php +++ b/src/Plugin/Field/FieldFormatter/VideoPlayerFormatter.php @@ -78,7 +78,7 @@ class VideoPlayerFormatter extends VideoPlayerFormatterBase implements Container * {@inheritdoc} */ public static function defaultSettings() { - return array( + return [ 'width' => '854', 'height' => '480', 'controls' => TRUE, @@ -86,7 +86,7 @@ class VideoPlayerFormatter extends VideoPlayerFormatterBase implements Container 'loop' => FALSE, 'muted' => FALSE, 'preload' => 'none' - ) + parent::defaultSettings(); + ] + parent::defaultSettings(); } /** @@ -129,11 +129,11 @@ class VideoPlayerFormatter extends VideoPlayerFormatterBase implements Container '#title' => t('Preload'), '#type' => 'select', '#default_value' => $this->getSetting('preload'), - '#options' => array( + '#options' => [ 'none' =>'none', 'metadata' => 'metadata', 'auto' => 'auto' - ), + ], '#description' => t('Hint to the browser about whether optimistic downloading of the video itself or its metadata is considered worthwhile.') ]; return $element; @@ -143,7 +143,7 @@ class VideoPlayerFormatter extends VideoPlayerFormatterBase implements Container * {@inheritdoc} */ public function settingsSummary() { - $summary = array(); + $summary = []; $summary[] = t('HTML5 Video (@widthx@height@controls@autoplay@loop@muted).', [ '@width' => $this->getSetting('width'), '@height' => $this->getSetting('height'), @@ -158,7 +158,7 @@ class VideoPlayerFormatter extends VideoPlayerFormatterBase implements Container * {@inheritdoc} */ public function viewElements(FieldItemListInterface $items, $langcode) { - $elements = array(); + $elements = []; $files = $this->getEntitiesToView($items, $langcode); // Early opt-out if the field is empty. @@ -169,11 +169,11 @@ class VideoPlayerFormatter extends VideoPlayerFormatterBase implements Container // Collect cache tags to be added for each item in the field. foreach ($files as $delta => $file) { $video_uri = $file->getFileUri(); - $elements[$delta] = array( + $elements[$delta] = [ '#theme' => 'video_player_formatter', - '#items' => array(Url::fromUri(file_create_url($video_uri))), + '#items' => [Url::fromUri(file_create_url($video_uri))], '#player_attributes' => $this->getSettings(), - ); + ]; } return $elements; } diff --git a/src/Plugin/Field/FieldFormatter/VideoPlayerListFormatter.php b/src/Plugin/Field/FieldFormatter/VideoPlayerListFormatter.php index 54f06bb..d5c2e36 100644 --- a/src/Plugin/Field/FieldFormatter/VideoPlayerListFormatter.php +++ b/src/Plugin/Field/FieldFormatter/VideoPlayerListFormatter.php @@ -31,7 +31,7 @@ class VideoPlayerListFormatter extends VideoPlayerFormatter implements Container * {@inheritdoc} */ public function viewElements(FieldItemListInterface $items, $langcode) { - $elements = array(); + $elements = []; $files = $this->getEntitiesToView($items, $langcode); // Early opt-out if the field is empty. @@ -40,16 +40,16 @@ class VideoPlayerListFormatter extends VideoPlayerFormatter implements Container } // Collect cache tags to be added for each item in the field. - $video_items = array(); + $video_items = []; foreach ($files as $delta => $file) { $video_uri = $file->getFileUri(); $video_items[] = Url::fromUri(file_create_url($video_uri)); } - $elements[] = array( + $elements[] = [ '#theme' => 'video_player_formatter', '#items' => $video_items, '#player_attributes' => $this->getSettings(), - ); + ]; return $elements; } diff --git a/src/Plugin/Field/FieldType/VideoItem.php b/src/Plugin/Field/FieldType/VideoItem.php index d42b3d8..e78181d 100644 --- a/src/Plugin/Field/FieldType/VideoItem.php +++ b/src/Plugin/Field/FieldType/VideoItem.php @@ -46,22 +46,22 @@ class VideoItem extends FileItem { * {@inheritdoc} */ public static function defaultStorageSettings() { - return array( - 'default_video' => array( + return [ + 'default_video' => [ 'uuid' => NULL, 'data' => NULL - ), - ) + parent::defaultStorageSettings(); + ], + ] + parent::defaultStorageSettings(); } /** * {@inheritdoc} */ public static function defaultFieldSettings() { - $settings = array( + $settings = [ 'file_extensions' => '', 'file_directory' => 'videos/[date:custom:Y]-[date:custom:m]', - ) + parent::defaultFieldSettings(); + ] + parent::defaultFieldSettings(); // Remove field option. unset($settings['description_field']); return $settings; @@ -71,29 +71,29 @@ class VideoItem extends FileItem { * {@inheritdoc} */ public static function schema(FieldStorageDefinitionInterface $field_definition) { - return array( - 'columns' => array( - 'target_id' => array( + return [ + 'columns' => [ + 'target_id' => [ 'description' => 'The ID of the file entity.', 'type' => 'int', 'unsigned' => TRUE, - ), - 'data' => array( + ], + 'data' => [ 'description' => "Additional video metadata.", 'type' => 'varchar', 'length' => 512, - ), - ), - 'indexes' => array( - 'target_id' => array('target_id'), - ), - 'foreign keys' => array( - 'target_id' => array( + ], + ], + 'indexes' => [ + 'target_id' => ['target_id'], + ], + 'foreign keys' => [ + 'target_id' => [ 'table' => 'file_managed', - 'columns' => array('target_id' => 'fid'), - ), - ), - ); + 'columns' => ['target_id' => 'fid'], + ], + ], + ]; } /** @@ -117,7 +117,7 @@ class VideoItem extends FileItem { * {@inheritdoc} */ public function storageSettingsForm(array &$form, FormStateInterface $form_state, $has_data) { - $element = array(); + $element = []; return $element; } @@ -158,9 +158,9 @@ class VideoItem extends FileItem { $destination = $dirname . '/' . $random->name(10, TRUE) . '.mp4'; $data = $random->paragraphs(3); $file = file_save_data($data, $destination, FILE_EXISTS_ERROR); - $values = array( + $values = [ 'target_id' => $file->id(), - ); + ]; return $values; } diff --git a/src/Plugin/Field/FieldWidget/VideoEmbedWidget.php b/src/Plugin/Field/FieldWidget/VideoEmbedWidget.php index 7fac355..a0abe5c 100644 --- a/src/Plugin/Field/FieldWidget/VideoEmbedWidget.php +++ b/src/Plugin/Field/FieldWidget/VideoEmbedWidget.php @@ -39,11 +39,11 @@ class VideoEmbedWidget extends FileWidget { * {@inheritdoc} */ public static function defaultSettings() { - $settings = array( + $settings = [ 'file_directory' => 'video-thumbnails/[date:custom:Y]-[date:custom:m]', 'allowed_providers' => ["youtube" => "youtube"], 'uri_scheme' => 'public' - ); + ]; return $settings; } @@ -51,7 +51,7 @@ class VideoEmbedWidget extends FileWidget { * {@inheritdoc} */ public function settingsForm(array $form, FormStateInterface $form_state) { - $element = array(); + $element = []; $settings = $this->getSettings(); $provider_manager = \Drupal::service('video.provider_manager'); $element['allowed_providers'] = [ @@ -60,23 +60,23 @@ class VideoEmbedWidget extends FileWidget { '#default_value' => $this->getSetting('allowed_providers'), '#options' => $provider_manager->getProvidersOptionList(), ]; - $element['file_directory'] = array( + $element['file_directory'] = [ '#type' => 'textfield', '#title' => t('Thumbnail directory'), '#default_value' => $settings['file_directory'], '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'), - '#element_validate' => array(array(get_class($this), 'validateDirectory')), + '#element_validate' => [[get_class($this), 'validateDirectory']], '#weight' => 3, - ); + ]; $scheme_options = \Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE); - $element['uri_scheme'] = array( + $element['uri_scheme'] = [ '#type' => 'radios', '#title' => t('Thumbnail destination'), '#options' => $scheme_options, '#default_value' => $this->getSetting('uri_scheme'), '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'), '#weight' => 6, - ); + ]; return $element; } @@ -100,12 +100,12 @@ class VideoEmbedWidget extends FileWidget { * {@inheritdoc} */ public function settingsSummary() { - $summary = array(); + $summary = []; $summary[] = t('Providers : @allowed_providers
Thumbnail directory : @file_directory', - array( + [ '@allowed_providers' => implode(', ', array_filter($this->getSetting('allowed_providers'))), '@file_directory' => $this->getSetting('uri_scheme') . '://' . $this->getSetting('file_directory'), - )); + ]); return $summary; } @@ -142,7 +142,7 @@ class VideoEmbedWidget extends FileWidget { $title = $this->fieldDefinition->getLabel(); $description = FieldFilteredMarkup::create(\Drupal::token()->replace($this->fieldDefinition->getDescription())); - $elements = array(); + $elements = []; for ($delta = 0; $delta <= $max; $delta++) { // Add a new empty item if it doesn't exist yet at this delta. @@ -174,15 +174,15 @@ class VideoEmbedWidget extends FileWidget { if ($is_multiple) { // We name the element '_weight' to avoid clashing with elements // defined by widget. - $element['_weight'] = array( + $element['_weight'] = [ '#type' => 'weight', - '#title' => $this->t('Weight for row @number', array('@number' => $delta + 1)), + '#title' => $this->t('Weight for row @number', ['@number' => $delta + 1]), '#title_display' => 'invisible', // Note: this 'delta' is the FAPI #type 'weight' element's property. '#delta' => $max, '#default_value' => $items[$delta]->_weight ? : $delta, '#weight' => 100, - ); + ]; } $elements[$delta] = $element; @@ -190,7 +190,7 @@ class VideoEmbedWidget extends FileWidget { } if ($elements) { - $elements += array( + $elements += [ '#theme' => 'field_multiple_value_form', '#field_name' => $field_name, '#cardinality' => $cardinality, @@ -199,28 +199,28 @@ class VideoEmbedWidget extends FileWidget { '#title' => $title, '#description' => $description, '#max_delta' => $max, - ); + ]; // Add 'add more' button, if not working with a programmed form. if ($cardinality == FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED && !$form_state->isProgrammed()) { - $id_prefix = implode('-', array_merge($parents, array($field_name))); + $id_prefix = implode('-', array_merge($parents, [$field_name])); $wrapper_id = Html::getUniqueId($id_prefix . '-add-more-wrapper'); // $elements['#prefix'] = '
'; // $elements['#suffix'] = '
'; - $elements['add_more'] = array( + $elements['add_more'] = [ '#type' => 'submit', '#name' => strtr($id_prefix, '-', '_') . '_add_more', '#value' => t('Add another item'), - '#attributes' => array('class' => array('field-add-more-submit')), - '#limit_validation_errors' => array(array_merge($parents, array($field_name))), - '#submit' => array(array(get_class($this), 'addMoreSubmit')), - '#ajax' => array( - 'callback' => array(get_class($this), 'addMoreAjax'), + '#attributes' => ['class' => ['field-add-more-submit']], + '#limit_validation_errors' => [array_merge($parents, [$field_name])], + '#submit' => [[get_class($this), 'addMoreSubmit']], + '#ajax' => [ + 'callback' => [get_class($this), 'addMoreAjax'], 'effect' => 'fade', - ), + ], '#weight' => 1000 - ); + ]; } } @@ -228,7 +228,7 @@ class VideoEmbedWidget extends FileWidget { // The group of elements all-together need some extra functionality after // building up the full list (like draggable table rows). $elements['#file_upload_delta'] = $delta; - $elements['#process'] = array(array(get_class($this), 'processMultiple')); + $elements['#process'] = [[get_class($this), 'processMultiple']]; $elements['#field_name'] = $field_name; $elements['#language'] = $items->getLangcode(); @@ -265,22 +265,22 @@ class VideoEmbedWidget extends FileWidget { foreach ($element_children as $delta => $key) { if ($delta != $element['#file_upload_delta']) { $description = static::getDescriptionFromElement($element[$key]); - $element[$key]['_weight'] = array( + $element[$key]['_weight'] = [ '#type' => 'weight', - '#title' => $description ? t('Weight for @title', array('@title' => $description)) : t('Weight for new file'), + '#title' => $description ? t('Weight for @title', ['@title' => $description]) : t('Weight for new file'), '#title_display' => 'invisible', '#delta' => $count, '#default_value' => $delta, - ); + ]; } else { // The title needs to be assigned to the upload field so that validation // errors include the correct widget label. $element[$key]['#title'] = $element['#title']; - $element[$key]['_weight'] = array( + $element[$key]['_weight'] = [ '#type' => 'hidden', '#default_value' => $delta, - ); + ]; } } @@ -300,7 +300,7 @@ class VideoEmbedWidget extends FileWidget { $value = NestedArray::getValue($form_state->getUserInput(), $element['#field_parents'])[$items->getName()][0]['value']; } if(empty($items[$delta]->getValue()) || !empty($value)){ - $element['value'] = $element + array( + $element['value'] = $element + [ '#type' => 'textfield', '#attributes' => ['class' => ['js-text-full', 'text-full']], '#default_value' => empty($value) ? '' : $value, @@ -308,7 +308,7 @@ class VideoEmbedWidget extends FileWidget { [get_class($this), 'validateFormElement'], ], '#allowed_providers' => $this->getSetting('allowed_providers') - ); + ]; } else { $element += parent::formElement($items, $delta, $element, $form, $form_state); @@ -359,7 +359,7 @@ class VideoEmbedWidget extends FileWidget { public function extractFormValues(FieldItemListInterface $items, array $form, FormStateInterface $form_state) { $field_name = $this->fieldDefinition->getName(); // Extract the values from $form_state->getValues(). - $path = array_merge($form['#parents'], array($field_name)); + $path = array_merge($form['#parents'], [$field_name]); $key_exists = NULL; $values = NestedArray::getValue($form_state->getValues(), $path, $key_exists); if ($key_exists) { @@ -404,11 +404,11 @@ class VideoEmbedWidget extends FileWidget { ]); $file->save(); unset($values[$delta]); - $values[] = array('fids' => array($file->id()), 'data' => serialize($matches)); + $values[] = ['fids' => [$file->id()], 'data' => serialize($matches)]; } else { unset($values[$delta]); - $values[] = array('fids' => array(reset($results)), 'data' => serialize($matches)); + $values[] = ['fids' => [reset($results)], 'data' => serialize($matches)]; } } } diff --git a/src/Plugin/Field/FieldWidget/VideoUploadWidget.php b/src/Plugin/Field/FieldWidget/VideoUploadWidget.php index 8a0ac01..5b8ae3f 100644 --- a/src/Plugin/Field/FieldWidget/VideoUploadWidget.php +++ b/src/Plugin/Field/FieldWidget/VideoUploadWidget.php @@ -28,12 +28,12 @@ class VideoUploadWidget extends FileWidget { * {@inheritdoc} */ public static function defaultSettings() { - $settings = array( + $settings = [ 'file_extensions' => 'mp4 ogv webm', 'file_directory' => 'videos/[date:custom:Y]-[date:custom:m]', 'max_filesize' => '', 'uri_scheme' => 'public' - ) + parent::defaultSettings(); + ] + parent::defaultSettings(); return $settings; } @@ -44,49 +44,49 @@ class VideoUploadWidget extends FileWidget { $element = parent::settingsForm($form, $form_state); $settings = $this->getSettings(); - $element['file_directory'] = array( + $element['file_directory'] = [ '#type' => 'textfield', '#title' => t('File directory'), '#default_value' => $settings['file_directory'], '#description' => t('Optional subdirectory within the upload destination where files will be stored. Do not include preceding or trailing slashes.'), - '#element_validate' => array(array(get_class($this), 'validateDirectory')), + '#element_validate' => [[get_class($this), 'validateDirectory']], '#weight' => 3, - ); + ]; // Make the extension list a little more human-friendly by comma-separation. $extensions = str_replace(' ', ', ', $settings['file_extensions']); - $element['file_extensions'] = array( + $element['file_extensions'] = [ '#type' => 'textfield', '#title' => t('Allowed file extensions'), '#default_value' => $extensions, '#description' => t('Separate extensions with a space or comma and do not include the leading dot.'), - '#element_validate' => array(array(get_class($this), 'validateExtensions')), + '#element_validate' => [[get_class($this), 'validateExtensions']], '#weight' => 1, '#maxlength' => 256, // By making this field required, we prevent a potential security issue // that would allow files of any type to be uploaded. '#required' => TRUE, - ); + ]; - $element['max_filesize'] = array( + $element['max_filesize'] = [ '#type' => 'textfield', '#title' => t('Maximum upload size'), '#default_value' => $settings['max_filesize'], '#description' => t('Enter a value like "512" (bytes), "80 KB" (kilobytes) or "50 MB" (megabytes) in order to restrict the allowed file size. If left empty the file sizes will be limited only by PHP\'s maximum post and file upload sizes (current limit %limit).', array('%limit' => format_size(file_upload_max_size()))), '#size' => 10, - '#element_validate' => array(array(get_class($this), 'validateMaxFilesize')), + '#element_validate' => [[get_class($this), 'validateMaxFilesize']], '#weight' => 5, - ); + ]; $scheme_options = \Drupal::service('stream_wrapper_manager')->getNames(StreamWrapperInterface::WRITE_VISIBLE); - $element['uri_scheme'] = array( + $element['uri_scheme'] = [ '#type' => 'radios', '#title' => t('Upload destination'), '#options' => $scheme_options, '#default_value' => $this->getSetting('uri_scheme'), '#description' => t('Select where the final files should be stored. Private file storage has significantly more overhead than public files, but allows restricted access to files within this field.'), '#weight' => 6, - ); + ]; return $element; } @@ -149,14 +149,14 @@ class VideoUploadWidget extends FileWidget { * {@inheritdoc} */ public function settingsSummary() { - $summary = array(); + $summary = []; $summary[] = t('Progress indicator: @progress_indicator
Extensions : @file_extensions
File directory : @file_directory
@max_filesize', - array( + [ '@progress_indicator' => $this->getSetting('progress_indicator'), '@file_extensions' => $this->getSetting('file_extensions'), '@file_directory' => $this->getSetting('uri_scheme') . '://' . $this->getSetting('file_directory'), '@max_filesize' => ($this->getSetting('max_filesize')) ? 'Max filesize: ' . $this->getSetting('max_filesize') : '', - )); + ]); return $summary; } @@ -169,12 +169,12 @@ class VideoUploadWidget extends FileWidget { $elements = parent::formMultipleElements($items, $form, $form_state); $cardinality = $this->fieldDefinition->getFieldStorageDefinition()->getCardinality(); - $file_upload_help = array( + $file_upload_help = [ '#theme' => 'file_upload_help', '#description' => '', '#upload_validators' => $elements[0]['#upload_validators'], '#cardinality' => $cardinality, - ); + ]; if ($cardinality == 1) { // If there's only one field, return it as delta 0. if (empty($elements[0]['#default_value']['fids'])) { @@ -214,7 +214,7 @@ class VideoUploadWidget extends FileWidget { * * @see token_replace() */ - public function getUploadLocation($data = array()) { + public function getUploadLocation($data = []) { return static::doGetUploadLocation($this->getSettings(), $data); } @@ -247,7 +247,7 @@ class VideoUploadWidget extends FileWidget { * element's '#upload_validators' property. */ public function getUploadValidators() { - $validators = array(); + $validators = []; $settings = $this->getSettings(); // Cap the upload size according to the PHP limit. @@ -257,11 +257,11 @@ class VideoUploadWidget extends FileWidget { } // There is always a file size limit due to the PHP server limit. - $validators['file_validate_size'] = array($max_filesize); + $validators['file_validate_size'] = [$max_filesize]; // Add the extension check if necessary. if (!empty($settings['file_extensions'])) { - $validators['file_validate_extensions'] = array($settings['file_extensions']); + $validators['file_validate_extensions'] = [$settings['file_extensions']]; } return $validators; diff --git a/src/Plugin/video/Provider/Facebook.php b/src/Plugin/video/Provider/Facebook.php index 9515c49..8cf6c00 100644 --- a/src/Plugin/video/Provider/Facebook.php +++ b/src/Plugin/video/Provider/Facebook.php @@ -29,7 +29,7 @@ class Facebook extends ProviderPluginBase { return [ '#type' => 'html_tag', '#tag' => 'div', - '0' => array( + '0' => [ '#type' => 'html_tag', '#tag' => 'script', '#value' => 'window.fbAsyncInit = function() { @@ -44,17 +44,17 @@ class Facebook extends ProviderPluginBase { js.src = "//connect.facebook.net/en_US/sdk.js"; fjs.parentNode.insertBefore(js, fjs); }(document, \'script\', \'facebook-jssdk\'));', - ), - '1' => array( + ], + '1' => [ '#type' => 'html_tag', '#tag' => 'div', - '#attributes' => array( + '#attributes' => [ 'class' => 'fb-video', 'data-href' => sprintf('https://www.facebook.com/video.php?v=%s', $data['id']), 'data-width' => $settings['width'], 'data-autoplay' => $settings['autoplay'] ? 1 : 0 - ), - ), + ], + ], ]; } diff --git a/src/Plugin/video/Provider/Instagram.php b/src/Plugin/video/Provider/Instagram.php index 321c1bd..9d4bc56 100644 --- a/src/Plugin/video/Provider/Instagram.php +++ b/src/Plugin/video/Provider/Instagram.php @@ -33,17 +33,17 @@ class Instagram extends ProviderPluginBase { 'allowfullscreen' => 'allowfullscreen', 'src' => sprintf('//instagram.com/p/%s/embed/?autoplay=%d', $data['id'], $settings['autoplay']), ], - '0' => array( + '0' => [ '#type' => 'html_tag', '#tag' => 'script', - '#attributes' => array( + '#attributes' => [ 'type' => 'text/javascript', 'src' => '//platform.instagram.com/en_US/embeds.js', 'async', 'defer' - ), + ], '#value' => '', - ), + ], ]; } diff --git a/src/ProviderManager.php b/src/ProviderManager.php index 2f146fd..4237a43 100644 --- a/src/ProviderManager.php +++ b/src/ProviderManager.php @@ -56,7 +56,7 @@ class ProviderManager extends DefaultPluginManager implements ProviderManagerInt foreach ($definitions as $definition) { foreach($definition['regular_expressions'] as $reqular_expr){ if (preg_match($reqular_expr, $user_input, $matches)) { - return array('definition' => $definition, 'matches' => $matches); + return ['definition' => $definition, 'matches' => $matches]; } } } @@ -66,7 +66,7 @@ class ProviderManager extends DefaultPluginManager implements ProviderManagerInt /** * {@inheritdoc} */ - public function loadProviderFromStream($stream, $file, $metadata = array(), $settings = array()) { + public function loadProviderFromStream($stream, $file, $metadata = [], $settings = []) { $definitions = $this->getDefinitions(); foreach ($definitions as $definition) { if($definition['stream_wrapper'] == $stream){ diff --git a/src/ProviderManagerInterface.php b/src/ProviderManagerInterface.php index c247283..c385a47 100644 --- a/src/ProviderManagerInterface.php +++ b/src/ProviderManagerInterface.php @@ -53,6 +53,6 @@ interface ProviderManagerInterface { * @return \Drupal\video\ProviderPluginInterface|bool * The loaded plugin. */ - public function loadProviderFromStream($stream, $file, $data = array()); + public function loadProviderFromStream($stream, $file, $data = []); } diff --git a/src/ProviderPluginBase.php b/src/ProviderPluginBase.php index 0362cc9..6fb1f7d 100644 --- a/src/ProviderPluginBase.php +++ b/src/ProviderPluginBase.php @@ -25,14 +25,14 @@ abstract class ProviderPluginBase implements ProviderPluginInterface, ContainerF * * @var array */ - protected $metadata = array(); + protected $metadata = []; /** * Additional settings for the video widget * * @var array */ - protected $settings = array(); + protected $settings = []; /** * An http client. diff --git a/src/StreamWrapper/VideoRemoteStreamWrapper.php b/src/StreamWrapper/VideoRemoteStreamWrapper.php index 65cfd7c..aa88215 100644 --- a/src/StreamWrapper/VideoRemoteStreamWrapper.php +++ b/src/StreamWrapper/VideoRemoteStreamWrapper.php @@ -15,7 +15,7 @@ use Drupal\Component\Utility\UrlHelper; abstract class VideoRemoteStreamWrapper extends ReadOnlyStream { protected static $base_url = NULL; - protected $parameters = array(); + protected $parameters = []; /** * {@inheritdoc}