@@ -279,7 +279,7 @@ |
||
| 279 | 279 | /** |
| 280 | 280 | * Helper function to return commands to return in AjaxResponse. |
| 281 | 281 | * |
| 282 | - * @return array |
|
| 282 | + * @return SelectEntitiesCommand[] |
|
| 283 | 283 | * An array of ajax commands. |
| 284 | 284 | */ |
| 285 | 285 | public function getAjaxCommands(FormStateInterface $form_state) { |
@@ -12,7 +12,6 @@ discard block |
||
| 12 | 12 | use Drupal\Core\Entity\EntityInterface; |
| 13 | 13 | use Drupal\Core\Routing\RouteMatchInterface; |
| 14 | 14 | use Drupal\Core\Url; |
| 15 | -use Drupal\entity_browser\DisplayAjaxInterface; |
|
| 16 | 15 | use Drupal\entity_browser\DisplayBase; |
| 17 | 16 | use Drupal\entity_browser\DisplayRouterInterface; |
| 18 | 17 | use Drupal\entity_browser\Events\Events; |
@@ -21,7 +20,6 @@ discard block |
||
| 21 | 20 | use Symfony\Component\EventDispatcher\EventDispatcherInterface; |
| 22 | 21 | use Drupal\Core\Path\CurrentPathStack; |
| 23 | 22 | use Drupal\Core\Ajax\AjaxResponse; |
| 24 | -use Drupal\Core\Ajax\CloseDialogCommand; |
|
| 25 | 23 | use Drupal\entity_browser\Ajax\SelectEntitiesCommand; |
| 26 | 24 | use Symfony\Component\HttpKernel\Event\FilterResponseEvent; |
| 27 | 25 | use Symfony\Component\HttpKernel\KernelEvents; |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | */ |
| 70 | 70 | protected $uuid = NULL; |
| 71 | 71 | |
| 72 | - /** |
|
| 72 | + /** |
|
| 73 | 73 | * Current request. |
| 74 | 74 | * |
| 75 | 75 | * @var \Symfony\Component\HttpFoundation\Request |
@@ -138,13 +138,13 @@ discard block |
||
| 138 | 138 | // info. |
| 139 | 139 | $event_object = new RegisterJSCallbacks($this->configuration['entity_browser_id'], $uuid); |
| 140 | 140 | $event_object->registerCallback('Drupal.entityBrowser.selectionCompleted'); |
| 141 | - $event = $this->eventDispatcher->dispatch(Events::REGISTER_JS_CALLBACKS, $event_object ); |
|
| 141 | + $event = $this->eventDispatcher->dispatch(Events::REGISTER_JS_CALLBACKS, $event_object); |
|
| 142 | 142 | $original_path = $this->currentPath->getPath(); |
| 143 | 143 | return [ |
| 144 | 144 | '#theme_wrappers' => ['container'], |
| 145 | 145 | 'path' => [ |
| 146 | 146 | '#type' => 'hidden', |
| 147 | - '#value' => Url::fromRoute('entity_browser.' . $this->configuration['entity_browser_id'], [], [ |
|
| 147 | + '#value' => Url::fromRoute('entity_browser.'.$this->configuration['entity_browser_id'], [], [ |
|
| 148 | 148 | 'query' => [ |
| 149 | 149 | 'uuid' => $uuid, |
| 150 | 150 | 'original_path' => $original_path, |
@@ -156,7 +156,7 @@ discard block |
||
| 156 | 156 | '#value' => $this->configuration['link_text'], |
| 157 | 157 | '#limit_validation_errors' => [], |
| 158 | 158 | '#submit' => [], |
| 159 | - '#name' => 'op_' . $this->configuration['entity_browser_id'], |
|
| 159 | + '#name' => 'op_'.$this->configuration['entity_browser_id'], |
|
| 160 | 160 | '#ajax' => [ |
| 161 | 161 | 'callback' => [$this, 'openModal'], |
| 162 | 162 | 'event' => 'click', |
@@ -165,7 +165,7 @@ discard block |
||
| 165 | 165 | 'data-uuid' => $uuid, |
| 166 | 166 | ], |
| 167 | 167 | '#attached' => [ |
| 168 | - 'library' => ['core/drupal.dialog.ajax', 'entity_browser/modal'], |
|
| 168 | + 'library' => ['core/drupal.dialog.ajax', 'entity_browser/modal'], |
|
| 169 | 169 | 'drupalSettings' => [ |
| 170 | 170 | 'entity_browser' => [ |
| 171 | 171 | 'modal' => [ |
@@ -285,7 +285,7 @@ discard block |
||
| 285 | 285 | * An array of ajax commands. |
| 286 | 286 | */ |
| 287 | 287 | public function getAjaxCommands(FormStateInterface $form_state) { |
| 288 | - $entities = array_map(function(EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()];}, $form_state->get(['entity_browser', 'selected_entities'])); |
|
| 288 | + $entities = array_map(function(EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()]; }, $form_state->get(['entity_browser', 'selected_entities'])); |
|
| 289 | 289 | |
| 290 | 290 | $commands = array(); |
| 291 | 291 | $commands[] = new SelectEntitiesCommand($this->uuid, $entities); |
@@ -305,13 +305,13 @@ discard block |
||
| 305 | 305 | public function propagateSelection(FilterResponseEvent $event) { |
| 306 | 306 | $render = [ |
| 307 | 307 | 'labels' => [ |
| 308 | - '#markup' => 'Labels: ' . implode(', ', array_map(function (EntityInterface $item) {return $item->label();}, $this->entities)), |
|
| 308 | + '#markup' => 'Labels: '.implode(', ', array_map(function(EntityInterface $item) {return $item->label(); }, $this->entities)), |
|
| 309 | 309 | '#attached' => [ |
| 310 | 310 | 'library' => ['entity_browser/modal_selection'], |
| 311 | 311 | 'drupalSettings' => [ |
| 312 | 312 | 'entity_browser' => [ |
| 313 | 313 | 'modal' => [ |
| 314 | - 'entities' => array_map(function (EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()];}, $this->entities), |
|
| 314 | + 'entities' => array_map(function(EntityInterface $item) {return [$item->id(), $item->uuid(), $item->getEntityTypeId()]; }, $this->entities), |
|
| 315 | 315 | 'uuid' => $this->request->query->get('uuid'), |
| 316 | 316 | ], |
| 317 | 317 | ], |
@@ -327,7 +327,7 @@ discard block |
||
| 327 | 327 | * {@inheritdoc} |
| 328 | 328 | */ |
| 329 | 329 | public function path() { |
| 330 | - return '/entity-browser/modal/' . $this->configuration['entity_browser_id']; |
|
| 330 | + return '/entity-browser/modal/'.$this->configuration['entity_browser_id']; |
|
| 331 | 331 | } |
| 332 | 332 | |
| 333 | 333 | /** |
@@ -7,7 +7,6 @@ |
||
| 7 | 7 | |
| 8 | 8 | namespace Drupal\entity_browser\Plugin\views\display; |
| 9 | 9 | |
| 10 | -use Drupal\Core\DependencyInjection\DependencySerializationTrait; |
|
| 11 | 10 | use Drupal\views\Plugin\views\display\DisplayPluginBase; |
| 12 | 11 | |
| 13 | 12 | /** |
@@ -90,7 +90,7 @@ |
||
| 90 | 90 | $form_element_row_id = $row_id; |
| 91 | 91 | |
| 92 | 92 | $substitutions[] = [ |
| 93 | - 'placeholder' => '<!--form-item-entity_browser_select--' . $form_element_row_id . '-->', |
|
| 93 | + 'placeholder' => '<!--form-item-entity_browser_select--'.$form_element_row_id.'-->', |
|
| 94 | 94 | 'field_name' => 'entity_browser_select', |
| 95 | 95 | 'row_id' => $form_element_row_id, |
| 96 | 96 | ]; |
@@ -45,10 +45,6 @@ |
||
| 45 | 45 | /** |
| 46 | 46 | * Form constructor for the bulk form. |
| 47 | 47 | * |
| 48 | - * @param array $form |
|
| 49 | - * An associative array containing the structure of the form. |
|
| 50 | - * @param \Drupal\Core\Form\FormStateInterface $form_state |
|
| 51 | - * The current state of the form. |
|
| 52 | 48 | */ |
| 53 | 49 | public function viewsForm(&$render) { |
| 54 | 50 | // Only add the bulk form options and buttons if there are results. |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | * {@inheritdoc} |
| 24 | 24 | */ |
| 25 | 25 | public function render(ResultRow $values) { |
| 26 | - return ViewsRenderPipelineMarkup::create('<!--form-item-' . $this->options['id'] . '--' . $values->index . '-->'); |
|
| 26 | + return ViewsRenderPipelineMarkup::create('<!--form-item-'.$this->options['id'].'--'.$values->index.'-->'); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -336,7 +336,7 @@ |
||
| 336 | 336 | '_title_callback' => 'Drupal\entity_browser\Controllers\StandalonePage::title', |
| 337 | 337 | 'entity_browser_id' => $this->id(), |
| 338 | 338 | ], |
| 339 | - ['_permission' => 'access ' . $this->id() . ' entity browser pages'], |
|
| 339 | + ['_permission' => 'access '.$this->id().' entity browser pages'], |
|
| 340 | 340 | ['_admin_route' => \Drupal::config('node.settings')->get('use_admin_theme')] |
| 341 | 341 | ); |
| 342 | 342 | } |
@@ -116,8 +116,7 @@ |
||
| 116 | 116 | |
| 117 | 117 | if (!$this->isSelectionCompleted($form_state)) { |
| 118 | 118 | $form_state->setRebuild(); |
| 119 | - } |
|
| 120 | - else { |
|
| 119 | + } else { |
|
| 121 | 120 | $entity_browser->getDisplay()->selectionCompleted($this->getSelectedEntities($form_state)); |
| 122 | 121 | } |
| 123 | 122 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | * {@inheritdoc} |
| 32 | 32 | */ |
| 33 | 33 | public function getFormId() { |
| 34 | - return 'entity_browser_' . $this->entity_browser->id() . '_form'; |
|
| 34 | + return 'entity_browser_'.$this->entity_browser->id().'_form'; |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -63,7 +63,7 @@ |
||
| 63 | 63 | |
| 64 | 64 | foreach ($browsers as $browser) { |
| 65 | 65 | if ($browser->route()) { |
| 66 | - $permissions['access ' . $browser->id() . ' entity browser pages'] = array( |
|
| 66 | + $permissions['access '.$browser->id().' entity browser pages'] = array( |
|
| 67 | 67 | 'title' => $this->translationManager->translate('Access @name pages', array('@name' => $browser->label())), |
| 68 | 68 | 'description' => $this->translationManager->translate('Access pages that %browser uses to operate.', array('%browser' => $browser->label())), |
| 69 | 69 | ); |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | // them only once. Reason for that is how SQL and Views work and we probably |
| 52 | 52 | // can't do much about it. |
| 53 | 53 | if (!empty($this->selectedEntities)) { |
| 54 | - $ids = array_map(function(EntityInterface $item) {return $item->id();}, $this->selectedEntities); |
|
| 54 | + $ids = array_map(function(EntityInterface $item) {return $item->id(); }, $this->selectedEntities); |
|
| 55 | 55 | $storage['selection_display_view']->setArguments([implode(',', $ids)]); |
| 56 | 56 | } |
| 57 | 57 | |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | $uploaded_files = $form_state->getValue(['upload'], []); |
| 54 | 54 | $trigger = $form_state->getTriggeringElement(); |
| 55 | 55 | // Only validate if we are uploading a file. |
| 56 | - if (empty($uploaded_files) && $trigger['#value'] == 'Upload') { |
|
| 56 | + if (empty($uploaded_files) && $trigger['#value'] == 'Upload') { |
|
| 57 | 57 | $form_state->setError($form['widget']['upload'], t('At least one file should be uploaded.')); |
| 58 | 58 | } |
| 59 | 59 | } |
@@ -72,9 +72,9 @@ |
||
| 72 | 72 | * @param \Drupal\Core\Session\AccountInterface $current_user |
| 73 | 73 | * The current user. |
| 74 | 74 | */ |
| 75 | - public function __construct(array $configuration, $plugin_id, $plugin_definition, EventDispatcherInterface $event_dispatcher, EntityManagerInterface $entity_manager, AccountInterface $current_user) { |
|
| 76 | - parent::__construct($configuration, $plugin_id, $plugin_definition, $event_dispatcher, $entity_manager); |
|
| 77 | - $this->currentUser = $current_user; |
|
| 75 | + public function __construct(array $configuration, $plugin_id, $plugin_definition, EventDispatcherInterface $event_dispatcher, EntityManagerInterface $entity_manager, AccountInterface $current_user) { |
|
| 76 | + parent::__construct($configuration, $plugin_id, $plugin_definition, $event_dispatcher, $entity_manager); |
|
| 77 | + $this->currentUser = $current_user; |
|
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | /** |
@@ -126,7 +126,7 @@ |
||
| 126 | 126 | $form_state->set('view_widget_rows', $ids); |
| 127 | 127 | |
| 128 | 128 | if (empty($view->field['entity_browser_select'])) { |
| 129 | - $url = Url::fromRoute('entity.view.edit_form',['view'=>$this->configuration['view']])->toString(); |
|
| 129 | + $url = Url::fromRoute('entity.view.edit_form', ['view'=>$this->configuration['view']])->toString(); |
|
| 130 | 130 | if ($this->currentUser->hasPermission('administer views')) { |
| 131 | 131 | return [ |
| 132 | 132 | '#markup' => t('Entity browser select form field not found on a view. <a href=":link">Go fix it</a>!', [':link' => $url]), |
@@ -131,8 +131,7 @@ |
||
| 131 | 131 | return [ |
| 132 | 132 | '#markup' => t('Entity browser select form field not found on a view. <a href=":link">Go fix it</a>!', [':link' => $url]), |
| 133 | 133 | ]; |
| 134 | - } |
|
| 135 | - else { |
|
| 134 | + } else { |
|
| 136 | 135 | return [ |
| 137 | 136 | '#markup' => t('Entity browser select form field not found on a view. Go fix it!'), |
| 138 | 137 | ]; |