chore: add php cs fixer from shared workflow (googleapis#7647)

thiyaguk09 · Dec 12, 2024 · 383a351 · 383a351
1 parent 7a1248f
commit 383a351
Show file tree

Hide file tree

Showing 106 changed files with 303 additions and 339 deletions.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -8,7 +8,7 @@ on:
 permissions:
   contents: read
 jobs:
-  style:
+  style_phpcs:
     runs-on: ubuntu-latest
     name: PHP Style Check
     steps:
@@ -21,6 +21,33 @@ jobs:
       run: composer global require "squizlabs/php_codesniffer:3.*"
     - name: Run PHPCS Code Style Checker
       run: ~/.composer/vendor/bin/phpcs --standard=phpcs-ruleset.xml -p
+
+  style_csfixer:
+    name: PHP CS Fixer
+    uses: GoogleCloudPlatform/php-tools/.github/workflows/code-standards.yml@main
+    with:
+      config: GoogleCloudPlatform/php-tools/.php-cs-fixer.default.php@main
+      exclude-patterns: |
+        [
+          "#.*/src/V[0-9]+#",
+          "#.*/src/.*/V[0-9]+#",
+          "#.*/(tests|samples|metadata)#",
+          "vendor",
+          "dev",
+          "docs",
+          "AccessContextManager/src/Type",
+          "Asset/external",
+          "BigQueryDataExchange/src/Common",
+          "CommonProtos",
+          "Core/src/Testing",
+          "GSuiteAddOns/external",
+          "OsLogin/src/Common",
+          "LongRunning/src/ApiCore/LongRunning",
+          "LongRunning/src/LongRunning",
+          "Translate/src/Connection",
+          "Translate/src/TranslateClient.php"
+        ]
+
   staticanalysis:
     runs-on: ubuntu-latest
     name: PHPStan Static Analysis

diff --git a/BigQuery/src/Connection/Rest.php b/BigQuery/src/Connection/Rest.php
@@ -19,7 +19,6 @@
 
 use Google\Auth\GetUniverseDomainInterface;
 use Google\Cloud\BigQuery\BigQueryClient;
-use Google\Cloud\BigQuery\Connection\ConnectionInterface;
 use Google\Cloud\Core\RequestBuilder;
 use Google\Cloud\Core\RequestWrapper;
 use Google\Cloud\Core\RestTrait;

diff --git a/BigQuery/src/JobWaitTrait.php b/BigQuery/src/JobWaitTrait.php
@@ -18,7 +18,6 @@
 namespace Google\Cloud\BigQuery;
 
 use Google\Cloud\BigQuery\Exception\JobException;
-use Google\Cloud\BigQuery\Job;
 use Google\Cloud\Core\Exception\ServiceException;
 use Google\Cloud\Core\ExponentialBackoff;
 use Throwable;

diff --git a/Bigtable/src/BigtableClient.php b/Bigtable/src/BigtableClient.php
@@ -17,16 +17,15 @@
 
 namespace Google\Cloud\Bigtable;
 
+use Google\ApiCore\ArrayTrait;
+use Google\ApiCore\ClientOptionsTrait;
 use Google\ApiCore\CredentialsWrapper;
+use Google\ApiCore\Serializer;
 use Google\ApiCore\Transport\TransportInterface;
 use Google\ApiCore\ValidationException;
 use Google\Auth\FetchAuthTokenInterface;
-use Google\ApiCore\ArrayTrait;
-use Google\ApiCore\ClientOptionsTrait;
-use Google\ApiCore\Serializer;
 use Google\Cloud\Bigtable\V2\Client\BigtableClient as GapicClient;
 use Google\Cloud\Core\DetectProjectIdTrait;
-use Google\Cloud\Core\RequestHandler;
 
 /**
  * Google Cloud Bigtable is Google's NoSQL Big Data database service.

diff --git a/Bigtable/src/ChunkFormatter.php b/Bigtable/src/ChunkFormatter.php
@@ -19,12 +19,12 @@
 
 use Google\ApiCore\ArrayTrait;
 use Google\Cloud\Bigtable\Exception\BigtableDataOperationException;
+use Google\Cloud\Bigtable\V2\Client\BigtableClient as GapicClient;
 use Google\Cloud\Bigtable\V2\ReadRowsRequest;
 use Google\Cloud\Bigtable\V2\ReadRowsResponse\CellChunk;
 use Google\Cloud\Bigtable\V2\RowRange;
 use Google\Cloud\Bigtable\V2\RowSet;
 use Google\Protobuf\Internal\Message;
-use Google\Cloud\Bigtable\V2\Client\BigtableClient as GapicClient;
 
 /**
  * Converts cell chunks into an easily digestable format. Please note this class
@@ -249,7 +249,7 @@ private function updateReadRowsRequest($request, $options, $prevRowKey)
                 foreach ($rowSet->getRowRanges() as $range) {
                     if (($range->getEndKeyOpen() && $prevRowKey > $range->getEndKeyOpen())
                         || ($range->getEndKeyClosed() && $prevRowKey >= $range->getEndKeyClosed())) {
-                            continue;
+                        continue;
                     } elseif ((!$range->getStartKeyOpen() || $prevRowKey > $range->getStartKeyOpen())
                         && (!$range->getStartKeyClosed() || $prevRowKey >= $range->getStartKeyClosed())) {
                         $range->setStartKeyOpen($prevRowKey);
@@ -268,8 +268,8 @@ private function updateReadRowsRequest($request, $options, $prevRowKey)
                 $options['requestCompleted'] = true;
             }
         } else {
-            $range = (new RowRange)->setStartKeyOpen($prevRowKey);
-            $options['rows'] = (new RowSet)->setRowRanges([$range]);
+            $range = (new RowRange())->setStartKeyOpen($prevRowKey);
+            $options['rows'] = (new RowSet())->setRowRanges([$range]);
         }
 
         return [$request, $options];

diff --git a/Bigtable/src/DataUtil.php b/Bigtable/src/DataUtil.php
@@ -34,7 +34,7 @@ class DataUtil
     public static function isSystemLittleEndian()
     {
         if (self::$isLittleEndian === null) {
-            self::$isLittleEndian = (pack("P", 2) === pack("Q", 2));
+            self::$isLittleEndian = (pack('P', 2) === pack('Q', 2));
         }
         return self::$isLittleEndian;
     }
@@ -75,7 +75,7 @@ public static function intToByteString($intValue)
                 )
             );
         }
-        $bytes = pack("J", $intValue);
+        $bytes = pack('J', $intValue);
         return $bytes;
     }
 
@@ -94,6 +94,6 @@ public static function byteStringToInt($bytes)
         if (self::isSystemLittleEndian()) {
             $bytes = strrev($bytes);
         }
-        return unpack("q", $bytes)[1];
+        return unpack('q', $bytes)[1];
     }
 }
diff --git a/Bigtable/src/Filter.php b/Bigtable/src/Filter.php
@@ -17,17 +17,17 @@
 
 namespace Google\Cloud\Bigtable;
 
-use Google\Cloud\Bigtable\Filter\ChainFilter;
-use Google\Cloud\Bigtable\Filter\ConditionFilter;
-use Google\Cloud\Bigtable\Filter\FilterInterface;
-use Google\Cloud\Bigtable\Filter\InterleaveFilter;
 use Google\Cloud\Bigtable\Filter\Builder\FamilyFilter;
 use Google\Cloud\Bigtable\Filter\Builder\KeyFilter;
 use Google\Cloud\Bigtable\Filter\Builder\LimitFilter;
 use Google\Cloud\Bigtable\Filter\Builder\OffsetFilter;
 use Google\Cloud\Bigtable\Filter\Builder\QualifierFilter;
 use Google\Cloud\Bigtable\Filter\Builder\TimestampFilter;
 use Google\Cloud\Bigtable\Filter\Builder\ValueFilter;
+use Google\Cloud\Bigtable\Filter\ChainFilter;
+use Google\Cloud\Bigtable\Filter\ConditionFilter;
+use Google\Cloud\Bigtable\Filter\FilterInterface;
+use Google\Cloud\Bigtable\Filter\InterleaveFilter;
 use Google\Cloud\Bigtable\Filter\SimpleFilter;
 use Google\Cloud\Bigtable\V2\RowFilter;
 

diff --git a/Bigtable/src/Filter/Builder/FamilyFilter.php b/Bigtable/src/Filter/Builder/FamilyFilter.php
@@ -18,7 +18,6 @@
 namespace Google\Cloud\Bigtable\Filter\Builder;
 
 use Google\Cloud\Bigtable\Filter\SimpleFilter;
-use Google\Cloud\Bigtable\V2\RowFilter;
 
 /**
  * A builder used to configure column family filters.

diff --git a/Bigtable/src/Filter/Builder/KeyFilter.php b/Bigtable/src/Filter/Builder/KeyFilter.php
@@ -109,7 +109,7 @@ public function sample($probability)
         }
 
         return new SimpleFilter(
-            (new RowFilter)->setRowSampleFilter($probability)
+            (new RowFilter())->setRowSampleFilter($probability)
         );
     }
 }
diff --git a/Bigtable/src/Filter/Builder/LimitFilter.php b/Bigtable/src/Filter/Builder/LimitFilter.php
@@ -49,7 +49,7 @@ class LimitFilter
     public function cellsPerRow($count)
     {
         return new SimpleFilter(
-            (new RowFilter)->setCellsPerRowLimitFilter($count)
+            (new RowFilter())->setCellsPerRowLimitFilter($count)
         );
     }
 
@@ -73,7 +73,7 @@ public function cellsPerRow($count)
     public function cellsPerColumn($count)
     {
         return new SimpleFilter(
-            (new RowFilter)->setCellsPerColumnLimitFilter($count)
+            (new RowFilter())->setCellsPerColumnLimitFilter($count)
         );
     }
 }
diff --git a/Bigtable/src/Filter/Builder/OffsetFilter.php b/Bigtable/src/Filter/Builder/OffsetFilter.php
@@ -49,7 +49,7 @@ class OffsetFilter
     public function cellsPerRow($count)
     {
         return new SimpleFilter(
-            (new RowFilter)->setCellsPerRowOffsetFilter($count)
+            (new RowFilter())->setCellsPerRowOffsetFilter($count)
         );
     }
 }
diff --git a/Bigtable/src/Filter/Builder/QualifierFilter.php b/Bigtable/src/Filter/Builder/QualifierFilter.php
@@ -19,7 +19,6 @@
 
 use Google\Cloud\Bigtable\Filter\QualifierRangeFilter;
 use Google\Cloud\Bigtable\Filter\SimpleFilter;
-use Google\Cloud\Bigtable\V2\RowFilter;
 
 /**
  * A builder used to configure qualifier based filters.

diff --git a/Bigtable/src/Filter/Builder/RegexTrait.php b/Bigtable/src/Filter/Builder/RegexTrait.php
@@ -37,7 +37,7 @@ trait RegexTrait
     private function buildRegexFilter($value, $setter)
     {
         return new SimpleFilter(
-            (new RowFilter)->$setter($value)
+            (new RowFilter())->$setter($value)
         );
     }
 

diff --git a/Bigtable/src/Filter/Builder/ValueFilter.php b/Bigtable/src/Filter/Builder/ValueFilter.php
@@ -105,7 +105,7 @@ public function range()
     public function strip()
     {
         return new SimpleFilter(
-            (new RowFilter)->setStripValueTransformer(true)
+            (new RowFilter())->setStripValueTransformer(true)
         );
     }
 }
diff --git a/Bigtable/src/Filter/ChainFilter.php b/Bigtable/src/Filter/ChainFilter.php
@@ -67,9 +67,9 @@ public function addFilter(FilterInterface $filter)
      */
     public function toProto()
     {
-        $chain = (new Chain)
+        $chain = (new Chain())
             ->setFilters($this->filters);
-        return (new RowFilter)
+        return (new RowFilter())
             ->setChain($chain);
     }
 }
