Fix typos

pgrimaud · ondrejmirtes · commit 5d439d4535b3 · 2020-04-24T21:13:32.000+02:00
diff --git a/src/Analyser/IgnoredErrorHelperResult.php b/src/Analyser/IgnoredErrorHelperResult.php
@@ -203,7 +203,7 @@ public function process(
 			}
 
 			$addErrors[] = new Error(sprintf(
-				'Ignored error pattern %s is expected to occur %d %s, but occured %d %s.',
+				'Ignored error pattern %s is expected to occur %d %s, but occurred %d %s.',
 				IgnoredError::stringifyPattern($unmatchedIgnoredError),
 				$unmatchedIgnoredError['count'],
 				$unmatchedIgnoredError['count'] === 1 ? 'time' : 'times',
@@ -225,7 +225,7 @@ public function process(
 				) {
 					if ($unmatchedIgnoredError['realCount'] < $unmatchedIgnoredError['count']) {
 						$errors[] = new Error(sprintf(
-							'Ignored error pattern %s is expected to occur %d %s, but occured only %d %s.',
+							'Ignored error pattern %s is expected to occur %d %s, but occurred only %d %s.',
 							IgnoredError::stringifyPattern($unmatchedIgnoredError),
 							$unmatchedIgnoredError['count'],
 							$unmatchedIgnoredError['count'] === 1 ? 'time' : 'times',
diff --git a/src/Command/ErrorFormatter/CheckstyleErrorFormatter.php b/src/Command/ErrorFormatter/CheckstyleErrorFormatter.php
@@ -96,7 +96,7 @@ protected function escape(string $string): string
 	 *
 	 * @param AnalysisResult $analysisResult
 	 * @return array<string, array> Array that have as key the relative path of file
-	 *                              and as value an array with occured errors.
+	 *                              and as value an array with occurred errors.
 	 */
 	private function groupByFile(AnalysisResult $analysisResult): array
 	{
diff --git a/src/Type/TypeCombinator.php b/src/Type/TypeCombinator.php
@@ -487,17 +487,17 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp
 
 		$keyTypesForGeneralArray = [];
 		$valueTypesForGeneralArray = [];
-		$generalArrayOcurred = false;
+		$generalArrayOccurred = false;
 		$constantKeyTypesNumbered = [];
 
 		/** @var int|float $nextConstantKeyTypeIndex */
 		$nextConstantKeyTypeIndex = 1;
 
 		foreach ($arrayTypes as $arrayType) {
-			if (!$arrayType instanceof ConstantArrayType || $generalArrayOcurred) {
+			if (!$arrayType instanceof ConstantArrayType || $generalArrayOccurred) {
 				$keyTypesForGeneralArray[] = $arrayType->getKeyType();
 				$valueTypesForGeneralArray[] = $arrayType->getItemType();
-				$generalArrayOcurred = true;
+				$generalArrayOccurred = true;
 				continue;
 			}
 
@@ -513,7 +513,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp
 				$constantKeyTypesNumbered[$keyTypeValue] = $nextConstantKeyTypeIndex;
 				$nextConstantKeyTypeIndex *= 2;
 				if (!is_int($nextConstantKeyTypeIndex)) {
-					$generalArrayOcurred = true;
+					$generalArrayOccurred = true;
 					continue;
 				}
 			}
@@ -526,7 +526,7 @@ private static function processArrayTypes(array $arrayTypes, array $accessoryTyp
 			), ...$accessoryTypes);
 		};
 
-		if ($generalArrayOcurred) {
+		if ($generalArrayOccurred) {
 			return [
 				$createGeneralArray(),
 			];
diff --git a/tests/PHPStan/Analyser/AnalyserTest.php b/tests/PHPStan/Analyser/AnalyserTest.php
@@ -121,7 +121,7 @@ public function testIgnoreErrorByPathAndCountMoreThanExpected(bool $onlyFiles):
 
 		$this->assertInstanceOf(Error::class, $result[2]);
 		$this->assertStringContainsString('Ignored error pattern #Fail\.#', $result[2]->getMessage());
-		$this->assertStringContainsString('is expected to occur 1 time, but occured 3 times.', $result[2]->getMessage());
+		$this->assertStringContainsString('is expected to occur 1 time, but occurred 3 times.', $result[2]->getMessage());
 		$this->assertSame(5, $result[2]->getLine());
 		$this->assertSamePaths(__DIR__ . '/data/two-fails.php', $result[2]->getFile());
 	}
@@ -143,7 +143,7 @@ public function testIgnoreErrorByPathAndCountLessThanExpected(bool $onlyFiles):
 		$this->assertCount(1, $result);
 		$this->assertInstanceOf(Error::class, $result[0]);
 		$this->assertStringContainsString('Ignored error pattern #Fail\.#', $result[0]->getMessage());
-		$this->assertStringContainsString('is expected to occur 4 times, but occured only 3 times.', $result[0]->getMessage());
+		$this->assertStringContainsString('is expected to occur 4 times, but occurred only 3 times.', $result[0]->getMessage());
 		$this->assertSamePaths(__DIR__ . '/data/two-fails.php', $result[0]->getFile());
 		$this->assertSame(5, $result[0]->getLine());
 	}

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ protected function escape(string $string): string`
`96`	`96`	`*`
`97`	`97`	`* @param AnalysisResult $analysisResult`
`98`	`98`	`* @return array<string, array> Array that have as key the relative path of file`
`99`		`- * and as value an array with occured errors.`
	`99`	`+ * and as value an array with occurred errors.`
`100`	`100`	`*/`
`101`	`101`	`private function groupByFile(AnalysisResult $analysisResult): array`
`102`	`102`	`{`