Increase PHPStan level to 2

staudenmeir · Sep 25, 2024 · 4d36bb8 · 4d36bb8
1 parent 0d65b49
commit 4d36bb8
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 22 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -1,11 +1,9 @@
 includes:
     - ./vendor/larastan/larastan/extension.neon
 parameters:
-    level: 1
+    level: 2
     paths:
         - src
-        - tests
     ignoreErrors:
         - "#Called 'first' on Laravel collection, but could have been retrieved as a query.#"
         - '#Call to private method take\(\) of parent class Illuminate\\Database\\Eloquent\\Relations\\BelongsTo#'
-        - '#Unsafe usage of new static\(\).#'
diff --git a/src/Grammars/JsonGrammar.php b/src/Grammars/JsonGrammar.php
@@ -56,4 +56,12 @@ public function compileMemberOf(string $column, ?string $objectKey, mixed $value
      * @return array
      */
     public function prepareBindingsForMemberOf(mixed $value): array;
+
+    /**
+     * Wrap a value in keyword identifiers.
+     *
+     * @param \Illuminate\Contracts\Database\Query\Expression|string $value
+     * @return string
+     */
+    public function wrap($value);
 }
diff --git a/src/Grammars/Traits/CompilesMySqlJsonQueries.php b/src/Grammars/Traits/CompilesMySqlJsonQueries.php
@@ -51,6 +51,8 @@ public function compileJsonValueSelect(string $column): string
      */
     public function supportsMemberOf(ConnectionInterface $connection): bool
     {
+        /** @var \Illuminate\Database\MySqlConnection $connection */
+
         if ($connection->isMaria()) {
             return false;
         }

diff --git a/src/HasJsonRelationships.php b/src/HasJsonRelationships.php
@@ -94,7 +94,10 @@ public function getAttributeValue($key)
      */
     protected function newHasOne(Builder $query, Model $parent, $foreignKey, $localKey)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new HasOnePostgres($query, $parent, $foreignKey, $localKey);
         }
 
@@ -115,7 +118,10 @@ protected function newHasOne(Builder $query, Model $parent, $foreignKey, $localK
      */
     protected function newHasOneThrough(Builder $query, Model $farParent, Model $throughParent, $firstKey, $secondKey, $localKey, $secondLocalKey)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new HasOneThroughPostgres($query, $farParent, $throughParent, $firstKey, $secondKey, $localKey, $secondLocalKey);
         }
 
@@ -134,7 +140,10 @@ protected function newHasOneThrough(Builder $query, Model $farParent, Model $thr
      */
     protected function newMorphOne(Builder $query, Model $parent, $type, $id, $localKey)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new MorphOnePostgres($query, $parent, $type, $id, $localKey);
         }
 
@@ -153,7 +162,10 @@ protected function newMorphOne(Builder $query, Model $parent, $type, $id, $local
      */
     protected function newBelongsTo(Builder $query, Model $child, $foreignKey, $ownerKey, $relation)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new BelongsToPostgres($query, $child, $foreignKey, $ownerKey, $relation);
         }
 
@@ -171,7 +183,10 @@ protected function newBelongsTo(Builder $query, Model $child, $foreignKey, $owne
      */
     protected function newHasMany(Builder $query, Model $parent, $foreignKey, $localKey)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new HasManyPostgres($query, $parent, $foreignKey, $localKey);
         }
 
@@ -192,7 +207,10 @@ protected function newHasMany(Builder $query, Model $parent, $foreignKey, $local
      */
     protected function newHasManyThrough(Builder $query, Model $farParent, Model $throughParent, $firstKey, $secondKey, $localKey, $secondLocalKey)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new HasManyThroughPostgres($query, $farParent, $throughParent, $firstKey, $secondKey, $localKey, $secondLocalKey);
         }
 
