Improve formatting of equals()

Author: joshdifabio

demo/auto/AutoValue_Address.php

@@ -39,15 +39,13 @@ public function equals($foo): bool
             if (\is_array($value1)) {
                 $equal = \is_array($value2) && \count($value1) === \count($value2) && !\array_udiff_assoc($value1, $value2, $compareValues);
             } else {
-                $equal = $value1 === $value2
-                    || (\method_exists($value1, 'equals') ? $value1->equals($value2) : \is_object($value1) && $value1 == $value2);
+                $equal = $value1 === $value2 || (\method_exists($value1, 'equals') ? $value1->equals($value2) : \is_object($value1) && $value1 == $value2);
             }
             return $equal ? 0 : 1;
         };
         return $compareValues($this->metadata, $foo->metadata) === 0
             && $compareValues($this->foo, $foo->foo) === 0
-            && \count($this->lines) === \count($foo->lines)
-                && !\array_udiff_assoc($this->lines, $foo->lines, $compareValues);
+            && \count($this->lines) === \count($foo->lines) && !\array_udiff_assoc($this->lines, $foo->lines, $compareValues);
     }
 
     public function toBuilder(): \AutoValue\Demo\AddressBuilder

demo/auto/AutoValue_Command.php

@@ -32,8 +32,7 @@ public function equals($subject): bool
             if (\is_array($value1)) {
                 $equal = \is_array($value2) && \count($value1) === \count($value2) && !\array_udiff_assoc($value1, $value2, $compareValues);
             } else {
-                $equal = $value1 === $value2
-                    || (\method_exists($value1, 'equals') ? $value1->equals($value2) : \is_object($value1) && $value1 == $value2);
+                $equal = $value1 === $value2 || (\method_exists($value1, 'equals') ? $value1->equals($value2) : \is_object($value1) && $value1 == $value2);
             }
             return $equal ? 0 : 1;
         };

src/ValueEquals/EqualsMethodProcessor.php

@@ -101,15 +101,13 @@ private function generateMethodBody(
             $arrayProperties
                 ->filter(function (Property $property) { return $property->isRequired(); })
                 ->mapPropertyNames(function (string $propertyName) use ($valueParam) {
-                    return "\count(\$this->{$propertyName}) === \count(\${$valueParam}->$propertyName)
-                && !\array_udiff_assoc(\$this->{$propertyName}, \${$valueParam}->$propertyName, \$compareValues)";
+                    return "\count(\$this->{$propertyName}) === \count(\${$valueParam}->$propertyName) && !\array_udiff_assoc(\$this->{$propertyName}, \${$valueParam}->$propertyName, \$compareValues)";
                 }),
 
             $arrayProperties
                 ->filter(function (Property $property) { return !$property->isRequired(); })
                 ->mapPropertyNames(function (string $propertyName) use ($valueParam) {
-                    return "\$this->{$propertyName} === null ? \${$valueParam}->$propertyName === null
-                : (\count(\$this->{$propertyName}) === \count(\${$valueParam}->$propertyName) && !\array_udiff_assoc(\$this->{$propertyName}, \${$valueParam}->$propertyName, \$compareValues))";
+                    return "\$this->{$propertyName} === null ? \${$valueParam}->$propertyName === null : (\count(\$this->{$propertyName}) === \count(\${$valueParam}->$propertyName) && !\array_udiff_assoc(\$this->{$propertyName}, \${$valueParam}->$propertyName, \$compareValues))";
                 })
         );
 
@@ -123,8 +121,7 @@ private function generateMethodBody(
             if (\is_array(\$value1)) {
                 \$equal = \is_array(\$value2) && \count(\$value1) === \count(\$value2) && !\array_udiff_assoc(\$value1, \$value2, \$compareValues);
             } else {
-                \$equal = \$value1 === \$value2
-                    || (\method_exists(\$value1, 'equals') ? \$value1->equals(\$value2) : \is_object(\$value1) && \$value1 == \$value2);
+                \$equal = \$value1 === \$value2 || (\method_exists(\$value1, 'equals') ? \$value1->equals(\$value2) : \is_object(\$value1) && \$value1 == \$value2);
             }
             return \$equal ? 0 : 1;
         };