Downgrade min required php version to 7.1 (fixes #89) (#90)

f3ath · web-flow · commit 6b9374a46c5c · 2018-12-31T16:34:57.000-08:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 php:
-  - '7.2'
+  - '7.1'
 
 before_script:
   - composer install
diff --git a/composer.json b/composer.json
@@ -11,11 +11,11 @@
     }
   ],
   "require": {
-    "php": ">=7.2"
+    "php": ">=7.1"
   },
   "require-dev": {
     "phpunit/phpunit": "^7.0",
-    "friendsofphp/php-cs-fixer": "^2.2"
+    "friendsofphp/php-cs-fixer": "^2.13"
   },
   "autoload": {
     "psr-4": {
diff --git a/src/Attribute.php b/src/Attribute.php
@@ -20,7 +20,10 @@ public function __construct(string $name, $val)
         $this->val = $val;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'attributes')->{$this->name} = $this->val;
     }
diff --git a/src/Error.php b/src/Error.php
@@ -21,7 +21,10 @@ public function __construct(ErrorMember ...$members)
         }
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->errors[] = $this->error;
     }
diff --git a/src/Error/Code.php b/src/Error/Code.php
@@ -19,7 +19,10 @@ public function __construct(string $code)
         $this->code = $code;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->code = $this->code;
     }
diff --git a/src/Error/Detail.php b/src/Error/Detail.php
@@ -19,7 +19,10 @@ public function __construct(string $detail)
         $this->detail = $detail;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->detail = $this->detail;
     }
diff --git a/src/Error/Id.php b/src/Error/Id.php
@@ -19,7 +19,10 @@ public function __construct(string $id)
         $this->id = $id;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->id = $this->id;
     }
diff --git a/src/Error/SourceParameter.php b/src/Error/SourceParameter.php
@@ -20,7 +20,10 @@ public function __construct(string $parameter)
         $this->parameter = $parameter;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'source')->parameter = $this->parameter;
     }
diff --git a/src/Error/SourcePointer.php b/src/Error/SourcePointer.php
@@ -17,7 +17,10 @@ public function __construct(string $pointer)
         $this->pointer = $pointer;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'source')->pointer = $this->pointer;
     }
diff --git a/src/Error/Status.php b/src/Error/Status.php
@@ -19,7 +19,10 @@ public function __construct(string $status)
         $this->status = $status;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->status = $this->status;
     }
diff --git a/src/Error/Title.php b/src/Error/Title.php
@@ -20,7 +20,10 @@ public function __construct(string $title)
         $this->title = $title;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->title = $this->title;
     }
diff --git a/src/Included.php b/src/Included.php
@@ -38,7 +38,10 @@ public function validateLinkage(PrimaryData $data): void
         }
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         foreach ($this->resources as $resource) {
             $resource->attachAsIncludedTo($o);
diff --git a/src/Internal/Attachable.php b/src/Internal/Attachable.php
@@ -7,5 +7,8 @@
  */
 interface Attachable
 {
-    public function attachTo(object $o): void;
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void;
 }
diff --git a/src/JsonApi.php b/src/JsonApi.php
@@ -20,7 +20,10 @@ public function __construct(string $version = '1.0', Meta $meta = null)
         }
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->jsonapi = $this->obj;
     }
diff --git a/src/Link/AboutLink.php b/src/Link/AboutLink.php
@@ -10,7 +10,10 @@ final class AboutLink implements ErrorMember
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->about = $this->link;
     }
diff --git a/src/Link/FirstLink.php b/src/Link/FirstLink.php
@@ -10,7 +10,10 @@ final class FirstLink implements PaginationLink
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->first = $this->link;
     }
diff --git a/src/Link/LastLink.php b/src/Link/LastLink.php
@@ -10,7 +10,10 @@ final class LastLink implements PaginationLink
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->last = $this->link;
     }
diff --git a/src/Link/NextLink.php b/src/Link/NextLink.php
@@ -10,7 +10,10 @@ final class NextLink implements PaginationLink
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->next = $this->link;
     }
diff --git a/src/Link/PrevLink.php b/src/Link/PrevLink.php
@@ -10,7 +10,10 @@ final class PrevLink implements PaginationLink
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->prev = $this->link;
     }
diff --git a/src/Link/RelatedLink.php b/src/Link/RelatedLink.php
@@ -10,7 +10,10 @@ final class RelatedLink implements ToOneMember
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->related = $this->link;
     }
diff --git a/src/Link/SelfLink.php b/src/Link/SelfLink.php
@@ -12,7 +12,10 @@ final class SelfLink implements DataDocumentMember, ResourceMember, ToOneMember
 {
     use LinkTrait;
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         child($o, 'links')->self = $this->link;
     }
diff --git a/src/Meta.php b/src/Meta.php
@@ -26,7 +26,7 @@ public function __construct(string $key, $value)
         $this->value = $value;
     }
 
