Fix PHPCS and test case fail issue (#920)

apigee · Aug 28, 2023 · 230b0c5 · 230b0c5
1 parent a096101
commit 230b0c5
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/...s/apigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityAddMemberEventTest.php b/...s/apigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityAddMemberEventTest.php
@@ -56,6 +56,15 @@ protected function setUp(): void {
     $this->installEntitySchema('team_member_role');
 
     $this->addOrganizationMatchedResponse();
+
+    // Setting teams cache to 900 to make sure null value is not returned in getCacheMaxAge().
+    $config_factory = \Drupal::configFactory();
+    $config = $config_factory->getEditable('apigee_edge_teams.team_settings');
+
+    if (NULL === $config->get('cache_expiration')) {
+      $config->set('cache_expiration', 900);
+      $config->save(TRUE);
+    }
   }
 
   /**

diff --git a/...pigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityRemoveMemberEventTest.php b/...pigee_edge_actions/tests/src/Kernel/Plugin/RulesEvent/EdgeEntityRemoveMemberEventTest.php
@@ -55,6 +55,15 @@ protected function setUp(): void {
     $this->installEntitySchema('team_member_role');
 
     $this->addOrganizationMatchedResponse();
+
+    // Setting teams cache to 900 to make sure null value is not returned in getCacheMaxAge().
+    $config_factory = \Drupal::configFactory();
+    $config = $config_factory->getEditable('apigee_edge_teams.team_settings');
+
+    if (NULL === $config->get('cache_expiration')) {
+      $config->set('cache_expiration', 900);
+      $config->save(TRUE);
+    }
   }
 
   /**

diff --git a/modules/apigee_edge_teams/src/Entity/Team.php b/modules/apigee_edge_teams/src/Entity/Team.php
@@ -391,7 +391,7 @@ protected static function propertyToBaseFieldBlackList(): array {
    * {@inheritdoc}
    */
   public function getCacheMaxAge(): int {
-    return \Drupal::config('apigee_edge.team_settings')->get('cache_expiration');
+    return \Drupal::config('apigee_edge_teams.team_settings')->get('cache_expiration');
   }
 
 }
diff --git a/modules/apigee_edge_teams/src/Entity/TeamApp.php b/modules/apigee_edge_teams/src/Entity/TeamApp.php
@@ -228,7 +228,7 @@ protected function urlRouteParameters($rel) {
    * {@inheritdoc}
    */
   public function getCacheMaxAge(): int {
-    return \Drupal::config('apigee_edge.team_app_settings')->get('cache_expiration');
+    return \Drupal::config('apigee_edge_teams.team_app_settings')->get('cache_expiration');
   }
 
 }
diff --git a/src/Entity/ApiProduct.php b/src/Entity/ApiProduct.php
@@ -334,4 +334,5 @@ public function setScopes(string ...$scopes): void {
   public function getCacheMaxAge(): int {
     return \Drupal::config('apigee_edge.api_product_settings')->get('cache_expiration');
   }
+
 }
diff --git a/src/Entity/DeveloperApp.php b/src/Entity/DeveloperApp.php
@@ -296,4 +296,5 @@ protected function urlRouteParameters($rel) {
   public function getCacheMaxAge(): int {
     return \Drupal::config('apigee_edge.developer_app_settings')->get('cache_expiration');
   }
+
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -334,4 +334,5 @@ public function setScopes(string ...$scopes): void { @@
       public function getCacheMaxAge(): int {
         return \Drupal::config('apigee_edge.api_product_settings')->get('cache_expiration');
       }
     }