Enhancement: Enable and configure class_attributes_separation fixer (#181)

localheinz · web-flow · commit c99cffdeca58 · 2020-12-21T00:51:20.000+01:00
* Enhancement: Enable and configure class_attributes_separation fixer

* Fix: Run 'make cs'
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -47,6 +47,11 @@ return $config
             ],
         ],
         'cast_spaces' => true,
+        'class_attributes_separation' => [
+            'elements' => [
+                'method' => 'one',
+            ],
+        ],
         'combine_nested_dirname' => true,
         'compact_nullable_typehint' => true,
         'concat_space' => [
diff --git a/src/Faker/ORM/Spot/ColumnTypeGuesser.php b/src/Faker/ORM/Spot/ColumnTypeGuesser.php
@@ -8,7 +8,6 @@ class ColumnTypeGuesser
 {
     protected $generator;
 
-
     /**
      * ColumnTypeGuesser constructor.
      * @param Generator $generator
diff --git a/src/Faker/Provider/Internet.php b/src/Faker/Provider/Internet.php
@@ -94,6 +94,7 @@ final public static function safeEmailDomain()
 
         return static::randomElement($domains);
     }
+
     /**
      * @example 'jdoe'
      */
@@ -115,6 +116,7 @@ public function userName()
 
         return $username;
     }
+
     /**
      * @example 'fY4èHdZv68'
      */
diff --git a/src/Faker/Provider/cs_CZ/Person.php b/src/Faker/Provider/cs_CZ/Person.php
@@ -431,7 +431,6 @@ class Person extends \Faker\Provider\Person
      * @param  int         $maxAge maximal age of "generated person" in years
      * @return czech       birth number
      */
-
     public function birthNumber($gender = null, $minAge = 0, $maxAge = 100, $slashProbability = 50)
     {
         if ($gender === null) {
diff --git a/src/Faker/Provider/es_PE/Person.php b/src/Faker/Provider/es_PE/Person.php
@@ -88,7 +88,6 @@ public static function suffix()
         return static::randomElement(static::$suffix);
     }
 
-
     /**
      * Generate a Documento Nacional de Identidad (DNI) number
      *
diff --git a/src/Faker/Provider/fa_IR/PhoneNumber.php b/src/Faker/Provider/fa_IR/PhoneNumber.php
@@ -68,6 +68,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber
         '0937#######',
         '0990#######', // MCI
     ];
+
     public static function mobileNumber()
     {
         return static::numerify(static::randomElement(static::$mobileNumberPrefixes));
diff --git a/src/Faker/Provider/fr_FR/PhoneNumber.php b/src/Faker/Provider/fr_FR/PhoneNumber.php
@@ -133,6 +133,7 @@ public function mobileNumber()
 
         return static::numerify($this->generator->parse($format));
     }
+
     /**
      * @example '0891951357'
      */
diff --git a/src/Faker/Provider/ka_GE/Address.php b/src/Faker/Provider/ka_GE/Address.php
@@ -102,7 +102,6 @@ class Address extends \Faker\Provider\Address
         '{{cityPrefix}} {{cityName}}'
     ];
 
-
     public static function regionSuffix()
     {
         return static::randomElement(static::$regionSuffix);
diff --git a/src/Faker/Provider/ka_GE/Company.php b/src/Faker/Provider/ka_GE/Company.php
@@ -26,7 +26,6 @@ class Company extends \Faker\Provider\Company
         '{{companyPrefix}} {{companyNameElement}}{{companyNameElement}}{{companyNameElement}}{{companyNameSuffix}}',
     ];
 
-
     /**
      * @example 'იმ ელექტროალმასგეოსაბჭო'
      */
diff --git a/src/Faker/Provider/ko_KR/PhoneNumber.php b/src/Faker/Provider/ko_KR/PhoneNumber.php
@@ -31,8 +31,6 @@ public function localAreaPhoneNumber()
         return self::numerify($this->generator->parse($format));
     }
 
-
-
     public function cellPhoneNumber()
     {
         $format = self::randomElement(array_slice(static::$formats, 6, 1));
diff --git a/src/Faker/Provider/nl_NL/Company.php b/src/Faker/Provider/nl_NL/Company.php
@@ -63,7 +63,6 @@ class Company extends \Faker\Provider\Company
         'Café', 'Garage'
     ];
 
