Macro return type

[Stevemoretz]

It would be nice to have the return type for a macro, currently it gives no return type in PhpDocs.

[AidasK]

Any solution for this?

[joelharkes]

seems not working yet, but it could with typesystem:

Builder::macro(/**
         * @template T
         * @param string $column
         * @param string $operator
         * @param $value
         * @return T
         */ 'whereOrNull', function (string $column, string $operator, mixed $value): Builder|\Illuminate\Contracts\Database\Query\Builder {
            /** @var Builder $builder */
            $builder = $this;

            return $builder->where(fn (Builder $builder) => $builder->where($column, $operator, $value)->orWhereNull($column));
        });
        Builder::macro('whereNot', function (string $column, $value) {
            /** @var Builder $builder */
            $builder = $this;
            if (null === $value) {
                return $builder->whereNotNull($column);
            }

            return $builder->where($column, '!=', $value);
        });