reverted:
--- b/entity_clone.info.yml
+++ a/entity_clone.info.yml
@@ -2,4 +2,3 @@
 description: Add a clone action for all entities
 core:  "8.x"
 type: module
-configure: entity_clone.settings
diff -u b/entity_clone.module b/entity_clone.module
--- b/entity_clone.module
+++ b/entity_clone.module
@@ -9,6 +9,15 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Routing\RouteMatchInterface;
 use Drupal\Core\Config\Entity\ConfigEntityTypeInterface;
+use Drupal\entity_clone\EntityClone\Config\ConfigEntityCloneBase;
+use Drupal\entity_clone\EntityClone\Config\ConfigEntityCloneFormBase;
+use Drupal\entity_clone\EntityClone\Config\ConfigWithFieldEntityClone;
+use Drupal\entity_clone\EntityClone\Config\FieldConfigEntityClone;
+use Drupal\entity_clone\EntityClone\Content\ContentEntityCloneBase;
+use Drupal\entity_clone\EntityClone\Content\ContentEntityCloneFormBase;
+use Drupal\entity_clone\EntityClone\Content\FileEntityClone;
+use Drupal\entity_clone\EntityClone\Content\TaxonomyTermEntityClone;
+use Drupal\entity_clone\EntityClone\Content\UserEntityClone;
 
 /**
  * Implements hook_help().
@@ -32,44 +41,38 @@
  * Implements hook_entity_type_build().
  */
 function entity_clone_entity_type_build(array &$entity_types) {
-  $root_namespace = '\Drupal\entity_clone\EntityClone';
-  $content_namespace = $root_namespace . '\Content';
-  $config_namespace = $root_namespace . '\Config';
-  $content_form_class_path = $content_namespace . '\ContentEntityCloneFormBase';
-  $config_form_class_path = $config_namespace . '\ConfigEntityCloneFormBase';
-
   $specific_handler = [
     'file' => [
-      'entity_clone' => $content_namespace . '\FileEntityClone',
-      'entity_clone_form' => $content_form_class_path,
+      'entity_clone' => FileEntityClone::class,
+      'entity_clone_form' => ContentEntityCloneFormBase::class,
     ],
     'user' => [
-      'entity_clone' => $content_namespace . '\UserEntityClone',
-      'entity_clone_form' => $content_form_class_path,
-    ],
-    'taxonomy_term' => [
-      'entity_clone' => $content_namespace . '\TaxonomyTermEntityClone',
-      'entity_clone_form' => $content_form_class_path,
+      'entity_clone' => UserEntityClone::class,
+      'entity_clone_form' => ContentEntityCloneFormBase::class,
     ],
     'field_config' => [
-      'entity_clone' => $config_namespace . '\FieldConfigEntityClone',
-      'entity_clone_form' => $config_form_class_path,
+      'entity_clone' => FieldConfigEntityClone::class,
+      'entity_clone_form' => ConfigEntityCloneFormBase::class,
     ],
     'node_type' => [
-      'entity_clone' => $config_namespace . '\ConfigWithFieldEntityClone',
-      'entity_clone_form' => $config_form_class_path,
+      'entity_clone' => ConfigWithFieldEntityClone::class,
+      'entity_clone_form' => ConfigEntityCloneFormBase::class,
     ],
     'comment_type' => [
-      'entity_clone' => $config_namespace . '\ConfigWithFieldEntityClone',
-      'entity_clone_form' => $config_form_class_path,
+      'entity_clone' => ConfigWithFieldEntityClone::class,
+      'entity_clone_form' => ConfigEntityCloneFormBase::class,
     ],
     'block_content_type' => [
-      'entity_clone' => $config_namespace . '\ConfigWithFieldEntityClone',
-      'entity_clone_form' => $config_form_class_path,
+      'entity_clone' => ConfigWithFieldEntityClone::class,
+      'entity_clone_form' => ConfigEntityCloneFormBase::class,
     ],
     'contact_form' => [
-      'entity_clone' => $config_namespace . '\ConfigWithFieldEntityClone',
-      'entity_clone_form' => $config_form_class_path,
+      'entity_clone' => ConfigWithFieldEntityClone::class,
+      'entity_clone_form' => ConfigEntityCloneFormBase::class,
+    ],
+    'taxonomy_term' => [
+      'entity_clone' => TaxonomyTermEntityClone::class,
+      'entity_clone_form' => ContentEntityCloneFormBase::class,
     ],
   ];
 
@@ -82,12 +85,12 @@
       }
     }
     elseif (!$entity_type->getHandlerClass('entity_clone') && $entity_type instanceof ContentEntityTypeInterface) {
-      $entity_type->setHandlerClass('entity_clone', $content_form_class_path);
-      $entity_type->setHandlerClass('entity_clone_form', $content_form_class_path);
+      $entity_type->setHandlerClass('entity_clone', ContentEntityCloneBase::class);
+      $entity_type->setHandlerClass('entity_clone_form', ContentEntityCloneFormBase::class);
     }
     elseif (!$entity_type->getHandlerClass('entity_clone') && $entity_type instanceof ConfigEntityTypeInterface) {
-      $entity_type->setHandlerClass('entity_clone', $config_form_class_path);
-      $entity_type->setHandlerClass('entity_clone_form', $config_form_class_path);
+      $entity_type->setHandlerClass('entity_clone', ConfigEntityCloneBase::class);
+      $entity_type->setHandlerClass('entity_clone_form', ConfigEntityCloneFormBase::class);
     }
   }
 }
