phpcs fixed

Author: shailesh-google

src/Api/Monetization/Denormalizer/LegalEntityDenormalizer.php

@@ -68,9 +68,9 @@ public function denormalize($data, $type, $format = null, array $context = []):
     {
         if ($data->isCompany) {
             return parent::denormalize($data, $this->companyClass, $format, $context);
-        } else {
-            return parent::denormalize($data, $this->developerClass, $format, $context);
         }
+
+        return parent::denormalize($data, $this->developerClass, $format, $context);
     }
 
     /**

src/Controller/PaginationHelperTrait.php

@@ -111,11 +111,10 @@ protected function listEntities(?PagerInterface $pager = null, array $query_para
 
         if (OrganizationFeatures::isPaginationAvailable($organization)) {
             return $this->listEntitiesWithCps($pager, $query_params, $key_provider);
-        } else {
-            $this->triggerCpsSimulationNotice($pager);
-
-            return $this->listEntitiesWithoutCps($pager, $query_params, $key_provider);
         }
+        $this->triggerCpsSimulationNotice($pager);
+
+        return $this->listEntitiesWithoutCps($pager, $query_params, $key_provider);
     }
 
     /**
@@ -136,11 +135,10 @@ protected function listEntityIds(?PagerInterface $pager = null, array $query_par
 
         if (OrganizationFeatures::isCpsEnabled($organization)) {
             return $this->listEntityIdsWithCps($pager, $query_params);
-        } else {
-            $this->triggerCpsSimulationNotice($pager);
-
-            return $this->listEntityIdsWithoutCps($pager, $query_params);
         }
+        $this->triggerCpsSimulationNotice($pager);
+
+        return $this->listEntityIdsWithoutCps($pager, $query_params);
     }
 
     /**
@@ -181,43 +179,42 @@ private function listEntitiesWithCps(?PagerInterface $pager = null, array $query
             $responseArray = reset($responseArray) ?: [];
 
             return $this->responseArrayToArrayOfEntities($responseArray, $key_provider);
-        } else {
-            // Pass an empty pager to load all entities.
-            $responseArray = $this->getResultsInRange($this->createPager(), $query_params);
-            // Ignore entity type key from response, ex.: developer, apiproduct,
-            // etc.
-            $responseArray = reset($responseArray);
-            if (empty($responseArray)) {
-                return [];
-            }
-            $entities = $this->responseArrayToArrayOfEntities($responseArray, $key_provider);
-            $lastEntity = end($entities);
-            $lastId = $lastEntity->{$key_provider}();
-            do {
-                $tmp = $this->getResultsInRange($this->createPager(0, $lastId), $query_params);
-                // Ignore entity type key from response, ex.: developer,
-                // apiproduct, etc.
-                $tmp = reset($tmp) ?: [];
-                // Remove the first item from the list because it is the same
-                // as the last item of $entities at this moment.
-                // Apigee Edge response always starts with the requested entity
-                // (startKey).
-                array_shift($tmp);
-                $tmpEntities = $this->responseArrayToArrayOfEntities((array) $tmp, $key_provider);
-
-                if (count($tmpEntities) > 0) {
-                    // The returned entity array is keyed by entity id which
-                    // is unique so we can do this.
-                    $entities += $tmpEntities;
-                    $lastEntity = end($tmpEntities);
-                    $lastId = $lastEntity->{$key_provider}();
-                } else {
-                    $lastId = false;
-                }
-            } while ($lastId);
-
-            return $entities;
         }
+        // Pass an empty pager to load all entities.
+        $responseArray = $this->getResultsInRange($this->createPager(), $query_params);
+        // Ignore entity type key from response, ex.: developer, apiproduct,
+        // etc.
+        $responseArray = reset($responseArray);
+        if (empty($responseArray)) {
+            return [];
+        }
+        $entities = $this->responseArrayToArrayOfEntities($responseArray, $key_provider);
+        $lastEntity = end($entities);
+        $lastId = $lastEntity->{$key_provider}();
+        do {
+            $tmp = $this->getResultsInRange($this->createPager(0, $lastId), $query_params);
+            // Ignore entity type key from response, ex.: developer,
+            // apiproduct, etc.
+            $tmp = reset($tmp) ?: [];
+            // Remove the first item from the list because it is the same
+            // as the last item of $entities at this moment.
+            // Apigee Edge response always starts with the requested entity
+            // (startKey).
+            array_shift($tmp);
+            $tmpEntities = $this->responseArrayToArrayOfEntities((array) $tmp, $key_provider);
+
+            if (count($tmpEntities) > 0) {
+                // The returned entity array is keyed by entity id which
+                // is unique so we can do this.
+                $entities += $tmpEntities;
+                $lastEntity = end($tmpEntities);
+                $lastId = $lastEntity->{$key_provider}();
+            } else {
+                $lastId = false;
+            }
+        } while ($lastId);
+
+        return $entities;
     }
 
     /**
@@ -322,30 +319,29 @@ private function listEntityIdsWithCps(?PagerInterface $pager = null, array $quer
         $expandCompatibility = str_ends_with($this->getClient()->getEndpoint(), $baseDomain);
         if ($pager) {
             return $this->getResultsInRange($pager, $query_params, $expandCompatibility);
-        } else {
-            $ids = $this->getResultsInRange($this->createPager(), $query_params, $expandCompatibility);
-            if (empty($ids)) {
-                return [];
-            }
-            $lastId = end($ids);
-            do {
-                $tmp = $this->getResultsInRange($this->createPager(0, $lastId), $query_params, $expandCompatibility);
-                // Remove the first item from the list because it is the same
-                // as the current last item of $ids.
-                // Apigee Edge response always starts with the requested entity
-                // id (startKey).
-                array_shift($tmp);
-
-                if (count($tmp) > 0) {
-                    $ids = array_merge($ids, $tmp);
-                    $lastId = end($tmp);
-                } else {
-                    $lastId = false;
-                }
-            } while ($lastId);
-
-            return $ids;
         }
+        $ids = $this->getResultsInRange($this->createPager(), $query_params, $expandCompatibility);
+        if (empty($ids)) {
+            return [];
+        }
+        $lastId = end($ids);
+        do {
+            $tmp = $this->getResultsInRange($this->createPager(0, $lastId), $query_params, $expandCompatibility);
+            // Remove the first item from the list because it is the same
+            // as the current last item of $ids.
+            // Apigee Edge response always starts with the requested entity
+            // id (startKey).
+            array_shift($tmp);
+
+            if (count($tmp) > 0) {
+                $ids = array_merge($ids, $tmp);
+                $lastId = end($tmp);
+            } else {
+                $lastId = false;
+            }
+        } while ($lastId);
+
+        return $ids;
     }
 
     /**