diff --git a/Bigtable/src/Filter/ConditionFilter.php b/Bigtable/src/Filter/ConditionFilter.php
@@ -123,15 +123,15 @@ public function toProto()
                 )
             );
         }
-        $condition = (new Condition)
+        $condition = (new Condition())
             ->setPredicateFilter($this->predicateFilter);
         if ($this->trueFilter) {
             $condition->setTrueFilter($this->trueFilter);
         }
         if ($this->falseFilter) {
             $condition->setFalseFilter($this->falseFilter);
         }
-        return (new RowFilter)
+        return (new RowFilter())
             ->setCondition($condition);
     }
 }
diff --git a/Bigtable/src/Filter/InterleaveFilter.php b/Bigtable/src/Filter/InterleaveFilter.php
@@ -67,9 +67,9 @@ public function addFilter(FilterInterface $filter)
      */
     public function toProto()
     {
-        $interleave = (new Interleave)
+        $interleave = (new Interleave())
             ->setFilters($this->filters);
-        return (new RowFilter)
+        return (new RowFilter())
             ->setInterleave($interleave);
     }
 }
diff --git a/Bigtable/src/Mutations.php b/Bigtable/src/Mutations.php
@@ -49,7 +49,7 @@ class Mutations
      */
     public function upsert($family, $qualifier, $value, $timeStamp = null)
     {
-        $mutationSetCell = (new SetCell)
+        $mutationSetCell = (new SetCell())
             ->setFamilyName($family)
             ->setColumnQualifier($qualifier)
             ->setValue($value);
@@ -63,7 +63,7 @@ public function upsert($family, $qualifier, $value, $timeStamp = null)
         } else {
             $mutationSetCell->setTimestampMicros($timeStamp);
         }
