Improved naming for Conditions

The naming for conditions is now (somewhat) more consistent.
TheGoodSuite · Aug 14, 2013 · 58e23aa · 58e23aa
1 parent c066116
commit 58e23aa
Show file tree

Hide file tree

Showing 17 changed files with 202 additions and 202 deletions.
diff --git a/Good/Manners/Condition/Greater.php → Good/Manners/Condition/EqualTo.php b/Good/Manners/Condition/Greater.php → Good/Manners/Condition/EqualTo.php
@@ -6,7 +6,7 @@
 use Good\Manners\ConditionProcessor;
 use Good\Manners\Storable;
 
-class Greater implements Condition
+class EqualTo implements Condition
 {
     private $to;
 
@@ -17,7 +17,7 @@ public function __construct(Storable $to)
 
     public function process(ConditionProcessor $processor)
     {
-        $processor->processGreaterCondition($this->to);
+        $processor->processEqualToCondition($this->to);
     }
 }
 

diff --git a/Good/Manners/Condition/GreaterOrEqual.php b/Good/Manners/Condition/GreaterOrEqual.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Good\Manners\Condition;
+
+use Good\Manners\Condition;
+use Good\Manners\ConditionProcessor;
+use Good\Manners\Storable;
+
+class GreaterOrEqual implements Condition
+{
+    private $to;
+
+    public function __construct(Storable $to)
+    {
+        $this->to = $to;
+    }
+
+    public function process(ConditionProcessor $processor)
+    {
+        $processor->processGreaterOrEqualCondition($this->to);
+    }
+}
+
+?>
diff --git a/Good/Manners/Condition/GreaterOrEquals.php b/Good/Manners/Condition/GreaterOrEquals.php
diff --git a/Good/Manners/Condition/Inequality.php → Good/Manners/Condition/GreaterThan.php b/Good/Manners/Condition/Inequality.php → Good/Manners/Condition/GreaterThan.php
@@ -6,7 +6,7 @@
 use Good\Manners\ConditionProcessor;
 use Good\Manners\Storable;
 
-class Inequality implements Condition
+class GreaterThan implements Condition
 {
     private $to;
 
@@ -17,7 +17,7 @@ public function __construct(Storable $to)
 
     public function process(ConditionProcessor $processor)
     {
-        $processor->processInequalityCondition($this->to);
+        $processor->processGreaterThanCondition($this->to);
     }
 }
 

diff --git a/Good/Manners/Condition/LessOrEqual.php b/Good/Manners/Condition/LessOrEqual.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Good\Manners\Condition;
+
+use Good\Manners\Condition;
+use Good\Manners\ConditionProcessor;
+use Good\Manners\Storable;
+
+class LessOrEqual implements Condition
+{
+    private $to;
+
+    public function __construct(Storable $to)
+    {
+        $this->to = $to;
+    }
+
+    public function process(ConditionProcessor $processor)
+    {
+        $processor->processLessOrEqualCondition($this->to);
+    }
+}
+
+?>
diff --git a/Good/Manners/Condition/LessOrEquals.php b/Good/Manners/Condition/LessOrEquals.php
diff --git a/Good/Manners/Condition/Equality.php → Good/Manners/Condition/LessThan.php b/Good/Manners/Condition/Equality.php → Good/Manners/Condition/LessThan.php
@@ -6,7 +6,7 @@
 use Good\Manners\ConditionProcessor;
 use Good\Manners\Storable;
 
-class Equality implements Condition
+class LessThan implements Condition
 {
     private $to;
 
@@ -17,7 +17,7 @@ public function __construct(Storable $to)
 
     public function process(ConditionProcessor $processor)
     {
-        $processor->processEqualityCondition($this->to);
+        $processor->processLessThanCondition($this->to);
     }
 }
 

diff --git a/Good/Manners/Condition/Less.php → Good/Manners/Condition/NotEqualTo.php b/Good/Manners/Condition/Less.php → Good/Manners/Condition/NotEqualTo.php
@@ -6,7 +6,7 @@
 use Good\Manners\ConditionProcessor;
 use Good\Manners\Storable;
 
-class Less implements Condition
+class NotEqualTo implements Condition
 {
     private $to;
 
@@ -17,7 +17,7 @@ public function __construct(Storable $to)
 
     public function process(ConditionProcessor $processor)
     {
-        $processor->processLessCondition($this->to);
+        $processor->processNotEqualToCondition($this->to);
     }
 }
 