-    public function attachTo(object $o): void
+    public function attachTo($o): void
     {
         child($o, 'meta')->{$this->key} = $this->value;
     }
diff --git a/src/NullData.php b/src/NullData.php
@@ -6,7 +6,10 @@
 
 final class NullData implements PrimaryData
 {
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->data = null;
     }
diff --git a/src/PaginatedCollection.php b/src/PaginatedCollection.php
@@ -22,7 +22,10 @@ public function __construct(Pagination $pagination, Collection $collection)
         $this->collection = $collection;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $this->collection->attachTo($o);
         $this->pagination->attachTo($o);
diff --git a/src/Pagination.php b/src/Pagination.php
@@ -18,7 +18,10 @@ public function __construct(PaginationLink ...$links)
         $this->links = $links;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         foreach ($this->links as $link) {
             $link->attachTo($o);
diff --git a/src/ResourceCollection.php b/src/ResourceCollection.php
@@ -17,7 +17,10 @@ public function __construct(ResourceObject ...$resources)
         $this->resources = $resources;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->data = [];
         foreach ($this->resources as $resource) {
diff --git a/src/ResourceIdentifier.php b/src/ResourceIdentifier.php
@@ -33,12 +33,18 @@ public function __construct(string $type, string $id, Meta $meta = null)
         $this->id = $id;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->data = $this->obj;
     }
 
-    public function attachToCollection(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachToCollection($o): void
     {
         $o->data[] = $this->obj;
     }
diff --git a/src/ResourceIdentifierCollection.php b/src/ResourceIdentifierCollection.php
@@ -17,7 +17,10 @@ public function __construct(ResourceIdentifier ...$identifiers)
         $this->identifiers = $identifiers;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->data = [];
         foreach ($this->identifiers as $identifier) {
diff --git a/src/ResourceObject.php b/src/ResourceObject.php
@@ -59,17 +59,26 @@ public function registerIn(array &$registry): void
         $registry = array_merge($registry, $this->registry);
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $o->data = $this->obj;
     }
 
-    public function attachAsIncludedTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachAsIncludedTo($o): void
     {
         $o->included[] = $this->obj;
     }
 
-    public function attachToCollection(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachToCollection($o): void
     {
         $o->data[] = $this->obj;
     }
diff --git a/src/ToMany.php b/src/ToMany.php
@@ -27,7 +27,10 @@ public function __construct(string $name, ResourceIdentifierCollection $collecti
         $this->collection = $collection;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $rel = child(child($o, 'relationships'), $this->name);
         $rel->data = [];
diff --git a/src/ToNull.php b/src/ToNull.php
@@ -21,7 +21,10 @@ public function __construct(string $name, ToOneMember ...$members)
         $this->members = $members;
     }
 
-    public function attachTo(object $o): void
+    /**
+     * @param object $o
+     */
+    public function attachTo($o): void
     {
         $obj = combine(...$this->members);
         $obj->data = null;
diff --git a/src/ToOne.php b/src/ToOne.php
diff --git a/src/functions.php b/src/functions.php
diff --git a/test/BaseTestCase.php b/test/BaseTestCase.php

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@ public function __construct(string $name, $val)`
`20`	`20`	`$this->val = $val;`
`21`	`21`	`}`
`22`	`22`
`23`		`- public function attachTo(object $o): void`
	`23`	`+ /**`
	`24`	`+ * @param object $o`
	`25`	`+ */`
	`26`	`+ public function attachTo($o): void`
`24`	`27`	`{`
`25`	`28`	`child($o, 'attributes')->{$this->name} = $this->val;`
`26`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,10 @@ public function __construct(ErrorMember ...$members)`
`21`	`21`	`}`
`22`	`22`	`}`
`23`	`23`
`24`		`- public function attachTo(object $o): void`
	`24`	`+ /**`
	`25`	`+ * @param object $o`
	`26`	`+ */`
	`27`	`+ public function attachTo($o): void`
`25`	`28`	`{`
`26`	`29`	`$o->errors[] = $this->error;`
`27`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,10 @@ public function __construct(string $code)`
`19`	`19`	`$this->code = $code;`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function attachTo(object $o): void`
	`22`	`+ /**`
	`23`	`+ * @param object $o`
	`24`	`+ */`
	`25`	`+ public function attachTo($o): void`
`23`	`26`	`{`
`24`	`27`	`$o->code = $this->code;`
`25`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,10 @@ public function __construct(string $pointer)`
`17`	`17`	`$this->pointer = $pointer;`
`18`	`18`	`}`
`19`	`19`
`20`		`- public function attachTo(object $o): void`
	`20`	`+ /**`
	`21`	`+ * @param object $o`
	`22`	`+ */`
	`23`	`+ public function attachTo($o): void`
`21`	`24`	`{`
`22`	`25`	`child($o, 'source')->pointer = $this->pointer;`
`23`	`26`	`}`