Fixed typos. (#837)

* Fixed typos.

Author: dereuromark

psalm-baseline.xml

@@ -186,9 +186,6 @@
     <RedundantPropertyInitializationCheck>
       <code><![CDATA[isset($this->container)]]></code>
     </RedundantPropertyInitializationCheck>
-    <ReferenceReusedFromConfusingScope>
-      <code><![CDATA[$executedVersion]]></code>
-    </ReferenceReusedFromConfusingScope>
   </file>
   <file src="src/Migration/ManagerFactory.php">
     <UndefinedConstant>

src/AbstractMigration.php

@@ -32,7 +32,7 @@ class AbstractMigration extends BaseAbstractMigration
     /**
      * Hook method to decide if this migration should use transactions
      *
-     * By default if your driver supports transactions, a transaction will be opened
+     * By default, if your driver supports transactions, a transaction will be opened
      * before the migration begins, and commit when the migration completes.
      *
      * @return bool

src/BaseMigration.php

@@ -199,7 +199,7 @@ public function setMigratingUp(bool $isMigratingUp)
     /**
      * Hook method to decide if this migration should use transactions
      *
-     * By default if your driver supports transactions, a transaction will be opened
+     * By default, if your driver supports transactions, a transaction will be opened
      * before the migration begins, and commit when the migration completes.
      *
      * @return bool
@@ -253,7 +253,7 @@ public function query(string $sql, array $params = []): mixed
      * Returns a new Query object that can be used to build complex SELECT, UPDATE, INSERT or DELETE
      * queries and execute them against the current database.
      *
-     * Queries executed through the query builder are always sent to the database, regardless of the
+     * Queries executed through the query builder are always sent to the database, regardless of
      * the dry-run settings.
      *
      * @see https://api.cakephp.org/3.6/class-Cake.Database.Query.html
@@ -269,7 +269,7 @@ public function getQueryBuilder(string $type): Query
      * Returns a new SelectQuery object that can be used to build complex
      * SELECT queries and execute them against the current database.
      *
-     * Queries executed through the query builder are always sent to the database, regardless of the
+     * Queries executed through the query builder are always sent to the database, regardless of
      * the dry-run settings.
      *
      * @return \Cake\Database\Query\SelectQuery
@@ -283,7 +283,7 @@ public function getSelectBuilder(): SelectQuery
      * Returns a new InsertQuery object that can be used to build complex
      * INSERT queries and execute them against the current database.
      *
-     * Queries executed through the query builder are always sent to the database, regardless of the
+     * Queries executed through the query builder are always sent to the database, regardless of
      * the dry-run settings.
      *
      * @return \Cake\Database\Query\InsertQuery
@@ -297,7 +297,7 @@ public function getInsertBuilder(): InsertQuery
      * Returns a new UpdateQuery object that can be used to build complex
      * UPDATE queries and execute them against the current database.
      *
-     * Queries executed through the query builder are always sent to the database, regardless of the
+     * Queries executed through the query builder are always sent to the database, regardless of
      * the dry-run settings.
      *
      * @return \Cake\Database\Query\UpdateQuery
@@ -311,7 +311,7 @@ public function getUpdateBuilder(): UpdateQuery
      * Returns a new DeleteQuery object that can be used to build complex
      * DELETE queries and execute them against the current database.
      *
-     * Queries executed through the query builder are always sent to the database, regardless of the
+     * Queries executed through the query builder are always sent to the database, regardless of
      * the dry-run settings.
      *
      * @return \Cake\Database\Query\DeleteQuery
@@ -369,7 +369,7 @@ public function dropDatabase(string $name): void
     /**
      * Creates schema.
      *
-     * This will thrown an error for adapters that do not support schemas.
+     * This will throw an error for adapters that do not support schemas.
      *
      * @param string $name Schema name
      * @return void
@@ -383,7 +383,7 @@ public function createSchema(string $name): void
     /**
      * Drops schema.
      *
-     * This will thrown an error for adapters that do not support schemas.
+     * This will throw an error for adapters that do not support schemas.
      *
      * @param string $name Schema name
      * @return void

src/CakeAdapter.php

@@ -81,8 +81,8 @@ public function getCakeConnection(): Connection
     /**
      * Returns a new Query object
      *
-     * @param string $type The type of query to generate (one of the
-     *  `\Cake\Database\Query::TYPE_*` constants).
+     * @param string $type The type of query to generate
+     *   (one of the `\Cake\Database\Query::TYPE_*` constants).
      * @return \Cake\Database\Query
      */
     public function getQueryBuilder(string $type): Query

src/Command/BakeMigrationDiffCommand.php

@@ -203,7 +203,7 @@ public function templateData(Arguments $arguments): array
     }
 
     /**
-     * This methods runs the various methods needed to calculate a diff between the current
+     * This method runs the various methods needed to calculate a diff between the current
      * state of the database and the schema dump file.
      *
      * @return void

src/Command/Phinx/MarkMigrated.php

@@ -95,7 +95,7 @@ protected function configure(): void
     /**
      * Mark migrations as migrated
      *
-     * `bin/cake migrations mark_migrated` mark every migrations as migrated
+     * `bin/cake migrations mark_migrated` mark every migration as migrated
      * `bin/cake migrations mark_migrated all` DEPRECATED: the same effect as above
      * `bin/cake migrations mark_migrated --target=VERSION` mark migrations as migrated up to the VERSION param
      * `bin/cake migrations mark_migrated --target=20150417223600 --exclude` mark migrations as migrated up to

src/Command/SnapshotTrait.php

@@ -43,7 +43,7 @@ protected function createFile(string $path, string $contents, Arguments $args, C
 
     /**
      * @internal
-     * @return bool Whether or not the builtin backend is active.
+     * @return bool Whether the builtin backend is active.
      */
     protected function useBuiltinBackend(): bool
     {

src/ConfigurationTrait.php

@@ -247,7 +247,7 @@ protected function getConnectionName(InputInterface $input): string
      * Translates driver specific connection flags (PDO attributes) to
      * Phinx compatible adapter options.
      *
-     * Currently Phinx supports of the following flags:
+     * Currently, Phinx supports of the following flags:
      *
      * - *Most* of `PDO::ATTR_*`
      * - `PDO::MYSQL_ATTR_*`

src/Db/Adapter/AbstractAdapter.php

@@ -1157,7 +1157,7 @@ public function dropIndex(string $tableName, string|array $columns): void
     /**
      * Returns the instructions to drop the specified index from a database table.
      *
-     * @param string $tableName The name of of the table where the index is
+     * @param string $tableName The name of the table where the index is
      * @param string|string[] $columns Column(s)
      * @return \Migrations\Db\AlterInstructions
      */

src/Db/Plan/Plan.php

@@ -208,7 +208,7 @@ function (RenameColumn $a, ChangeColumn $b) {
         $this->tableUpdates = $tableUpdates;
 
         // Dropping indexes used by foreign keys is a conflict, but one we can resolve
-        // if the foreign key is also scheduled to be dropped. If we can find such a a case,
+        // if the foreign key is also scheduled to be dropped. If we can find such a case,
         // we force the execution of the index drop after the foreign key is dropped.
         // Changing constraint properties sometimes require dropping it and then
         // creating it again with the new stuff. Unfortunately, we have already bundled