-
     /**
      * @example 'Fietsenmaker Zijlemans'
      *
diff --git a/src/Faker/Provider/pt_BR/Payment.php b/src/Faker/Provider/pt_BR/Payment.php
@@ -70,7 +70,6 @@ public static function bankAccountNumber($prefix = '', $countryCode = 'BR', $len
         return static::iban($countryCode, $prefix, $length);
     }
 
-
     /**
      * @see list of Brazilians banks (2018-02-15), source: https://pt.wikipedia.org/wiki/Lista_de_bancos_do_Brasil
      */
diff --git a/test/Faker/Calculator/IbanTest.php b/test/Faker/Calculator/IbanTest.php
@@ -295,6 +295,7 @@ public function mod97Provider()
 
         return $return;
     }
+
     /**
      * @dataProvider mod97Provider
      */
diff --git a/test/Faker/Provider/BaseTest.php b/test/Faker/Provider/BaseTest.php
@@ -24,7 +24,6 @@ public function testRandomDigitNotNullReturnsNotNullDigit()
         self::assertLessThan(10, BaseProvider::randomDigitNotNull());
     }
 
-
     public function testRandomDigitNotReturnsValidDigit()
     {
         for ($i = 0; $i <= 9; $i++) {
diff --git a/test/Faker/Provider/PaymentTest.php b/test/Faker/Provider/PaymentTest.php
@@ -165,6 +165,7 @@ public function ibanFormatProvider()
 
         return $return;
     }
+
     /**
      * @dataProvider ibanFormatProvider
      */
diff --git a/test/Faker/Provider/ProviderOverrideTest.php b/test/Faker/Provider/ProviderOverrideTest.php
@@ -38,7 +38,6 @@ public function testAddress($locale = null)
         self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->country);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
@@ -51,7 +50,6 @@ public function testCompany($locale = null)
         self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->company);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
@@ -65,7 +63,6 @@ public function testDateTime($locale = null)
         self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->timezone);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
@@ -87,7 +84,6 @@ public function testInternet($locale = null)
         self::assertMatchesRegularExpression(static::TEST_EMAIL_REGEX, $faker->companyEmail);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
@@ -103,7 +99,6 @@ public function testPerson($locale = null)
         self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->lastName);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
@@ -116,7 +111,6 @@ public function testPhoneNumber($locale = null)
         self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->phoneNumber);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
@@ -129,7 +123,6 @@ public function testUserAgent($locale = null)
         self::assertMatchesRegularExpression(static::TEST_STRING_REGEX, $faker->userAgent);
     }
 
