Commit 611c880c authored by bojanz's avatar bojanz Committed by bojanz

Issue #3093193 by bojanz, strozx: Require Drupal 8.8

parent e5b4e014
......@@ -2,7 +2,7 @@ name: Address
type: module
description: 'Provides functionality for handling postal addresses.'
package: Field types
core_version_requirement: ^8.7.7 || ^9
core_version_requirement: ^8.8.0 || ^9
config: entity.address_format.collection
dependencies:
- drupal:field
......@@ -5,7 +5,7 @@
"homepage": "http://drupal.org/project/address",
"license": "GPL-2.0+",
"require": {
"drupal/core": "^8.7.7 || ^9",
"drupal/core": "^8.8.0 || ^9",
"commerceguys/addressing": "^1.0.7"
},
"require-dev": {
......
......@@ -17,17 +17,9 @@ use Drupal\Core\Field\FieldItemListInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Render\Element;
use Drupal\Core\Security\TrustedCallbackInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
// @codingStandardsIgnoreStart
// @todo remove this BC layer once support for Drupal 8.7 is sunsetted
if (interface_exists('\Drupal\Core\Security\TrustedCallbackInterface')) {
interface TrustedCallbackInterface extends \Drupal\Core\Security\TrustedCallbackInterface {}
}
else {
interface TrustedCallbackInterface {}
}
// @codingStandardsIgnoreStop
/**
* Plugin implementation of the 'address_default' formatter.
*
......
......@@ -9,11 +9,6 @@ use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
// @todo Remove this when 8.7.x is EOL.
// @see https://www.drupal.org/project/address/issues/3093193
if (!trait_exists('\Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait')) {
class_alias('\Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait', '\Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait');
}
use Drupal\Tests\token\Kernel\KernelTestBase;
/**
......
......@@ -81,14 +81,7 @@ abstract class FormatterTestBase extends KernelTestBase {
]);
$field->save();
// @todo Technical debt. Thanks Core! Remove when 8.7.x is EOL.
// @see https://www.drupal.org/project/drupal/issues/3093130
if (is_callable(['\Drupal\Core\Entity\EntityDisplayRepository', 'getViewDisplay'])) {
$this->display = \Drupal::service('entity_display.repository')->getViewDisplay('entity_test', 'entity_test', 'default');
}
else {
$this->display = entity_get_display('entity_test', 'entity_test', 'default');
}
$this->display = \Drupal::service('entity_display.repository')->getViewDisplay('entity_test', 'entity_test', 'default');
$this->display->setComponent($this->fieldName, [
'type' => $formatter_id,
'settings' => [],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment