wip

Author: freekmurze

README.md

@@ -70,19 +70,6 @@ $users = QueryBuilder::for(User::class)
 
 [Read more about selecting fields.](https://spatie.be/docs/laravel-query-builder/v3/features/selecting-fields/)
 
-### Appending attributes to a query: `/users?append=full_name`
-
-```php
-$users = QueryBuilder::for(User::class)
-    ->allowedAppends('full_name')
-    ->get()
-    ->toJson();
-
-// the resulting JSON will have the `getFullNameAttribute` attributes included
-```
-
-[Read more about appending attributes.](https://spatie.be/docs/laravel-query-builder/v3/features/appending-attributes/)
-
 ## Support us
 
 [<img src="https://github-ads.s3.eu-central-1.amazonaws.com/laravel-query-builder.jpg?t=1" width="419px" />](https://spatie.be/github-ad-click/laravel-query-builder)

UPGRADING.md

@@ -4,7 +4,7 @@
 
 This version adds support for Laravel 9 and drops support for all older version.
 
-The public API was not changed, so you'll be able to upgrade without making any changes.
+Appending attributes to a query was removed to make package maintenance easier. The rest of the public API was not changed, so you'll be able to upgrade without making any changes.
 
 ## From v3 to v4
 

config/query-builder.php

@@ -1,7 +1,4 @@
 <?php
-/**
- * @see https://github.com/spatie/laravel-query-builder
- */
 
 return [
 

docs/features/appending-attributes.md

@@ -72,19 +72,6 @@ $users = QueryBuilder::for(User::class)
 
 [Read more about selecting fields.](https://spatie.be/docs/laravel-query-builder/v2/features/selecting-fields/)
 
-### Appending attributes to a query: `/users?append=full_name`
-
-```php
-$users = QueryBuilder::for(User::class)
-    ->allowedAppends('full_name')
-    ->get()
-    ->toJson();
-
-// the resulting JSON will have the `getFullNameAttribute` attributes included
-```
-
-[Read more about appending attributes.](https://spatie.be/docs/laravel-query-builder/v2/features/appending-attributes/)
-
 ## We have badges!
 
 [![Latest Version on Packagist](https://img.shields.io/packagist/v/spatie/laravel-query-builder.svg?style=flat-square)](https://packagist.org/packages/spatie/laravel-query-builder)

docs/introduction.md

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <testsuites>
     <testsuite name="Spatie Test Suite">
       <directory>tests</directory>

phpunit.xml.dist

@@ -3,18 +3,13 @@
 namespace Spatie\QueryBuilder;
 
 use ArrayAccess;
-use Illuminate\Contracts\Pagination\CursorPaginator;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Http\Request;
-use Illuminate\Pagination\LengthAwarePaginator;
-use Illuminate\Pagination\Paginator;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Traits\ForwardsCalls;
 use Spatie\QueryBuilder\Concerns\AddsFieldsToQuery;
 use Spatie\QueryBuilder\Concerns\AddsIncludesToQuery;
-use Spatie\QueryBuilder\Concerns\AppendsAttributesToResults;
 use Spatie\QueryBuilder\Concerns\FiltersQuery;
 use Spatie\QueryBuilder\Concerns\SortsQuery;
 use Spatie\QueryBuilder\Exceptions\InvalidSubject;
@@ -28,7 +23,6 @@ class QueryBuilder implements ArrayAccess
     use SortsQuery;
     use AddsIncludesToQuery;
     use AddsFieldsToQuery;
-    use AppendsAttributesToResults;
     use ForwardsCalls;
 
     /** @var \Spatie\QueryBuilder\QueryBuilderRequest */
@@ -118,18 +112,6 @@ public function __call($name, $arguments)
             return $this;
         }
 
-        if ($result instanceof Model) {
-            $this->addAppendsToResults(collect([$result]));
-        }
-
-        if ($result instanceof Collection) {
-            $this->addAppendsToResults($result);
-        }
-
-        if ($result instanceof LengthAwarePaginator || $result instanceof Paginator || $result instanceof CursorPaginator) {
-            $this->addAppendsToResults(collect($result->items()));
-        }
-
         return $result;
     }
 

src/Concerns/AppendsAttributesToResults.php

@@ -189,4 +189,13 @@ public static function getFilterArrayValueDelimiter(): string
     {
         return static::$filterArrayValueDelimiter;
     }
+
+    public static function resetDelimiters(): void
+    {
+        self::$includesArrayValueDelimiter = ',';
+        self::$appendsArrayValueDelimiter = ',';
+        self::$fieldsArrayValueDelimiter = ',';
+        self::$sortsArrayValueDelimiter = ',';
+        self::$filterArrayValueDelimiter = ',';
+    }
 }