orFilter/andFilter behaviour changes/breakage with 4.0

[lazka]

With 3.x:

$builder = new Builder(new Connection());
$builder->orFilter(function (Builder $builder) {
    $builder->whereEquals("foo", "1");
    $builder->whereEquals("foo", "2");
});
var_dump($builder->getQuery());
// (|(foo=\31)(foo=\32))

With 4.x:

$builder = new Builder(new Connection());
$builder->orFilter(function (Builder $builder) {
    $builder->whereEquals("foo", "1");
    $builder->whereEquals("foo", "2");
});
var_dump($builder->getQuery());
// (|(&(foo=\31)(foo=\32)))

The result is "AND" and not "OR".

Somewhat related, andFilter() wraps everything into a separate "and" now.

$builder = new Builder(new Connection());
$builder->andFilter(function (Builder $builder) {
    $builder->whereEquals("foo", "1");
    $builder->whereEquals("foo", "2");
});
var_dump($builder->getQuery());
// (&(&(foo=\31)(foo=\32)))

am I missing something? If I'm reading https://ldaprecord.com/docs/core/v4/searching#nested-filters correctly then this should not happen.

[stevebauman]

Hey @lazka! You're correct -- the behaviour changed when it shouldn't have. I think this is a bug. Working on a patch! 👍

[stevebauman]

Resolved in v4.0.1!

[lazka]

Thanks!

That seems to have fixed it for Query\Builder, but Query\Model\Builder still shows the same issue as described above (which is the builder I'm actually using, I just tried to simplify for the reproducer above).

use LdapRecord\Connection;
use LdapRecord\Models\OpenLDAP\User;
use LdapRecord\Query\Builder as QueryBuilder;
use LdapRecord\Query\Model\Builder as ModelBuilder;

$builder = new ModelBuilder(new User(), new QueryBuilder(new Connection()));
$builder->orFilter(function (ModelBuilder $builder) {
    $builder->whereEquals("foo", "1");
    $builder->whereEquals("foo", "2");
});
var_dump($builder->getQuery()->getQuery()); // (|(&(foo=\31)(foo=\32)))

use LdapRecord\Connection;
use LdapRecord\Models\OpenLDAP\User;
use LdapRecord\Query\Builder as QueryBuilder;
use LdapRecord\Query\Model\Builder as ModelBuilder;

$builder = new ModelBuilder(new User(), new QueryBuilder(new Connection()));
$builder->andFilter(function (ModelBuilder $builder) {
    $builder->whereEquals("foo", "1");
    $builder->whereEquals("foo", "2");
});
var_dump($builder->getQuery()->getQuery()); // (&(&(foo=\31)(foo=\32)))

[stevebauman]

Sorry @lazka, I'll patch this -- my mistake 🙏

[stevebauman]

Ok fixed in v4.0.2!