opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.1. For more information, see https://www.drupal.org/node/2718713

Browse source
This commit is contained in:
Pantheon Automation 2016-05-04 14:35:41 -07:00 • committed by Greg Anderson
parent c0a0d5a94c
commit 9eae24d844
669 changed files with 3873 additions and 1553 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
View file

@ -317,7 +317,7 @@ class ImageItem extends FileItem {
$image = \Drupal::service('image.factory')->get($this->entity->getFileUri());
if ($image->isValid()) {
$this->width = $image->getWidth();
$this->height =$image->getHeight();
$this->height = $image->getHeight();
}
}
}
@ -366,7 +366,7 @@ class ImageItem extends FileItem {
'target_id' => $file->id(),
'alt' => $random->sentences(4),
'title' => $random->sentences(4),
'width' =>$width,
'width' => $width,
'height' => $height,
);
return $values;

1
core/modules/image/src/Tests/ImageFieldWidgetTest.php
View file

@ -29,4 +29,3 @@ class ImageFieldWidgetTest extends ImageFieldTestBase {
}
}

2
core/modules/image/src/Tests/ImageOnTranslatedEntityTest.php
View file

@ -36,7 +36,7 @@ class ImageOnTranslatedEntityTest extends ImageFieldTestBase {
$this->fieldName = strtolower($this->randomMachineName());
$this->createImageField($this->fieldName, 'basicpage', [], ['title_field' => 1]);
// Create and login user.
// Create and log in user.
$permissions = array(
'access administration pages',
'administer content translation',

4
core/modules/image/tests/src/Kernel/Migrate/d7/MigrateImageStylesTest.php
View file

@ -33,8 +33,8 @@ class MigrateImageStylesTest extends MigrateDrupal7TestBase {
*/
public function testImageStylesMigration() {
$this->assertEntity('custom_image_style_1', "Custom image style 1", ['image_scale_and_crop', 'image_desaturate'], [['width' => 55, 'height' => 55], []]);
$this->assertEntity('custom_image_style_2', "Custom image style 2", ['image_resize', 'image_rotate'], [['width' => 55, 'height' => 100], ['degrees' => 45, 'bgcolor' => '#FFFFFF', 'random' => false]]);
$this->assertEntity('custom_image_style_3', "Custom image style 3", ['image_scale', 'image_crop'], [['width' => 150, 'height' => NULL, 'upscale' => false], ['width' => 50, 'height' => 50, 'anchor' => 'left-top']]);
$this->assertEntity('custom_image_style_2', "Custom image style 2", ['image_resize', 'image_rotate'], [['width' => 55, 'height' => 100], ['degrees' => 45, 'bgcolor' => '#FFFFFF', 'random' => FALSE]]);
$this->assertEntity('custom_image_style_3', "Custom image style 3", ['image_scale', 'image_crop'], [['width' => 150, 'height' => NULL, 'upscale' => FALSE], ['width' => 50, 'height' => 50, 'anchor' => 'left-top']]);
}
/**