@@ -211,7 +229,10 @@ protected function newHasManyThrough(Builder $query, Model $farParent, Model $th
      */
     protected function newMorphMany(Builder $query, Model $parent, $type, $id, $localKey)
     {
-        if ($query->getConnection()->getDriverName() === 'pgsql') {
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
+
+        if ($connection->getDriverName() === 'pgsql') {
             return new MorphManyPostgres($query, $parent, $type, $id, $localKey);
         }
 
@@ -428,7 +449,7 @@ protected function addHasManyThroughJsonPivotRelationship(
                     $hasManyJson->hydratePivotRelation(
                         $models,
                         $this,
-                        fn (Model $model) => json_decode($model->laravel_through_key, true)
+                        fn (Model $model) => json_decode($model->laravel_through_key ?? '[]', true)
                     );
                 }
             };
@@ -445,7 +466,7 @@ function (array $models, Collection $results, string $relation) use ($hasManyJso
                         $hasManyJson->hydratePivotRelation(
                             $model->$relation,
                             $model,
-                            fn (Model $model) => json_decode($model->laravel_through_key, true)
+                            fn (Model $model) => json_decode($model->laravel_through_key ?? '[]', true)
                         );
                     }
 

diff --git a/src/Relations/HasManyJson.php b/src/Relations/HasManyJson.php
@@ -219,10 +219,12 @@ protected function setForeignAttributesForCreate(Model $model)
     {
         $foreignKey = explode('.', $this->foreignKey)[1];
 
-        /** @var \Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson $relation */
-        $relation = $model->belongsToJson(get_class($this->parent), $foreignKey, $this->localKey);
+        if (method_exists($model, 'belongsToJson')) {
+            /** @var \Staudenmeir\EloquentJsonRelations\Relations\BelongsToJson $relation */
+            $relation = $model->belongsToJson(get_class($this->parent), $foreignKey, $this->localKey);
 
-        $relation->attach($this->getParentKey());
+            $relation->attach($this->getParentKey());
+        }
     }
 
     /**

diff --git a/src/Relations/Postgres/HasOneOrManyThrough.php b/src/Relations/Postgres/HasOneOrManyThrough.php
@@ -22,7 +22,8 @@ protected function performJoin(?Builder $query = null)
 
         $query->join($this->throughParent->getTable(), $this->getQualifiedParentKeyName(), '=', $farKey);
 
-        if ($this->throughParentSoftDeletes()) {
+        if ($this->throughParentSoftDeletes()
+            && method_exists($this->throughParent, 'getQualifiedDeletedAtColumn')) {
             $query->whereNull($this->throughParent->getQualifiedDeletedAtColumn());
         }
     }
@@ -99,7 +100,8 @@ public function getRelationExistenceQueryForThroughSelfRelation(Builder $query,
 
         $query->join($table, $hash.'.'.$this->secondLocalKey, '=', $farKey);
 
-        if ($this->throughParentSoftDeletes()) {
+        if ($this->throughParentSoftDeletes()
+            && method_exists($this->throughParent, 'getDeletedAtColumn')) {
             $query->whereNull($hash.'.'.$this->throughParent->getDeletedAtColumn());
         }
 

diff --git a/src/Relations/Traits/Concatenation/IsConcatenableBelongsToJsonRelation.php b/src/Relations/Traits/Concatenation/IsConcatenableBelongsToJsonRelation.php
@@ -99,7 +99,7 @@ protected function buildDictionaryForDeepRelationship(Collection $results): arra
         $dictionary = [];
 
         foreach ($results as $result) {
-            $dictionary[$result->laravel_through_key][] = $result;
+            $dictionary[$result->laravel_through_key ?? null][] = $result;
         }
 
         return $dictionary;

diff --git a/src/Relations/Traits/Concatenation/IsConcatenableHasManyJsonRelation.php b/src/Relations/Traits/Concatenation/IsConcatenableHasManyJsonRelation.php
@@ -115,7 +115,7 @@ protected function buildDictionaryForDeepRelationship(Collection $results): arra
         $key = $this->key ? str_replace('->', '.', $this->key) : null;
 
         foreach ($results as $result) {
-            $values = json_decode($result->laravel_through_key, true);
+            $values = json_decode($result->laravel_through_key ?? '[]', true);
 
             if ($key) {
                 $values = array_filter(

diff --git a/src/Relations/Traits/IsJsonRelation.php b/src/Relations/Traits/IsJsonRelation.php
@@ -146,10 +146,11 @@ protected function whereJsonContainsOrMemberOf(
      */
     protected function getJsonGrammar(Builder $query): JsonGrammar
     {
-        $driver = $query->getConnection()->getDriverName();
+        /** @var \Illuminate\Database\Connection $connection */
+        $connection = $query->getConnection();
 
-        return $query->getConnection()->withTablePrefix(
-            match ($driver) {
+        return $connection->withTablePrefix(
+            match ($connection->getDriverName()) {
                 'mysql' => new MySqlGrammar(),
                 'mariadb' => new MariaDbGrammar(),
                 'pgsql' => new PostgresGrammar(),