Merge branch 'pull/1922'

Dry up shallow augmentation. Let the objects handle it rather than th…

…e fieldtypes.

Handle pipe array syntax when using `in` and `not_in` conditions.

fix rule

a mystery how that was ever false. 🤯

Don't set sites

Update method call where trait was removed in a0b9313

Use proper augmentedasset instance

Closes statamic#1482

Merge branch 'feature/globals'

Fixes save of existing user for database users (statamic#1574)

* Typecasts $except to int in UniqueUserValue.php

The value of `$except` is a string in a fresh v3 install (for me at least), the identical-to comparison operator therefore means it's not possible to edit an existing user. Typecasting `$except` to an integer fixes this.

* Changes comparison operator to equal to in UniqueUserValue.php

Bring across no options style