-        $this->mutations[] = (new Mutation)->setSetCell($mutationSetCell);
+        $this->mutations[] = (new Mutation())->setSetCell($mutationSetCell);
         return $this;
     }
 
@@ -76,9 +76,9 @@ public function upsert($family, $qualifier, $value, $timeStamp = null)
      */
     public function deleteFromFamily($family)
     {
-        $this->mutations[] = (new Mutation)
+        $this->mutations[] = (new Mutation())
             ->setDeleteFromFamily(
-                (new DeleteFromFamily)->setFamilyName($family)
+                (new DeleteFromFamily())->setFamilyName($family)
             );
         return $this;
     }
@@ -97,11 +97,11 @@ public function deleteFromFamily($family)
      */
     public function deleteFromColumn($family, $qualifier, array $timeRange = [])
     {
-        $deleteFromColumn = (new DeleteFromColumn)
+        $deleteFromColumn = (new DeleteFromColumn())
             ->setFamilyName($family)
             ->setColumnQualifier($qualifier);
         if (!empty($timeRange)) {
-            $timestampRange = new TimestampRange;
+            $timestampRange = new TimestampRange();
             if (isset($timeRange['start'])) {
                 $timestampRange->setStartTimestampMicros($timeRange['start']);
             }
@@ -110,7 +110,7 @@ public function deleteFromColumn($family, $qualifier, array $timeRange = [])
             }
             $deleteFromColumn->setTimeRange($timestampRange);
         }
