Merge cb390df into 9436207

tylernathanreed · Apr 1, 2023 · 93325c6 · 93325c6
2 parents 9436207 + cb390df
commit 93325c6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 20 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -15,18 +15,18 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, xdebug
           tools: composer:v2
           coverage: xdebug
 
       - name: Install dependencies
-        uses: nick-invision/retry@v1
+        uses: nick-invision/retry@v2
         with:
           timeout_minutes: 5
           max_attempts: 2

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
@@ -15,18 +15,18 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.0
+          php-version: 8.1
           extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd
           tools: composer:v2
           coverage: none
 
       - name: Install dependencies
-        uses: nick-invision/retry@v1
+        uses: nick-invision/retry@v2
         with:
           timeout_minutes: 5
           max_attempts: 2

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -11,14 +11,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.3', '7.4', '8.0']
+        php: ['7.3', '7.4', '8.0', '8.1']
         stability: [prefer-lowest, prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -29,7 +29,7 @@ jobs:
           coverage: none
 
       - name: Install dependencies
-        uses: nick-invision/retry@v1
+        uses: nick-invision/retry@v2
         with:
           timeout_minutes: 5
           max_attempts: 2

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Laravel Relation Joins
 
-[![Laravel Version](https://img.shields.io/badge/Laravel-7.x%2F8.x%2F9.x-blue)](https://laravel.com/)
+[![Laravel Version](https://img.shields.io/badge/Laravel-8.x%2F9.x%2F10.x-blue)](https://laravel.com/)
 [![Build Status](https://github.com/tylernathanreed/laravel-relation-joins/workflows/tests/badge.svg)](https://github.com/tylernathanreed/laravel-relation-joins/actions)
 [![Style Status](https://github.com/tylernathanreed/laravel-relation-joins/workflows/style/badge.svg)](https://github.com/tylernathanreed/laravel-relation-joins/actions)
 [![Coverage Status](https://coveralls.io/repos/github/tylernathanreed/laravel-relation-joins/badge.svg?branch=master)](https://coveralls.io/github/tylernathanreed/laravel-relation-joins?branch=master)
@@ -62,8 +62,9 @@ Reedware\LaravelRelationJoins\LaravelRelationJoinServiceProvider::class
 <a name="versioning"></a>
 ### Versioning
 
-This package was built with the latest version of Laravel in mind, but support goes back to Laravel 7.x.
+This package was built with the latest version of Laravel in mind, but support goes back to Laravel 8.x.
 
+For Laravel 7.x, use version 3.x of this package.
 For Laravel 6.x, use version 2.x of this package.  
 For Laravel 5.5, use version 1.x of this package.
 

diff --git a/composer.json b/composer.json
@@ -10,15 +10,16 @@
         }
     ],
     "require": {
-        "php": ">=7.2.5",
-        "illuminate/database": "^7.30.4|^8.23|^9.0",
-        "illuminate/support": "^7.30.4|^8.23|^9.0"
+        "php": ">=7.3",
+        "illuminate/contracts": "^8.83|^9.52|^10.0",
+        "illuminate/database": "^8.83|^9.52|^10.0",
+        "illuminate/support": "^8.83|^9.52|^10.0"
     },
     "require-dev": {
-        "illuminate/container": "^7.30.4|^8.23|^9.0",
-        "mockery/mockery": "^1.4.3",
+        "illuminate/container": "^8.83|^9.52|^10.0",
+        "mockery/mockery": "^1.5.1",
         "php-coveralls/php-coveralls": "^2.4",
-        "phpunit/phpunit": "^8.5|^9.5",
+        "phpunit/phpunit": "^8.5.33|^9.5",
         "squizlabs/php_codesniffer": "^3.6"
     },
     "autoload": {

diff --git a/src/RelationJoinQuery.php b/src/RelationJoinQuery.php
@@ -111,7 +111,7 @@ protected static function belongsTo(Relation $relation, Builder $query, Builder
      */
     protected static function belongsToMany(Relation $relation, Builder $query, Builder $parentQuery, string $type = 'inner', string $alias = null)
     {
-        if (strpos($alias, ',') !== false) {
+        if (! is_null($alias) && strpos($alias, ',') !== false) {
             [$pivotAlias, $farAlias] = explode(',', $alias);
         } else {
             [$pivotAlias, $farAlias] = [null, $alias];
@@ -202,7 +202,7 @@ protected static function hasOneOrMany(Relation $relation, Builder $query, Build
      */
     protected static function hasOneOrManyThrough(Relation $relation, Builder $query, Builder $parentQuery, string $type = 'inner', string $alias = null)
     {
-        if (strpos($alias, ',') !== false) {
+        if (! is_null($alias) && strpos($alias, ',') !== false) {
             [$throughAlias, $farAlias] = explode(',', $alias);
         } else {
             [$throughAlias, $farAlias] = [null, $alias];
@@ -279,7 +279,7 @@ protected static function morphOneOrMany(Relation $relation, Builder $query, Bui
      */
     protected static function morphToMany(Relation $relation, Builder $query, Builder $parentQuery, string $type = 'inner', string $alias = null)
     {
-        if (strpos($alias, ',') !== false) {
+        if (! is_null($alias) && strpos($alias, ',') !== false) {
             [$pivotAlias, $farAlias] = explode(',', $alias);
         } else {
             [$pivotAlias, $farAlias] = [null, $alias];