Add static return type

aplus-developer · Jun 27, 2021 · 3b20562 · 3b20562
1 parent 97204d7
commit 3b20562
Show file tree

Hide file tree

Showing 28 changed files with 463 additions and 402 deletions.
diff --git a/src/Database.php b/src/Database.php
@@ -149,15 +149,15 @@ protected function makeConfig(array $config) : array
 	 *
 	 * @throws Exception
 	 *
-	 * @return $this
+	 * @return static
 	 */
 	protected function connect(
 		array | string $username,
 		string $password = null,
 		string $schema = null,
 		string $host = 'localhost',
 		int $port = 3306
-	) {
+	) : static {
 		if ( ! \is_array($username)) {
 			$username = [
 				'host' => $host,

diff --git a/src/Definition/AlterSchema.php b/src/Definition/AlterSchema.php
@@ -22,9 +22,9 @@ class AlterSchema extends Statement
 	/**
 	 * @param string $schemaName
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function schema(string $schemaName)
+	public function schema(string $schemaName) : static
 	{
 		$this->sql['schema'] = $schemaName;
 		return $this;
@@ -45,9 +45,9 @@ protected function renderSchema() : ?string
 	/**
 	 * @param string $charset
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function charset(string $charset)
+	public function charset(string $charset) : static
 	{
 		$this->sql['charset'] = $charset;
 		return $this;
@@ -65,9 +65,9 @@ protected function renderCharset() : ?string
 	/**
 	 * @param string $collation
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function collate(string $collation)
+	public function collate(string $collation) : static
 	{
 		$this->sql['collation'] = $collation;
 		return $this;
@@ -83,9 +83,9 @@ protected function renderCollate() : ?string
 	}
 
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function upgrade()
+	public function upgrade() : static
 	{
 		$this->sql['upgrade'] = true;
 		return $this;

diff --git a/src/Definition/AlterTable.php b/src/Definition/AlterTable.php
@@ -22,9 +22,9 @@
 class AlterTable extends Statement
 {
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function online()
+	public function online() : static
 	{
 		$this->sql['online'] = true;
 		return $this;
@@ -39,9 +39,9 @@ protected function renderOnline() : ?string
 	}
 
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function ignore()
+	public function ignore() : static
 	{
 		$this->sql['ignore'] = true;
 		return $this;
@@ -58,9 +58,9 @@ protected function renderIgnore() : ?string
 	/**
 	 * @param string $tableName
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function table(string $tableName)
+	public function table(string $tableName) : static
 	{
 		$this->sql['table'] = $tableName;
 		return $this;
@@ -77,9 +77,9 @@ protected function renderTable() : string
 	/**
 	 * @param int $seconds
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function wait(int $seconds)
+	public function wait(int $seconds) : static
 	{
 		$this->sql['wait'] = $seconds;
 		return $this;
@@ -101,9 +101,9 @@ protected function renderWait() : ?string
 	/**
 	 * @param callable $definition
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function add(callable $definition)
+	public function add(callable $definition) : static
 	{
 		$this->sql['add'] = $definition;
 		return $this;
@@ -122,9 +122,9 @@ protected function renderAdd() : ?string
 	/**
 	 * @param callable $definition
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function change(callable $definition)
+	public function change(callable $definition) : static
 	{
 		$this->sql['change'] = $definition;
 		return $this;
@@ -143,9 +143,9 @@ protected function renderChange() : ?string
 	/**
 	 * @param callable $definition
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function modify(callable $definition)
+	public function modify(callable $definition) : static
 	{
 		$this->sql['modify'] = $definition;
 		return $this;
@@ -164,9 +164,9 @@ protected function renderModify() : ?string
 	/**
 	 * @param callable $definition
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function dropColumns(callable $definition)
+	public function dropColumns(callable $definition) : static
 	{
 		$this->sql['drop_columns'] = $definition;
 		return $this;
@@ -175,9 +175,9 @@ public function dropColumns(callable $definition)
 	/**
 	 * @param callable $definition
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function drop(callable $definition)
+	public function drop(callable $definition) : static
 	{
 		$this->sql['drop'] = $definition;
 		return $this;

diff --git a/src/Definition/CreateSchema.php b/src/Definition/CreateSchema.php
@@ -20,9 +20,9 @@
 class CreateSchema extends Statement
 {
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function orReplace()
+	public function orReplace() : static
 	{
 		$this->sql['or_replace'] = true;
 		return $this;
@@ -37,9 +37,9 @@ protected function renderOrReplace() : ?string
 	}
 
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function ifNotExists()
+	public function ifNotExists() : static
 	{
 		$this->sql['if_not_exists'] = true;
 		return $this;
@@ -61,9 +61,9 @@ protected function renderIfNotExists() : ?string
 	/**
 	 * @param string $schemaName
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function schema(string $schemaName)
+	public function schema(string $schemaName) : static
 	{
 		$this->sql['schema'] = $schemaName;
 		return $this;
@@ -80,9 +80,9 @@ protected function renderSchema() : string
 	/**
 	 * @param string $charset
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function charset(string $charset)
+	public function charset(string $charset) : static
 	{
 		$this->sql['charset'] = $charset;
 		return $this;
@@ -100,9 +100,9 @@ protected function renderCharset() : ?string
 	/**
 	 * @param string $collation
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function collate(string $collation)
+	public function collate(string $collation) : static
 	{
 		$this->sql['collation'] = $collation;
 		return $this;

diff --git a/src/Definition/CreateTable.php b/src/Definition/CreateTable.php
@@ -25,9 +25,9 @@ class CreateTable extends Statement
 	 *
 	 * WARNING: This feature is MariaDB only. It is not compatible with MySQL.
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function orReplace()
+	public function orReplace() : static
 	{
 		$this->sql['or_replace'] = true;
 		return $this;
@@ -47,9 +47,9 @@ protected function renderOrReplace() : ?string
 	}
 
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function temporary()
+	public function temporary() : static
 	{
 		$this->sql['temporary'] = true;
 		return $this;
@@ -64,9 +64,9 @@ protected function renderTemporary() : ?string
 	}
 
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function ifNotExists()
+	public function ifNotExists() : static
 	{
 		$this->sql['if_not_exists'] = true;
 		return $this;
@@ -88,9 +88,9 @@ protected function renderIfNotExists() : ?string
 	/**
 	 * @param string $tableName
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function table(string $tableName)
+	public function table(string $tableName) : static
 	{
 		$this->sql['table'] = $tableName;
 		return $this;
@@ -107,9 +107,9 @@ protected function renderTable() : string
 	/**
 	 * @param callable $definition
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function definition(callable $definition)
+	public function definition(callable $definition) : static
 	{
 		$this->sql['definition'] = $definition;
 		return $this;

diff --git a/src/Definition/DropSchema.php b/src/Definition/DropSchema.php
@@ -20,9 +20,9 @@
 class DropSchema extends Statement
 {
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function ifExists()
+	public function ifExists() : static
 	{
 		$this->sql['if_exists'] = true;
 		return $this;
@@ -39,9 +39,9 @@ protected function renderIfExists() : ?string
 	/**
 	 * @param string $schemaName
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function schema(string $schemaName)
+	public function schema(string $schemaName) : static
 	{
 		$this->sql['schema'] = $schemaName;
 		return $this;

diff --git a/src/Definition/DropTable.php b/src/Definition/DropTable.php
@@ -21,9 +21,9 @@
 class DropTable extends Statement
 {
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function temporary()
+	public function temporary() : static
 	{
 		$this->sql['temporary'] = true;
 		return $this;
@@ -38,9 +38,9 @@ protected function renderTemporary() : ?string
 	}
 
 	/**
-	 * @return $this
+	 * @return static
 	 */
-	public function ifExists()
+	public function ifExists() : static
 	{
 		$this->sql['if_exists'] = true;
 		return $this;
@@ -57,9 +57,9 @@ protected function renderIfExists() : ?string
 	/**
 	 * @param string $comment
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function commentToSave(string $comment)
+	public function commentToSave(string $comment) : static
 	{
 		$this->sql['comment'] = $comment;
 		return $this;
@@ -78,9 +78,9 @@ protected function renderCommentToSave() : ?string
 	 * @param string $table
 	 * @param string ...$tables
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function table(string $table, string ...$tables)
+	public function table(string $table, string ...$tables) : static
 	{
 		$this->sql['tables'] = $tables ? \array_merge([$table], $tables) : [$table];
 		return $this;
@@ -103,9 +103,9 @@ protected function renderTables() : string
 	/**
 	 * @param int $seconds
 	 *
-	 * @return $this
+	 * @return static
 	 */
-	public function wait(int $seconds)
+	public function wait(int $seconds) : static
 	{
 		$this->sql['wait'] = $seconds;
 		return $this;