-        $this->mutations[] = (new Mutation)->setDeleteFromColumn($deleteFromColumn);
+        $this->mutations[] = (new Mutation())->setDeleteFromColumn($deleteFromColumn);
         return $this;
     }
 
@@ -121,7 +121,7 @@ public function deleteFromColumn($family, $qualifier, array $timeRange = [])
      */
     public function deleteRow()
     {
-        $this->mutations[] = (new Mutation)->setDeleteFromRow(new DeleteFromRow);
+        $this->mutations[] = (new Mutation())->setDeleteFromRow(new DeleteFromRow());
         return $this;
     }
 

diff --git a/Bigtable/src/ReadModifyWriteRowRules.php b/Bigtable/src/ReadModifyWriteRowRules.php
@@ -45,7 +45,7 @@ class ReadModifyWriteRowRules
      */
     public function append($familyName, $qualifier, $value)
     {
-        $this->rules[] = (new ReadModifyWriteRule)
+        $this->rules[] = (new ReadModifyWriteRule())
             ->setFamilyName($familyName)
             ->setColumnQualifier($qualifier)
             ->setAppendValue($value);
@@ -65,7 +65,7 @@ public function append($familyName, $qualifier, $value)
      */
     public function increment($familyName, $qualifier, $amount)
     {
-        $this->rules[] = (new ReadModifyWriteRule)
+        $this->rules[] = (new ReadModifyWriteRule())
             ->setFamilyName($familyName)
             ->setColumnQualifier($qualifier)
             ->setIncrementAmount($amount);

diff --git a/Bigtable/src/ResumableStream.php b/Bigtable/src/ResumableStream.php
@@ -209,7 +209,7 @@ public static function isRetryable($code)
         return isset(self::$retryableStatusCodes[$code]);
     }
 
-    private function getMaxRetries(array $options) : int
+    private function getMaxRetries(array $options): int
     {
         $retrySettings = $options['retrySettings'] ?? [];