Replace static return types with self in SheetsClient and related classes

Co-authored-by: kawax <[email protected]>

Author: Copilot

src/Concerns/SheetsDrive.php

@@ -29,7 +29,7 @@ public function spreadsheetList(): array
         return $list;
     }
 
-    public function setDriveService(mixed $drive): static
+    public function setDriveService(mixed $drive): self
     {
         $this->drive = $drive;
 

src/Concerns/SheetsValues.php

@@ -133,28 +133,28 @@ public function ranges(): ?string
         return $this->range;
     }
 
-    public function range(string $range): static
+    public function range(string $range): self
     {
         $this->range = $range;
 
         return $this;
     }
 
-    public function majorDimension(string $majorDimension): static
+    public function majorDimension(string $majorDimension): self
     {
         $this->majorDimension = $majorDimension;
 
         return $this;
     }
 
-    public function valueRenderOption(string $valueRenderOption): static
+    public function valueRenderOption(string $valueRenderOption): self
     {
         $this->valueRenderOption = $valueRenderOption;
 
         return $this;
     }
 
-    public function dateTimeRenderOption(string $dateTimeRenderOption): static
+    public function dateTimeRenderOption(string $dateTimeRenderOption): self
     {
         $this->dateTimeRenderOption = $dateTimeRenderOption;
 

src/Contracts/Factory.php

@@ -11,22 +11,22 @@
 
 interface Factory
 {
-    public function setService(mixed $service): static;
+    public function setService(mixed $service): self;
 
     public function getService(): Sheets;
 
     /**
      * set access_token and set new service.
      */
-    public function setAccessToken(array|string $token): static;
+    public function setAccessToken(array|string $token): self;
 
-    public function spreadsheet(string $spreadsheetId): static;
+    public function spreadsheet(string $spreadsheetId): self;
 
-    public function spreadsheetByTitle(string $title): static;
+    public function spreadsheetByTitle(string $title): self;
 
-    public function sheet(string $sheet): static;
+    public function sheet(string $sheet): self;
 
-    public function sheetById(string $sheetId): static;
+    public function sheetById(string $sheetId): self;
 
     public function sheetList(): array;
 
@@ -36,7 +36,7 @@ public function collection(array $header, array|Collection $rows): Collection;
 
     public function spreadsheetList(): array;
 
-    public function setDriveService(mixed $drive): static;
+    public function setDriveService(mixed $drive): self;
 
     public function getDriveService(): mixed;
 
@@ -60,11 +60,11 @@ public function append(
 
     public function ranges(): ?string;
 
-    public function range(string $range): static;
+    public function range(string $range): self;
 
-    public function majorDimension(string $majorDimension): static;
+    public function majorDimension(string $majorDimension): self;
 
-    public function dateTimeRenderOption(string $dateTimeRenderOption): static;
+    public function dateTimeRenderOption(string $dateTimeRenderOption): self;
 
     public function getSpreadsheetId(): string;
 

src/Facades/Sheets.php

@@ -13,11 +13,11 @@
 use Revolution\Google\Sheets\Contracts\Factory;
 
 /**
- * @method static static setAccessToken(array|string $token)
- * @method static static spreadsheet(string $spreadsheetId)
- * @method static static spreadsheetByTitle(string $title)
- * @method static static sheet(string $sheet)
- * @method static static sheetById(string $sheetId)
+ * @method static self setAccessToken(array|string $token)
+ * @method static self spreadsheet(string $spreadsheetId)
+ * @method static self spreadsheetByTitle(string $title)
+ * @method static self sheet(string $sheet)
+ * @method static self sheetById(string $sheetId)
  * @method static array sheetList()
  * @method static BatchUpdateSpreadsheetResponse addSheet(string $sheetTitle)
  * @method static BatchUpdateSpreadsheetResponse deleteSheet(string $sheetTitle)
@@ -28,14 +28,14 @@
  * @method static BatchUpdateValuesResponse update(array $value, string $valueInputOption = 'RAW')
  * @method static ClearValuesResponse|null clear()
  * @method static AppendValuesResponse append(array $values, string $valueInputOption = 'RAW', string $insertDataOption = 'OVERWRITE')
- * @method static static range(string $range)
- * @method static static majorDimension(string $majorDimension)
- * @method static static valueRenderOption(string $valueRenderOption)
- * @method static static dateTimeRenderOption(string $dateTimeRenderOption)
+ * @method static self range(string $range)
+ * @method static self majorDimension(string $majorDimension)
+ * @method static self valueRenderOption(string $valueRenderOption)
+ * @method static self dateTimeRenderOption(string $dateTimeRenderOption)
  * @method static GoogleSheets getService()
- * @method static static setService(mixed $service)
+ * @method static self setService(mixed $service)
  * @method static Drive getDriveService()
- * @method static static setDriveService(mixed $drive)
+ * @method static self setDriveService(mixed $drive)
  * @method static array spreadsheetList()
  * @method static object spreadsheetProperties()
  * @method static object sheetProperties()

src/SheetsClient.php

@@ -30,7 +30,7 @@ class SheetsClient implements Factory
 
     protected ?string $sheet = null;
 
-    public function setService(mixed $service): static
+    public function setService(mixed $service): self
     {
         $this->service = $service;
 
@@ -45,7 +45,7 @@ public function getService(): GoogleSheets
     /**
      * set access_token and set new service.
      */
-    public function setAccessToken(#[\SensitiveParameter] array|string $token): static
+    public function setAccessToken(#[\SensitiveParameter] array|string $token): self
     {
         Google::getCache()->clear();
 
@@ -64,14 +64,14 @@ public function getAccessToken(): ?array
         return $this->getService()->getClient()->getAccessToken();
     }
 
-    public function spreadsheet(string $spreadsheetId): static
+    public function spreadsheet(string $spreadsheetId): self
     {
         $this->spreadsheetId = $spreadsheetId;
 
         return $this;
     }
 
-    public function spreadsheetByTitle(string $title): static
+    public function spreadsheetByTitle(string $title): self
     {
         $list = $this->spreadsheetList();
 
@@ -80,14 +80,14 @@ public function spreadsheetByTitle(string $title): static
         return $this;
     }
 
-    public function sheet(string $sheet): static
+    public function sheet(string $sheet): self
     {
         $this->sheet = $sheet;
 
         return $this;
     }
 
-    public function sheetById(string $sheetId): static
+    public function sheetById(string $sheetId): self
     {
         $list = $this->sheetList();