drupal-media / crop

crop.module

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
  */
 use Drupal\Component\Utility\UrlHelper;
 use \Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\StreamWrapper\PublicStream;
 use Drupal\crop\Entity\Crop;
 use Drupal\image\Entity\ImageStyle;
 use \Drupal\media_entity\MediaBundleInterface;

Spacing +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
     // Get the file path without query parameter.
     $parsed_uri = UrlHelper::parse($match[3]);
     // Get the file URI using parsed schema and file path.
-    $file_uri = $match[2] . '://' . $parsed_uri['path'];
+    $file_uri = $match[2].'://'.$parsed_uri['path'];
 
     // Prevent double hashing, if there is a hash argument already, do not add
     // it again.
@@ -149,7 +149,7 @@ 
     if ($crop_type && $crop = Crop::findCrop($file_uri, $crop_type)) {
       // Found a crop for this image, append a hash of it to the URL,
       // so that browsers reload the image and CDNs and proxies can be bypassed.
-      $shortened_hash = substr(md5(implode($crop->position()) . implode($crop->anchor())), 0, 8);
+      $shortened_hash = substr(md5(implode($crop->position()).implode($crop->anchor())), 0, 8);
 
       // If the URI has a schema and that is not http, https or data, convert
       // the URI to the external URL. Otherwise the appended query argument
@@ -164,10 +164,10 @@ 
 
       // Append either with a ? or a & if there are existing query arguments.
       if (strpos($uri, '?') === FALSE) {
-        $uri .= '?h=' . $shortened_hash;
+        $uri .= '?h='.$shortened_hash;
       }
       else {
-        $uri .= '&h=' . $shortened_hash;
+        $uri .= '&h='.$shortened_hash;
       }
     }
   }

Braces +1 added lines, -2 removed lines

@@ -165,8 +165,7 @@
       // Append either with a ? or a & if there are existing query arguments.
       if (strpos($uri, '?') === FALSE) {
         $uri .= '?h=' . $shortened_hash;
-      }
-      else {
+      } else {
         $uri .= '&h=' . $shortened_hash;
       }
     }

src/Tests/CropFunctionalTest.php

Spacing +7 added lines, -7 removed lines

@@ -105,10 +105,10 @@ 
     $this->assertRaw($edit['description']);
 
     // See if crop type appears on image effect configuration form.
-    $this->drupalGet('admin/config/media/image-styles/manage/' . $this->testStyle->id() . '/add/crop_crop');
+    $this->drupalGet('admin/config/media/image-styles/manage/'.$this->testStyle->id().'/add/crop_crop');
     $option = $this->xpath("//select[@id='edit-data-crop-type']/option");
     $this->assert(strpos($option[0]->asXML(), $edit['label']) !== FALSE, 'Crop type label found on image effect page.');
-    $this->drupalPostForm('admin/config/media/image-styles/manage/' . $this->testStyle->id() . '/add/crop_crop', ['data[crop_type]' => $edit['id']], t('Add effect'));
+    $this->drupalPostForm('admin/config/media/image-styles/manage/'.$this->testStyle->id().'/add/crop_crop', ['data[crop_type]' => $edit['id']], t('Add effect'));
     $this->assertText(t('The image effect was successfully applied.'));
     $this->assertText(t('Manual crop uses @name crop type', ['@name' => $edit['label']]));
     $this->testStyle = $this->container->get('entity.manager')->getStorage('image_style')->loadUnchanged($this->testStyle->id());
@@ -122,7 +122,7 @@ 
 
     // Try to access edit form as anonymous user.
     $this->drupalLogout();
-    $this->drupalGet('admin/config/media/crop/manage/' . $edit['id']);
+    $this->drupalGet('admin/config/media/crop/manage/'.$edit['id']);
     $this->assertResponse(403);
     $this->drupalLogin($this->adminUser);
 
@@ -135,7 +135,7 @@ 
     $this->assertLink('Test image style');
     $this->clickLink(t('Delete'));
     $this->assertText(t('Are you sure you want to delete the crop type @name?', ['@name' => $edit['label']]));
-    $this->drupalPostForm('admin/config/media/crop/manage/' . $edit['id'] . '/delete', [], t('Delete'));
+    $this->drupalPostForm('admin/config/media/crop/manage/'.$edit['id'].'/delete', [], t('Delete'));
     $this->assertRaw(t('The crop type %name has been deleted.', ['%name' => $edit['label']]));
     $this->assertText(t('No crop types available.'));
   }
@@ -147,7 +147,7 @@ 
    */
   protected function doTestFileUriAlter() {
     // Get the test file.
-    file_unmanaged_copy(drupal_get_path('module', 'crop') . '/tests/files/sarajevo.png', PublicStream::basePath());
+    file_unmanaged_copy(drupal_get_path('module', 'crop').'/tests/files/sarajevo.png', PublicStream::basePath());
     $file_uri = 'public://sarajevo.png';
     $file = File::create(['uri' => $file_uri, 'status' => FILE_STATUS_PERMANENT]);
     $file->save();
@@ -169,7 +169,7 @@ 
     // Test that the hash is appended both when a URL is created and passed
     // through file_create_url() and when a URL is created, without additional
     // file_create_url() calls.
-    $shortened_hash = substr(md5(implode($crop->position()) . implode($crop->anchor())), 0, 8);
+    $shortened_hash = substr(md5(implode($crop->position()).implode($crop->anchor())), 0, 8);
 
     // Build an image style derivative for the file URI.
     $image_style_uri = $this->testStyle->buildUri($file_uri);
@@ -183,7 +183,7 @@ 
     // Update the crop to assert the hash has changed.
     $crop->setPosition('80', '80')->save();
     $old_hash = $shortened_hash;
-    $new_hash = substr(md5(implode($crop->position()) . implode($crop->anchor())), 0, 8);
+    $new_hash = substr(md5(implode($crop->position()).implode($crop->anchor())), 0, 8);
     $image_style_url = $this->testStyle->buildUrl($file_uri);
     $this->assertFalse(strpos($image_style_url, $old_hash) !== FALSE, 'The image style URL does not contain the old hash.');
     $this->assertTrue(strpos($image_style_url, $new_hash) !== FALSE, 'The image style URL contains an updated hash.');