CS fixes

canvural · canvural · commit 038d2a04700f · 2020-07-22T13:25:22.000+02:00
diff --git a/src/Exception/NoPath.php b/src/Exception/NoPath.php
@@ -5,14 +5,15 @@
 namespace Vural\OpenAPIFaker\Exception;
 
 use Exception;
+
 use function Safe\sprintf;
 
 class NoPath extends Exception
 {
     protected string $method;
     protected string $path;
 
-    public static function forPathAndMethod(string $path, string $method) : self
+    public static function forPathAndMethod(string $path, string $method): self
     {
         $e         = new self(sprintf('OpenAPI spec does not have a path for %s %s', $method, $path));
         $e->path   = $path;
diff --git a/src/Exception/NoRequest.php b/src/Exception/NoRequest.php
@@ -5,6 +5,7 @@
 namespace Vural\OpenAPIFaker\Exception;
 
 use Exception;
+
 use function Safe\sprintf;
 
 class NoRequest extends Exception
@@ -13,7 +14,7 @@ class NoRequest extends Exception
     protected string $path;
     protected string $contentType;
 
-    public static function forPathAndMethod(string $path, string $method) : self
+    public static function forPathAndMethod(string $path, string $method): self
     {
         $e         = new self(sprintf('OpenAPI spec does not have a response for %s %s', $method, $path));
         $e->path   = $path;
@@ -22,7 +23,7 @@ public static function forPathAndMethod(string $path, string $method) : self
         return $e;
     }
 
-    public static function forPathAndMethodAndContentType(string $path, string $method, string $contentType) : self
+    public static function forPathAndMethodAndContentType(string $path, string $method, string $contentType): self
     {
         $e              = new self(sprintf('OpenAPI spec does not have a response for %s %s', $method, $path));
         $e->path        = $path;
diff --git a/src/Exception/NoResponse.php b/src/Exception/NoResponse.php
@@ -5,6 +5,7 @@
 namespace Vural\OpenAPIFaker\Exception;
 
 use Exception;
+
 use function Safe\sprintf;
 
 class NoResponse extends Exception
@@ -13,7 +14,7 @@ class NoResponse extends Exception
     protected string $path;
     protected ?string $statusCode = null;
 
-    public static function forPathAndMethod(string $path, string $method) : self
+    public static function forPathAndMethod(string $path, string $method): self
     {
         $e         = new self(sprintf('OpenAPI spec does not have a response for %s %s', $method, $path));
         $e->path   = $path;
@@ -22,7 +23,7 @@ public static function forPathAndMethod(string $path, string $method) : self
         return $e;
     }
 
-    public static function forPathAndMethodAndStatusCode(string $path, string $method, string $statusCode) : self
+    public static function forPathAndMethodAndStatusCode(string $path, string $method, string $statusCode): self
     {
         $e             = new self(sprintf('OpenAPI spec does not have a response for status code %s at %s %s', $statusCode, $method, $path));
         $e->path       = $path;
diff --git a/src/Exception/NoSchema.php b/src/Exception/NoSchema.php
@@ -5,18 +5,19 @@
 namespace Vural\OpenAPIFaker\Exception;
 
 use Exception;
+
 use function Safe\sprintf;
 
 class NoSchema extends Exception
 {
     public string $name;
 
-    public static function forZeroComponents() : self
+    public static function forZeroComponents(): self
     {
         return new self('OpenAPI spec does not have any components.');
     }
 
-    public static function forComponentName(string $name) : self
+    public static function forComponentName(string $name): self
     {
         return new self(sprintf('OpenAPI spec does not have any component schema named %s.', $name));
     }
diff --git a/src/OpenAPIFaker.php b/src/OpenAPIFaker.php
@@ -19,6 +19,7 @@
 use Vural\OpenAPIFaker\Exception\NoResponse;
 use Vural\OpenAPIFaker\Exception\NoSchema;
 use Vural\OpenAPIFaker\SchemaFaker\SchemaFaker;
+
 use function array_key_exists;
 use function strtolower;
 
@@ -35,7 +36,7 @@ private function __construct()
      * @throws TypeErrorException
      * @throws UnresolvableReferenceException
      */
-    public static function createFromJson(string $json) : self
+    public static function createFromJson(string $json): self
     {
         $instance                = new static();
         $instance->openAPISchema = (new LeagueOpenAPI\SchemaFactory\JsonFactory($json))->createSchema();
@@ -47,7 +48,7 @@ public static function createFromJson(string $json) : self
      * @throws TypeErrorException
      * @throws UnresolvableReferenceException
      */
-    public static function createFromYaml(string $yaml) : self
+    public static function createFromYaml(string $yaml): self
     {
         $instance                = new static();
         $instance->openAPISchema = (new LeagueOpenAPI\SchemaFactory\YamlFactory($yaml))->createSchema();
@@ -143,7 +144,7 @@ public function mockComponentSchema(string $schemaName)
     /**
      * @throws NoPath
      */
-    private function findOperation(string $path, string $method) : Operation
+    private function findOperation(string $path, string $method): Operation
     {
         try {
             $operation = (new LeagueOpenAPI\SpecFinder($this->openAPISchema))
diff --git a/src/SchemaFaker/ArrayFaker.php b/src/SchemaFaker/ArrayFaker.php
@@ -6,6 +6,7 @@
 
 use cebe\openapi\spec\Schema;
 use Faker\Provider\Base;
+
 use function array_unique;
 use function array_values;
 
@@ -17,7 +18,7 @@ final class ArrayFaker
     /**
      * @return array<mixed>
      */
-    public static function generate(Schema $schema) : array
+    public static function generate(Schema $schema): array
     {
         $minimum  = $schema->minItems ?? 0;
         $maximum  = $schema->maxItems ?? $minimum + 15;
diff --git a/src/SchemaFaker/BooleanFaker.php b/src/SchemaFaker/BooleanFaker.php
@@ -6,14 +6,15 @@
 
 use cebe\openapi\spec\Schema;
 use Faker\Provider\Base;
+
 use function random_int;
 
 /**
  * @internal
  */
 final class BooleanFaker
 {
-    public static function generate(Schema $schema) : bool
+    public static function generate(Schema $schema): bool
     {
         if ($schema->enum !== null) {
             return Base::randomElement($schema->enum);
diff --git a/src/SchemaFaker/NumberFaker.php b/src/SchemaFaker/NumberFaker.php
@@ -6,6 +6,7 @@
 
 use cebe\openapi\spec\Schema;
 use Faker\Provider\Base;
+
 use function mt_getrandmax;
 
 /**
diff --git a/src/SchemaFaker/ObjectFaker.php b/src/SchemaFaker/ObjectFaker.php
@@ -6,6 +6,7 @@
 
 use cebe\openapi\spec\Schema;
 use Faker\Provider\Base;
+
 use function array_diff;
 use function array_keys;
 use function array_merge;
@@ -20,7 +21,7 @@ final class ObjectFaker
     /**
      * @return array<mixed>
      */
-    public static function generate(Schema $schema) : array
+    public static function generate(Schema $schema): array
     {
         $result = [];
 
diff --git a/src/SchemaFaker/SchemaFaker.php b/src/SchemaFaker/SchemaFaker.php
@@ -6,6 +6,7 @@
 
 use cebe\openapi\spec\Schema;
 use Faker\Provider\Base;
+
 use function array_key_exists;
 use function array_reverse;
 use function in_array;
@@ -64,7 +65,7 @@ public function generate()
      *
      * @return array<mixed>
      */
-    private function resolveOfConstraints(array $schema) : array
+    private function resolveOfConstraints(array $schema): array
     {
         $copy = $schema;
         foreach ($copy as $key => $item) {
@@ -108,7 +109,7 @@ private function resolveOfConstraints(array $schema) : array
      *
      * @return array<mixed>
      */
-    private function merge(array $firstArray, array $secondArray) : array
+    private function merge(array $firstArray, array $secondArray): array
     {
         // phpcs:ignore
         foreach ($secondArray as $key => $_) {
diff --git a/src/SchemaFaker/StringFaker.php b/src/SchemaFaker/StringFaker.php
@@ -11,17 +11,19 @@
 use Faker\Provider\Internet;
 use Faker\Provider\Lorem;
 use Faker\Provider\Uuid;
+
 use function max;
 use function Safe\substr;
 use function strlen;
+
 use const DATE_RFC3339;
 
 /**
  * @internal
  */
 final class StringFaker
 {
-    public static function generate(Schema $schema) : string
+    public static function generate(Schema $schema): string
     {
         if ($schema->enum !== null) {
             return Base::randomElement($schema->enum);
@@ -51,25 +53,33 @@ public static function generate(Schema $schema) : string
         return $result;
     }
 
-    private static function generateFromFormat(Schema $schema) : string
+    private static function generateFromFormat(Schema $schema): string
     {
         switch ($schema->format) {
             case 'date':
                 return DateTime::date('Y-m-d', '2199-01-01');
+
             case 'date-time':
                 return DateTime::dateTime('2199-01-01 00:00:00')->format(DATE_RFC3339);
+
             case 'email':
                 return (new Internet(Factory::create()))->safeEmail();
+
             case 'uuid':
                 return Uuid::uuid();
+
             case 'uri':
                 return (new Internet(Factory::create()))->url();
+
             case 'hostname':
                 return (new Internet(Factory::create()))->domainName();
+
             case 'ipv4':
                 return (new Internet(Factory::create()))->ipv4();
+
             case 'ipv6':
                 return (new Internet(Factory::create()))->ipv6();
+
             default:
                 return Lorem::word();
         }
diff --git a/tests/Integration/E2ETest.php b/tests/Integration/E2ETest.php
@@ -12,6 +12,7 @@
 use PHPUnit\Framework\TestCase;
 use Throwable;
 use Vural\OpenAPIFaker\OpenAPIFaker;
+
 use function Safe\file_get_contents;
 use function Safe\sprintf;
 
@@ -140,7 +141,7 @@ function it_can_generate_valid_component(string $filename)
     /**
      * @return string[][]
      */
-    public function specProvider() : array
+    public function specProvider(): array
     {
         return [
             ['petstore'],
diff --git a/tests/Integration/OpenAPIFakerTest.php b/tests/Integration/OpenAPIFakerTest.php
@@ -10,6 +10,7 @@
 use Vural\OpenAPIFaker\Exception\NoResponse;
 use Vural\OpenAPIFaker\Exception\NoSchema;
 use Vural\OpenAPIFaker\OpenAPIFaker;
+
 use function count;
 
 class OpenAPIFakerTest extends TestCase
@@ -437,7 +438,7 @@ function it_will_throw_exception_if_schema_does_not_exist()
         $faker->mockComponentSchema('DummySchema');
     }
 
-    private function getTodosSpec() : string
+    private function getTodosSpec(): string
     {
         return <<<'YAML'
 openapi: 3.0.2
diff --git a/tests/SchemaFactory.php b/tests/SchemaFactory.php
@@ -6,16 +6,17 @@
 
 use cebe\openapi\spec\Schema;
 use Symfony\Component\Yaml\Yaml;
+
 use function Safe\json_decode;
 
 final class SchemaFactory
 {
-    public static function fromJson(string $content) : Schema
+    public static function fromJson(string $content): Schema
     {
         return new Schema(json_decode($content, true));
     }
 
-    public static function fromYaml(string $content) : Schema
+    public static function fromYaml(string $content): Schema
     {
         return new Schema(Yaml::parse($content));
     }
diff --git a/tests/Unit/SchemaFaker/ArrayFakerTest.php b/tests/Unit/SchemaFaker/ArrayFakerTest.php
@@ -7,6 +7,7 @@
 use Vural\OpenAPIFaker\SchemaFaker\ArrayFaker;
 use Vural\OpenAPIFaker\Tests\SchemaFactory;
 use Vural\OpenAPIFaker\Tests\Unit\UnitTestCase;
+
 use function array_unique;
 use function Safe\sort;
 
diff --git a/tests/Unit/SchemaFaker/SchemaFakerTest.php b/tests/Unit/SchemaFaker/SchemaFakerTest.php
@@ -9,6 +9,7 @@
 use Vural\OpenAPIFaker\SchemaFaker\SchemaFaker;
 use Vural\OpenAPIFaker\Tests\SchemaFactory;
 use Vural\OpenAPIFaker\Tests\Unit\UnitTestCase;
+
 use function array_keys;
 
 /**
diff --git a/tests/Unit/SchemaFaker/StringFakerTest.php b/tests/Unit/SchemaFaker/StringFakerTest.php
@@ -8,9 +8,11 @@
 use Vural\OpenAPIFaker\SchemaFaker\StringFaker;
 use Vural\OpenAPIFaker\Tests\SchemaFactory;
 use Vural\OpenAPIFaker\Tests\Unit\UnitTestCase;
+
 use function filter_var;
 use function Safe\sprintf;
 use function strlen;
+
 use const FILTER_VALIDATE_URL;
 
 /**
diff --git a/tests/Unit/UnitTestCase.php b/tests/Unit/UnitTestCase.php
@@ -6,14 +6,16 @@
 
 use PHPUnit\Framework\TestCase;
 use Spatie\Snapshots\MatchesSnapshots;
+
 use function mt_srand;
+
 use const MT_RAND_PHP;
 
 class UnitTestCase extends TestCase
 {
     use MatchesSnapshots;
 
-    public function setUp() : void
+    public function setUp(): void
     {
         parent::setUp();
 

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,15 @@`
`5`	`5`	`namespace Vural\OpenAPIFaker\Exception;`
`6`	`6`
`7`	`7`	`use Exception;`
	`8`	`+`
`8`	`9`	`use function Safe\sprintf;`
`9`	`10`
`10`	`11`	`class NoPath extends Exception`
`11`	`12`	`{`
`12`	`13`	`protected string $method;`
`13`	`14`	`protected string $path;`
`14`	`15`
`15`		`- public static function forPathAndMethod(string $path, string $method) : self`
	`16`	`+ public static function forPathAndMethod(string $path, string $method): self`
`16`	`17`	`{`
`17`	`18`	`$e = new self(sprintf('OpenAPI spec does not have a path for %s %s', $method, $path));`
`18`	`19`	`$e->path = $path;`
Original file line number	Diff line number	Diff line change
`@@ -5,18 +5,19 @@`
`5`	`5`	`namespace Vural\OpenAPIFaker\Exception;`
`6`	`6`
`7`	`7`	`use Exception;`
	`8`	`+`
`8`	`9`	`use function Safe\sprintf;`
`9`	`10`
`10`	`11`	`class NoSchema extends Exception`
`11`	`12`	`{`
`12`	`13`	`public string $name;`
`13`	`14`
`14`		`- public static function forZeroComponents() : self`
	`15`	`+ public static function forZeroComponents(): self`
`15`	`16`	`{`
`16`	`17`	`return new self('OpenAPI spec does not have any components.');`
`17`	`18`	`}`
`18`	`19`
`19`		`- public static function forComponentName(string $name) : self`
	`20`	`+ public static function forComponentName(string $name): self`
`20`	`21`	`{`
`21`	`22`	`return new self(sprintf('OpenAPI spec does not have any component schema named %s.', $name));`
`22`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`use cebe\openapi\spec\Schema;`
`8`	`8`	`use Faker\Provider\Base;`
	`9`	`+`
`9`	`10`	`use function array_key_exists;`
`10`	`11`	`use function array_reverse;`
`11`	`12`	`use function in_array;`
`@@ -64,7 +65,7 @@ public function generate()`
`64`	`65`	`*`
`65`	`66`	`* @return array<mixed>`
`66`	`67`	`*/`
`67`		`- private function resolveOfConstraints(array $schema) : array`
	`68`	`+ private function resolveOfConstraints(array $schema): array`
`68`	`69`	`{`
`69`	`70`	`$copy = $schema;`
`70`	`71`	`foreach ($copy as $key => $item) {`
`@@ -108,7 +109,7 @@ private function resolveOfConstraints(array $schema) : array`
`108`	`109`	`*`
`109`	`110`	`* @return array<mixed>`
`110`	`111`	`*/`
`111`		`- private function merge(array $firstArray, array $secondArray) : array`
	`112`	`+ private function merge(array $firstArray, array $secondArray): array`
`112`	`113`	`{`
`113`	`114`	`// phpcs:ignore`
`114`	`115`	`foreach ($secondArray as $key => $_) {`