@@ -14,6 +14,7 @@ class Interval implements IntervalInterface
14
14
* Minimal possible value
15
15
*/
16
16
const DELTA = 0.005 ;
17
+
17
18
/**
18
19
* @var Select
19
20
*/
@@ -60,12 +61,12 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
60
61
$ valueFiled = $ this ->getValueFiled ();
61
62
$ valueAlias = $ this ->getValueAlias ();
62
63
if ($ lower !== null ) {
63
- $ select ->where (" $ { valueFiled} >= ?" , $ lower - self ::DELTA );
64
+ $ select ->where ($ valueFiled . ' >= ?' , $ lower - self ::DELTA );
64
65
}
65
66
if ($ upper !== null ) {
66
- $ select ->where (" $ { valueFiled} < ?" , $ upper - self ::DELTA );
67
+ $ select ->where ($ valueFiled . ' < ?' , $ upper - self ::DELTA );
67
68
}
68
- $ select ->order (" $ { valueAlias} ASC" )
69
+ $ select ->order ($ valueAlias . ' ASC' )
69
70
->limit ($ limit , $ offset );
70
71
71
72
return $ this ->arrayValuesToFloat (
@@ -82,9 +83,9 @@ public function loadPrevious($data, $index, $lower = null)
82
83
$ select = clone $ this ->select ;
83
84
$ valueFiled = $ this ->getValueFiled ();
84
85
$ select ->columns (['count ' => 'COUNT(*) ' ])
85
- ->where (" $ { valueFiled} < ?" , $ data - self ::DELTA );
86
+ ->where ($ valueFiled . ' < ?' , $ data - self ::DELTA );
86
87
if ($ lower !== null ) {
87
- $ select ->where (" $ { valueFiled} >= ?" , $ lower - self ::DELTA );
88
+ $ select ->where ($ valueFiled . ' >= ?' , $ lower - self ::DELTA );
88
89
}
89
90
$ offset = $ this ->select ->getConnection ()
90
91
->fetchRow ($ select )['count ' ];
@@ -104,10 +105,10 @@ public function loadNext($data, $rightIndex, $upper = null)
104
105
$ valueFiled = $ this ->getValueFiled ();
105
106
$ valueAlias = $ this ->getValueAlias ();
106
107
$ select ->columns (['count ' => 'COUNT(*) ' ])
107
- ->where (" $ { valueFiled} > ?" , $ data + self ::DELTA );
108
+ ->where ($ valueFiled . ' > ?' , $ data + self ::DELTA );
108
109
109
110
if ($ upper !== null ) {
110
- $ select ->where (" $ { valueFiled} < ? " , $ data - self ::DELTA );
111
+ $ select ->where ($ valueFiled . ' < ?' , $ data - self ::DELTA );
111
112
}
112
113
113
114
$ offset = $ this ->select ->getConnection ()
@@ -118,11 +119,11 @@ public function loadNext($data, $rightIndex, $upper = null)
118
119
}
119
120
120
121
$ select = clone $ this ->select ;
121
- $ select ->where (" $ { valueFiled} >= ?" , $ data - self ::DELTA );
122
+ $ select ->where ($ valueFiled . ' >= ?' , $ data - self ::DELTA );
122
123
if ($ upper !== null ) {
123
- $ select ->where (" $ { valueFiled} < ? " , $ data - self ::DELTA );
124
+ $ select ->where ($ valueFiled . ' < ?' , $ data - self ::DELTA );
124
125
}
125
- $ select ->order (" $ { valueAlias} DESC" )
126
+ $ select ->order ($ valueAlias . ' DESC' )
126
127
->limit ($ rightIndex - $ offset + 1 , $ offset - 1 );
127
128
128
129
return $ this ->arrayValuesToFloat (
0 commit comments