Minor refactoring with DateTime filter functions. Finalize testing with FilterFactory.

curiosity26 · curiosity26 · commit 8be1697d2e81 · 2015-01-03T13:29:25.000-05:00
diff --git a/Test/ODataFilterFactoryTest.php b/Test/ODataFilterFactoryTest.php
@@ -45,10 +45,52 @@ public function testString() {
     }
 
     public function testDate() {
+        $filter = new \ODataQuery\Filter\ODataFilterFactory();
+        $filter
+            ->now()
+            ->datetime()
+            ->equals(new DateTime('1/2/2015 8:00 PM EST'));
+        $this->assertEquals('datetime(now()) eq 2015-01-02 20:00:00 EST', (string)$filter);
 
+        $filter
+            ->now()
+            ->day()
+            ->equals(8);
+        $this->assertEquals('day(now()) eq 8', (string)$filter);
+
+        $filter->now();
+        $filter->month()
+            ->greaterThan(6);
+        $this->assertEquals('month(now()) gt 6', (string)$filter);
+
+        $filter->maxDateTime();
+        $filter->year()
+            ->greaterThanEquals(2015);
+        $this->assertEquals('year(maxdatetime()) ge 2015', (string)$filter);
+
+        $filter->minDateTime();
+        $filter->hour()
+            ->lessThan(20);
+        $this->assertEquals('hour(mindatetime()) lt 20', (string)$filter);
+
+        $filter->now();
+        $filter->minute()
+            ->lessThanEquals(43);
+        $this->assertEquals('minute(now()) le 43', (string)$filter);
+
+        $filter->now();
+        $filter->second()
+            ->notEquals(20);
+        $this->assertEquals('second(now()) ne 20', (string)$filter);
     }
 
     public function testLambda() {
+        $filter = new \ODataQuery\Filter\ODataFilterFactory('Items');
+        $filter->any(new \ODataQuery\Filter\Operators\Logical\ODataGreaterThanEqualsOperator('Quantity', 10));
+        $this->assertEquals('Items/any(d:d/Quantity ge 10)', (string)$filter);
 
+        $filter = new \ODataQuery\Filter\ODataFilterFactory('Items');
+        $filter->all(new \ODataQuery\Filter\Operators\Logical\ODataGreaterThanEqualsOperator('Quantity', 10));
+        $this->assertEquals('Items/all(d:d/Quantity ge 10)', (string)$filter);
     }
 }
diff --git a/src/Filter/ODataFilterFactory.php b/src/Filter/ODataFilterFactory.php
@@ -276,6 +276,7 @@ public function any($value) {
         $this->property = new ODataAnyOperator($this->property, $value);
         return $this;
     }
+
     public function all($value) {
         $this->property = new ODataAllOperator($this->property, $value);
         return $this;
diff --git a/src/Filter/Operators/Functional/DateTime/ODataDateOperator.php b/src/Filter/Operators/Functional/DateTime/ODataDateOperator.php
@@ -9,7 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-class ODataDateOperator extends ODataDateTimeOperator {
+class ODataDateOperator extends ODataDateTimeFilter {
     protected $format = 'Y-m-d';
     public function __construct($property = NULL) {
         parent::__construct('date', $property);
diff --git a/src/Filter/Operators/Functional/DateTime/ODataDateTimeFilter.php b/src/Filter/Operators/Functional/DateTime/ODataDateTimeFilter.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: alexboyce
+ * Date: 1/3/15
+ * Time: 1:09 PM
+ */
+
+namespace ODataQuery\Filter\Operators\Functional\DateTime;
+
+
+use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
+
+abstract class ODataDateTimeFilter extends ODataComparableFunctionOperator {
+    protected $format = 'Y-m-d H:i:s e';
+
+    public function __construct($operator = 'datetime', $property = NULL) {
+        parent::__construct($operator, $property);
+    }
+
+    public function equals($value, $isField = FALSE) {
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format($this->format);
+            $isField = TRUE;
+        }
+        return parent::equals($value, $isField);
+    }
+
+    public function notEquals($value, $isField = FALSE) {
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format($this->format);
+            $isField = TRUE;
+        }
+        return parent::notEquals($value, $isField);
+    }
+
+    public function lessThan($value, $isField = FALSE) {
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format($this->format);
+            $isField = TRUE;
+        }
+        return parent::lessThan($value, $isField);
+    }
+
+    public function lessThanEquals($value, $isField = FALSE) {
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format($this->format);
+            $isField = TRUE;
+        }
+        return parent::lessThanEquals($value, $isField);
+    }
+
+    public function greaterThan($value, $isField = FALSE) {
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format($this->format);
+            $isField = TRUE;
+        }
+        return parent::greaterThan($value, $isField);
+    }
+
+    public function greaterThanEquals($value, $isField = FALSE) {
+        if ($value instanceof \DateTimeInterface) {
+            $value = $value->format($this->format);
+            $isField = TRUE;
+        }
+        return parent::greaterThanEquals($value, $isField);
+    }
+}
diff --git a/src/Filter/Operators/Functional/DateTime/ODataDateTimeOperator.php b/src/Filter/Operators/Functional/DateTime/ODataDateTimeOperator.php
@@ -9,60 +9,11 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
 
