Issue #2897889 by chaitanya17, Mile23: method/Class QueryFactory is deprecated

Author: chaitanya17

config_entity_example/src/Form/RobotFormBase.php

@@ -3,7 +3,7 @@
 namespace Drupal\config_entity_example\Form;
 
 use Drupal\Core\Entity\EntityForm;
-use Drupal\Core\Entity\Query\QueryFactory;
+use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Link;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -21,9 +21,9 @@
 class RobotFormBase extends EntityForm {
 
   /**
-   * @var \Drupal\Core\Entity\Query\QueryFactory
+   * @var \Drupal\Core\Entity\EntityStorageInterface
    */
-  protected $entityQueryFactory;
+  protected $entityStorage;
 
   /**
    * Construct the RobotFormBase.
@@ -33,11 +33,11 @@ class RobotFormBase extends EntityForm {
    * from the container. We later use this query factory to build an entity
    * query for the exists() method.
    *
-   * @param \Drupal\Core\Entity\Query\QueryFactory $query_factory
+   * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
    *   An entity query factory for the robot entity type.
    */
-  public function __construct(QueryFactory $query_factory) {
-    $this->entityQueryFactory = $query_factory;
+  public function __construct(EntityStorageInterface $entity_storage) {
+    $this->entityStorage  = $entity_storage;
   }
 
   /**
@@ -55,7 +55,7 @@ public function __construct(QueryFactory $query_factory) {
    * pass the factory to our class as a constructor parameter.
    */
   public static function create(ContainerInterface $container) {
-    return new static($container->get('entity.query'));
+    return new static($container->get('entity_type.manager')->getStorage('robot'));
   }
 
   /**
@@ -126,7 +126,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
    */
   public function exists($entity_id, array $element, FormStateInterface $form_state) {
     // Use the query factory to build a new robot entity query.
-    $query = $this->entityQueryFactory->get('robot');
+    $query = $this->entityStorage->getQuery();
 
     // Query the entity ID to see if its in use.
     $result = $query->condition('id', $element['#field_prefix'] . $entity_id)

config_entity_example/tests/src/Functional/ConfigEntityExampleTest.php

@@ -1,7 +1,9 @@
 <?php
 
 namespace Drupal\Tests\config_entity_example\Functional;
+
 use Drupal\config_entity_example\Entity\Robot;
+use Drupal\Core\Url;
 use Drupal\Tests\BrowserTestBase;
 
 /**
@@ -131,7 +133,21 @@ public function testConfigEntityExample() {
     $assert->pageTextContains($robby_label);
     $assert->pageTextContains($robby_machine_name);
 
+    // Try to re-submit the same robot, and verify that we see an error message
+    // and not a PHP error.
+    $this->drupalPostForm(
+      Url::fromRoute('entity.robot.add_form'),
+      [
+        'label' => $robby_label,
+        'id' => $robby_machine_name,
+        'floopy' => TRUE,
+      ],
+      'Create Robot'
+    );
+    $assert->pageTextContains('The machine-readable name is already in use.');
+
     // 6) Verify that required links are present on respective paths.
+    $this->drupalGet(Url::fromRoute('entity.robot.list'));
     $this->assertLinkByHref('/examples/config-entity-example/add');
     $this->assertLinkByHref('/examples/config-entity-example/manage/robby_machine_name');
     $this->assertLinkByHref('/examples/config-entity-example/manage/robby_machine_name/delete');
@@ -153,6 +169,20 @@ public function testConfigEntityExample() {
       [':path' => '/examples/config-entity-example']
     );
     $this->assertEqual(count($cancel_button), 1, 'Found cancel button linking to list page.');
+
+    // Try to submit a robot with a machine name of 'custom'. This is a reserved
+    // keyword we've disallowed in the form.
+    $this->drupalPostForm(
+      Url::fromRoute('entity.robot.add_form'),
+      [
+        'label' => 'Custom',
+        'id' => 'custom',
+        'floopy' => TRUE,
+      ],
+      'Create Robot'
+    );
+    $assert->pageTextContains('Additionally, it can not be the reserved word "custom".');
+
   }
 
   /**