diff -u b/src/EntityClone/Content/ContentEntityCloneBase.php b/src/EntityClone/Content/ContentEntityCloneBase.php
--- b/src/EntityClone/Content/ContentEntityCloneBase.php
+++ b/src/EntityClone/Content/ContentEntityCloneBase.php
@@ -57,8 +57,9 @@
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, $properties = []) {
-    if ($cloned_entity instanceof FieldableEntityInterface) {
+  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, array $properties = []) {
+    // Clone referenced entities.
+    if ($cloned_entity instanceof FieldableEntityInterface && $entity instanceof FieldableEntityInterface) {
       foreach ($cloned_entity->getFieldDefinitions() as $field_id => $field_definition) {
         if ($field_definition instanceof FieldConfigInterface && in_array($field_definition->getType(), [
           'entity_reference',
@@ -67,94 +68,67 @@
           $field = $entity->get($field_id);
           /** @var \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $value */
           if ($field->count() > 0) {
-            $cloned_entity->set($field_id, $this->getNewValues($field, $field_definition, $properties));
+            $cloned_entity->set($field_id, $this->cloneReferencedEntities($field, $field_definition, $properties));
           }
         }
       }
     }
 
-    if ($label_key = $this->entityTypeManager->getDefinition($this->entityTypeId)->getKey('label')) {
+    if ($label_key = $this->entityTypeManager
+      ->getDefinition($this->entityTypeId)
+      ->getKey('label')
+    ) {
       $cloned_entity->set($label_key, $entity->label() . ' - Cloned');
     }
 
     $cloned_entity->save();
+
     return $cloned_entity;
   }
 
   /**
-   * Fetches new values for the clone operation.
+   * Clone referenced entities.
    *
    * @param \Drupal\Core\Field\FieldItemListInterface $field
-   *   The field.
-   * @param Drupal\Core\Field\FieldConfigInterface $field_definition
+   *   The field item.
+   * @param \Drupal\Core\Field\FieldConfigInterface $field_definition
    *   The field definition.
    * @param array $properties
    *   All new properties to replace old.
    *
    * @return array
-   *   The list of new values.
+   *   Referenced entities.
    */
-  protected function getNewValues(FieldItemListInterface $field, FieldConfigInterface $field_definition, array $properties) {
-    $new_values = [];
-
+  protected function cloneReferencedEntities(FieldItemListInterface $field, FieldConfigInterface $field_definition, array $properties) {
+    $referenced_entities = [];
     foreach ($field as $value) {
       /** @var \Drupal\Core\Entity\ContentEntityInterface $referenced_entity */
       $referenced_entity = $value->get('entity')->getTarget()->getValue();
       if (isset($properties['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['clone'])
         && $properties['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['clone'] === 1) {
-
         $cloned_reference = $referenced_entity->createDuplicate();
         /** @var \Drupal\entity_clone\EntityClone\EntityCloneInterface $entity_clone_handler */
         $entity_clone_handler = $this->entityTypeManager->getHandler($referenced_entity->getEntityTypeId(), 'entity_clone');
-        $child_properties = $this->getChildProperties($field_definition, $properties, $referenced_entity);
-        $entity_clone_handler->cloneEntity($referenced_entity, $cloned_reference, $child_properties);
-        $new_values[] = $this->getTargetIds($cloned_reference->id(), $cloned_reference->getRevisionId());
+
+        $children_properties = [];
+        if (isset($properties['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['children'])) {
+          $children_properties = $properties['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['children'];
+        }
+        $entity_clone_handler->cloneEntity($referenced_entity, $cloned_reference, $children_properties);
+
+        $referenced_entities[] = [
+          'target_id' => $cloned_reference->id(),
+          'target_revision_id' => $cloned_reference->getRevisionId(),
+        ];
       }
       else {
-        $new_values[] = $this->getTargetIds($referenced_entity->id(), $referenced_entity->getRevisionId());
+        $referenced_entities[] = [
+          'target_id' => $referenced_entity->id(),
+          'target_revision_id' => $referenced_entity->getRevisionId(),
+        ];
       }
     }
-
-    return $new_values;
-  }
-
-  /**
-   * Fetches the child properties.
-   *
-   * @param Drupal\Core\Field\FieldConfigInterface $field_definition
-   *   The field definition.
-   * @param array $properties
-   *   All new properties to replace old.
-   * @param \Drupal\Core\Entity\EntityInterface $referenced_entity
-   *   The entity.
-   *
-   * @return array
-   *   The child properties.
-   */
-  protected function getChildProperties(FieldConfigInterface $field_definition, array $properties, EntityInterface $referenced_entity) {
-    $child_properties = [];
-    if (isset($properties['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['children'])) {
-      $child_properties = $properties['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['children'];
-    }
-    return $child_properties;
-  }
-
-  /**
-   * Fetches the list of target IDs.
-   *
-   * @param int $target_id
-   *   The target ID.
-   * @param int $target_revision_id
-   *   The target revision ID.
-   *
-   * @return array
-   *   The list of target IDs.
-   */
-  protected function getTargetIds($target_id, $target_revision_id) {
-    return [
-      'target_id' => $target_id,
-      'target_revision_id' => $target_revision_id,
-    ];
+    return $referenced_entities;
   }
 
 }
diff -u b/src/EntityClone/Content/ContentEntityCloneFormBase.php b/src/EntityClone/Content/ContentEntityCloneFormBase.php
--- b/src/EntityClone/Content/ContentEntityCloneFormBase.php
+++ b/src/EntityClone/Content/ContentEntityCloneFormBase.php
@@ -9,6 +9,7 @@
 use Drupal\Core\Entity\EntityTypeManager;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Field\FieldConfigInterface;
+use Drupal\Core\Field\FieldItemListInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\StringTranslation\TranslationManager;
@@ -83,48 +84,7 @@
           $field = $entity->get($field_id);
           /** @var \Drupal\Core\Field\Plugin\Field\FieldType\EntityReferenceItem $value */
           if ($field->count() > 0) {
-
-            $form['recursive']['#tree'] = TRUE;
-
-            $form['recursive'][$field_definition->id()] = [
-              '#type' => 'fieldset',
-              '#title' => $this->t('Entities referenced by field <em>@label (@field_id)</em>.', [
-                '@label' => $field_definition->label(),
-                '@field_id' => $field_id,
-              ]),
-              '#access' => !$this->entityCloneSettingsManager->getHiddenValue($field_definition->getFieldStorageDefinition()->getSetting('target_type')),
-            ];
-
-            foreach ($field as $value) {
-              /** @var \Drupal\Core\Entity\ContentEntityInterface $referenced_entity */
-              $referenced_entity = $value->get('entity')->getTarget()->getValue();
-
-              $form['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['clone'] = [
-                '#type' => 'checkbox',
-                '#title' => $this->t('Clone entity <strong>ID:</strong> <em>@entity_id</em>, <strong>Type:</strong> <em>@entity_type - @bundle</em>, <strong>Label:</strong> <em>@entity_label</em>', [
-                  '@entity_id' => $referenced_entity->id(),
-                  '@entity_type' => $referenced_entity->getEntityTypeId(),
-                  '@bundle' => $referenced_entity->bundle(),
-                  '@entity_label' => $referenced_entity->label(),
-                ]),
-                '#default_value' => $this->entityCloneSettingsManager->getDefaultValue($referenced_entity->getEntityTypeId()),
-                '#attributes' => [
-                  'disabled' => $this->entityCloneSettingsManager->getDisableValue($referenced_entity->getEntityTypeId()),
-                ],
-              ];
-
-              $form['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['target_entity_type_id'] = [
-                '#type' => 'hidden',
-                '#value' => $referenced_entity->getEntityTypeId(),
-              ];
-
-              $form['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['target_bundle'] = [
-                '#type' => 'hidden',
-                '#value' => $referenced_entity->bundle(),
-              ];
-
-              $form['recursive'][$field_definition->id()]['references'][$referenced_entity->id()]['children'] = $this->getChildren($referenced_entity);
-            }
+            $form['recursive'] = $this->getRecursiveFormElement($field_definition, $field_id, $field);
           }
         }
       }
@@ -134,6 +94,67 @@
   }
 
   /**
+   * Get the recursive form element.
+   *
+   * @param \Drupal\Core\Field\FieldConfigInterface $field_definition
+   *   The field definition.
+   * @param string $field_id
+   *   The field ID.
+   * @param \Drupal\Core\Field\FieldItemListInterface $field
+   *   The field item.
+   *
+   * @return array
+   *   The form element for a recursive clone.
+   */
+  protected function getRecursiveFormElement(FieldConfigInterface $field_definition, $field_id, FieldItemListInterface $field) {
+    $form_element = [
+      '#tree' => TRUE,
+    ];
+
+    $form_element[$field_definition->id()] = [
+      '#type' => 'fieldset',
+      '#title' => $this->t('Entities referenced by field <em>@label (@field_id)</em>.', [
+        '@label' => $field_definition->label(),
+        '@field_id' => $field_id,
+      ]),
+      '#access' => !$this->entityCloneSettingsManager->getHiddenValue($field_definition->getFieldStorageDefinition()->getSetting('target_type')),
+    ];
+
+    foreach ($field as $value) {
+      /** @var \Drupal\Core\Entity\ContentEntityInterface $referenced_entity */
+      $referenced_entity = $value->get('entity')->getTarget()->getValue();
+
+      $form_element[$field_definition->id()]['references'][$referenced_entity->id()]['clone'] = [
+        '#type' => 'checkbox',
+        '#title' => $this->t('Clone entity <strong>ID:</strong> <em>@entity_id</em>, <strong>Type:</strong> <em>@entity_type - @bundle</em>, <strong>Label:</strong> <em>@entity_label</em>', [
+          '@entity_id' => $referenced_entity->id(),
+          '@entity_type' => $referenced_entity->getEntityTypeId(),
+          '@bundle' => $referenced_entity->bundle(),
+          '@entity_label' => $referenced_entity->label(),
+        ]),
+        '#default_value' => $this->entityCloneSettingsManager->getDefaultValue($referenced_entity->getEntityTypeId()),
+        '#attributes' => [
+          'disabled' => $this->entityCloneSettingsManager->getDisableValue($referenced_entity->getEntityTypeId()),
+        ],
+      ];
+
+      $form_element[$field_definition->id()]['references'][$referenced_entity->id()]['target_entity_type_id'] = [
+        '#type' => 'hidden',
+        '#value' => $referenced_entity->getEntityTypeId(),
+      ];
+
+      $form_element[$field_definition->id()]['references'][$referenced_entity->id()]['target_bundle'] = [
+        '#type' => 'hidden',
+        '#value' => $referenced_entity->bundle(),
+      ];
+
+      $form_element[$field_definition->id()]['references'][$referenced_entity->id()]['children'] = $this->getChildren($referenced_entity);
+    }
+
+    return $form_element;
+  }
+
+  /**
    * Fetches clonable children from a field.
    *
    * @param \Drupal\Core\Entity\ContentEntityInterface $referenced_entity
diff -u b/src/EntityClone/Content/TaxonomyTermEntityClone.php b/src/EntityClone/Content/TaxonomyTermEntityClone.php
--- b/src/EntityClone/Content/TaxonomyTermEntityClone.php
+++ b/src/EntityClone/Content/TaxonomyTermEntityClone.php
@@ -12,7 +12,7 @@
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, $properties = []) {
+  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, array $properties = []) {
     /** @var \Drupal\core\Entity\ContentEntityInterface $cloned_entity */
 
     // Enforce a parent if the cloned term doesn't have a parent.
diff -u b/src/EntityCloneSettingsManager.php b/src/EntityCloneSettingsManager.php
--- b/src/EntityCloneSettingsManager.php
+++ b/src/EntityCloneSettingsManager.php
@@ -61,9 +61,9 @@
    * Get all content entity types.
    *
    * @return \Drupal\Core\Entity\ContentEntityTypeInterface[]
-   *   The content entity types.
+   *   An array containing all content entity types.
    */
-  public function getContentEntityTypes() {
+  public function getContentEntityTypes($allowed_only = FALSE) {
     $definitions = $this->entityTypeManager->getDefinitions();
     $ret = [];
     foreach ($definitions as $machine => $type) {
@@ -79,7 +79,7 @@
    * Set the entity clone settings.
    *
    * @param array $settings
-   *   The settings.
+   *   The settings from the form.
    */
   public function setFormSettings(array $settings) {
     if (isset($settings['table'])) {
@@ -98,11 +98,11 @@
   /**
    * Get the checkbox default value for a given entity type.
    *
-   * @param int $entity_type_id
+   * @param string $entity_type_id
    *   The entity type ID.
    *
-   * @return mixed|false
-   *   The default value or FALSE if there isn't one.
+   * @return bool
+   *   The default value.
    */
   public function getDefaultValue($entity_type_id) {
     $form_settings = $this->config->get('form_settings');
@@ -115,11 +115,11 @@
   /**
    * Get the checkbox disable value for a given entity type.
    *
-   * @param int $entity_type_id
+   * @param string $entity_type_id
    *   The entity type ID.
    *
-   * @return mixed|false
-   *   The disable value or FALSE if there isn't one.
+   * @return bool
+   *   The disable value.
    */
   public function getDisableValue($entity_type_id) {
     $form_settings = $this->config->get('form_settings');
@@ -132,11 +132,11 @@
   /**
    * Get the checkbox hidden value for a given entity type.
    *
-   * @param int $entity_type_id
+   * @param string $entity_type_id
    *   The entity type ID.
    *
    * @return bool
-   *   The hidden value or FALSE if there isn't one.
+   *   The hidden value.
    */
   public function getHiddenValue($entity_type_id) {
     $form_settings = $this->config->get('form_settings');
diff -u b/src/Form/EntityCloneSettingsForm.php b/src/Form/EntityCloneSettingsForm.php
--- b/src/Form/EntityCloneSettingsForm.php
+++ b/src/Form/EntityCloneSettingsForm.php
@@ -15,7 +15,7 @@
 class EntityCloneSettingsForm extends ConfigFormBase implements ContainerInjectionInterface {
 
   /**
-   * The settings manager.
+   * The entity clone settings manager.
    *
    * @var \Drupal\entity_clone\EntityCloneSettingsManager
    */
diff -u b/src/Tests/EntityCloneContentRecursiveTest.php b/src/Tests/EntityCloneContentRecursiveTest.php
--- b/src/Tests/EntityCloneContentRecursiveTest.php
+++ b/src/Tests/EntityCloneContentRecursiveTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneContentTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\node\Entity\Node;
@@ -26,7 +21,7 @@
   public static $modules = ['entity_clone', 'block', 'node', 'datetime'];
 
   /**
-   * Profile to install
+   * Profile to install.
    *
    * @var string
    */
@@ -40,7 +35,7 @@
   protected $permissions = [
     'bypass node access',
     'administer nodes',
-    'clone node entity'
+    'clone node entity',
   ];
 
   /**
@@ -60,6 +55,9 @@
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a content entity with another entities attached.
+   */
   public function testContentEntityClone() {
 
     $term_title = $this->randomMachineName(8);
@@ -75,12 +73,12 @@
       'title' => $node_title,
       'field_tags' => [
         'target_id' => $term->id(),
-      ]
+      ],
     ]);
     $node->save();
 
     $this->drupalPostForm('entity_clone/node/' . $node->id(), [
-      'recursive[node.article.field_tags][references][' . $term->id() . '][clone]' => 1
+      'recursive[node.article.field_tags][references][' . $term->id() . '][clone]' => 1,
     ], t('Clone'));
 
     $nodes = \Drupal::entityTypeManager()
only in patch2:
unchanged:
--- a/src/EntityClone/Config/ConfigEntityCloneBase.php
+++ b/src/EntityClone/Config/ConfigEntityCloneBase.php
@@ -54,7 +54,7 @@ class ConfigEntityCloneBase implements EntityHandlerInterface, EntityCloneInterf
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, $properties = []) {
+  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, array $properties = []) {
     /** @var \Drupal\core\Config\Entity\ConfigEntityInterface $cloned_entity */
     $id_key = $this->entityTypeManager->getDefinition($this->entityTypeId)->getKey('id');
     $label_key = $this->entityTypeManager->getDefinition($this->entityTypeId)->getKey('label');
only in patch2:
unchanged:
--- a/src/EntityClone/Config/ConfigWithFieldEntityClone.php
+++ b/src/EntityClone/Config/ConfigWithFieldEntityClone.php
@@ -13,7 +13,7 @@ class ConfigWithFieldEntityClone extends ConfigEntityCloneBase {
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, $properties = []) {
+  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, array $properties = []) {
     $cloned_entity = parent::cloneEntity($entity, $cloned_entity, $properties);
     $bundle_of = $cloned_entity->getEntityType()->getBundleOf();
     if ($bundle_of) {
@@ -40,16 +40,16 @@ class ConfigWithFieldEntityClone extends ConfigEntityCloneBase {
    *
    * @param string $entity_id
    *   The base entity ID.
-   * @param $cloned_entity_id
+   * @param string $cloned_entity_id
    *   The cloned entity ID.
-   * @param $bundle_of
+   * @param string $bundle_of
    *   The bundle of the cloned entity.
    */
   protected function cloneFields($entity_id, $cloned_entity_id, $bundle_of) {
     /** @var \Drupal\Core\Entity\EntityFieldManager $field_manager */
     $field_manager = \Drupal::service('entity_field.manager');
     $fields = $field_manager->getFieldDefinitions($bundle_of, $entity_id);
-    foreach ($fields as $field_id => $field_definition) {
+    foreach ($fields as $field_definition) {
       if ($field_definition instanceof FieldConfigInterface) {
         if ($this->entityTypeManager->hasHandler($this->entityTypeManager->getDefinition($field_definition->getEntityTypeId())
           ->id(), 'entity_clone')
@@ -77,14 +77,14 @@ class ConfigWithFieldEntityClone extends ConfigEntityCloneBase {
    *   The type of display (view or form).
    * @param string $entity_id
    *   The base entity ID.
-   * @param $cloned_entity_id
+   * @param string $cloned_entity_id
    *   The cloned entity ID.
    * @param array $view_displays
    *   All view available display for this type.
-   * @param $bundle_of
+   * @param string $bundle_of
    *   The bundle of the cloned entity.
    */
-  protected function cloneDisplays($type, $entity_id, $cloned_entity_id, $view_displays, $bundle_of) {
+  protected function cloneDisplays($type, $entity_id, $cloned_entity_id, array $view_displays, $bundle_of) {
     foreach ($view_displays as $view_display_id => $view_display) {
       /** @var \Drupal\Core\Entity\Display\EntityDisplayInterface $display */
       $display = $this->entityTypeManager->getStorage('entity_' . $type . '_display')->load($bundle_of . '.' . $entity_id . '.' . $view_display_id);
only in patch2:
unchanged:
--- a/src/EntityClone/Config/FieldConfigEntityClone.php
+++ b/src/EntityClone/Config/FieldConfigEntityClone.php
@@ -12,7 +12,7 @@ class FieldConfigEntityClone extends ConfigEntityCloneBase {
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $field_config, EntityInterface $cloned_field_config, $properties = []) {
+  public function cloneEntity(EntityInterface $field_config, EntityInterface $cloned_field_config, array $properties = []) {
     /** @var \Drupal\field\Entity\FieldConfig $field_config */
     /** @var \Drupal\field\Entity\FieldConfig $cloned_field_config */
     /** @var \Drupal\field\Entity\FieldStorageConfig $cloned_field_storage */
only in patch2:
unchanged:
--- a/src/EntityClone/Content/FileEntityClone.php
+++ b/src/EntityClone/Content/FileEntityClone.php
@@ -12,7 +12,7 @@ class FileEntityClone extends ContentEntityCloneBase {
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, $properties = []) {
+  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, array $properties = []) {
     /** @var \Drupal\file\FileInterface $cloned_entity */
     $cloned_file = file_copy($cloned_entity, $cloned_entity->getFileUri(), FILE_EXISTS_RENAME);
     return parent::cloneEntity($entity, $cloned_file, $properties);
only in patch2:
unchanged:
--- a/src/EntityClone/Content/UserEntityClone.php
+++ b/src/EntityClone/Content/UserEntityClone.php
@@ -12,7 +12,7 @@ class UserEntityClone extends ContentEntityCloneBase {
   /**
    * {@inheritdoc}
    */
-  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, $properties = []) {
+  public function cloneEntity(EntityInterface $entity, EntityInterface $cloned_entity, array $properties = []) {
     /** @var \Drupal\user\UserInterface $cloned_entity */
     $cloned_entity->set('name', $cloned_entity->getAccountName() . '_cloned');
     return parent::cloneEntity($entity, $cloned_entity, $properties);
only in patch2:
unchanged:
--- a/src/EntityClonePermissions.php
+++ b/src/EntityClonePermissions.php
@@ -26,7 +26,6 @@ class EntityClonePermissions implements ContainerInjectionInterface {
    */
   protected $translationManager;
 
-
   /**
    * Constructs a new EntityClonePermissions instance.
    *
only in patch2:
unchanged:
--- a/src/Plugin/Derivative/DynamicLocalTasks.php
+++ b/src/Plugin/Derivative/DynamicLocalTasks.php
@@ -62,12 +62,12 @@ class DynamicLocalTasks extends DeriverBase implements ContainerDeriverInterface
       $has_canonical_path = $entity_type->hasLinkTemplate('canonical');
 
       if ($has_clone_path) {
-        $this->derivatives["$entity_type_id.clone_tab"] = array(
+        $this->derivatives["$entity_type_id.clone_tab"] = [
           'route_name' => "entity.$entity_type_id.clone_form",
           'title' => $this->translationManager->translate('Clone'),
           'base_route' => "entity.$entity_type_id." . ($has_canonical_path ? "canonical" : "edit_form"),
           'weight' => 100,
-        );
+        ];
       }
     }
 
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneActionTest.php
+++ b/src/Tests/EntityCloneActionTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneActionTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\Component\Utility\Crypt;
@@ -31,11 +26,13 @@ class EntityCloneActionTest extends WebTestBase {
    */
   protected $permissions = [
     'administer actions',
-    'clone action entity'
+    'clone action entity',
   ];
 
   /**
-   * An administrative user with permission to configure actions settings.
+   * An administrative user.
+   *
+   * With permission to configure actions settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -51,6 +48,9 @@ class EntityCloneActionTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone an action entity.
+   */
   public function testActionEntityClone() {
     foreach (\Drupal::service('plugin.manager.action')->getDefinitions() as $id => $definition) {
       if (is_subclass_of($definition['class'], '\Drupal\Core\Plugin\PluginFormInterface') && $definition['label'] == 'Send email') {
@@ -91,4 +91,3 @@ class EntityCloneActionTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneBlockTest.php
+++ b/src/Tests/EntityCloneBlockTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneBlockTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\block\Entity\Block;
@@ -31,11 +26,13 @@ class EntityCloneBlockTest extends WebTestBase {
    */
   protected $permissions = [
     'administer blocks',
-    'clone block entity'
+    'clone block entity',
   ];
 
   /**
-   * An administrative user with permission to configure blocks settings.
+   * An administrative user.
+   *
+   * With permission to configure blocks settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -51,6 +48,9 @@ class EntityCloneBlockTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a block entity.
+   */
   public function testBlockEntityClone() {
     $config = \Drupal::configFactory();
     $block = Block::create([
@@ -79,4 +79,3 @@ class EntityCloneBlockTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneCommentTest.php
+++ b/src/Tests/EntityCloneCommentTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneCommentTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\comment\Tests\CommentTestBase;
@@ -24,7 +19,15 @@ class EntityCloneCommentTest extends CommentTestBase {
    *
    * @var array
    */
-  public static $modules = ['entity_clone', 'block', 'comment', 'node', 'history', 'field_ui', 'datetime'];
+  public static $modules = [
+    'entity_clone',
+    'block',
+    'comment',
+    'node',
+    'history',
+    'field_ui',
+    'datetime',
+  ];
 
   /**
    * Permissions to grant admin user.
@@ -42,7 +45,7 @@ class EntityCloneCommentTest extends CommentTestBase {
     'access comments',
     'access user profiles',
     'access content',
-    'clone comment entity'
+    'clone comment entity',
   ];
 
   /**
@@ -55,6 +58,9 @@ class EntityCloneCommentTest extends CommentTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a comment entity.
+   */
   public function testCommentEntityClone() {
     $subject = 'Test comment for clone';
     $body = $this->randomMachineName();
@@ -72,4 +78,4 @@ class EntityCloneCommentTest extends CommentTestBase {
     $this->assertTrue($comments, 'Test comment cloned found in database.');
   }
 
-}
\ No newline at end of file
+}
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneContentTest.php
+++ b/src/Tests/EntityCloneContentTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneContentTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\node\Entity\Node;
@@ -32,7 +27,7 @@ class EntityCloneContentTest extends NodeTestBase {
   protected $permissions = [
     'bypass node access',
     'administer nodes',
-    'clone node entity'
+    'clone node entity',
   ];
 
   /**
@@ -52,6 +47,9 @@ class EntityCloneContentTest extends NodeTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a content entity.
+   */
   public function testContentEntityClone() {
     $node_title = $this->randomMachineName(8);
     $node = Node::create([
@@ -71,4 +69,4 @@ class EntityCloneContentTest extends NodeTestBase {
     $this->assertTrue($node, 'Test node cloned found in database.');
   }
 
-}
\ No newline at end of file
+}
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneCustomBlockTest.php
+++ b/src/Tests/EntityCloneCustomBlockTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneCustomBlockTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\block_content\Tests\BlockContentTestBase;
@@ -41,9 +36,12 @@ class EntityCloneCustomBlockTest extends BlockContentTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a custom block entity.
+   */
   public function testCustomBlockEntityClone() {
 
-    $edit = array();
+    $edit = [];
     $edit['info[0][value]'] = 'Test block ready to clone';
     $edit['body[0][value]'] = $this->randomMachineName(16);
     $this->drupalPostForm('block/add/basic', $edit, t('Save'));
@@ -68,4 +66,4 @@ class EntityCloneCustomBlockTest extends BlockContentTestBase {
     $this->assertTrue($block, 'Test Block cloned found in database.');
   }
 
-}
\ No newline at end of file
+}
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneDateFormatTest.php
+++ b/src/Tests/EntityCloneDateFormatTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneDateFormatTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneDateFormatTest extends WebTestBase {
    */
   protected $permissions = [
     'clone date_format entity',
-    'administer site configuration'
+    'administer site configuration',
   ];
 
   /**
-   * An administrative user with permission to configure date formats settings.
+   * An administrative user.
+   *
+   * With permission to configure date formats settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneDateFormatTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a date format entity.
+   */
   public function testDateFormatEntityClone() {
     $edit = [
       'label' => 'Test date format for clone',
@@ -81,4 +81,3 @@ class EntityCloneDateFormatTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneEntityFormModeTest.php
+++ b/src/Tests/EntityCloneEntityFormModeTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneEntityFormModeTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -29,11 +24,13 @@ class EntityCloneEntityFormModeTest extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'clone entity_form_mode entity'
+    'clone entity_form_mode entity',
   ];
 
   /**
-   * An administrative user with permission to configure entity form modes settings.
+   * An administrative user.
+   *
+   * With permission to configure entity form modes settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -49,6 +46,9 @@ class EntityCloneEntityFormModeTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a form mode entity.
+   */
   public function testEntityFormModeEntityClone() {
     $entity_form_modes = \Drupal::entityTypeManager()
       ->getStorage('entity_form_mode')
@@ -73,4 +73,3 @@ class EntityCloneEntityFormModeTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneEntityViewModeTest.php
+++ b/src/Tests/EntityCloneEntityViewModeTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneEntityViewModeTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -29,11 +24,13 @@ class EntityCloneEntityViewModeTest extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'clone entity_view_mode entity'
+    'clone entity_view_mode entity',
   ];
 
   /**
-   * An administrative user with permission to configure entity view modes settings.
+   * An administrative user.
+   *
+   * With permission to configure entity view modes settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -49,6 +46,9 @@ class EntityCloneEntityViewModeTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a view mode entity.
+   */
   public function testEntityViewModeEntityClone() {
     $entity_view_modes = \Drupal::entityTypeManager()
       ->getStorage('entity_view_mode')
@@ -73,4 +73,3 @@ class EntityCloneEntityViewModeTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneFileTest.php
+++ b/src/Tests/EntityCloneFileTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneFileTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\file\Entity\File;
@@ -30,11 +25,13 @@ class EntityCloneFileTest extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'clone file entity'
+    'clone file entity',
   ];
 
   /**
-   * An administrative user with permission to configure files settings.
+   * An administrative user.
+   *
+   * With permission to configure files settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,15 +47,18 @@ class EntityCloneFileTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a file entity.
+   */
   public function testFileEntityClone() {
     /** @var \Drupal\file\FileInterface $file */
-    $file = File::create(array(
+    $file = File::create([
       'uid' => 1,
       'filename' => 'druplicon.txt',
       'uri' => 'public://druplicon.txt',
       'filemime' => 'text/plain',
       'status' => FILE_STATUS_PERMANENT,
-    ));
+    ]);
     file_put_contents($file->getFileUri(), 'hello world');
     $file->save();
 
@@ -76,4 +76,3 @@ class EntityCloneFileTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneFilterFormatTest.php
+++ b/src/Tests/EntityCloneFilterFormatTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneFilterFormatTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneFilterFormatTest extends WebTestBase {
    */
   protected $permissions = [
     'clone filter_format entity',
-    'administer filters'
+    'administer filters',
   ];
 
   /**
-   * An administrative user with permission to configure filter formats settings.
+   * An administrative user.
+   *
+   * With permission to configure filters settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneFilterFormatTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a filter format entity.
+   */
   public function testFilterFormatEntityClone() {
     $edit = [
       'name' => 'Test filter format for clone',
@@ -80,4 +80,3 @@ class EntityCloneFilterFormatTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneImageStyleTest.php
+++ b/src/Tests/EntityCloneImageStyleTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneImageStyleTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneImageStyleTest extends WebTestBase {
    */
   protected $permissions = [
     'clone image_style entity',
-    'administer image styles'
+    'administer image styles',
   ];
 
   /**
-   * An administrative user with permission to configure image styles settings.
+   * An administrative user.
+   *
+   * With permission to configure image styles settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneImageStyleTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone an image style entity.
+   */
   public function testImageStyleEntityClone() {
     $edit = [
       'label' => 'Test image style for clone',
@@ -80,4 +80,3 @@ class EntityCloneImageStyleTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneLanguageTest.php
+++ b/src/Tests/EntityCloneLanguageTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneLanguageTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneLanguageTest extends WebTestBase {
    */
   protected $permissions = [
     'administer languages',
-    'clone configurable_language entity'
+    'clone configurable_language entity',
   ];
 
   /**
-   * An administrative user with permission to configure languages settings.
+   * An administrative user.
+   *
+   * With permission to configure languages settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,9 +47,12 @@ class EntityCloneLanguageTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a language entity.
+   */
   public function testLanguageEntityClone() {
     $edit = [
-      'predefined_langcode' => 'fr'
+      'predefined_langcode' => 'fr',
     ];
     $this->drupalPostForm("/admin/config/regional/language/add", $edit, t('Add language'));
 
@@ -79,4 +79,3 @@ class EntityCloneLanguageTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneMenuTest.php
+++ b/src/Tests/EntityCloneMenuTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneMenuTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneMenuTest extends WebTestBase {
    */
   protected $permissions = [
     'clone menu entity',
-    'administer menu'
+    'administer menu',
   ];
 
   /**
-   * An administrative user with permission to configure menus settings.
+   * An administrative user.
+   *
+   * With permission to configure menus settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneMenuTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a menu entity.
+   */
   public function testMenuEntityClone() {
 
     $menus = \Drupal::entityTypeManager()
@@ -75,4 +75,3 @@ class EntityCloneMenuTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneResponsiveImageStyleTest.php
+++ b/src/Tests/EntityCloneResponsiveImageStyleTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneResponsiveImageStyleTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneResponsiveImageStyleTest extends WebTestBase {
    */
   protected $permissions = [
     'clone responsive_image_style entity',
-    'administer responsive images'
+    'administer responsive images',
   ];
 
   /**
-   * An administrative user with permission to configure image styles settings.
+   * An administrative user.
+   *
+   * With permission to configure image styles settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneResponsiveImageStyleTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a responsive image style entity.
+   */
   public function testResponsiveImageStyleEntityClone() {
     $edit = [
       'label' => 'Test responsive image style for clone',
@@ -82,4 +82,3 @@ class EntityCloneResponsiveImageStyleTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneRoleTest.php
+++ b/src/Tests/EntityCloneRoleTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneRoleTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneRoleTest extends WebTestBase {
    */
   protected $permissions = [
     'administer permissions',
-    'clone user_role entity'
+    'clone user_role entity',
   ];
 
   /**
-   * An administrative user with permission to configure roles settings.
+   * An administrative user.
+   *
+   * With permission to configure roles settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneRoleTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a role entity.
+   */
   public function testRoleEntityClone() {
     $edit = [
       'label' => 'Test role for clone',
@@ -80,4 +80,3 @@ class EntityCloneRoleTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneSearchPageTest.php
+++ b/src/Tests/EntityCloneSearchPageTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneSearchPageTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -30,11 +25,13 @@ class EntityCloneSearchPageTest extends WebTestBase {
    */
   protected $permissions = [
     'administer search',
-    'clone search_page entity'
+    'clone search_page entity',
   ];
 
   /**
-   * An administrative user with permission to configure search pages settings.
+   * An administrative user.
+   *
+   * With permission to configure search pages settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -50,6 +47,9 @@ class EntityCloneSearchPageTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a search page entity.
+   */
   public function testSearchPageEntityClone() {
     $edit = [
       'label' => 'Test search page for clone',
@@ -81,4 +81,3 @@ class EntityCloneSearchPageTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneShortcutSetTest.php
+++ b/src/Tests/EntityCloneShortcutSetTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneShortcutSetTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -29,11 +24,13 @@ class EntityCloneShortcutSetTest extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'clone shortcut_set entity'
+    'clone shortcut_set entity',
   ];
 
   /**
-   * An administrative user with permission to configure shortcuts settings.
+   * An administrative user.
+   *
+   * With permission to configure shortcuts settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -49,6 +46,9 @@ class EntityCloneShortcutSetTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a shortcut entity.
+   */
   public function testShortcutSetEntityClone() {
     $edit = [
       'id' => 'test_shortcut_set_cloned',
@@ -66,4 +66,3 @@ class EntityCloneShortcutSetTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneUserTest.php
+++ b/src/Tests/EntityCloneUserTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneUserTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -29,11 +24,13 @@ class EntityCloneUserTest extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'clone user entity'
+    'clone user entity',
   ];
 
   /**
-   * An administrative user with permission to configure users settings.
+   * An administrative user.
+   *
+   * With permission to configure users settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -49,6 +46,9 @@ class EntityCloneUserTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a user entity.
+   */
   public function testUserEntityClone() {
     $this->drupalPostForm('entity_clone/user/' . $this->adminUser->id(), [], t('Clone'));
 
@@ -62,4 +62,3 @@ class EntityCloneUserTest extends WebTestBase {
   }
 
 }
-
only in patch2:
unchanged:
--- a/src/Tests/EntityCloneViewTest.php
+++ b/src/Tests/EntityCloneViewTest.php
@@ -1,10 +1,5 @@
 <?php
 
-/**
- * @file
- * Definition of Drupal\entity_clone\Tests\EntityCloneViewTest.
- */
-
 namespace Drupal\entity_clone\Tests;
 
 use Drupal\simpletest\WebTestBase;
@@ -29,11 +24,13 @@ class EntityCloneViewTest extends WebTestBase {
    * @var array
    */
   protected $permissions = [
-    'clone view entity'
+    'clone view entity',
   ];
 
   /**
-   * An administrative user with permission to configure views settings.
+   * An administrative user.
+   *
+   * With permission to configure views settings.
    *
    * @var \Drupal\user\UserInterface
    */
@@ -49,6 +46,9 @@ class EntityCloneViewTest extends WebTestBase {
     $this->drupalLogin($this->adminUser);
   }
 
+  /**
+   * Test clone a view entity.
+   */
   public function testViewEntityClone() {
     $edit = [
       'id' => 'test_view_cloned',
@@ -66,4 +66,3 @@ class EntityCloneViewTest extends WebTestBase {
   }
 
 }
-