-class ODataDateTimeOperator extends ODataComparableFunctionOperator {
+class ODataDateTimeOperator extends ODataDateTimeFilter {
   protected $format = 'Y-m-d H:i:s e';
 
   public function __construct($property = NULL) {
     parent::__construct('datetime', $property);
   }
-
-  public function equals($value, $isField = FALSE) {
-    if ($value instanceof \DateTimeInterface) {
-      $value = $value->format($this->format);
-      $isField = TRUE;
-    }
-    return parent::equals($value, $isField);
-  }
-
-  public function notEquals($value, $isField = FALSE) {
-    if ($value instanceof \DateTimeInterface) {
-      $value = $value->format($this->format);
-      $isField = TRUE;
-    }
-    return parent::notEquals($value, $isField);
-  }
-
-  public function lessThan($value, $isField = FALSE) {
-    if ($value instanceof \DateTimeInterface) {
-      $value = $value->format($this->format);
-      $isField = TRUE;
-    }
-    return parent::lessThan($value, $isField);
-  }
-
-  public function lessThanEquals($value, $isField = FALSE) {
-    if ($value instanceof \DateTimeInterface) {
-      $value = $value->format($this->format);
-      $isField = TRUE;
-    }
-    return parent::lessThanEquals($value, $isField);
-  }
-
-  public function greaterThan($value, $isField = FALSE) {
-    if ($value instanceof \DateTimeInterface) {
-      $value = $value->format($this->format);
-      $isField = TRUE;
-    }
-    return parent::greaterThan($value, $isField);
-  }
-
-  public function greaterThanEquals($value, $isField = FALSE) {
-    if ($value instanceof \DateTimeInterface) {
-      $value = $value->format($this->format);
-      $isField = TRUE;
-    }
-    return parent::greaterThanEquals($value, $isField);
-  }
 }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataDayOperator.php b/src/Filter/Operators/Functional/DateTime/ODataDayOperator.php
@@ -9,9 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
-
-class ODataDayOperator extends ODataComparableFunctionOperator{
+class ODataDayOperator extends ODataDateTimeFilter{
     public function __construct($property = NULL) {
         parent::__construct('day', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataFractionalSecondsOperator.php b/src/Filter/Operators/Functional/DateTime/ODataFractionalSecondsOperator.php
@@ -9,9 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
-
-class ODataFractionalSecondsOperator extends ODataComparableFunctionOperator {
+class ODataFractionalSecondsOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('fractionalseconds', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataHourOperator.php b/src/Filter/Operators/Functional/DateTime/ODataHourOperator.php
@@ -9,9 +9,8 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
 
-class ODataHourOperator extends ODataComparableFunctionOperator {
+class ODataHourOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('hour', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataMaxDateTimeOperator.php b/src/Filter/Operators/Functional/DateTime/ODataMaxDateTimeOperator.php
@@ -9,7 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-class ODataMaxDateTimeOperator extends ODataDateTimeOperator {
+class ODataMaxDateTimeOperator extends ODataDateTimeFilter {
     public function __construct() {
         parent::__construct('maxdatetime');
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataMinDateTimeOperator.php b/src/Filter/Operators/Functional/DateTime/ODataMinDateTimeOperator.php
@@ -9,7 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-class ODataMinDateTimeOperator extends ODataDateTimeOperator {
+class ODataMinDateTimeOperator extends ODataDateTimeFilter {
     public function __construct() {
         parent::__construct('mindatetime');
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataMinuteOperator.php b/src/Filter/Operators/Functional/DateTime/ODataMinuteOperator.php
@@ -9,9 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
-
-class ODataMinuteOperator extends ODataComparableFunctionOperator {
+class ODataMinuteOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('minute', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataMonthOperator.php b/src/Filter/Operators/Functional/DateTime/ODataMonthOperator.php
@@ -9,9 +9,8 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
 
-class ODataMonthOperator extends ODataComparableFunctionOperator {
+class ODataMonthOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('month', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataNowOperator.php b/src/Filter/Operators/Functional/DateTime/ODataNowOperator.php
@@ -9,7 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-class ODataNowOperator extends ODataDateTimeOperator {
+class ODataNowOperator extends ODataDateTimeFilter {
     public function __construct() {
         parent::__construct('now');
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataSecondOperator.php b/src/Filter/Operators/Functional/DateTime/ODataSecondOperator.php
@@ -9,9 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
-
-class ODataSecondOperator extends ODataComparableFunctionOperator {
+class ODataSecondOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('second', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataTimeOperator.php b/src/Filter/Operators/Functional/DateTime/ODataTimeOperator.php
@@ -9,9 +9,9 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-class ODataTimeOperator extends ODataDateTimeOperator {
+class ODataTimeOperator extends ODataDateTimeFilter {
+    protected $format = 'H:i:s e';
     public function __construct($property = NULL) {
         parent::__construct('time', $property);
-        $this->format = 'H:i:s e';
     }
 }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataTotalOffsetMinutesOperator.php b/src/Filter/Operators/Functional/DateTime/ODataTotalOffsetMinutesOperator.php
@@ -9,9 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
-
-class ODataTotalOffsetMinutesOperator extends ODataComparableFunctionOperator {
+class ODataTotalOffsetMinutesOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('totaloffsetminutes', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataTotalSecondsOperator.php b/src/Filter/Operators/Functional/DateTime/ODataTotalSecondsOperator.php
@@ -9,9 +9,7 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
-
-class ODataTotalSecondsOperator extends ODataComparableFunctionOperator {
+class ODataTotalSecondsOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL) {
         parent::__construct('totalseconds', $property);
     }
diff --git a/src/Filter/Operators/Functional/DateTime/ODataYearOperator.php b/src/Filter/Operators/Functional/DateTime/ODataYearOperator.php
@@ -9,9 +9,8 @@
 namespace ODataQuery\Filter\Operators\Functional\DateTime;
 
 
-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;
 
-class ODataYearOperator extends ODataComparableFunctionOperator {
+class ODataYearOperator extends ODataDateTimeFilter {
     public function __construct($property = NULL)
     {
         parent::__construct('year', $property);

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ public function any($value) {`
`276`	`276`	`$this->property = new ODataAnyOperator($this->property, $value);`
`277`	`277`	`return $this;`
`278`	`278`	`}`
	`279`	`+`
`279`	`280`	`public function all($value) {`
`280`	`281`	`$this->property = new ODataAllOperator($this->property, $value);`
`281`	`282`	`return $this;`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,7 @@`
`9`	`9`	`namespace ODataQuery\Filter\Operators\Functional\DateTime;`
`10`	`10`
`11`	`11`
`12`		`-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;`
`13`		`-`
`14`		`-class ODataDayOperator extends ODataComparableFunctionOperator{`
	`12`	`+class ODataDayOperator extends ODataDateTimeFilter{`
`15`	`13`	`public function __construct($property = NULL) {`
`16`	`14`	`parent::__construct('day', $property);`
`17`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@`
`9`	`9`	`namespace ODataQuery\Filter\Operators\Functional\DateTime;`
`10`	`10`
`11`	`11`
`12`		`-use ODataQuery\Filter\Operators\Functional\ODataComparableFunctionOperator;`
`13`	`12`
`14`		`-class ODataHourOperator extends ODataComparableFunctionOperator {`
	`13`	`+class ODataHourOperator extends ODataDateTimeFilter {`
`15`	`14`	`public function __construct($property = NULL) {`
`16`	`15`	`parent::__construct('hour', $property);`
`17`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace ODataQuery\Filter\Operators\Functional\DateTime;`
`10`	`10`
`11`	`11`
`12`		`-class ODataMaxDateTimeOperator extends ODataDateTimeOperator {`
	`12`	`+class ODataMaxDateTimeOperator extends ODataDateTimeFilter {`
`13`	`13`	`public function __construct() {`
`14`	`14`	`parent::__construct('maxdatetime');`
`15`	`15`	`}`