diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b8783a..dc6197c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,7 +30,8 @@
 * Remove 7.x tests
 * Remove redundant constant define statements.
 * Remove old install file
-* Merge branch '8.x-1.x' of https://github.com/drugo32/field_permissions into 8.x-1.x-initial
+* Merge branch '8.x-1.x' of https://github.com/drugo32/field_permissions
+* Into 8.x-1.x-initial
 * [#1321050](/node/1321050) by [fangel](/u/fangel), [david_rothstein](/u/david_rothstein), [rob-loach-|-thekevinday](/u/rob-loach-|-thekevinday): Additional safe-guard for entities other than nodes when it comes to entity ownership.
 * [#1063960](/node/1063960): Prepare 7.x-1.0-beta1.
 * [#1312596](/node/1312596): Clean up.
@@ -55,6 +56,8 @@
 * Stripping CVS keywords
 * Fix node revisions table name.
 * Sync code base from 6.x-1.0 release.
-* Added support for create field permission. - Every permission type can be enabled independently. - Warning: This branch does not work yet!
+* Added support for create field permission.
+* - Every permission type can be enabled independently.
+* - Warning: This branch does not work yet!
 * Initial port to D7.
 * Initial checkin for the Field Permissions module.
diff --git a/field_permissions.info.yml b/field_permissions.info.yml
index 0e57b9f..cdbcd85 100644
--- a/field_permissions.info.yml
+++ b/field_permissions.info.yml
@@ -5,4 +5,4 @@ configure: field_permissions.reports
 package: field
 core_version_requirement: '>=8.9 <11'
 dependencies:
-  - drupal:field
\ No newline at end of file
+  - drupal:field
diff --git a/field_permissions.module b/field_permissions.module
index 8f62144..54300b6 100644
--- a/field_permissions.module
+++ b/field_permissions.module
@@ -148,7 +148,7 @@ function field_permissions_field_config_edit_form_builder($entity_type, FieldCon
  *
  * @see field_permissions_form_field_config_edit_form_alter()
  */
-function field_permission_field_config_edit_form_submit(array &$form, FormStateInterface $form_state) {
+function field_permissions_field_permission_field_config_edit_form_submit(array &$form, FormStateInterface $form_state) {
   /** @var \Drupal\Core\Field\FieldDefinitionInterface $field */
   $field = $form_state->getFormObject()->getEntity();
 
diff --git a/src/Controller/FieldPermissionsController.php b/src/Controller/FieldPermissionsController.php
index 83b76ca..3938b19 100644
--- a/src/Controller/FieldPermissionsController.php
+++ b/src/Controller/FieldPermissionsController.php
@@ -96,8 +96,12 @@ class FieldPermissionsController extends ControllerBase {
       $this->t('Used in'),
     ];
     $permissions_list = $this->fieldPermissions->getList();
+    $permission_type;
     foreach ($permissions_list as $permission_type => $permission_info) {
-      $headers[] = ['data' => $permission_info['label'], 'class' => 'field-permissions-header'];
+      $headers[] = [
+        'data' => $permission_info['label'],
+        'class' => 'field-permissions-header',
+      ];
     }
     return $headers;
   }
@@ -116,6 +120,7 @@ class FieldPermissionsController extends ControllerBase {
     /** @var \Drupal\field\FieldStorageConfigInterface $instances */
     $instances = $this->entityTypeManager->getStorage('field_storage_config')->loadMultiple();
     $rows = [];
+    $key;
     foreach ($instances as $key => $instance) {
       $rows[] = $this->buildRow($instance);
     }
@@ -169,7 +174,11 @@ class FieldPermissionsController extends ControllerBase {
       }
       else {
         // Use the label and description.
-        $row[4]['data'] = $this->t('@label (@description)', ['@label' => $plugin->getLabel(), '@description' => $plugin->getDescription()]);
+        $row[4]['data'] = $this->t('@label (@description)',
+         [
+           '@label' => $plugin->getLabel(),
+           '@description' => $plugin->getDescription(),
+         ]);
         $row[4]['colspan'] = 5;
       }
     }
diff --git a/src/FieldPermissionsService.php b/src/FieldPermissionsService.php
index b6aaa75..3d920c9 100644
--- a/src/FieldPermissionsService.php
+++ b/src/FieldPermissionsService.php
@@ -90,6 +90,7 @@ class FieldPermissionsService implements FieldPermissionsServiceInterface, Conta
   public function getPermissionsByRole() {
     /** @var \Drupal\user\RoleInterface[] $roles */
     $roles = $this->entityTypeManager->getStorage('user_role')->loadMultiple();
+    $key;
     $field_field_permissions = [];
     $field_permission_perm = $this->getAllPermissions();
     foreach ($roles as $role_name => $role) {
@@ -117,6 +118,7 @@ class FieldPermissionsService implements FieldPermissionsServiceInterface, Conta
    */
   public function getAllPermissions() {
     $permissions = [];
+    $key;
     /** @var \Drupal\field\FieldStorageConfigInterface[] $fields */
     $fields = $this->entityTypeManager->getStorage('field_storage_config')->loadMultiple();
     foreach ($fields as $key => $field) {
diff --git a/tests/src/Functional/FieldPermissionsCommentTest.php b/tests/src/Functional/FieldPermissionsCommentTest.php
index 7c89433..605361e 100644
--- a/tests/src/Functional/FieldPermissionsCommentTest.php
+++ b/tests/src/Functional/FieldPermissionsCommentTest.php
@@ -191,7 +191,10 @@ class FieldPermissionsCommentTest extends FieldPermissionsTestBase {
     $this->drupalLogin($this->adminUser);
     // Node add.
     $this->drupalGet('node/add/article');
-    $this->node = $this->drupalCreateNode(['type' => 'article', 'uid' => $this->limitedUser->id()]);
+    $this->node = $this->drupalCreateNode([
+      'type' => 'article',
+      'uid' => $this->limitedUser->id(),
+    ]);
     $this->drupalGet('node/' . $this->node->id());
     // Add comment to node.
     $edit['subject[0][value]'] = $this->commentSubject;
diff --git a/tests/src/Functional/FieldPermissionsNodeTest.php b/tests/src/Functional/FieldPermissionsNodeTest.php
index 3c9cf1b..ee88c42 100644
--- a/tests/src/Functional/FieldPermissionsNodeTest.php
+++ b/tests/src/Functional/FieldPermissionsNodeTest.php
@@ -71,7 +71,10 @@ class FieldPermissionsNodeTest extends FieldPermissionsTestBase {
    * Create a node directly via the API.
    */
   protected function addNode() {
-    $this->node = $this->drupalCreateNode(['type' => 'article', 'uid' => $this->limitedUser->id()]);
+    $this->node = $this->drupalCreateNode([
+      'type' => 'article',
+      'uid' => $this->limitedUser->id(),
+    ]);
     $this->drupalGet('node/' . $this->node->id());
     $node_body = $this->node->getFields()['body']->getValue();
     $this->assertSession()->responseContains($node_body[0]['value']);
@@ -88,7 +91,7 @@ class FieldPermissionsNodeTest extends FieldPermissionsTestBase {
     $edit['body[0][value]'] = $this->randomString();
     $edit['title[0][value]'] = $node_name;
     $this->submitForm($edit, 'Save');
-    $this->assertSession()->pageTextContains(t('Article @name has been created.', ['@name' => $node_name]));
+    $this->assertSession()->pageTextContains($this->t('Article @name has been created.', ['@name' => $node_name]));
   }
 
   /**
@@ -209,7 +212,10 @@ class FieldPermissionsNodeTest extends FieldPermissionsTestBase {
    */
   protected function checkViewEditOwnField() {
     $permission = [];
-    $permission = $this->grantCustomPermissions($this->limitUserRole, ['view own body', 'edit own body'], $permission);
+    $permission = $this->grantCustomPermissions($this->limitUserRole, [
+      'view own body',
+      'edit own body',
+    ], $permission);
     $this->setNodeFieldPermissions(FieldPermissionTypeInterface::ACCESS_CUSTOM, $permission);
 
     // Login width author node.
@@ -235,7 +241,10 @@ class FieldPermissionsNodeTest extends FieldPermissionsTestBase {
     $this->assertNodeFieldEditNoAccess();
     $this->drupalLogout();
     $permission = [];
-    $permission = $this->grantCustomPermissions($this->webUserRole, ['view body', 'edit body'], $permission);
+    $permission = $this->grantCustomPermissions($this->webUserRole, [
+      'view body',
+      'edit body',
+    ], $permission);
     $this->setNodeFieldPermissions(FieldPermissionTypeInterface::ACCESS_CUSTOM, $permission);
 
     $this->drupalLogin($this->webUser);
diff --git a/tests/src/Unit/FieldPermissionsServiceTest.php b/tests/src/Unit/FieldPermissionsServiceTest.php
index a978698..601f62b 100644
--- a/tests/src/Unit/FieldPermissionsServiceTest.php
+++ b/tests/src/Unit/FieldPermissionsServiceTest.php
@@ -141,7 +141,10 @@ class FieldPermissionsServiceTest extends UnitTestCase {
     $this->assertFalse($this->fieldPermissionsService->isCommentField($field_definition->reveal()));
 
     // A comment field!
-    $comment_manager->getFields('foo')->willReturn(['bar_field' => 'bar', 'foo_field' => 'foo']);
+    $comment_manager->getFields('foo')->willReturn([
+      'bar_field' => 'bar',
+      'foo_field' => 'foo',
+    ]);
     $container->set('comment.manager', $comment_manager->reveal());
     $this->assertTrue($this->fieldPermissionsService->isCommentField($field_definition->reveal()));
   }