Merge branch '1.0' into 1.1

pamil · pamil · commit 6948a6800b34 · 2018-04-12T10:56:41.000+02:00
* 1.0: Fix JS error when autocomplete field is empty Use nullable return type formatting content in a email message willdurand/hateoas 2.12 version update (Sylius#9302) Minor documentation changes for product reviews Minor doc fix Correct minor typo in docs Test edge case for orders filtering Provide default times for datetime filter Filtering orders without time scenaio
diff --git a/Filter/DateFilter.php b/Filter/DateFilter.php
@@ -31,7 +31,7 @@ public function apply(DataSourceInterface $dataSource, string $name, $data, arra
 
         $field = (string) $this->getOption($options, 'field', $name);
 
-        $from = isset($data['from']) ? $this->getDateTime($data['from']) : null;
+        $from = isset($data['from']) ? $this->getDateTime($data['from'], '00:00') : null;
         if (null !== $from) {
             $inclusive = (bool) $this->getOption($options, 'inclusive_from', self::DEFAULT_INCLUSIVE_FROM);
             if (true === $inclusive) {
@@ -41,7 +41,7 @@ public function apply(DataSourceInterface $dataSource, string $name, $data, arra
             }
         }
 
-        $to = isset($data['to']) ? $this->getDateTime($data['to']) : null;
+        $to = isset($data['to']) ? $this->getDateTime($data['to'], '23:59') : null;
         if (null !== $to) {
             $inclusive = (bool) $this->getOption($options, 'inclusive_to', self::DEFAULT_INCLUSIVE_TO);
             if (true === $inclusive) {
@@ -66,17 +66,18 @@ private function getOption(array $options, string $name, $default)
 
     /**
      * @param string[] $data
+     * @param string $defaultTime
      *
      * @return string|null
      */
-    private function getDateTime(array $data): ?string
+    private function getDateTime(array $data, string $defaultTime): ?string
     {
         if (empty($data['date'])) {
             return null;
         }
 
         if (empty($data['time'])) {
-            return $data['date'];
+            $data['time'] = $defaultTime;
         }
 
         return $data['date'] . ' ' . $data['time'];
diff --git a/spec/Filter/DateFilterSpec.php b/spec/Filter/DateFilterSpec.php
@@ -77,14 +77,14 @@ function it_filters_date_from_not_inclusive(
         );
     }
 
-    function it_filters_date_from_without_time(
+    function it_filters_date_from_with_default_time(
         DataSourceInterface $dataSource,
         ExpressionBuilderInterface $expressionBuilder
     ): void {
         $dataSource->getExpressionBuilder()->willReturn($expressionBuilder);
 
         $expressionBuilder
-            ->greaterThanOrEqual('checkoutCompletedAt', '2016-12-05')
+            ->greaterThanOrEqual('checkoutCompletedAt', '2016-12-05 00:00')
             ->shouldBeCalled()
         ;
 
@@ -157,14 +157,14 @@ function it_filters_date_to_inclusive(
         );
     }
 
-    function it_filters_date_to_without_time(
+    function it_filters_date_to_with_default_time(
         DataSourceInterface $dataSource,
         ExpressionBuilderInterface $expressionBuilder
     ): void {
         $dataSource->getExpressionBuilder()->willReturn($expressionBuilder);
 
         $expressionBuilder
-            ->lessThan('checkoutCompletedAt', '2016-12-06')
+            ->lessThan('checkoutCompletedAt', '2016-12-06 23:59')
             ->shouldBeCalled()
         ;
 

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public function apply(DataSourceInterface $dataSource, string $name, $data, arra`
`31`	`31`
`32`	`32`	`$field = (string) $this->getOption($options, 'field', $name);`
`33`	`33`
`34`		`- $from = isset($data['from']) ? $this->getDateTime($data['from']) : null;`
	`34`	`+ $from = isset($data['from']) ? $this->getDateTime($data['from'], '00:00') : null;`
`35`	`35`	`if (null !== $from) {`
`36`	`36`	`$inclusive = (bool) $this->getOption($options, 'inclusive_from', self::DEFAULT_INCLUSIVE_FROM);`
`37`	`37`	`if (true === $inclusive) {`
`@@ -41,7 +41,7 @@ public function apply(DataSourceInterface $dataSource, string $name, $data, arra`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`		`- $to = isset($data['to']) ? $this->getDateTime($data['to']) : null;`
	`44`	`+ $to = isset($data['to']) ? $this->getDateTime($data['to'], '23:59') : null;`
`45`	`45`	`if (null !== $to) {`
`46`	`46`	`$inclusive = (bool) $this->getOption($options, 'inclusive_to', self::DEFAULT_INCLUSIVE_TO);`
`47`	`47`	`if (true === $inclusive) {`
`@@ -66,17 +66,18 @@ private function getOption(array $options, string $name, $default)`
`66`	`66`
`67`	`67`	`/**`
`68`	`68`	`* @param string[] $data`
	`69`	`+ * @param string $defaultTime`
`69`	`70`	`*`
`70`	`71`	`* @return string\|null`
`71`	`72`	`*/`
`72`		`- private function getDateTime(array $data): ?string`
	`73`	`+ private function getDateTime(array $data, string $defaultTime): ?string`
`73`	`74`	`{`
`74`	`75`	`if (empty($data['date'])) {`
`75`	`76`	`return null;`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`if (empty($data['time'])) {`
`79`		`- return $data['date'];`
	`80`	`+ $data['time'] = $defaultTime;`
`80`	`81`	`}`
`81`	`82`
`82`	`83`	`return $data['date'] . ' ' . $data['time'];`