Skip to content

Commit

Permalink
Merge pull request #647 from ergebnis/fix/wrapping
Browse files Browse the repository at this point in the history
Fix: Wrapping
  • Loading branch information
localheinz committed Jan 22, 2022
2 parents e7b8e6d + 342d0ae commit 1e34de2
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 20 deletions.
6 changes: 4 additions & 2 deletions test/Unit/AbstractNormalizerTestCase.php
Expand Up @@ -46,8 +46,10 @@ final protected function className(): string
return $className;
}

final protected static function assertJsonStringEqualsJsonStringNormalized(string $expected, string $actual): void
{
final protected static function assertJsonStringEqualsJsonStringNormalized(
string $expected,
string $actual
): void {
$printer = new Printer\Printer();

$normalize = static function (string $json) use ($printer): string {
Expand Down
19 changes: 13 additions & 6 deletions test/Unit/Format/IndentTest.php
Expand Up @@ -94,8 +94,11 @@ public function testFromSizeAndStyleRejectsInvalidStyle(): void
/**
* @dataProvider provideSizeStyleAndIndentString
*/
public function testFromSizeAndStyleReturnsIndent(int $size, string $style, string $string): void
{
public function testFromSizeAndStyleReturnsIndent(
int $size,
string $style,
string $string
): void {
$indent = Format\Indent::fromSizeAndStyle(
$size,
$style,
Expand Down Expand Up @@ -186,8 +189,10 @@ public function provideValidIndentString(): \Generator
* @dataProvider provideMixedIndentAndSniffedIndent
* @dataProvider providePureIndentAndSniffedIndent
*/
public function testFromJsonReturnsIndentSniffedFromArray(string $actualIndent, string $sniffedIndent): void
{
public function testFromJsonReturnsIndentSniffedFromArray(
string $actualIndent,
string $sniffedIndent
): void {
$json = Json::fromEncoded(
<<<JSON
[
Expand All @@ -209,8 +214,10 @@ public function testFromJsonReturnsIndentSniffedFromArray(string $actualIndent,
* @dataProvider provideMixedIndentAndSniffedIndent
* @dataProvider providePureIndentAndSniffedIndent
*/
public function testFromJsonReturnsIndentSniffedFromObject(string $actualIndent, string $sniffedIndent): void
{
public function testFromJsonReturnsIndentSniffedFromObject(
string $actualIndent,
string $sniffedIndent
): void {
$json = Json::fromEncoded(
<<<JSON
{
Expand Down
6 changes: 4 additions & 2 deletions test/Unit/Format/JsonEncodeOptionsTest.php
Expand Up @@ -88,8 +88,10 @@ public function provideValidValue(): \Generator
/**
* @dataProvider provideJsonEncodeOptionsAndEncoded
*/
public function testFromJsonReturnsJsonEncodeOptions(int $value, string $encoded): void
{
public function testFromJsonReturnsJsonEncodeOptions(
int $value,
string $encoded
): void {
$json = Json::fromEncoded($encoded);

$jsonEncodeOptions = Format\JsonEncodeOptions::fromJson($json);
Expand Down
7 changes: 5 additions & 2 deletions test/Unit/SchemaNormalizerTest.php
Expand Up @@ -211,8 +211,11 @@ public function testNormalizeThrowsOriginalInvalidAccordingToSchemaExceptionWhen
/**
* @dataProvider provideExpectedEncodedAndSchemaUri
*/
public function testNormalizeNormalizes(string $expected, string $encoded, string $schemaUri): void
{
public function testNormalizeNormalizes(
string $expected,
string $encoded,
string $schemaUri
): void {
$json = Json::fromEncoded($encoded);

$normalizer = new SchemaNormalizer(
Expand Down
12 changes: 8 additions & 4 deletions test/Unit/Vendor/Composer/ComposerJsonNormalizerTest.php
Expand Up @@ -218,8 +218,10 @@ public function testNormalizeNormalizes(): void
/**
* @param class-string $className
*/
private static function assertComposesNormalizer(string $className, NormalizerInterface $normalizer): void
{
private static function assertComposesNormalizer(
string $className,
NormalizerInterface $normalizer
): void {
$attributeName = 'normalizer';

self::assertObjectHasAttribute($attributeName, $normalizer, \sprintf(
Expand All @@ -240,8 +242,10 @@ private static function assertComposesNormalizer(string $className, NormalizerIn
*
* @throws \ReflectionException
*/
private static function assertComposesNormalizers(array $classNames, NormalizerInterface $normalizer): void
{
private static function assertComposesNormalizers(
array $classNames,
NormalizerInterface $normalizer
): void {
$attributeName = 'normalizers';

self::assertObjectHasAttribute($attributeName, $normalizer, \sprintf(
Expand Down
14 changes: 10 additions & 4 deletions test/Unit/Vendor/Composer/VersionConstraintNormalizerTest.php
Expand Up @@ -96,8 +96,11 @@ public function provideProperty(): \Generator
/**
* @dataProvider providePropertyAndVersionConstraint
*/
public function testNormalizeNormalizesVersionConstraints(string $property, string $versionConstraint, string $normalizedVersionConstraint): void
{
public function testNormalizeNormalizesVersionConstraints(
string $property,
string $versionConstraint,
string $normalizedVersionConstraint
): void {
$json = Json::fromEncoded(
<<<JSON
{
Expand Down Expand Up @@ -147,8 +150,11 @@ public function providePropertyAndVersionConstraint(): \Generator
/**
* @dataProvider providePropertyAndUntrimmedVersionConstraint
*/
public function testNormalizeNormalizesTrimsVersionConstraints(string $property, string $versionConstraint, string $trimmedVersionConstraint): void
{
public function testNormalizeNormalizesTrimsVersionConstraints(
string $property,
string $versionConstraint,
string $trimmedVersionConstraint
): void {
$json = Json::fromEncoded(
<<<JSON
{
Expand Down

0 comments on commit 1e34de2

Please sign in to comment.