Completed
Pull Request — 8.x-1.x (#8)
by Vijay
02:44
created
media.module 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,13 +11,13 @@
 block discarded – undo
11 11
  * Implements hook_help().
12 12
  */
13 13
 function media_help($route_name, RouteMatchInterface $route_match) {
14
-  switch ($route_name) {
14
+    switch ($route_name) {
15 15
     // Main module help for the media module.
16 16
     case 'help.page.media':
17 17
       $output = '';
18
-      $output .= '<h3>' . t('About') . '</h3>';
19
-      $output .= '<p>' . t('Media module for Drupal 8') . '</p>';
20
-      return $output;
18
+        $output .= '<h3>' . t('About') . '</h3>';
19
+        $output .= '<p>' . t('Media module for Drupal 8') . '</p>';
20
+        return $output;
21 21
 
22 22
     default:
23 23
   }
Please login to merge, or discard this patch.
src/Tests/VideoBundleTest.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -10,65 +10,65 @@  discard block
 block discarded – undo
10 10
  * @group media
11 11
  */
12 12
 class VideoBundleTest 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;
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 21
 
22
-  /**
23
-   * Modules to enable.
24
-   *
25
-   * @var array
26
-   */
27
-  public static $modules = [
22
+    /**
23
+     * Modules to enable.
24
+     *
25
+     * @var array
26
+     */
27
+    public static $modules = [
28 28
     'media',
29 29
     'media_entity',
30 30
     'video_embed_field',
31 31
     'video_embed_media',
32 32
     'node',
33
-  ];
33
+    ];
34 34
 
35
-  /**
36
-   * The test media bundle.
37
-   *
38
-   * @var \Drupal\media_entity\MediaBundleInterface
39
-   */
40
-  protected $testBundle;
35
+    /**
36
+     * The test media bundle.
37
+     *
38
+     * @var \Drupal\media_entity\MediaBundleInterface
39
+     */
40
+    protected $testBundle;
41 41
 
42
-  /**
43
-   * {@inheritdoc}
44
-   */
45
-  protected function setUp() {
42
+    /**
43
+     * {@inheritdoc}
44
+     */
45
+    protected function setUp() {
46 46
     parent::setUp();
47 47
     $this->testBundle = $this->container->get('entity.manager')->getStorage('media_bundle')->load('video');
48 48
 
49 49
     $adminUser = $this->drupalCreateUser([
50
-      'view media',
51
-      'create media',
52
-      'update media',
53
-      'update any media',
54
-      'delete media',
55
-      'delete any media',
56
-      'access media overview',
50
+        'view media',
51
+        'create media',
52
+        'update media',
53
+        'update any media',
54
+        'delete media',
55
+        'delete any media',
56
+        'access media overview',
57 57
     ]);
58 58
     $this->drupalLogin($adminUser);
59
-  }
59
+    }
60 60
 
61
-  /**
62
-   * Tests video media bundle creation from config files.
63
-   */
64
-  public function testMediaBundleCreationFromModule() {
61
+    /**
62
+     * Tests video media bundle creation from config files.
63
+     */
64
+    public function testMediaBundleCreationFromModule() {
65 65
     $type_configuration = [
66
-      'source_field' => 'field_video',
66
+        'source_field' => 'field_video',
67 67
     ];
68 68
 
69 69
     $field_map = [
70
-      'id' => 'field_id',
71
-      'source_name' => 'field_source',
70
+        'id' => 'field_id',
71
+        'source_name' => 'field_source',
72 72
     ];
73 73
 
74 74
     $this->assertTrue((bool) $this->testBundle, 'The media bundle from default configuration has been created in the database.');
@@ -77,15 +77,15 @@  discard block
 block discarded – undo
77 77
     $this->assertEqual($this->testBundle->get('type'), 'video_embed_field', 'Correct plugin ID detected.');
78 78
     $this->assertEqual($this->testBundle->get('type_configuration'), $type_configuration, 'Type configuration correct.');
79 79
     $this->assertEqual($this->testBundle->get('field_map'), $field_map, 'Correct field map detected.');
80
-  }
80
+    }
81 81
 
82
-  /**
83
-   * Tests video media bundle field maps.
84
-   */
85
-  public function testBundleFieldMap() {
82
+    /**
83
+     * Tests video media bundle field maps.
84
+     */
85
+    public function testBundleFieldMap() {
86 86
     $edit = [
87
-      'name[0][value]' => 'Drupal video!',
88
-      'field_video[0][value]' => 'https://www.youtube.com/watch?v=XgYu7-DQjDQ',
87
+        'name[0][value]' => 'Drupal video!',
88
+        'field_video[0][value]' => 'https://www.youtube.com/watch?v=XgYu7-DQjDQ',
89 89
     ];
90 90
     $this->drupalPostForm('media/add/' . $this->testBundle->id(), $edit, t('Save and publish'));
91 91
 
@@ -94,11 +94,11 @@  discard block
 block discarded – undo
94 94
     $media_id = reset($media_id);
95 95
     /** @var \Drupal\media_entity\MediaInterface $media */
96 96
     $media = $this->container->get('entity_type.manager')
97
-      ->getStorage('media')
98
-      ->loadUnchanged($media_id);
97
+        ->getStorage('media')
98
+        ->loadUnchanged($media_id);
99 99
     $properties = $media->toArray();
100 100
     $this->assertEqual($properties['field_id'][0]['value'], 'XgYu7-DQjDQ', 'Correct video ID detected.');
101 101
     $this->assertEqual($properties['field_source'][0]['value'], 'youtube', 'Correct video source detected.');
102
-  }
102
+    }
103 103
 
104 104
 }
Please login to merge, or discard this patch.
src/Tests/ImageBundleTest.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -10,61 +10,61 @@  discard block
 block discarded – undo
10 10
  * @group media
11 11
  */
12 12
 class ImageBundleTest 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;
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 21
 
22
-  /**
23
-   * Modules to enable.
24
-   *
25
-   * @var array
26
-   */
27
-  public static $modules = [
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_image',
31 31
     'image',
32 32
     'node',
33
-  ];
33
+    ];
34 34
 
35
-  /**
36
-   * The test media bundle.
37
-   *
38
-   * @var \Drupal\media_entity\MediaBundleInterface
39
-   */
40
-  protected $testBundle;
35
+    /**
36
+     * The test media bundle.
37
+     *
38
+     * @var \Drupal\media_entity\MediaBundleInterface
39
+     */
40
+    protected $testBundle;
41 41
 
42
-  /**
43
-   * {@inheritdoc}
44
-   */
45
-  protected function setUp() {
42
+    /**
43
+     * {@inheritdoc}
44
+     */
45
+    protected function setUp() {
46 46
     parent::setUp();
47 47
     $this->testBundle = $this->container->get('entity.manager')->getStorage('media_bundle')->load('image');
48 48
 
49 49
     $adminUser = $this->drupalCreateUser([
50
-      'view media',
51
-      'create media',
52
-      'update media',
53
-      'update any media',
54
-      'delete media',
55
-      'delete any media',
56
-      'access media overview',
50
+        'view media',
51
+        'create media',
52
+        'update media',
53
+        'update any media',
54
+        'delete media',
55
+        'delete any media',
56
+        'access media overview',
57 57
     ]);
58 58
     $this->drupalLogin($adminUser);
59
-  }
59
+    }
60 60
 
61
-  /**
62
-   * Tests image media bundle creation from config files.
63
-   */
64
-  public function testMediaBundleCreationFromModule() {
61
+    /**
62
+     * Tests image media bundle creation from config files.
63
+     */
64
+    public function testMediaBundleCreationFromModule() {
65 65
     $type_configuration = [
66
-      'source_field' => 'field_image',
67
-      'gather_exif' => FALSE,
66
+        'source_field' => 'field_image',
67
+        'gather_exif' => FALSE,
68 68
     ];
69 69
 
70 70
     $this->assertTrue((bool) $this->testBundle, 'The media bundle from default configuration has been created in the database.');
@@ -73,20 +73,20 @@  discard block
 block discarded – undo
73 73
     $this->assertEqual($this->testBundle->get('type'), 'image', 'Correct plugin ID detected.');
74 74
     $this->assertEqual($this->testBundle->get('type_configuration'), $type_configuration, 'Type configuration correct.');
75 75
     $this->assertEqual($this->testBundle->get('field_map'), [], 'Correct field map detected.');
76
-  }
76
+    }
77 77
 
78
-  /**
79
-   * Tests item creation and thumbnail.
80
-   */
81
-  public function testMediaBundleItemCreation() {
78
+    /**
79
+     * Tests item creation and thumbnail.
80
+     */
81
+    public function testMediaBundleItemCreation() {
82 82
     // Define the media item name.
83 83
     $name = $this->randomMachineName();
84 84
     $image_files = $this->drupalGetTestFiles('image');
85 85
     $testImage = current($image_files);
86 86
     $file_path = $this->container->get('file_system')->realpath($testImage->uri);
87 87
     $edit = [
88
-      'name[0][value]' => $name,
89
-      'files[field_image_0]' => $file_path,
88
+        'name[0][value]' => $name,
89
+        'files[field_image_0]' => $file_path,
90 90
     ];
91 91
 
92 92
     // Save the image.
@@ -105,6 +105,6 @@  discard block
 block discarded – undo
105 105
     $thumbnail = $image->thumbnail($media);
106 106
     $default_thumbnail = $image->getDefaultThumbnail();
107 107
     $this->assertNotEqual($thumbnail, $default_thumbnail, "The thumbnail generated is different from the default thumbnail.");
108
-  }
108
+    }
109 109
 
110 110
 }
Please login to merge, or discard this patch.
src/Tests/GalleryBundleTest.php 7 patches
Doc Comments   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,7 +197,4 @@
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.
Unused Use Statements   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,7 +197,4 @@
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,7 +197,4 @@
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,7 +197,4 @@
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @group media
11 11
  */
12 12
 class GalleryBundleTest extends WebTestBase {
13
-<<<<<<< HEAD
13
+<< << <<< HEAD
14 14
   /**
15 15
    * Exempt from strict schema checking.
16 16
    *
@@ -197,7 +197,4 @@  discard block
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,7 +197,4 @@
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.
Upper-Lower-Casing   +1 added lines, -4 removed lines patch added patch discarded remove patch
@@ -197,7 +197,4 @@
 block discarded – undo
197 197
     $item = $this->container->get('entity_type.manager')
198 198
       ->getStorage('media')
199 199
       ->loadUnchanged($id);
200
-    return $item;
201
-  }
202
-
203
-}
200
+    return $item
204 201
\ No newline at end of file
Please login to merge, or discard this patch.