@@ -10,59 +10,59 @@ discard block |
||
10 | 10 | * @group media |
11 | 11 | */ |
12 | 12 | class GalleryBundleTest extends WebTestBase { |
13 | - /** |
|
14 | - * Exempt from strict schema checking. |
|
15 | - * |
|
16 | - * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker |
|
17 | - * |
|
18 | - * @var bool |
|
19 | - */ |
|
20 | - protected $strictConfigSchema = FALSE; |
|
21 | - |
|
22 | - /** |
|
23 | - * Modules to enable. |
|
24 | - * |
|
25 | - * @var array |
|
26 | - */ |
|
27 | - public static $modules = [ |
|
13 | + /** |
|
14 | + * Exempt from strict schema checking. |
|
15 | + * |
|
16 | + * @see \Drupal\Core\Config\Testing\ConfigSchemaChecker |
|
17 | + * |
|
18 | + * @var bool |
|
19 | + */ |
|
20 | + protected $strictConfigSchema = FALSE; |
|
21 | + |
|
22 | + /** |
|
23 | + * Modules to enable. |
|
24 | + * |
|
25 | + * @var array |
|
26 | + */ |
|
27 | + public static $modules = [ |
|
28 | 28 | 'media', |
29 | 29 | 'media_entity', |
30 | 30 | 'media_entity_slideshow', |
31 | 31 | 'node', |
32 | - ]; |
|
33 | - |
|
34 | - /** |
|
35 | - * The test media bundle. |
|
36 | - * |
|
37 | - * @var \Drupal\media_entity\MediaBundleInterface |
|
38 | - */ |
|
39 | - protected $testBundle; |
|
40 | - |
|
41 | - /** |
|
42 | - * {@inheritdoc} |
|
43 | - */ |
|
44 | - protected function setUp() { |
|
32 | + ]; |
|
33 | + |
|
34 | + /** |
|
35 | + * The test media bundle. |
|
36 | + * |
|
37 | + * @var \Drupal\media_entity\MediaBundleInterface |
|
38 | + */ |
|
39 | + protected $testBundle; |
|
40 | + |
|
41 | + /** |
|
42 | + * {@inheritdoc} |
|
43 | + */ |
|
44 | + protected function setUp() { |
|
45 | 45 | parent::setUp(); |
46 | 46 | $this->testBundle = $this->container->get('entity_type.manager')->getStorage('media_bundle')->load('gallery'); |
47 | 47 | |
48 | 48 | $adminUser = $this->drupalCreateUser([ |
49 | - 'view media', |
|
50 | - 'create media', |
|
51 | - 'update media', |
|
52 | - 'update any media', |
|
53 | - 'delete media', |
|
54 | - 'delete any media', |
|
55 | - 'access media overview', |
|
49 | + 'view media', |
|
50 | + 'create media', |
|
51 | + 'update media', |
|
52 | + 'update any media', |
|
53 | + 'delete media', |
|
54 | + 'delete any media', |
|
55 | + 'access media overview', |
|
56 | 56 | ]); |
57 | 57 | $this->drupalLogin($adminUser); |
58 | - } |
|
58 | + } |
|
59 | 59 | |
60 | - /** |
|
61 | - * Tests gallery media bundle creation from config files. |
|
62 | - */ |
|
63 | - public function testMediaBundleCreationFromModule() { |
|
60 | + /** |
|
61 | + * Tests gallery media bundle creation from config files. |
|
62 | + */ |
|
63 | + public function testMediaBundleCreationFromModule() { |
|
64 | 64 | $type_configuration = [ |
65 | - 'source_field' => 'field_slide', |
|
65 | + 'source_field' => 'field_slide', |
|
66 | 66 | ]; |
67 | 67 | |
68 | 68 | $this->assertTrue((bool) $this->testBundle, 'The media bundle from default configuration has been created in the database.'); |
@@ -71,21 +71,21 @@ discard block |
||
71 | 71 | $this->assertEqual($this->testBundle->get('type'), 'slideshow', 'Correct plugin ID detected.'); |
72 | 72 | $this->assertEqual($this->testBundle->get('type_configuration'), $type_configuration, 'Type configuration correct.'); |
73 | 73 | $this->assertEqual($this->testBundle->get('field_map'), [], 'Correct field map detected.'); |
74 | - } |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * Tests thumbnail of the gallery item. |
|
78 | - */ |
|
79 | - public function testGalleryItemThumbnail() { |
|
76 | + /** |
|
77 | + * Tests thumbnail of the gallery item. |
|
78 | + */ |
|
79 | + public function testGalleryItemThumbnail() { |
|
80 | 80 | // Let's add one image and one video. |
81 | 81 | $imageItem = $this->addImageItem(); |
82 | 82 | $videoItem = $this->addVideoItem(); |
83 | 83 | $this->drupalGet('media/add/gallery'); |
84 | 84 | $pathValue = (string) current($this->xpath('//input[@data-drupal-selector="edit-field-slide-entity-browser-path"]/@value')); |
85 | 85 | $edit = [ |
86 | - 'name[0][value]' => 'Gallery item', |
|
87 | - 'field_slide[target_id]' => $imageItem['id'] . ' ' . $videoItem['id'], |
|
88 | - 'field_slide[entity_browser][path]' => $pathValue, |
|
86 | + 'name[0][value]' => 'Gallery item', |
|
87 | + 'field_slide[target_id]' => $imageItem['id'] . ' ' . $videoItem['id'], |
|
88 | + 'field_slide[entity_browser][path]' => $pathValue, |
|
89 | 89 | ]; |
90 | 90 | $this->drupalPostForm(NULL, $edit, t('Save and publish')); |
91 | 91 | |
@@ -102,9 +102,9 @@ discard block |
||
102 | 102 | |
103 | 103 | $this->drupalGet('media/add/gallery'); |
104 | 104 | $edit = [ |
105 | - 'name[0][value]' => 'Gallery item 2', |
|
106 | - 'field_slide[target_id]' => $videoItem['id'] . ' ' . $imageItem['id'] , |
|
107 | - 'field_slide[entity_browser][path]' => $pathValue, |
|
105 | + 'name[0][value]' => 'Gallery item 2', |
|
106 | + 'field_slide[target_id]' => $videoItem['id'] . ' ' . $imageItem['id'] , |
|
107 | + 'field_slide[entity_browser][path]' => $pathValue, |
|
108 | 108 | ]; |
109 | 109 | $this->drupalPostForm(NULL, $edit, t('Save and publish')); |
110 | 110 | |
@@ -113,19 +113,19 @@ discard block |
||
113 | 113 | $gallery = $this->loadMediaItem(reset($gallery_id)); |
114 | 114 | $gallery_thumbnail = $gallery->getType()->thumbnail($gallery); |
115 | 115 | $this->assertEqual($gallery_thumbnail, $video_thumbnail, "Correct thumbnail detected."); |
116 | - } |
|
116 | + } |
|
117 | 117 | |
118 | - /** |
|
119 | - * Adds image type item. |
|
120 | - */ |
|
121 | - public function addImageItem() { |
|
118 | + /** |
|
119 | + * Adds image type item. |
|
120 | + */ |
|
121 | + public function addImageItem() { |
|
122 | 122 | // Let's add image first. |
123 | 123 | $name = $this->randomMachineName(); |
124 | 124 | $testImage = current($this->drupalGetTestFiles('image')); |
125 | 125 | $file_path = $this->container->get('file_system')->realpath($testImage->uri); |
126 | 126 | $edit = [ |
127 | - 'name[0][value]' => $name, |
|
128 | - 'files[field_image_0]' => $file_path, |
|
127 | + 'name[0][value]' => $name, |
|
128 | + 'files[field_image_0]' => $file_path, |
|
129 | 129 | ]; |
130 | 130 | // Save the image. |
131 | 131 | $this->drupalPostForm('media/add/image', $edit, t('Save and publish')); |
@@ -136,15 +136,15 @@ discard block |
||
136 | 136 | $edit['id'] = $media_id; |
137 | 137 | |
138 | 138 | return $edit; |
139 | - } |
|
139 | + } |
|
140 | 140 | |
141 | - /** |
|
142 | - * Adds video type item. |
|
143 | - */ |
|
144 | - public function addVideoItem() { |
|
141 | + /** |
|
142 | + * Adds video type item. |
|
143 | + */ |
|
144 | + public function addVideoItem() { |
|
145 | 145 | $edit = [ |
146 | - 'name[0][value]' => 'Drupal video!', |
|
147 | - 'field_video[0][value]' => 'https://www.youtube.com/watch?v=XgYu7-DQjDQ', |
|
146 | + 'name[0][value]' => 'Drupal video!', |
|
147 | + 'field_video[0][value]' => 'https://www.youtube.com/watch?v=XgYu7-DQjDQ', |
|
148 | 148 | ]; |
149 | 149 | $this->drupalPostForm('media/add/video', $edit, t('Save and publish')); |
150 | 150 | // Obtain the video id. |
@@ -153,22 +153,22 @@ discard block |
||
153 | 153 | $edit['id'] = $media_id; |
154 | 154 | |
155 | 155 | return $edit; |
156 | - } |
|
157 | - |
|
158 | - /** |
|
159 | - * Loads the media entity item. |
|
160 | - * |
|
161 | - * @param int $id |
|
162 | - * The id of the item. |
|
163 | - * |
|
164 | - * @return \Drupal\media_entity\MediaInterface |
|
165 | - * The media entity item. |
|
166 | - */ |
|
167 | - public function loadMediaItem($id) { |
|
156 | + } |
|
157 | + |
|
158 | + /** |
|
159 | + * Loads the media entity item. |
|
160 | + * |
|
161 | + * @param int $id |
|
162 | + * The id of the item. |
|
163 | + * |
|
164 | + * @return \Drupal\media_entity\MediaInterface |
|
165 | + * The media entity item. |
|
166 | + */ |
|
167 | + public function loadMediaItem($id) { |
|
168 | 168 | $item = $this->container->get('entity_type.manager') |
169 | - ->getStorage('media') |
|
170 | - ->loadUnchanged($id); |
|
169 | + ->getStorage('media') |
|
170 | + ->loadUnchanged($id); |
|
171 | 171 | return $item; |
172 | - } |
|
172 | + } |
|
173 | 173 | |
174 | 174 | } |
@@ -103,7 +103,7 @@ |
||
103 | 103 | $this->drupalGet('media/add/gallery'); |
104 | 104 | $edit = [ |
105 | 105 | 'name[0][value]' => 'Gallery item 2', |
106 | - 'field_slide[target_id]' => $videoItem['id'] . ' ' . $imageItem['id'] , |
|
106 | + 'field_slide[target_id]' => $videoItem['id'] . ' ' . $imageItem['id'], |
|
107 | 107 | 'field_slide[entity_browser][path]' => $pathValue, |
108 | 108 | ]; |
109 | 109 | $this->drupalPostForm(NULL, $edit, t('Save and publish')); |
@@ -13,13 +13,13 @@ discard block |
||
13 | 13 | * Implements hook_help(). |
14 | 14 | */ |
15 | 15 | function media_help($route_name, RouteMatchInterface $route_match) { |
16 | - switch ($route_name) { |
|
16 | + switch ($route_name) { |
|
17 | 17 | // Main module help for the media module. |
18 | 18 | case 'help.page.media': |
19 | 19 | $output = ''; |
20 | - $output .= '<h3>' . t('About') . '</h3>'; |
|
21 | - $output .= '<p>' . t('Media module for Drupal 8') . '</p>'; |
|
22 | - return $output; |
|
20 | + $output .= '<h3>' . t('About') . '</h3>'; |
|
21 | + $output .= '<p>' . t('Media module for Drupal 8') . '</p>'; |
|
22 | + return $output; |
|
23 | 23 | |
24 | 24 | default: |
25 | 25 | } |
@@ -29,25 +29,25 @@ discard block |
||
29 | 29 | * Implements hook_form_alter(). |
30 | 30 | */ |
31 | 31 | function media_form_alter(&$form, FormStateInterface &$form_state) { |
32 | - if ($form['#form_id'] == 'entity_browser_media_library_form') { |
|
32 | + if ($form['#form_id'] == 'entity_browser_media_library_form') { |
|
33 | 33 | // Style the submit button. |
34 | 34 | $form['actions']['submit']['#attributes']['class'][] = 'button--primary'; |
35 | 35 | $form['actions']['submit']['#attributes']['class'][] = 'entity-browser-modal-target'; |
36 | - } |
|
36 | + } |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
40 | 40 | * Implements hook_library_info_alter(). |
41 | 41 | */ |
42 | 42 | function media_library_info_alter(&$libraries, $extension) { |
43 | - // Optionally use the Libraries module to determine our library paths. |
|
44 | - if ($extension == 'media' && \Drupal::moduleHandler()->moduleExists('libraries')) { |
|
43 | + // Optionally use the Libraries module to determine our library paths. |
|
44 | + if ($extension == 'media' && \Drupal::moduleHandler()->moduleExists('libraries')) { |
|
45 | 45 | $imagesloaded_path = libraries_get_path('imagesloaded') . '/imagesloaded.pkgd.min.js'; |
46 | 46 | $masonry_path = libraries_get_path('masonry') . '/dist/masonry.pkgd.min.js'; |
47 | 47 | |
48 | 48 | $libraries['imagesloaded']['js'] = ['/' . $imagesloaded_path => ['minified' => 'true']]; |
49 | 49 | $libraries['masonry']['js'] = ['/' . $masonry_path => ['minified' => 'true']]; |
50 | - } |
|
50 | + } |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
@@ -56,9 +56,9 @@ discard block |
||
56 | 56 | * Adds the media.view library to the media views. |
57 | 57 | */ |
58 | 58 | function media_views_pre_render(ViewExecutable $view) { |
59 | - if (isset($view) && ($view->storage->id() == 'media_library' || $view->storage->id() == 'global_media_library')) { |
|
59 | + if (isset($view) && ($view->storage->id() == 'media_library' || $view->storage->id() == 'global_media_library')) { |
|
60 | 60 | $view->element['#attached']['library'][] = 'media/view'; |
61 | - } |
|
61 | + } |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | /** |
@@ -67,14 +67,14 @@ discard block |
||
67 | 67 | * Adds the add media button from media_entity on library pages. |
68 | 68 | */ |
69 | 69 | function media_menu_local_actions_alter(&$local_actions) { |
70 | - $local_actions['media.add']['appears_on'][] = 'view.media_library.user_media_library'; |
|
71 | - $local_actions['media.add']['appears_on'][] = 'view.media_library.global_media_library_page'; |
|
70 | + $local_actions['media.add']['appears_on'][] = 'view.media_library.user_media_library'; |
|
71 | + $local_actions['media.add']['appears_on'][] = 'view.media_library.global_media_library_page'; |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
75 | 75 | * Implements hook_entity_type_alter(). |
76 | 76 | */ |
77 | 77 | function media_entity_type_alter(array &$entity_types) { |
78 | - $field_name = \Drupal::config('media_entity.bundle.gallery')->get('type_configuration.source_field'); |
|
79 | - $entity_types['media']->addConstraint('GalleryMediaBundle', array('sourceFieldName' => $field_name)); |
|
78 | + $field_name = \Drupal::config('media_entity.bundle.gallery')->get('type_configuration.source_field'); |
|
79 | + $entity_types['media']->addConstraint('GalleryMediaBundle', array('sourceFieldName' => $field_name)); |
|
80 | 80 | } |
@@ -10,22 +10,22 @@ |
||
10 | 10 | */ |
11 | 11 | class GalleryMediaBundleConstraintValidator extends ConstraintValidator { |
12 | 12 | |
13 | - /** |
|
14 | - * {@inheritdoc} |
|
15 | - */ |
|
16 | - public function validate($value, Constraint $constraint) { |
|
13 | + /** |
|
14 | + * {@inheritdoc} |
|
15 | + */ |
|
16 | + public function validate($value, Constraint $constraint) { |
|
17 | 17 | if (!isset($value)) { |
18 | - return; |
|
18 | + return; |
|
19 | 19 | } |
20 | 20 | if ($value->hasField($constraint->sourceFieldName)) { |
21 | - $slideshowItems = $value->get($constraint->sourceFieldName); |
|
22 | - foreach ($slideshowItems as $item) { |
|
21 | + $slideshowItems = $value->get($constraint->sourceFieldName); |
|
22 | + foreach ($slideshowItems as $item) { |
|
23 | 23 | $itemBundle = \Drupal::entityTypeManager()->getStorage('media')->load($item->target_id)->bundle(); |
24 | 24 | if ($itemBundle == "gallery") { |
25 | - $this->context->addViolation($constraint->message); |
|
25 | + $this->context->addViolation($constraint->message); |
|
26 | 26 | } |
27 | - } |
|
27 | + } |
|
28 | + } |
|
28 | 29 | } |
29 | - } |
|
30 | 30 | |
31 | 31 | } |
@@ -14,17 +14,17 @@ |
||
14 | 14 | */ |
15 | 15 | class GalleryMediaBundleConstraint extends Constraint { |
16 | 16 | |
17 | - /** |
|
18 | - * Name of the source field for slideshow bundle. |
|
19 | - * |
|
20 | - * @var string |
|
21 | - */ |
|
22 | - public $sourceFieldName; |
|
17 | + /** |
|
18 | + * Name of the source field for slideshow bundle. |
|
19 | + * |
|
20 | + * @var string |
|
21 | + */ |
|
22 | + public $sourceFieldName; |
|
23 | 23 | |
24 | - /** |
|
25 | - * The default violation message. |
|
26 | - * |
|
27 | - * @var string |
|
28 | - */ |
|
29 | - public $message = 'Gallery cannot contain gallery type item.'; |
|
24 | + /** |
|
25 | + * The default violation message. |
|
26 | + * |
|
27 | + * @var string |
|
28 | + */ |
|
29 | + public $message = 'Gallery cannot contain gallery type item.'; |
|
30 | 30 | } |