[commits] Horde branch master updated. 35bcd22f0b986659605f709d7a21767cd21d28cb

[Chuck Hagenbuch]

The branch "master" has been updated.
The following is a summary of the commits.

from: 0cf751ab33d24b8b929a68af17167dd310f17ce9

71d21ff... Use addConstraint() in the compound constraint constructor Collapse compound constraints of the same type
a8017e8... Revert "add constraint coupler to separate object creation from logic classes"
1ca1d81... remove bad method declaration
a9cf499... Rename Horde_Constraint_Compound to Horde_Constraint_Coupler
35bcd22... Rework the Constraint filter to take a coupler (an And constraint or an Or constraint) as the default when adding multiple constraints to a field.

-----------------------------------------------------------------------

commit 71d21ff66091523028de50ef6e33838cc170c2be
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Mon Sep 28 14:26:43 2009 -0400

    Use addConstraint() in the compound constraint constructor
    Collapse compound constraints of the same type

 framework/Constraint/lib/Horde/Constraint/Compound.php |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Compound.php?rt=horde-git&r1=8824912b1f15b4ab9a43478adb9e9cd698e70786&r2=71d21ff66091523028de50ef6e33838cc170c2be

-----------------------------------------------------------------------

commit a8017e8ab403dded222fdaeb51047d97c76026c3
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Mon Sep 28 14:28:42 2009 -0400

    Revert "add constraint coupler to separate object creation from logic classes"
    
    This reverts commit 360abb926cba981e5aa2eba66129a7815004ef1a.

 framework/Constraint/lib/Horde/Constraint/Compound/Factory.php    |   21 --
 .../Constraint/lib/Horde/Constraint/Compound/Factory/And.php      |   17 --
 framework/Constraint/lib/Horde/Constraint/Compound/Factory/Or.php |   17 --
 framework/Constraint/lib/Horde/Constraint/Coupler.php             |   47 -----
 framework/Log/lib/Horde/Log/Filter/Constraint.php                 |   20 +--
 5 files changed, 3 insertions(+), 119 deletions(-)
 delete mode 100644 framework/Constraint/lib/Horde/Constraint/Compound/Factory.php
 delete mode 100644 framework/Constraint/lib/Horde/Constraint/Compound/Factory/And.php
 delete mode 100644 framework/Constraint/lib/Horde/Constraint/Compound/Factory/Or.php
 delete mode 100644 framework/Constraint/lib/Horde/Constraint/Coupler.php

http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Compound/Factory.php?rt=horde-git&r1=360abb926cba981e5aa2eba66129a7815004ef1a&r2=a8017e8ab403dded222fdaeb51047d97c76026c3
http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Compound/Factory/And.php?rt=horde-git&r1=360abb926cba981e5aa2eba66129a7815004ef1a&r2=a8017e8ab403dded222fdaeb51047d97c76026c3
http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Compound/Factory/Or.php?rt=horde-git&r1=360abb926cba981e5aa2eba66129a7815004ef1a&r2=a8017e8ab403dded222fdaeb51047d97c76026c3
http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Coupler.php?rt=horde-git&r1=360abb926cba981e5aa2eba66129a7815004ef1a&r2=a8017e8ab403dded222fdaeb51047d97c76026c3
http://git.horde.org/diff.php/framework/Log/lib/Horde/Log/Filter/Constraint.php?rt=horde-git&r1=360abb926cba981e5aa2eba66129a7815004ef1a&r2=a8017e8ab403dded222fdaeb51047d97c76026c3

-----------------------------------------------------------------------

commit 1ca1d81d1ccc4b4833c7409d16362d8193c4d87c
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Mon Sep 28 14:33:43 2009 -0400

    remove bad method declaration

 framework/Constraint/lib/Horde/Constraint/Compound.php |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Compound.php?rt=horde-git&r1=71d21ff66091523028de50ef6e33838cc170c2be&r2=1ca1d81d1ccc4b4833c7409d16362d8193c4d87c

-----------------------------------------------------------------------

commit a9cf499da11faa6f0eb387716d4c0b3864d3dda7
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Mon Sep 28 14:46:19 2009 -0400

    Rename Horde_Constraint_Compound to Horde_Constraint_Coupler

 framework/Constraint/lib/Horde/Constraint/And.php      |    2 +-
 framework/Constraint/lib/Horde/Constraint/Compound.php |   39 ----------------
 framework/Constraint/lib/Horde/Constraint/Coupler.php  |   39 ++++++++++++++++
 framework/Constraint/lib/Horde/Constraint/Or.php       |    2 +-
 framework/Constraint/package.xml                       |    4 +-
 5 files changed, 43 insertions(+), 43 deletions(-)
 delete mode 100644 framework/Constraint/lib/Horde/Constraint/Compound.php
 create mode 100644 framework/Constraint/lib/Horde/Constraint/Coupler.php

http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/And.php?rt=horde-git&r1=8824912b1f15b4ab9a43478adb9e9cd698e70786&r2=a9cf499da11faa6f0eb387716d4c0b3864d3dda7
http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Compound.php?rt=horde-git&r1=1ca1d81d1ccc4b4833c7409d16362d8193c4d87c&r2=a9cf499da11faa6f0eb387716d4c0b3864d3dda7
http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Coupler.php?rt=horde-git&r1=a8017e8ab403dded222fdaeb51047d97c76026c3&r2=a9cf499da11faa6f0eb387716d4c0b3864d3dda7
http://git.horde.org/diff.php/framework/Constraint/lib/Horde/Constraint/Or.php?rt=horde-git&r1=8824912b1f15b4ab9a43478adb9e9cd698e70786&r2=a9cf499da11faa6f0eb387716d4c0b3864d3dda7
http://git.horde.org/diff.php/framework/Constraint/package.xml?rt=horde-git&r1=8824912b1f15b4ab9a43478adb9e9cd698e70786&r2=a9cf499da11faa6f0eb387716d4c0b3864d3dda7

-----------------------------------------------------------------------

commit 35bcd22f0b986659605f709d7a21767cd21d28cb
Author: Chuck Hagenbuch <chuck at horde.org>
Date:   Mon Sep 28 14:54:06 2009 -0400

    Rework the Constraint filter to take a coupler (an And constraint or an Or
    constraint) as the default when adding multiple constraints to a field.

 framework/Log/lib/Horde/Log/Filter/Constraint.php |   32 +++++++++++++++++---
 1 files changed, 27 insertions(+), 5 deletions(-)

http://git.horde.org/diff.php/framework/Log/lib/Horde/Log/Filter/Constraint.php?rt=horde-git&r1=a8017e8ab403dded222fdaeb51047d97c76026c3&r2=35bcd22f0b986659605f709d7a21767cd21d28cb