Merge pull request #3 from localgovdrupal/1/rename-modules-fields-ent…

…ities

Update composer.json.

composer.json

@@ -1,8 +1,8 @@
 {
     "name": "localgovdrupal/localgov_elections",
-    "description": "Module to report on elections for LocalGovDrupal sites.",
+    "description": "Module to report on elections for LocalGov Drupal sites.",
     "type": "drupal-module",
-    "homepage": "https://gitlab.com/rohallion/localgov_elections",
+    "homepage": "https://github.com/localgovdrupal/localgov_elections",
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "require": {

localgov_elections.install

@@ -6,11 +6,7 @@
  */
 
 use Drupal\Core\Config\FileStorage;
-use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\Core\Entity\EntityStorageException;
-use Drupal\field\Entity\FieldConfig;
-use Drupal\field\Entity\FieldStorageConfig;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Implements hook_install().

modules/localgov_elections_constituency_provider/src/Form/UkConstituencyTwentyFourProviderDownloadForm.php

@@ -6,9 +6,9 @@
 use Drupal\Core\DependencyInjection\ContainerInjectionInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
-use Drupal\localgov_elections_constituency_provider\CacheKey;
 use Drupal\localgov_elections\BoundaryProviderInterface;
 use Drupal\localgov_elections\Form\BoundaryProviderSubformInterface;
+use Drupal\localgov_elections_constituency_provider\CacheKey;
 use GuzzleHttp\Client;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\RequestStack;

modules/localgov_elections_constituency_provider/tests/src/Functional/FormTest.php

@@ -73,7 +73,7 @@ protected function setUp(): void {
     $this->election = $storage->create([
       'title' => "UK Election 2024",
       'status' => TRUE,
-      'type' => "election",
+      'type' => "localgov_election",
     ]);
 
     $this->election->save();

modules/localgov_elections_constituency_provider/tests/src/FunctionalJavascript/AutocompleteTest.php

@@ -77,7 +77,7 @@ protected function setUp(): void {
     $this->election = $storage->create([
       'title' => "UK Election 2024",
       'status' => TRUE,
-      'type' => "election",
+      'type' => "localgov_election",
     ]);
 
     $this->election->save();

src/Event/NodeInsertDivisionVotes.php

@@ -12,7 +12,7 @@
  */
 class NodeInsertDivisionVotes extends Event {
 
-  const localgov_elections_NODE_INSERT = 'localgov_elections.node.insert';
+  const LOCALGOV_ELECTIONS_NODE_INSERT = 'localgov_elections.node.insert';
 
   /**
    * Node entity.

src/Plugin/Block/AnalysisBlock.php

@@ -121,8 +121,8 @@ public function build() {
         $previous_winner_abbr = $previous_winning_party->localgov_election_abbreviation->value;
       }
 
-      // If previous year not manually set, look if previous 'localgov_area_vote'
-      // been set.
+      // If previous year not manually set, look if previous
+      // 'localgov_area_vote' has been set.
       if (isset($previous_result)) {
         // phpcs:ignore
         $previous_localgov_area_vote = Node::load($previous_result->id());

src/Plugin/Block/PartySeatsBlock.php

@@ -31,7 +31,8 @@ public function build() {
       $nid = $election->id();
       $election_parties = [];
 
-      // Find all 'Areas vote' (localgov_area_vote) nodes referencing this election.
+      // Find all 'Areas vote' (localgov_area_vote) nodes referencing this
+      // election.
       // phpcs:ignore
       $query = \Drupal::entityQuery('node')
         ->condition('type', 'localgov_area_vote')

src/Plugin/views/field/ElectionSeatsParty.php

@@ -42,7 +42,8 @@ public function render(ResultRow $values) {
       // Arg must be NID of an Election content type.
       if ($node->getType() == 'localgov_election') {
         $election = $node->id();
-        // Find all 'Area vote' (localgov_area_vote) nodes referencing this election.
+        // Find all 'Area vote' (localgov_area_vote) nodes referencing this
+        // election.
         $query = \Drupal::entityQuery('node')
           ->condition('type', 'localgov_area_vote')
           ->condition('localgov_election', $election);

src/Plugin/views/field/ElectionShare.php

@@ -53,7 +53,8 @@ public function render(ResultRow $values) {
       // Arg must be NID of an Election content type.
       if ($node->getType() == 'localgov_election') {
         // $election = $node->id();
-        // Find all 'Area vote' (localgov_area_vote) nodes referencing this election
+        // Find all 'Area vote' (localgov_area_vote) nodes referencing this
+        // election.
         $query = \Drupal::entityQuery('node')
           ->condition('type', 'localgov_area_vote')
           ->condition('localgov_election', $election);

src/Plugin/views/field/PartyName.php

@@ -35,7 +35,8 @@ public function render(ResultRow $values) {
     $party_name = NULL;
     $results = [];
 
-    // Find all 'Areas vote' (localgov_area_vote) nodes referencing this election.
+    // Find all 'Areas vote' (localgov_area_vote) nodes referencing this
+    // election.
     $query = \Drupal::entityQuery('node')
       ->condition('type', 'localgov_area_vote')
       ->condition('localgov_election', $election);