Merge branch 'master' of github.com:spatie/typed

spatie · Jul 23, 2018 · 40e4ac8 · 40e4ac8
2 parents 6fb0753 + d5351a3
commit 40e4ac8
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 21 deletions.
diff --git a/src/Collection.php b/src/Collection.php
@@ -36,7 +36,7 @@ public function __construct($type)
         $this->set($type);
     }
 
-    public function set(array $data): Collection
+    public function set(array $data): self
     {
         foreach ($data as $item) {
             $this[] = $item;

diff --git a/src/Excpetions/InferredTypeError.php b/src/Excpetions/InferredTypeError.php
@@ -6,7 +6,7 @@
 
 class InferredTypeError extends TypeError
 {
-    public static function cannotInferType(string $name): InferredTypeError
+    public static function cannotInferType(string $name): self
     {
         return new self("Cannot infer type {$name}.");
     }

diff --git a/src/Excpetions/UninitialisedError.php b/src/Excpetions/UninitialisedError.php
@@ -6,7 +6,7 @@
 
 class UninitialisedError extends TypeError
 {
-    public static function forField(string $name): UninitialisedError
+    public static function forField(string $name): self
     {
         return new self("Field {$name} was uninitialised.");
     }

diff --git a/src/Struct.php b/src/Struct.php
@@ -5,8 +5,8 @@
 namespace Spatie\Typed;
 
 use ArrayAccess;
-use Spatie\Typed\Excpetions\UninitialisedError;
 use Spatie\Typed\Excpetions\WrongType;
+use Spatie\Typed\Excpetions\UninitialisedError;
 
 class Struct implements ArrayAccess
 {
@@ -21,7 +21,7 @@ class Struct implements ArrayAccess
     public function __construct(array $types)
     {
         foreach ($types as $field => $type) {
-            if (!$type instanceof Type) {
+            if (! $type instanceof Type) {
                 $this->values[$field] = $type;
 
                 $type = T::infer($type);

diff --git a/src/T.php b/src/T.php
@@ -4,7 +4,6 @@
 
 namespace Spatie\Typed;
 
-use Spatie\Typed\Excpetions\InferredTypeError;
 use Spatie\Typed\Types\NullType;
 use Spatie\Typed\Types\ArrayType;
 use Spatie\Typed\Types\FloatType;
@@ -15,6 +14,7 @@
 use Spatie\Typed\Types\IntegerType;
 use Spatie\Typed\Types\CallableType;
 use Spatie\Typed\Types\CollectionType;
+use Spatie\Typed\Excpetions\InferredTypeError;
 
 class T
 {
@@ -99,6 +99,6 @@ public static function infer($value): Type
             throw InferredTypeError::cannotInferType($type);
         }
 
-        return forward_static_call(self::class . '::' . $type);
+        return forward_static_call(self::class.'::'.$type);
     }
 }
diff --git a/src/Tuple.php b/src/Tuple.php
@@ -6,9 +6,8 @@
 
 use Iterator;
 use ArrayAccess;
-use Spatie\Typed\Excpetions\UninitialisedError;
-use Spatie\Typed\Excpetions\UninitialisedValue;
 use Spatie\Typed\Excpetions\WrongType;
+use Spatie\Typed\Excpetions\UninitialisedError;
 
 class Tuple implements ArrayAccess
 {
@@ -23,7 +22,7 @@ class Tuple implements ArrayAccess
     public function __construct(...$types)
     {
         foreach ($types as $field => $type) {
-            if (!$type instanceof Type) {
+            if (! $type instanceof Type) {
                 $this->values[$field] = $type;
 
                 $type = T::infer($type);

diff --git a/src/Types/UnionType.php b/src/Types/UnionType.php
@@ -6,8 +6,8 @@
 
 use TypeError;
 use Spatie\Typed\Type;
-use Spatie\Typed\Excpetions\WrongType;
 use Spatie\Typed\ValidatesType;
+use Spatie\Typed\Excpetions\WrongType;
 
 class UnionType implements Type
 {

diff --git a/src/ValidatesType.php b/src/ValidatesType.php
@@ -4,8 +4,8 @@
 
 namespace Spatie\Typed;
 
-use Spatie\Typed\Excpetions\WrongType;
 use TypeError;
+use Spatie\Typed\Excpetions\WrongType;
 
 trait ValidatesType
 {

diff --git a/tests/StructTest.php b/tests/StructTest.php
@@ -4,13 +4,13 @@
 
 namespace Spatie\Typed\Tests;
 
-use Spatie\Typed\Excpetions\UninitialisedError;
-use Spatie\Typed\Tests\Extra\Post;
-use Spatie\Typed\Excpetions\WrongType;
 use TypeError;
 use Spatie\Typed\T;
 use Spatie\Typed\Struct;
+use Spatie\Typed\Tests\Extra\Post;
 use Spatie\Typed\Tests\Extra\Wrong;
+use Spatie\Typed\Excpetions\WrongType;
+use Spatie\Typed\Excpetions\UninitialisedError;
 
 class StructTest extends TestCase
 {

diff --git a/tests/TupleTest.php b/tests/TupleTest.php
@@ -4,8 +4,6 @@
 
 namespace Spatie\Typed\Tests;
 
-use Spatie\Typed\Excpetions\InferredTypeError;
-use Spatie\Typed\Excpetions\UninitialisedError;
 use Spatie\Typed\T;
 use Spatie\Typed\Tuple;
 use Spatie\Typed\Tests\Extra\Post;
@@ -14,6 +12,7 @@
 use Spatie\Typed\Types\BooleanType;
 use Spatie\Typed\Types\IntegerType;
 use Spatie\Typed\Excpetions\WrongType;
+use Spatie\Typed\Excpetions\UninitialisedError;
 
 class TupleTest extends TestCase
 {

diff --git a/tests/TypeTest.php b/tests/TypeTest.php
@@ -4,10 +4,9 @@
 
 namespace Spatie\Typed\Tests;
 
-use Spatie\Typed\Excpetions\InferredTypeError;
-use Spatie\Typed\Type;
 use TypeError;
 use Spatie\Typed\T;
+use Spatie\Typed\Type;
 use Spatie\Typed\Collection;
 use Spatie\Typed\Types\ArrayType;
 use Spatie\Typed\Types\FloatType;
@@ -19,6 +18,7 @@
 use Spatie\Typed\Types\IntegerType;
 use Spatie\Typed\Types\CallableType;
 use Spatie\Typed\Types\CollectionType;
+use Spatie\Typed\Excpetions\InferredTypeError;
 
 class TypeTest extends TestCase
 {
@@ -48,7 +48,6 @@ public function wrong_types_throw_type_errors($type, $value)
         $collection[] = $value;
     }
 
-
     /** @test */
     public function unknown_types_cannot_be_inferred()
     {
@@ -107,7 +106,8 @@ public function inferredProvider()
             [new Post(), T::generic(Post::class)],
             [[], T::array()],
             [true, T::boolean()],
-            [function () {}, T::callable()],
+            [function () {
+            }, T::callable()],
         ];
     }
 }