From a9cf499da11faa6f0eb387716d4c0b3864d3dda7 Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Mon, 28 Sep 2009 14:46:19 -0400
Subject: [PATCH] Rename Horde_Constraint_Compound to Horde_Constraint_Coupler

---
 framework/Constraint/lib/Horde/Constraint/And.php                     | 2 +-
 .../Constraint/lib/Horde/Constraint/{Compound.php => Coupler.php}     | 4 ++--
 framework/Constraint/lib/Horde/Constraint/Or.php                      | 2 +-
 framework/Constraint/package.xml                                      | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename framework/Constraint/lib/Horde/Constraint/{Compound.php => Coupler.php} (87%)

diff --git a/framework/Constraint/lib/Horde/Constraint/And.php b/framework/Constraint/lib/Horde/Constraint/And.php
index 2f199a44d..a061dff3f 100644
--- a/framework/Constraint/lib/Horde/Constraint/And.php
+++ b/framework/Constraint/lib/Horde/Constraint/And.php
@@ -7,7 +7,7 @@
  *
  * @author James Pepin <james@jamespepin.com>
  */
-class Horde_Constraint_And extends Horde_Constraint_Compound
+class Horde_Constraint_And extends Horde_Constraint_Coupler
 {
     public function evaluate($value)
     {
diff --git a/framework/Constraint/lib/Horde/Constraint/Compound.php b/framework/Constraint/lib/Horde/Constraint/Coupler.php
similarity index 87%
rename from framework/Constraint/lib/Horde/Constraint/Compound.php
rename to framework/Constraint/lib/Horde/Constraint/Coupler.php
index a74624d7d..514a7fd99 100644
--- a/framework/Constraint/lib/Horde/Constraint/Compound.php
+++ b/framework/Constraint/lib/Horde/Constraint/Coupler.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * Interface for compound constraints.
+ * Interface for grouped (compound, coupled) constraints.
  *
  * @author James Pepin <james@jamespepin.com>
  */
-abstract class Horde_Constraint_Compound implements Horde_Constraint
+abstract class Horde_Constraint_Coupler implements Horde_Constraint
 {
     protected $_constraints = array();
 
diff --git a/framework/Constraint/lib/Horde/Constraint/Or.php b/framework/Constraint/lib/Horde/Constraint/Or.php
index 0882fedcd..8be773d9c 100644
--- a/framework/Constraint/lib/Horde/Constraint/Or.php
+++ b/framework/Constraint/lib/Horde/Constraint/Or.php
@@ -5,7 +5,7 @@
  * @author James Pepin <james@jamespepin.com>
  * @author Chuck Hagenbuch <chuck@horde.org>
  */
-class Horde_Constraint_Or extends Horde_Constraint_Compound
+class Horde_Constraint_Or extends Horde_Constraint_Coupler
 {
     public function evaluate($value)
     {
diff --git a/framework/Constraint/package.xml b/framework/Constraint/package.xml
index f07079797..9622a17cf 100644
--- a/framework/Constraint/package.xml
+++ b/framework/Constraint/package.xml
@@ -40,7 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
       <file name="AlwaysFalse.php" role="php" />
       <file name="AlwaysTrue.php" role="php" />
       <file name="And.php" role="php" />
-      <file name="Compound.php" role="php" />
+      <file name="Coupler.php" role="php" />
       <file name="IsEqual.php" role="php" />
       <file name="IsInstanceOf.php" role="php" />
       <file name="Not.php" role="php" />
@@ -68,7 +68,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
    <install name="lib/Horde/Constraint/AlwaysFalse.php" as="Horde/Constraint/AlwaysFalse.php" />
    <install name="lib/Horde/Constraint/AlwaysTrue.php" as="Horde/Constraint/AlwaysTrue.php" />
    <install name="lib/Horde/Constraint/And.php" as="Horde/Constraint/And.php" />
-   <install name="lib/Horde/Constraint/Compound.php" as="Horde/Constraint/Compound.php" />
+   <install name="lib/Horde/Constraint/Coupler.php" as="Horde/Constraint/Coupler.php" />
    <install name="lib/Horde/Constraint/IsEqual.php" as="Horde/Constraint/IsEqual.php" />
    <install name="lib/Horde/Constraint/IsInstanceOf.php" as="Horde/Constraint/IsInstanceOf.php" />
    <install name="lib/Horde/Constraint/Not.php" as="Horde/Constraint/Not.php" />
-- 
2.11.0