Fix typos (#611)

Author: szepeviktor

README.md

@@ -6,7 +6,7 @@ Additionally errors in code handling the results of sql queries can be detected.
 
 This extension provides the following features, as long as you [stick to the rules](https://staabm.github.io/2022/07/23/phpstan-dba-inference-placeholder.html#the-golden-phpstan-dba-rules):
 
-* [result set type-inferrence](https://staabm.github.io/2022/06/19/phpstan-dba-type-inference.html)
+* [result set type-inference](https://staabm.github.io/2022/06/19/phpstan-dba-type-inference.html)
 * [detect errors in sql queries](https://staabm.github.io/2022/08/05/phpstan-dba-syntax-error-detection.html)
 * [detect placeholder/bound value mismatches](https://staabm.github.io/2022/07/30/phpstan-dba-placeholder-validation.html)
 * [query plan analysis](https://staabm.github.io/2022/08/16/phpstan-dba-query-plan-analysis.html) to detect performance issues

docs/pgsql.md

@@ -2,7 +2,7 @@
 
 PGSQL/PostgresSQL is supported since `phpstandba 0.2.26`.
 
-While the `phpstandba` engine requires `pdo-pgsql` at analysis time, the codebase beeing analyzed can either use Doctrine DBAL or PDO.
+While the `phpstandba` engine requires `pdo-pgsql` at analysis time, the codebase being analyzed can either use Doctrine DBAL or PDO.
 
 **Note:** ["Record and Replay" is not yet supported on the PGSQL driver](https://github.com/staabm/phpstan-dba/issues/353)
 

docs/rules.md

@@ -50,7 +50,7 @@ services:
                 - 'Deployer\runMysqlQuery#0'
 ```
 
-__the callable format is `funtionName#parameterIndex`, while the parameter-index defines the position of the query-string argument.__
+__the callable format is `functionName#parameterIndex`, while the parameter-index defines the position of the query-string argument.__
 
 ## use `DoctrineKeyValueStyleRule` for your custom classes
 

src/Extensions/PdoStatementExecuteTypeSpecifyingExtension.php

@@ -46,13 +46,13 @@ public function specifyTypes(MethodReflection $methodReflection, MethodCall $nod
         $methodCall = $node;
 
         try {
-            $inferedType = $this->inferStatementType($methodReflection, $methodCall, $scope);
+            $inferredType = $this->inferStatementType($methodReflection, $methodCall, $scope);
         } catch (UnresolvableQueryException $e) {
             return new SpecifiedTypes();
         }
 
-        if (null !== $inferedType) {
-            return $this->typeSpecifier->create($methodCall->var, $inferedType, TypeSpecifierContext::createTruthy(), true);
+        if (null !== $inferredType) {
+            return $this->typeSpecifier->create($methodCall->var, $inferredType, TypeSpecifierContext::createTruthy(), true);
         }
 
         return new SpecifiedTypes();

src/QueryReflection/QuerySimulation.php

@@ -148,17 +148,17 @@ public static function stripTrailers(string $queryString): ?string
         // XXX someday we will use a proper SQL parser
         $queryString = rtrim($queryString);
 
-        // strip trailling delimiting semicolon
+        // strip trailing delimiting semicolon
         $queryString = rtrim($queryString, ';');
 
-        // strip trailling FOR UPDATE/FOR SHARE
+        // strip trailing FOR UPDATE/FOR SHARE
         $queryString = preg_replace('/(.*)FOR (UPDATE|SHARE)\s*(SKIP\s+LOCKED|NOWAIT)?$/i', '$1', $queryString);
 
         if (null === $queryString) {
-            throw new ShouldNotHappenException('Could not strip trailling FOR UPDATE/SHARE from query');
+            throw new ShouldNotHappenException('Could not strip trailing FOR UPDATE/SHARE from query');
         }
 
-        // strip trailling OFFSET
+        // strip trailing OFFSET
         $queryString = preg_replace('/(.*)OFFSET\s+["\']?\d+["\']?\s*$/i', '$1', $queryString);
 
         if (null === $queryString) {

src/SqlAst/ConcatReturnTypeExtension.php

@@ -29,7 +29,7 @@ public function getReturnType(FunctionCall $expression, QueryScope $scope): Type
         $args = $expression->getArguments();
 
         $results = [];
-        $containtsNull = false;
+        $containsNull = false;
         $allNumeric = true;
         $isNonFalsyString = false;
         $isNonEmptyString = false;
@@ -43,7 +43,7 @@ public function getReturnType(FunctionCall $expression, QueryScope $scope): Type
                 }
 
                 if (TypeCombinator::containsNull($argType)) {
-                    $containtsNull = true;
+                    $containsNull = true;
                 }
             }
 
@@ -75,7 +75,7 @@ public function getReturnType(FunctionCall $expression, QueryScope $scope): Type
 
         $results[] = TypeCombinator::intersect(new StringType(), ...$accessories);
 
-        if ($containtsNull) {
+        if ($containsNull) {
             $results[] = new NullType();
         }
 

tests/default/data/pdo-prepare.php

@@ -119,7 +119,7 @@ public function noInferenceOnBug196(PDO $pdo, array $minorPhpVersions, \DateTime
             'SELECT '.implode(', ', $sumQueries).' FROM ada WHERE adaid = :package'
         );
         $stmt->execute(['package' => 'abc']);
-        // this query is too dynamic for beeing analyzed.
+        // this query is too dynamic for being analyzed.
         // make sure we don't infer a wrong type.
         assertType('PDOStatement', $stmt);
     }

tests/defaultFetchAssoc/data/modes.php

@@ -26,7 +26,7 @@ public function assocModeFetch(PDO $pdo)
         assertType('array{email: string, adaid: int<-32768, 32767>}|false', $result);
     }
 
-    public function assocModeFetchOverriden(PDO $pdo)
+    public function assocModeFetchOverridden(PDO $pdo)
     {
         $stmt = $pdo->prepare('SELECT email, adaid FROM ada');
         assertType('PDOStatement<array{email: string, adaid: int<-32768, 32767>}>', $stmt);
@@ -36,15 +36,15 @@ public function assocModeFetchOverriden(PDO $pdo)
         assertType('array{string, int<-32768, 32767>}|false', $result);
     }
 
-    public function assocModeQueryFetchOverriden(PDO $pdo)
+    public function assocModeQueryFetchOverridden(PDO $pdo)
     {
         $stmt = $pdo->query('SELECT email, adaid FROM ada');
         assertType('PDOStatement<array{email: string, adaid: int<-32768, 32767>}>', $stmt);
         $result = $stmt->fetch(PDO::FETCH_NUM);
         assertType('array{string, int<-32768, 32767>}|false', $result);
     }
 
-    public function assocModeQueryOverriden(PDO $pdo)
+    public function assocModeQueryOverridden(PDO $pdo)
     {
         $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_NUM);
         assertType('PDOStatement<array{string, int<-32768, 32767>}>', $stmt);

tests/defaultFetchNumeric/data/modes.php

@@ -26,7 +26,7 @@ public function numericModeFetch(PDO $pdo)
         assertType('array{string, int<-32768, 32767>}|false', $result);
     }
 
-    public function numericModeFetchOverriden(PDO $pdo)
+    public function numericModeFetchOverridden(PDO $pdo)
     {
         $stmt = $pdo->prepare('SELECT email, adaid FROM ada');
         assertType('PDOStatement<array{string, int<-32768, 32767>}>', $stmt);
@@ -36,15 +36,15 @@ public function numericModeFetchOverriden(PDO $pdo)
         assertType('array{email: string, adaid: int<-32768, 32767>}|false', $result);
     }
 
-    public function numericModeQueryFetchOverriden(PDO $pdo)
+    public function numericModeQueryFetchOverridden(PDO $pdo)
     {
         $stmt = $pdo->query('SELECT email, adaid FROM ada');
         assertType('PDOStatement<array{string, int<-32768, 32767>}>', $stmt);
         $result = $stmt->fetch(PDO::FETCH_ASSOC);
         assertType('array{email: string, adaid: int<-32768, 32767>}|false', $result);
     }
 
-    public function numericModeQueryOverriden(PDO $pdo)
+    public function numericModeQueryOverridden(PDO $pdo)
     {
         $stmt = $pdo->query('SELECT email, adaid FROM ada', PDO::FETCH_ASSOC);
         assertType('PDOStatement<array{email: string, adaid: int<-32768, 32767>}>', $stmt);

tests/rules/data/syntax-error-in-prepared-statement.php

@@ -144,7 +144,7 @@ public function samePlaceholderMultipleTimes(Connection $connection)
         $connection->preparedQuery($query, [':gesperrt' => 1]);
     }
 
-    public function noErrorOnTraillingSemicolon(Connection $connection)
+    public function noErrorOnTrailingSemicolon(Connection $connection)
     {
         $query = 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada;';
         $connection->preparedQuery($query, []);
@@ -307,7 +307,7 @@ public function conditionalNumberOfPlaceholders(Connection $connection, string $
         $connection->preparedQuery($sql, $args);
     }
 
-    public function noErrorOnTraillingSemicolonAndWhitespace(Connection $connection)
+    public function noErrorOnTrailingSemicolonAndWhitespace(Connection $connection)
     {
         $query = 'SELECT email, adaid, gesperrt, freigabe1u1 FROM ada;  ';
         $connection->preparedQuery($query, []);