diff --git a/Good/Manners/ConditionProcessor.php b/Good/Manners/ConditionProcessor.php
@@ -4,12 +4,12 @@
 
 interface ConditionProcessor
 {
-    public function processEqualityCondition(Storable $to);
-    public function processInequalityCondition(Storable $to);
-    public function processGreaterCondition(Storable $to);
-    public function processGreaterOrEqualsCondition(Storable $to);
-    public function processLessCondition(Storable $to);
-    public function processLessOrEqualsCondition(Storable $to);
+    public function processEqualToCondition(Storable $to);
+    public function processNotEqualToCondition(Storable $to);
+    public function processGreaterThanCondition(Storable $to);
+    public function processGreaterOrEqualCondition(Storable $to);
+    public function processLessThanCondition(Storable $to);
+    public function processLessOrEqualCondition(Storable $to);
 
     public function processAndCondition(Condition $condition1, Condition $condition2);
     public function processOrCondition(Condition $condition1, Condition $condition2);

diff --git a/Good/Memory/SQL/ConditionWriter.php b/Good/Memory/SQL/ConditionWriter.php
@@ -56,27 +56,27 @@ public function writeComparisonCondition(Storable $to, $comparison)
         }
     }
 
-    public function processEqualityCondition(Storable $to)
+    public function processEqualToCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '=');
     }
-    public function processInequalityCondition(Storable $to)
+    public function processNotEqualToCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '<>');
     }
-    public function processGreaterCondition(Storable $to)
+    public function processGreaterThanCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '>');
     }
-    public function processGreaterOrEqualsCondition(Storable $to)
+    public function processGreaterOrEqualCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '>=');
     }
-    public function processLessCondition(Storable $to)
+    public function processLessThanCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '<');
     }
-    public function processLessOrEqualsCondition(Storable $to)
+    public function processLessOrEqualCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '<=');
     }
@@ -122,14 +122,14 @@ public function visitReferenceProperty($name, $datatypeName, $dirty,
                                                 ' IS NOT NULL';
                 }
 
-                // todo: error out if not equality or inequality
+                // todo: error out if not EqualTo or NotEqualTo
             }
             else if (!$value->isNew())
             {
                 $this->condition .= 't' . $this->currentTable . '.' . $this->storage->fieldNamify($name) . 
                                             $this->comparison . ' ' . \intval($value->getId());
 
-                // todo: error out if not equality or inequality
+                // todo: error out if not EqualTo or NotEqualTo
             }
             else
             {
@@ -166,7 +166,7 @@ public function visitTextProperty($name, $dirty, $value)
                     $this->condition .= ' IS NOT NULL';
                 }
 
-                // todo: error out if not equality or inequality
+                // todo: error out if not EqualTo or NotEqualTo
             }
             else
             {
@@ -193,7 +193,7 @@ public function visitIntProperty($name, $dirty, $value)
                     $this->condition .= ' IS NOT NULL';
                 }
 
-                // todo: error out if not equality or inequality
+                // todo: error out if not EqualTo or NotEqualTo
             }
             else
             {
@@ -219,7 +219,7 @@ public function visitFloatProperty($name, $dirty, $value)
                     $this->condition .= ' IS NOT NULL';
                 }
 
-                // todo: error out if not equality or inequality
+                // todo: error out if not EqualTo or NotEqualTo
             }
             else
             {
@@ -245,7 +245,7 @@ public function visitDatetimeProperty($name, $dirty, $value)
                     $this->condition .= ' IS NOT NULL';
                 }
 
-                // todo: error out if not equality or inequality
+                // todo: error out if not equality or NotEqualTo
             }
             else
             {

diff --git a/Good/Memory/SQL/UpdateConditionWriter.php b/Good/Memory/SQL/UpdateConditionWriter.php
@@ -150,27 +150,27 @@ public function writeSimpleComparisonCondition(Storable $to, $comparison)
     }
 
 
-    public function processEqualityCondition(Storable $to)
+    public function processEqualToCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '=');
     }
-    public function processInequalityCondition(Storable $to)
+    public function processNotEqualToCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '<>');
     }
-    public function processGreaterCondition(Storable $to)
+    public function processGreaterThanCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '>');
     }
-    public function processGreaterOrEqualsCondition(Storable $to)
+    public function processGreaterOrEqualCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '>=');
     }
-    public function processLessCondition(Storable $to)
+    public function processLessThanCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '<');
     }
-    public function processLessOrEqualsCondition(Storable $to)
+    public function processLessOrEqualCondition(Storable $to)
     {
         $this->writeComparisonCondition($to, '<=');
     }