GH-291: Drupal 9 compatibility. Fix deprecated EntityManager.

Author: yenyasinn

modules/ui_patterns_library/tests/modules/ui_patterns_library_theme_test/ui_patterns_library_theme_test.info.yml

@@ -1,3 +1,4 @@
 name: 'UI Patterns library theme test'
 type: theme
 core: 8.x
+base theme: stable

src/Plugin/UiPatterns/Source/FieldSource.php

@@ -2,7 +2,7 @@
 
 namespace Drupal\ui_patterns\Plugin\UiPatterns\Source;
 
-use Drupal\Core\Entity\EntityManager;
+use Drupal\Core\Entity\EntityFieldManager;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\ui_patterns\Plugin\PatternSourceBase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -24,16 +24,16 @@ class FieldSource extends PatternSourceBase implements ContainerFactoryPluginInt
   /**
    * Entity manager service.
    *
-   * @var \Drupal\Core\Entity\EntityManager
+   * @var \Drupal\Core\Entity\EntityFieldManager
    */
-  protected $entityManager;
+  protected $entityFieldManager;
 
   /**
    * {@inheritdoc}
    */
-  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManager $entity_manager) {
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityFieldManager $entity_manager) {
     parent::__construct($configuration, $plugin_id, $plugin_definition);
-    $this->entityManager = $entity_manager;
+    $this->entityFieldManager = $entity_manager;
   }
 
   /**
@@ -44,7 +44,7 @@ public static function create(ContainerInterface $container, array $configuratio
       $configuration,
       $plugin_id,
       $plugin_definition,
-      $container->get('entity.manager')
+      $container->get('entity_field.manager')
     );
   }
 
@@ -53,7 +53,7 @@ public static function create(ContainerInterface $container, array $configuratio
    */
   public function getSourceFields() {
     $sources = [];
-    $fields = $this->entityManager->getFieldDefinitions($this->getContextProperty('entity_type'), $this->getContextProperty('entity_bundle'));
+    $fields = $this->entityFieldManager->getFieldDefinitions($this->getContextProperty('entity_type'), $this->getContextProperty('entity_bundle'));
 
     /** @var \Drupal\Core\Field\FieldDefinitionInterface $field */
     foreach ($fields as $field) {

ui_patterns.info.yml

@@ -2,6 +2,7 @@ name: UI Patterns
 type: module
 description: UI patterns
 core: 8.x
+core_version_requirement: ^8 || ^9
 package: User interface
 dependencies:
   - drupal:system (>=8.3.0)