diff --git a/src/Plugin/Field/FieldWidget/FocalPointImageWidget.php b/src/Plugin/Field/FieldWidget/FocalPointImageWidget.php index f60014e..2d467ee 100644 --- a/src/Plugin/Field/FieldWidget/FocalPointImageWidget.php +++ b/src/Plugin/Field/FieldWidget/FocalPointImageWidget.php @@ -143,7 +143,8 @@ class FocalPointImageWidget extends ImageWidget { */ public static function validateFocalPoint($element, FormStateInterface $form_state) { if (empty($element['#value']) || (FALSE === \Drupal::service('focal_point.manager')->validateFocalPoint($element['#value']))) { - $form_state->setError($element, new TranslatableMarkup('The @title field should be in the form "leftoffset,topoffset" where offsets are in percents. Ex: 25,75.', array('@title' => $element['#title']))); + $replacements = ['@title' => strtolower($element['#title'])]; + $form_state->setError($element, new TranslatableMarkup('The @title field should be in the form "leftoffset,topoffset" where offsets are in percentages. Ex: 25,75.', $replacements)); } } diff --git a/tests/src/Unit/FieldWidgets/FocalPointFieldWidgetTest.php b/tests/src/Unit/FieldWidgets/FocalPointFieldWidgetTest.php index c9a1b94..cf30925 100644 --- a/tests/src/Unit/FieldWidgets/FocalPointFieldWidgetTest.php +++ b/tests/src/Unit/FieldWidgets/FocalPointFieldWidgetTest.php @@ -29,7 +29,6 @@ class FocalPointFieldWidgetTest extends UnitTestCase { */ protected $testFormState; - /** * {@inheritdoc} */ @@ -52,19 +51,21 @@ class FocalPointFieldWidgetTest extends UnitTestCase { '#parents' => array('field_image'), ); - // Create a FocalPointImageWidget for testing. - // Setup a mock form state object for testing. // @todo: Figure out why using prophesize for this mock causes an exception. $this->testFormState = $this->getMockBuilder('\Drupal\Core\Form\FormStateInterface')->disableOriginalConstructor()->getMock(); } /** + * Testing focal point validation. + * * @covers ::validateFocalPoint * * @dataProvider providerValidateFocalPoint */ public function testValidateFocalPoint($value, $is_valid) { + $this->testElement['#value'] = $value; + // Test that an invalid focal point value sets a form error and a valid // focal point value does not. if ($is_valid === TRUE) { @@ -83,8 +84,8 @@ class FocalPointFieldWidgetTest extends UnitTestCase { ]; // Create a focal point image widget and test the validate method. - $FocalPointImageWidget = new FocalPointImageWidget(array(), array(), $this->prophesize(FieldDefinitionInterface::class)->reveal(), array(), array(), $this->prophesize(ElementInfoManagerInterface::class)->reveal()); - $FocalPointImageWidget::validateFocalPoint($element, $this->testFormState); + $focalPointImageWidget = new FocalPointImageWidget(array(), array(), $this->prophesize(FieldDefinitionInterface::class)->reveal(), array(), array(), $this->prophesize(ElementInfoManagerInterface::class)->reveal()); + $focalPointImageWidget::validateFocalPoint($element, $this->testFormState); } /** diff --git a/tests/src/Unit/FocalPointManagerTest.php b/tests/src/Unit/FocalPointManagerTest.php index b6b89ab..8606a38 100644 --- a/tests/src/Unit/FocalPointManagerTest.php +++ b/tests/src/Unit/FocalPointManagerTest.php @@ -103,7 +103,7 @@ class FocalPointManagerTest extends FocalPointUnitTestCase { $data['basic_case_1'] = [ ['x' => 25, 'y' => 50], ['width' => 1000, 'height' => 2000], - ['x' => 250, 'y' => 1000] + ['x' => 250, 'y' => 1000], ]; $data['basic_case_2'] = [ ['x' => 50, 'y' => 25],