-
     /**
      * @dataProvider localeDataProvider
      *
diff --git a/test/Faker/Provider/fr_FR/CompanyTest.php b/test/Faker/Provider/fr_FR/CompanyTest.php
@@ -55,7 +55,6 @@ public function testIsCatchPhraseValidReturnsTrueWhenNoWordAppearsTwice()
         self::assertTrue($isCatchPhraseValid);
     }
 
-
     protected function getProviders(): iterable
     {
         yield new Company($this->faker);
diff --git a/test/Faker/Provider/ja_JP/PhoneNumberTest.php b/test/Faker/Provider/ja_JP/PhoneNumberTest.php
@@ -16,7 +16,6 @@ public function testPhoneNumber()
         }
     }
 
-
     protected function getProviders(): iterable
     {
         yield new PhoneNumber($this->faker);
diff --git a/test/Faker/Provider/kk_KZ/CompanyTest.php b/test/Faker/Provider/kk_KZ/CompanyTest.php
@@ -19,7 +19,6 @@ public function testBusinessIdentificationNumberIsValid()
         );
     }
 
-
     protected function getProviders(): iterable
     {
         yield new Company($this->faker);
diff --git a/test/Faker/Provider/kk_KZ/PersonTest.php b/test/Faker/Provider/kk_KZ/PersonTest.php
@@ -17,7 +17,6 @@ public function testIndividualIdentificationNumberIsValid()
         self::assertSame($controlDigit, (int) substr($individualIdentificationNumber, 11, 1));
     }
 
-
     protected function getProviders(): iterable
     {
         yield new Person($this->faker);
diff --git a/test/Faker/Provider/mn_MN/PersonTest.php b/test/Faker/Provider/mn_MN/PersonTest.php
@@ -17,7 +17,6 @@ public function testIdNumber()
         self::assertMatchesRegularExpression('/^[А-Я]{2}\d{8}$/u', $this->faker->idNumber);
     }
 
-
     protected function getProviders(): iterable
     {
         yield new Person($this->faker);
diff --git a/test/Faker/Provider/pt_PT/PhoneNumberTest.php b/test/Faker/Provider/pt_PT/PhoneNumberTest.php
@@ -11,6 +11,7 @@ public function testPhoneNumberReturnsPhoneNumberWithOrWithoutPrefix()
     {
         self::assertMatchesRegularExpression('/^(9[1,2,3,6][0-9]{7})|(2[0-9]{8})|(\+351 [2][0-9]{8})|(\+351 9[1,2,3,6][0-9]{7})/', $this->faker->phoneNumber());
     }
+
     public function testMobileNumberReturnsMobileNumberWithOrWithoutPrefix()
     {
         self::assertMatchesRegularExpression('/^(9[1,2,3,6][0-9]{7})/', $this->faker->mobileNumber());
diff --git a/test/Faker/Provider/ro_RO/PersonTest.php b/test/Faker/Provider/ro_RO/PersonTest.php
@@ -82,7 +82,6 @@ public function testAllRandomReturnsValidCnp()
         );
     }
 
-
     public function testValidGenderReturnsValidCnp()
     {
         $cnp = $this->faker->cnp(Person::GENDER_MALE);
@@ -157,7 +156,6 @@ public function testInvalidCountyCodeThrowsException($value)
         $this->faker->cnp(null, null, $value);
     }
 
-
     public function testNonResidentReturnsValidCnp()
     {
         $cnp = $this->faker->cnp(null, null, null, false);
@@ -191,7 +189,6 @@ public function testValidInputDataReturnsValidCnp($gender, $dateOfBirth, $county
         );
     }
 
-
     protected function isValidFemaleCnp($value)
     {
         return $this->isValidCnp($value) && in_array($value[0], [2, 4, 6, 8, 9]);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ class ColumnTypeGuesser`
`8`	`8`	`{`
`9`	`9`	`protected $generator;`
`10`	`10`
`11`		`-`
`12`	`11`	`/**`
`13`	`12`	`* ColumnTypeGuesser constructor.`
`14`	`13`	`* @param Generator $generator`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ final public static function safeEmailDomain()`
`94`	`94`
`95`	`95`	`return static::randomElement($domains);`
`96`	`96`	`}`
	`97`	`+`
`97`	`98`	`/**`
`98`	`99`	`* @example 'jdoe'`
`99`	`100`	`*/`
`@@ -115,6 +116,7 @@ public function userName()`
`115`	`116`
`116`	`117`	`return $username;`
`117`	`118`	`}`
	`119`	`+`
`118`	`120`	`/**`
`119`	`121`	`* @example 'fY4èHdZv68'`
`120`	`122`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -431,7 +431,6 @@ class Person extends \Faker\Provider\Person`
`431`	`431`	`* @param int $maxAge maximal age of "generated person" in years`
`432`	`432`	`* @return czech birth number`
`433`	`433`	`*/`
`434`		`-`
`435`	`434`	`public function birthNumber($gender = null, $minAge = 0, $maxAge = 100, $slashProbability = 50)`
`436`	`435`	`{`
`437`	`436`	`if ($gender === null) {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,6 @@ public static function suffix()`
`88`	`88`	`return static::randomElement(static::$suffix);`
`89`	`89`	`}`
`90`	`90`
`91`		`-`
`92`	`91`	`/**`
`93`	`92`	`* Generate a Documento Nacional de Identidad (DNI) number`
`94`	`93`	`*`
Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ class PhoneNumber extends \Faker\Provider\PhoneNumber`
`68`	`68`	`'0937#######',`
`69`	`69`	`'0990#######', // MCI`
`70`	`70`	`];`
	`71`	`+`
`71`	`72`	`public static function mobileNumber()`
`72`	`73`	`{`
`73`	`74`	`return static::numerify(static::randomElement(static::$mobileNumberPrefixes));`
Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ public function mobileNumber()`
`133`	`133`
`134`	`134`	`return static::numerify($this->generator->parse($format));`
`135`	`135`	`}`
	`136`	`+`
`136`	`137`	`/**`
`137`	`138`	`* @example '0891951357'`
`138`	`139`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,6 @@ class Address extends \Faker\Provider\Address`
`102`	`102`	`'{{cityPrefix}} {{cityName}}'`
`103`	`103`	`];`
`104`	`104`
`105`		`-`
`106`	`105`	`public static function regionSuffix()`
`107`	`106`	`{`
`108`	`107`	`return static::randomElement(static::$regionSuffix);`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ public function localAreaPhoneNumber()`
`31`	`31`	`return self::numerify($this->generator->parse($format));`
`32`	`32`	`}`
`33`	`33`
`34`		`-`
`35`		`-`
`36`	`34`	`public function cellPhoneNumber()`
`37`	`35`	`{`
`38`	`36`	`$format = self::randomElement(array_slice(static::$formats, 6, 1));`