Merge branch 'main' of github.com:spatie/diff

src/Differ.php

@@ -32,7 +32,7 @@ public function diff(mixed $first, mixed $second): DiffResult
 
  protected function determineTypeDiffer(mixed $first, mixed $second): ?TypeDiffer
  {
- foreach($this->differs as $differClass) {
+ foreach ($this->differs as $differClass) {
  $differClass = new $differClass;
 
  if ($differClass->candiff($first, $second)) {

src/Exceptions/CannotDiff.php

@@ -8,11 +8,11 @@ class CannotDiff extends Exception
 {
  public static function noDifferFound(mixed $first, mixed $second): self
  {
- return new self("We could not find a differ for the given type of the passed arguments");
+ return new self('We could not find a differ for the given type of the passed arguments');
  }
 
  public static function differentTypes(mixed $first, mixed $second): self
  {
- return new self("The given arguments are of different types");
+ return new self('The given arguments are of different types');
  }
 }

src/Normalisers/ObjectNormaliser.php

@@ -4,5 +4,4 @@
 
 class ObjectNormaliser
 {
-
 }

src/TypeDiffers/ArrayDiffer.php

@@ -13,21 +13,19 @@ public function canDiff(mixed $first, mixed $second): bool
  }
 
  /**
- * @param array $first
- * @param array $second
- *
- * @return \Spatie\Diff\DiffResult
+ * @param array $first
+ * @param array $second
  */
  public function diff($first, $second): DiffResult
  {
  $diffResult = new DiffResult($first, $second);
 
- foreach(array_diff_key($second, $first) as $key => $value) {
- $diffResult->add(DiffResultLineType::Added, $key, $value);
+ foreach (array_diff_key($second, $first) as $key => $value) {
+  $diffResult->add(DiffResultLineType::Added, $key, $value);
  }
 
- foreach(array_diff_key($first, $second) as $key => $value) {
- $diffResult->add(DiffResultLineType::Removed, $key, $value);
+ foreach (array_diff_key($first, $second) as $key => $value) {
+  $diffResult->add(DiffResultLineType::Removed, $key, $value);
  }
 
  foreach ($first as $key => $value) {

src/TypeDiffers/ScalarDiffer.php

@@ -6,7 +6,6 @@
 
 class ScalarDiffer implements TypeDiffer
 {
-
  public function canDiff(mixed $first, mixed $second): bool
  {
  return is_scalar($first) && is_scalar($second);