Run tests in PHP 8.1 (#3)

* Run tests in PHP 8.1

* Apply fixes from StyleCI

Co-authored-by: Daniel Mason <[email protected]>

Author: dmason30

.github/workflows/psalm.yml

@@ -16,8 +16,8 @@ jobs:
             - name: Setup PHP
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.0'
-                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+                  php-version: '8.1'
+                  extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
                   coverage: none
 
             - name: Cache composer dependencies

.github/workflows/run-tests.yml

@@ -9,7 +9,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.0, 7.4, 7.3]
+        php: ['8.1', '8.0', '7.4', '7.3']
         laravel: [8.*]
         dependency-version: [prefer-lowest, prefer-stable]
 
@@ -29,7 +29,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
           coverage: pcov
 
       - name: Install dependencies

src/HasMorphToOne.php

@@ -11,15 +11,14 @@ trait HasMorphToOne
     /**
      * Define a one-to-one via pivot relationship.
      *
-     * @param  string $related
-     * @param  string $name
-     * @param  string $table
-     * @param  string $foreignPivotKey
-     * @param  string $relatedPivotKey
-     * @param  string $parentKey
-     * @param  string $relatedKey
-     * @param  bool $inverse
-     *
+     * @param  string  $related
+     * @param  string  $name
+     * @param  string  $table
+     * @param  string  $foreignPivotKey
+     * @param  string  $relatedPivotKey
+     * @param  string  $parentKey
+     * @param  string  $relatedKey
+     * @param  bool  $inverse
      * @return MorphToOne
      */
     public function morphToOne($related, $name, $table = null, $foreignPivotKey = null,
@@ -52,17 +51,16 @@ public function morphToOne($related, $name, $table = null, $foreignPivotKey = nu
     /**
      * Instantiate a new MorphToOne relationship.
      *
-     * @param Builder $query
-     * @param Model $parent
-     * @param  string $name
-     * @param  string $table
-     * @param  string $foreignPivotKey
-     * @param  string $relatedPivotKey
-     * @param  string $parentKey
-     * @param  string $relatedKey
-     * @param  string $relationName
-     * @param  bool $inverse
-     *
+     * @param  Builder  $query
+     * @param  Model  $parent
+     * @param  string  $name
+     * @param  string  $table
+     * @param  string  $foreignPivotKey
+     * @param  string  $relatedPivotKey
+     * @param  string  $parentKey
+     * @param  string  $relatedKey
+     * @param  string  $relationName
+     * @param  bool  $inverse
      * @return MorphToOne
      */
     protected function newMorphToOne(Builder $query, Model $parent, $name, $table, $foreignPivotKey,
@@ -76,14 +74,13 @@ protected function newMorphToOne(Builder $query, Model $parent, $name, $table, $
     /**
      * Define a polymorphic, inverse many-to-many relationship but one.
      *
-     * @param  string $related
-     * @param  string $name
-     * @param  string $table
-     * @param  string $foreignPivotKey
-     * @param  string $relatedPivotKey
-     * @param  string $parentKey
-     * @param  string $relatedKey
-     *
+     * @param  string  $related
+     * @param  string  $name
+     * @param  string  $table
+     * @param  string  $foreignPivotKey
+     * @param  string  $relatedPivotKey
+     * @param  string  $parentKey
+     * @param  string  $relatedKey
      * @return MorphToOne
      */
     public function morphedByOne($related, $name, $table = null, $foreignPivotKey = null,

src/MorphToOne.php

@@ -24,9 +24,8 @@ public function getResults()
     /**
      * Initialize the relation on a set of models.
      *
-     * @param  array $models
-     * @param  string $relation
-     *
+     * @param  array  $models
+     * @param  string  $relation
      * @return array
      */
     public function initRelation(array $models, $relation)
@@ -41,10 +40,9 @@ public function initRelation(array $models, $relation)
     /**
      * Match the eagerly loaded results to their parents.
      *
-     * @param  array $models
-     * @param Collection $results
-     * @param  string $relation
-     *
+     * @param  array  $models
+     * @param  Collection  $results
+     * @param  string  $relation
      * @return array
      */
     public function match(array $models, Collection $results, $relation)
@@ -69,8 +67,7 @@ public function match(array $models, Collection $results, $relation)
     /**
      * Make a new related instance for the given model.
      *
-     * @param Model $parent
-     *
+     * @param  Model  $parent
      * @return Model
      */
     public function newRelatedInstanceFor(Model $parent)