@@ -11,348 +11,348 @@ |
||
11 | 11 | |
12 | 12 | protected function setUp() |
13 | 13 | { |
14 | - if( !interface_exists( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) ) { |
|
15 | - $this->markTestSkipped( 'Install Laravel framework first' ); |
|
14 | + if (!interface_exists('\\Illuminate\\Contracts\\Filesystem\\Filesystem')) { |
|
15 | + $this->markTestSkipped('Install Laravel framework first'); |
|
16 | 16 | } |
17 | 17 | |
18 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Contracts\\Filesystem\\Filesystem' ) |
|
18 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Contracts\\Filesystem\\Filesystem') |
|
19 | 19 | ->disableOriginalConstructor() |
20 | 20 | ->getMock(); |
21 | 21 | |
22 | - $this->object = new \Aimeos\MW\Filesystem\Laravel( $this->mock, sys_get_temp_dir() ); |
|
22 | + $this->object = new \Aimeos\MW\Filesystem\Laravel($this->mock, sys_get_temp_dir()); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | |
26 | 26 | protected function tearDown() |
27 | 27 | { |
28 | - unset( $this->object ); |
|
28 | + unset($this->object); |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | |
32 | 32 | public function testIsdir() |
33 | 33 | { |
34 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
35 | - ->will( $this->returnValue( array( 't', 'test', 'es' ) ) ); |
|
34 | + $this->mock->expects($this->once())->method('directories') |
|
35 | + ->will($this->returnValue(array('t', 'test', 'es'))); |
|
36 | 36 | |
37 | - $this->assertTrue( $this->object->isdir( 'test' ) ); |
|
37 | + $this->assertTrue($this->object->isdir('test')); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function testIsdirFalse() |
42 | 42 | { |
43 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
44 | - ->will( $this->returnValue( array( 't', 'es' ) ) ); |
|
43 | + $this->mock->expects($this->once())->method('directories') |
|
44 | + ->will($this->returnValue(array('t', 'es'))); |
|
45 | 45 | |
46 | - $this->assertFalse( $this->object->isdir( 'test' ) ); |
|
46 | + $this->assertFalse($this->object->isdir('test')); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | 50 | public function testMkdir() |
51 | 51 | { |
52 | - $this->mock->expects( $this->once() )->method( 'makeDirectory' ); |
|
52 | + $this->mock->expects($this->once())->method('makeDirectory'); |
|
53 | 53 | |
54 | - $this->object->mkdir( 'test' ); |
|
54 | + $this->object->mkdir('test'); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
58 | 58 | public function testMkdirException() |
59 | 59 | { |
60 | - $this->mock->expects( $this->once() )->method( 'makeDirectory' ) |
|
61 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
60 | + $this->mock->expects($this->once())->method('makeDirectory') |
|
61 | + ->will($this->throwException(new \RuntimeException())); |
|
62 | 62 | |
63 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
64 | - $this->object->mkdir( 'test' ); |
|
63 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
64 | + $this->object->mkdir('test'); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | |
68 | 68 | public function testRmdir() |
69 | 69 | { |
70 | - $this->mock->expects( $this->once() )->method( 'deleteDirectory' ); |
|
70 | + $this->mock->expects($this->once())->method('deleteDirectory'); |
|
71 | 71 | |
72 | - $this->object->rmdir( 'test' ); |
|
72 | + $this->object->rmdir('test'); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | |
76 | 76 | public function testRmdirException() |
77 | 77 | { |
78 | - $this->mock->expects( $this->once() )->method( 'deleteDirectory' ) |
|
79 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
78 | + $this->mock->expects($this->once())->method('deleteDirectory') |
|
79 | + ->will($this->throwException(new \RuntimeException())); |
|
80 | 80 | |
81 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
82 | - $this->object->rmdir( 'test' ); |
|
81 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
82 | + $this->object->rmdir('test'); |
|
83 | 83 | } |
84 | 84 | |
85 | 85 | |
86 | 86 | public function testScan() |
87 | 87 | { |
88 | - $list = array( 't', 'es', 'st' ); |
|
88 | + $list = array('t', 'es', 'st'); |
|
89 | 89 | |
90 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
91 | - ->will( $this->returnValue( array( 't', 'es' ) ) ); |
|
90 | + $this->mock->expects($this->once())->method('directories') |
|
91 | + ->will($this->returnValue(array('t', 'es'))); |
|
92 | 92 | |
93 | - $this->mock->expects( $this->once() )->method( 'files' ) |
|
94 | - ->will( $this->returnValue( array( 'st' ) ) ); |
|
93 | + $this->mock->expects($this->once())->method('files') |
|
94 | + ->will($this->returnValue(array('st'))); |
|
95 | 95 | |
96 | 96 | $result = $this->object->scan(); |
97 | 97 | |
98 | - $this->assertInternalType( 'array', $result ); |
|
98 | + $this->assertInternalType('array', $result); |
|
99 | 99 | |
100 | - foreach( $result as $entry ) { |
|
101 | - $this->assertTrue( in_array( $entry, $list ) ); |
|
100 | + foreach ($result as $entry) { |
|
101 | + $this->assertTrue(in_array($entry, $list)); |
|
102 | 102 | } |
103 | 103 | } |
104 | 104 | |
105 | 105 | |
106 | 106 | public function testScanException() |
107 | 107 | { |
108 | - $this->mock->expects( $this->once() )->method( 'directories' ) |
|
109 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
108 | + $this->mock->expects($this->once())->method('directories') |
|
109 | + ->will($this->throwException(new \RuntimeException())); |
|
110 | 110 | |
111 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
112 | - $this->object->scan( 'test' ); |
|
111 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
112 | + $this->object->scan('test'); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | |
116 | 116 | public function testSize() |
117 | 117 | { |
118 | - $this->mock->expects( $this->once() )->method( 'size' ) |
|
119 | - ->will( $this->returnValue( 4 ) ); |
|
118 | + $this->mock->expects($this->once())->method('size') |
|
119 | + ->will($this->returnValue(4)); |
|
120 | 120 | |
121 | - $result = $this->object->size( 'test' ); |
|
121 | + $result = $this->object->size('test'); |
|
122 | 122 | |
123 | - $this->assertEquals( 4, $result ); |
|
123 | + $this->assertEquals(4, $result); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | |
127 | 127 | public function testSizeException() |
128 | 128 | { |
129 | - $this->mock->expects( $this->once() )->method( 'size' ) |
|
130 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
129 | + $this->mock->expects($this->once())->method('size') |
|
130 | + ->will($this->throwException(new \RuntimeException())); |
|
131 | 131 | |
132 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
133 | - $this->object->size( 'test' ); |
|
132 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
133 | + $this->object->size('test'); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 | |
137 | 137 | public function testTime() |
138 | 138 | { |
139 | - $this->mock->expects( $this->once() )->method( 'lastModified' ) |
|
140 | - ->will( $this->returnValue( 1 ) ); |
|
139 | + $this->mock->expects($this->once())->method('lastModified') |
|
140 | + ->will($this->returnValue(1)); |
|
141 | 141 | |
142 | - $result = $this->object->time( 'test' ); |
|
142 | + $result = $this->object->time('test'); |
|
143 | 143 | |
144 | - $this->assertGreaterThan( 0, $result ); |
|
144 | + $this->assertGreaterThan(0, $result); |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | |
148 | 148 | public function testTimeException() |
149 | 149 | { |
150 | - $this->mock->expects( $this->once() )->method( 'lastModified' ) |
|
151 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
150 | + $this->mock->expects($this->once())->method('lastModified') |
|
151 | + ->will($this->throwException(new \RuntimeException())); |
|
152 | 152 | |
153 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
154 | - $this->object->time( 'test' ); |
|
153 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
154 | + $this->object->time('test'); |
|
155 | 155 | } |
156 | 156 | |
157 | 157 | |
158 | 158 | public function testRm() |
159 | 159 | { |
160 | - $this->mock->expects( $this->once() )->method( 'delete' ); |
|
160 | + $this->mock->expects($this->once())->method('delete'); |
|
161 | 161 | |
162 | - $this->object->rm( 'test' ); |
|
162 | + $this->object->rm('test'); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | |
166 | 166 | public function testRmException() |
167 | 167 | { |
168 | - $this->mock->expects( $this->once() )->method( 'delete' ) |
|
169 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
168 | + $this->mock->expects($this->once())->method('delete') |
|
169 | + ->will($this->throwException(new \RuntimeException())); |
|
170 | 170 | |
171 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
172 | - $this->object->rm( 'test' ); |
|
171 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
172 | + $this->object->rm('test'); |
|
173 | 173 | } |
174 | 174 | |
175 | 175 | |
176 | 176 | public function testHas() |
177 | 177 | { |
178 | - $this->mock->expects( $this->once() )->method( 'exists' ) |
|
179 | - ->will( $this->returnValue( true ) ); |
|
178 | + $this->mock->expects($this->once())->method('exists') |
|
179 | + ->will($this->returnValue(true)); |
|
180 | 180 | |
181 | - $result = $this->object->has( 'test' ); |
|
181 | + $result = $this->object->has('test'); |
|
182 | 182 | |
183 | - $this->assertTrue( $result ); |
|
183 | + $this->assertTrue($result); |
|
184 | 184 | } |
185 | 185 | |
186 | 186 | |
187 | 187 | public function testHasFalse() |
188 | 188 | { |
189 | - $this->mock->expects( $this->once() )->method( 'exists' ) |
|
190 | - ->will( $this->returnValue( false ) ); |
|
189 | + $this->mock->expects($this->once())->method('exists') |
|
190 | + ->will($this->returnValue(false)); |
|
191 | 191 | |
192 | - $result = $this->object->has( 'test' ); |
|
192 | + $result = $this->object->has('test'); |
|
193 | 193 | |
194 | - $this->assertFalse( $result ); |
|
194 | + $this->assertFalse($result); |
|
195 | 195 | } |
196 | 196 | |
197 | 197 | |
198 | 198 | public function testRead() |
199 | 199 | { |
200 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
201 | - ->will( $this->returnValue( 'test' ) ); |
|
200 | + $this->mock->expects($this->once())->method('get') |
|
201 | + ->will($this->returnValue('test')); |
|
202 | 202 | |
203 | - $result = $this->object->read( 'file' ); |
|
203 | + $result = $this->object->read('file'); |
|
204 | 204 | |
205 | - $this->assertEquals( 'test', $result ); |
|
205 | + $this->assertEquals('test', $result); |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | |
209 | 209 | public function testReadException() |
210 | 210 | { |
211 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
212 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
211 | + $this->mock->expects($this->once())->method('get') |
|
212 | + ->will($this->throwException(new \RuntimeException())); |
|
213 | 213 | |
214 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
215 | - $this->object->read( 'readinvalid' ); |
|
214 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
215 | + $this->object->read('readinvalid'); |
|
216 | 216 | } |
217 | 217 | |
218 | 218 | |
219 | 219 | public function testReadf() |
220 | 220 | { |
221 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
222 | - ->will( $this->returnValue( 'test' ) ); |
|
221 | + $this->mock->expects($this->once())->method('get') |
|
222 | + ->will($this->returnValue('test')); |
|
223 | 223 | |
224 | - $result = $this->object->readf( 'file' ); |
|
224 | + $result = $this->object->readf('file'); |
|
225 | 225 | |
226 | - $this->assertEquals( 'test', file_get_contents( $result ) ); |
|
227 | - unlink( $result ); |
|
226 | + $this->assertEquals('test', file_get_contents($result)); |
|
227 | + unlink($result); |
|
228 | 228 | } |
229 | 229 | |
230 | 230 | |
231 | 231 | public function testReads() |
232 | 232 | { |
233 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
234 | - ->will( $this->returnValue( 'test' ) ); |
|
233 | + $this->mock->expects($this->once())->method('get') |
|
234 | + ->will($this->returnValue('test')); |
|
235 | 235 | |
236 | - $handle = $this->object->reads( 'file' ); |
|
236 | + $handle = $this->object->reads('file'); |
|
237 | 237 | |
238 | - $this->assertInternalType( 'resource', $handle ); |
|
239 | - $this->assertEquals( 'test', fgets( $handle ) ); |
|
238 | + $this->assertInternalType('resource', $handle); |
|
239 | + $this->assertEquals('test', fgets($handle)); |
|
240 | 240 | |
241 | - fclose( $handle ); |
|
241 | + fclose($handle); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | |
245 | 245 | public function testReadsException() |
246 | 246 | { |
247 | - $this->mock->expects( $this->once() )->method( 'get' ) |
|
248 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
247 | + $this->mock->expects($this->once())->method('get') |
|
248 | + ->will($this->throwException(new \RuntimeException())); |
|
249 | 249 | |
250 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
251 | - $this->object->reads( 'readinvalid' ); |
|
250 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
251 | + $this->object->reads('readinvalid'); |
|
252 | 252 | } |
253 | 253 | |
254 | 254 | |
255 | 255 | public function testWrite() |
256 | 256 | { |
257 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
257 | + $this->mock->expects($this->once())->method('put'); |
|
258 | 258 | |
259 | - $this->object->write( 'file', 'test' ); |
|
259 | + $this->object->write('file', 'test'); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | |
263 | 263 | public function testWriteException() |
264 | 264 | { |
265 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
266 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
265 | + $this->mock->expects($this->once())->method('put') |
|
266 | + ->will($this->throwException(new \RuntimeException())); |
|
267 | 267 | |
268 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
269 | - $this->object->write( '', 'test' ); |
|
268 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
269 | + $this->object->write('', 'test'); |
|
270 | 270 | } |
271 | 271 | |
272 | 272 | |
273 | 273 | public function testWritef() |
274 | 274 | { |
275 | - $file = sys_get_temp_dir() . DIRECTORY_SEPARATOR . 'file99'; |
|
276 | - file_put_contents( $file, 'test' ); |
|
275 | + $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'file99'; |
|
276 | + file_put_contents($file, 'test'); |
|
277 | 277 | |
278 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
278 | + $this->mock->expects($this->once())->method('put'); |
|
279 | 279 | |
280 | - $this->object->writef( 'file', $file ); |
|
280 | + $this->object->writef('file', $file); |
|
281 | 281 | |
282 | - unlink( $file ); |
|
282 | + unlink($file); |
|
283 | 283 | } |
284 | 284 | |
285 | 285 | |
286 | 286 | public function testWritefException() |
287 | 287 | { |
288 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
289 | - $this->object->writef( '', 'invalid' ); |
|
288 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
289 | + $this->object->writef('', 'invalid'); |
|
290 | 290 | } |
291 | 291 | |
292 | 292 | |
293 | 293 | public function testWrites() |
294 | 294 | { |
295 | - $this->mock->expects( $this->once() )->method( 'put' ); |
|
295 | + $this->mock->expects($this->once())->method('put'); |
|
296 | 296 | |
297 | - $handle = fopen( __FILE__, 'r' ); |
|
297 | + $handle = fopen(__FILE__, 'r'); |
|
298 | 298 | |
299 | - $this->object->writes( 'file', $handle ); |
|
299 | + $this->object->writes('file', $handle); |
|
300 | 300 | |
301 | - fclose( $handle ); |
|
301 | + fclose($handle); |
|
302 | 302 | } |
303 | 303 | |
304 | 304 | |
305 | 305 | public function testWritesException() |
306 | 306 | { |
307 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
308 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
307 | + $this->mock->expects($this->once())->method('put') |
|
308 | + ->will($this->throwException(new \RuntimeException())); |
|
309 | 309 | |
310 | - $handle = fopen( __FILE__, 'r' ); |
|
310 | + $handle = fopen(__FILE__, 'r'); |
|
311 | 311 | |
312 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
313 | - $this->object->writes( 'file', $handle ); |
|
312 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
313 | + $this->object->writes('file', $handle); |
|
314 | 314 | } |
315 | 315 | |
316 | 316 | |
317 | 317 | public function testWritesException2() |
318 | 318 | { |
319 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
320 | - $this->object->writes( 'file', null ); |
|
319 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
320 | + $this->object->writes('file', null); |
|
321 | 321 | } |
322 | 322 | |
323 | 323 | |
324 | 324 | public function testMove() |
325 | 325 | { |
326 | - $this->mock->expects( $this->once() )->method( 'move' ); |
|
326 | + $this->mock->expects($this->once())->method('move'); |
|
327 | 327 | |
328 | - $this->object->move( 'file1', 'file2' ); |
|
328 | + $this->object->move('file1', 'file2'); |
|
329 | 329 | } |
330 | 330 | |
331 | 331 | |
332 | 332 | public function testMoveException() |
333 | 333 | { |
334 | - $this->mock->expects( $this->once() )->method( 'move' ) |
|
335 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
334 | + $this->mock->expects($this->once())->method('move') |
|
335 | + ->will($this->throwException(new \RuntimeException())); |
|
336 | 336 | |
337 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
338 | - $this->object->move( 'file1', 'file2' ); |
|
337 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
338 | + $this->object->move('file1', 'file2'); |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | |
342 | 342 | public function testCopy() |
343 | 343 | { |
344 | - $this->mock->expects( $this->once() )->method( 'copy' ); |
|
344 | + $this->mock->expects($this->once())->method('copy'); |
|
345 | 345 | |
346 | - $this->object->copy( 'file1', 'file2' ); |
|
346 | + $this->object->copy('file1', 'file2'); |
|
347 | 347 | } |
348 | 348 | |
349 | 349 | |
350 | 350 | public function testCopyException() |
351 | 351 | { |
352 | - $this->mock->expects( $this->once() )->method( 'copy' ) |
|
353 | - ->will( $this->throwException( new \RuntimeException() ) ); |
|
352 | + $this->mock->expects($this->once())->method('copy') |
|
353 | + ->will($this->throwException(new \RuntimeException())); |
|
354 | 354 | |
355 | - $this->setExpectedException( '\Aimeos\MW\Filesystem\Exception' ); |
|
356 | - $this->object->copy( 'file1', 'file2' ); |
|
355 | + $this->setExpectedException('\Aimeos\MW\Filesystem\Exception'); |
|
356 | + $this->object->copy('file1', 'file2'); |
|
357 | 357 | } |
358 | 358 | } |
@@ -21,12 +21,12 @@ discard block |
||
21 | 21 | */ |
22 | 22 | protected function setUp() |
23 | 23 | { |
24 | - if( interface_exists( '\\Illuminate\\Session\\Store' ) === false ) { |
|
25 | - $this->markTestSkipped( 'Class \\Illuminate\\Session\\Store not found' ); |
|
24 | + if (interface_exists('\\Illuminate\\Session\\Store') === false) { |
|
25 | + $this->markTestSkipped('Class \\Illuminate\\Session\\Store not found'); |
|
26 | 26 | } |
27 | 27 | |
28 | - $this->mock = $this->getMockBuilder( '\\Illuminate\\Session\\Store' )->getMock(); |
|
29 | - $this->object = new \Aimeos\MW\Session\Laravel5( $this->mock ); |
|
28 | + $this->mock = $this->getMockBuilder('\\Illuminate\\Session\\Store')->getMock(); |
|
29 | + $this->object = new \Aimeos\MW\Session\Laravel5($this->mock); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | |
@@ -38,21 +38,21 @@ discard block |
||
38 | 38 | */ |
39 | 39 | protected function tearDown() |
40 | 40 | { |
41 | - unset( $this->object ); |
|
41 | + unset($this->object); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | |
45 | 45 | public function testGetDefault() |
46 | 46 | { |
47 | - $this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( 'notexist' ) ); |
|
48 | - $this->object->get( 'notexist' ); |
|
47 | + $this->mock->expects($this->once())->method('get')->with($this->equalTo('notexist')); |
|
48 | + $this->object->get('notexist'); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
52 | 52 | public function testSet() |
53 | 53 | { |
54 | - $this->mock->expects( $this->once() )->method( 'put' ) |
|
55 | - ->with( $this->equalTo( 'key' ), $this->equalTo( 'value' ) ); |
|
56 | - $this->object->set( 'key', 'value' ); |
|
54 | + $this->mock->expects($this->once())->method('put') |
|
55 | + ->with($this->equalTo('key'), $this->equalTo('value')); |
|
56 | + $this->object->set('key', 'value'); |
|
57 | 57 | } |
58 | 58 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | * |
28 | 28 | * @param \Illuminate\View\Factory $factory Laravel view factory |
29 | 29 | */ |
30 | - public function __construct( \Illuminate\View\Factory $factory ) |
|
30 | + public function __construct(\Illuminate\View\Factory $factory) |
|
31 | 31 | { |
32 | 32 | $this->factory = $factory; |
33 | 33 | } |
@@ -42,19 +42,19 @@ discard block |
||
42 | 42 | * @return string Output generated by the template |
43 | 43 | * @throws \Aimeos\MW\View\Exception If the template isn't found |
44 | 44 | */ |
45 | - public function render( \Aimeos\MW\View\Iface $view, $filename, array $values ) |
|
45 | + public function render(\Aimeos\MW\View\Iface $view, $filename, array $values) |
|
46 | 46 | { |
47 | 47 | $factory = $this->factory; |
48 | - $lv = $factory->file( $filename, $values ); |
|
48 | + $lv = $factory->file($filename, $values); |
|
49 | 49 | |
50 | - $fcn = function() use ( $factory, $view ) |
|
50 | + $fcn = function() use ($factory, $view) |
|
51 | 51 | { |
52 | - foreach( $factory->getSections() as $name => $section ) { |
|
53 | - $view->block()->set( $name, $section ); |
|
52 | + foreach ($factory->getSections() as $name => $section) { |
|
53 | + $view->block()->set($name, $section); |
|
54 | 54 | } |
55 | 55 | }; |
56 | 56 | |
57 | - $contents = $lv->render( $fcn ); |
|
57 | + $contents = $lv->render($fcn); |
|
58 | 58 | $this->factory->flushSections(); |
59 | 59 | |
60 | 60 | return $contents; |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | * |
29 | 29 | * @param \Illuminate\Session\Store $object Laravel session object |
30 | 30 | */ |
31 | - public function __construct( \Illuminate\Session\Store $object ) |
|
31 | + public function __construct(\Illuminate\Session\Store $object) |
|
32 | 32 | { |
33 | 33 | $this->object = $object; |
34 | 34 | } |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | * @param mixed $default Value returned if requested key isn't found |
44 | 44 | * @return mixed Value associated to the requested key |
45 | 45 | */ |
46 | - public function get( $name, $default = null ) |
|
46 | + public function get($name, $default = null) |
|
47 | 47 | { |
48 | - return $this->object->get( $name, $default ); |
|
48 | + return $this->object->get($name, $default); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | |
@@ -58,8 +58,8 @@ discard block |
||
58 | 58 | * @param mixed $value Value that should be associated with the given key |
59 | 59 | * @return void |
60 | 60 | */ |
61 | - public function set( $name, $value ) |
|
61 | + public function set($name, $value) |
|
62 | 62 | { |
63 | - $this->object->put( $name, $value ); |
|
63 | + $this->object->put($name, $value); |
|
64 | 64 | } |
65 | 65 | } |
@@ -249,7 +249,7 @@ |
||
249 | 249 | * |
250 | 250 | * @param string $manager Name of the sub manager type in lower case |
251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
252 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
252 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
253 | 253 | */ |
254 | 254 | public function getSubManager( $manager, $name = null ) |
255 | 255 | { |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | 'customer.lists.id'=> array( |
26 | 26 | 'code'=>'customer.lists.id', |
27 | 27 | 'internalcode'=>'lvuli."id"', |
28 | - 'internaldeps' => array( 'LEFT JOIN "users_list" AS lvuli ON ( lvu."id" = lvuli."parentid" )' ), |
|
28 | + 'internaldeps' => array('LEFT JOIN "users_list" AS lvuli ON ( lvu."id" = lvuli."parentid" )'), |
|
29 | 29 | 'label'=>'Customer list ID', |
30 | 30 | 'type'=> 'integer', |
31 | 31 | 'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -133,14 +133,14 @@ discard block |
||
133 | 133 | * |
134 | 134 | * @param array $siteids List of IDs for sites whose entries should be deleted |
135 | 135 | */ |
136 | - public function cleanup( array $siteids ) |
|
136 | + public function cleanup(array $siteids) |
|
137 | 137 | { |
138 | 138 | $path = 'mshop/customer/manager/lists/submanagers'; |
139 | - foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) { |
|
140 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
139 | + foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) { |
|
140 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
141 | 141 | } |
142 | 142 | |
143 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/laravel/delete' ); |
|
143 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/laravel/delete'); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | |
@@ -150,11 +150,11 @@ discard block |
||
150 | 150 | * @param boolean $withsub Return also attributes of sub-managers if true |
151 | 151 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
152 | 152 | */ |
153 | - public function getSearchAttributes( $withsub = true ) |
|
153 | + public function getSearchAttributes($withsub = true) |
|
154 | 154 | { |
155 | 155 | $path = 'mshop/customer/manager/lists/submanagers'; |
156 | 156 | |
157 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'type' ), $withsub ); |
|
157 | + return $this->getSearchAttributesBase($this->searchConfig, $path, array('type'), $withsub); |
|
158 | 158 | } |
159 | 159 | |
160 | 160 | |
@@ -165,9 +165,9 @@ discard block |
||
165 | 165 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
166 | 166 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
167 | 167 | */ |
168 | - public function getSubManager( $manager, $name = null ) |
|
168 | + public function getSubManager($manager, $name = null) |
|
169 | 169 | { |
170 | - return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
170 | + return $this->getSubManagerBase('customer', 'lists/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
171 | 171 | } |
172 | 172 | |
173 | 173 |
@@ -249,7 +249,7 @@ |
||
249 | 249 | * |
250 | 250 | * @param string $manager Name of the sub manager type in lower case |
251 | 251 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
252 | - * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
|
252 | + * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions, e.g stock, tags, locations, etc. |
|
253 | 253 | */ |
254 | 254 | public function getSubManager( $manager, $name = null ) |
255 | 255 | { |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | 'customer.lists.type.id' => array( |
26 | 26 | 'code'=>'customer.lists.type.id', |
27 | 27 | 'internalcode'=>'lvulity."id"', |
28 | - 'internaldeps'=>array( 'LEFT JOIN "users_list_type" AS lvulity ON ( lvuli."typeid" = lvulity."id" )' ), |
|
28 | + 'internaldeps'=>array('LEFT JOIN "users_list_type" AS lvulity ON ( lvuli."typeid" = lvulity."id" )'), |
|
29 | 29 | 'label'=>'Customer list type ID', |
30 | 30 | 'type'=> 'integer', |
31 | 31 | 'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT, |
@@ -96,14 +96,14 @@ discard block |
||
96 | 96 | * |
97 | 97 | * @param array $siteids List of IDs for sites whose entries should be deleted |
98 | 98 | */ |
99 | - public function cleanup( array $siteids ) |
|
99 | + public function cleanup(array $siteids) |
|
100 | 100 | { |
101 | 101 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
102 | - foreach( $this->getContext()->getConfig()->get( $path, [] ) as $domain ) { |
|
103 | - $this->getObject()->getSubManager( $domain )->cleanup( $siteids ); |
|
102 | + foreach ($this->getContext()->getConfig()->get($path, []) as $domain) { |
|
103 | + $this->getObject()->getSubManager($domain)->cleanup($siteids); |
|
104 | 104 | } |
105 | 105 | |
106 | - $this->cleanupBase( $siteids, 'mshop/customer/manager/lists/type/laravel/delete' ); |
|
106 | + $this->cleanupBase($siteids, 'mshop/customer/manager/lists/type/laravel/delete'); |
|
107 | 107 | } |
108 | 108 | |
109 | 109 | |
@@ -113,11 +113,11 @@ discard block |
||
113 | 113 | * @param boolean $withsub Return also attributes of sub-managers if true |
114 | 114 | * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface |
115 | 115 | */ |
116 | - public function getSearchAttributes( $withsub = true ) |
|
116 | + public function getSearchAttributes($withsub = true) |
|
117 | 117 | { |
118 | 118 | $path = 'mshop/customer/manager/lists/type/submanagers'; |
119 | 119 | |
120 | - return $this->getSearchAttributesBase( $this->searchConfig, $path, [], $withsub ); |
|
120 | + return $this->getSearchAttributesBase($this->searchConfig, $path, [], $withsub); |
|
121 | 121 | } |
122 | 122 | |
123 | 123 | |
@@ -128,9 +128,9 @@ discard block |
||
128 | 128 | * @param string|null $name Name of the implementation, will be from configuration (or Default) if null |
129 | 129 | * @return mixed Manager for different extensions, e.g stock, tags, locations, etc. |
130 | 130 | */ |
131 | - public function getSubManager( $manager, $name = null ) |
|
131 | + public function getSubManager($manager, $name = null) |
|
132 | 132 | { |
133 | - return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'Laravel' : $name ) ); |
|
133 | + return $this->getSubManagerBase('customer', 'lists/type/'.$manager, ($name === null ? 'Laravel' : $name)); |
|
134 | 134 | } |
135 | 135 | |
136 | 136 |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | */ |
22 | 22 | public function getPreDependencies() |
23 | 23 | { |
24 | - return array( 'TablesAddLaravelTestData' ); |
|
24 | + return array('TablesAddLaravelTestData'); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | |
@@ -31,36 +31,36 @@ discard block |
||
31 | 31 | public function migrate() |
32 | 32 | { |
33 | 33 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; |
34 | - if( !( $this->additional instanceof $iface ) ) { |
|
35 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); |
|
34 | + if (!($this->additional instanceof $iface)) { |
|
35 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); |
|
36 | 36 | } |
37 | 37 | |
38 | - $this->msg( 'Adding Laravel customer test data', 0 ); |
|
39 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
38 | + $this->msg('Adding Laravel customer test data', 0); |
|
39 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
40 | 40 | |
41 | 41 | $parentIds = []; |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer.php'; |
|
43 | + $path = __DIR__.$ds.'data'.$ds.'customer.php'; |
|
44 | 44 | |
45 | - if( ( $testdata = include( $path ) ) == false ){ |
|
46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer domain', $path ) ); |
|
45 | + if (($testdata = include($path)) == false) { |
|
46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer domain', $path)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | |
50 | - $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager( $this->additional, 'Laravel' ); |
|
51 | - $customerAddressManager = $customerManager->getSubManager( 'address', 'Laravel' ); |
|
50 | + $customerManager = \Aimeos\MShop\Customer\Manager\Factory::createManager($this->additional, 'Laravel'); |
|
51 | + $customerAddressManager = $customerManager->getSubManager('address', 'Laravel'); |
|
52 | 52 | |
53 | - $this->cleanupCustomerData( $customerManager, $customerAddressManager ); |
|
53 | + $this->cleanupCustomerData($customerManager, $customerAddressManager); |
|
54 | 54 | |
55 | 55 | $this->conn->begin(); |
56 | 56 | |
57 | - $parentIds = $this->addCustomerData( $testdata, $customerManager, $customerAddressManager->createItem() ); |
|
58 | - $this->addCustomerAddressData( $testdata, $customerAddressManager, $parentIds ); |
|
57 | + $parentIds = $this->addCustomerData($testdata, $customerManager, $customerAddressManager->createItem()); |
|
58 | + $this->addCustomerAddressData($testdata, $customerAddressManager, $parentIds); |
|
59 | 59 | |
60 | 60 | $this->conn->commit(); |
61 | 61 | |
62 | 62 | |
63 | - $this->status( 'done' ); |
|
63 | + $this->status('done'); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | |
@@ -70,17 +70,17 @@ discard block |
||
70 | 70 | * @param \Aimeos\MShop\Common\Manager\Iface $customerManager Customer manager |
71 | 71 | * @param \Aimeos\MShop\Common\Manager\Iface $customerAddressManager Customer address manager |
72 | 72 | */ |
73 | - protected function cleanupCustomerData( \Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager ) |
|
73 | + protected function cleanupCustomerData(\Aimeos\MShop\Common\Manager\Iface $customerManager, \Aimeos\MShop\Common\Manager\Iface $customerAddressManager) |
|
74 | 74 | { |
75 | 75 | $search = $customerManager->createSearch(); |
76 | - $search->setConditions( $search->compare( '=~', 'customer.code', 'unitCustomer' ) ); |
|
77 | - $customerItems = $customerManager->searchItems( $search ); |
|
76 | + $search->setConditions($search->compare('=~', 'customer.code', 'unitCustomer')); |
|
77 | + $customerItems = $customerManager->searchItems($search); |
|
78 | 78 | |
79 | 79 | $search = $customerAddressManager->createSearch(); |
80 | - $search->setConditions( $search->compare( '=~', 'customer.address.email', 'unitCustomer' ) ); |
|
81 | - $addressItems = $customerAddressManager->searchItems( $search ); |
|
80 | + $search->setConditions($search->compare('=~', 'customer.address.email', 'unitCustomer')); |
|
81 | + $addressItems = $customerAddressManager->searchItems($search); |
|
82 | 82 | |
83 | - $customerAddressManager->deleteItems( array_keys( $addressItems ) ); |
|
84 | - $customerManager->deleteItems( array_keys( $customerItems ) ); |
|
83 | + $customerAddressManager->deleteItems(array_keys($addressItems)); |
|
84 | + $customerManager->deleteItems(array_keys($customerItems)); |
|
85 | 85 | } |
86 | 86 | } |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function getPreDependencies() |
24 | 24 | { |
25 | - return array( 'TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData', 'TextAddTestData' ); |
|
25 | + return array('TablesCreateLaravel', 'CustomerAddLaravelTestData', 'LocaleAddTestData', 'TextAddTestData'); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | |
@@ -32,29 +32,29 @@ discard block |
||
32 | 32 | public function migrate() |
33 | 33 | { |
34 | 34 | $iface = '\\Aimeos\\MShop\\Context\\Item\\Iface'; |
35 | - if( !( $this->additional instanceof $iface ) ) { |
|
36 | - throw new \Aimeos\MW\Setup\Exception( sprintf( 'Additionally provided object is not of type "%1$s"', $iface ) ); |
|
35 | + if (!($this->additional instanceof $iface)) { |
|
36 | + throw new \Aimeos\MW\Setup\Exception(sprintf('Additionally provided object is not of type "%1$s"', $iface)); |
|
37 | 37 | } |
38 | 38 | |
39 | - $this->msg( 'Adding customer-list Laravel test data', 0 ); |
|
40 | - $this->additional->setEditor( 'ai-laravel:unittest' ); |
|
39 | + $this->msg('Adding customer-list Laravel test data', 0); |
|
40 | + $this->additional->setEditor('ai-laravel:unittest'); |
|
41 | 41 | |
42 | 42 | $ds = DIRECTORY_SEPARATOR; |
43 | - $path = __DIR__ . $ds . 'data' . $ds . 'customer-list.php'; |
|
43 | + $path = __DIR__.$ds.'data'.$ds.'customer-list.php'; |
|
44 | 44 | |
45 | - if( ( $testdata = include( $path ) ) == false ){ |
|
46 | - throw new \Aimeos\MShop\Exception( sprintf( 'No file "%1$s" found for customer list domain', $path ) ); |
|
45 | + if (($testdata = include($path)) == false) { |
|
46 | + throw new \Aimeos\MShop\Exception(sprintf('No file "%1$s" found for customer list domain', $path)); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | $refKeys = []; |
50 | - foreach( $testdata['customer/lists'] as $dataset ) { |
|
51 | - $refKeys[ $dataset['domain'] ][] = $dataset['refid']; |
|
50 | + foreach ($testdata['customer/lists'] as $dataset) { |
|
51 | + $refKeys[$dataset['domain']][] = $dataset['refid']; |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | $refIds = []; |
55 | - $refIds['text'] = $this->getTextData( $refKeys['text'] ); |
|
56 | - $this->addCustomerListData( $testdata, $refIds, 'Laravel' ); |
|
55 | + $refIds['text'] = $this->getTextData($refKeys['text']); |
|
56 | + $this->addCustomerListData($testdata, $refIds, 'Laravel'); |
|
57 | 57 | |
58 | - $this->status( 'done' ); |
|
58 | + $this->status('done'); |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * |
30 | 30 | * @param \Illuminate\Contracts\Cache\Store $cache Laravel cache object |
31 | 31 | */ |
32 | - public function __construct( \Illuminate\Contracts\Cache\Store $cache ) |
|
32 | + public function __construct(\Illuminate\Contracts\Cache\Store $cache) |
|
33 | 33 | { |
34 | 34 | $this->object = $cache; |
35 | 35 | } |
@@ -53,9 +53,9 @@ discard block |
||
53 | 53 | * |
54 | 54 | * @param string $key Key string that identifies the single cache entry |
55 | 55 | */ |
56 | - public function delete( $key ) |
|
56 | + public function delete($key) |
|
57 | 57 | { |
58 | - $this->object->forget( $key ); |
|
58 | + $this->object->forget($key); |
|
59 | 59 | } |
60 | 60 | |
61 | 61 | |
@@ -67,10 +67,10 @@ discard block |
||
67 | 67 | * @param \Traversable|array $keys List of key strings that identify the cache entries |
68 | 68 | * that should be removed |
69 | 69 | */ |
70 | - public function deleteMultiple( $keys ) |
|
70 | + public function deleteMultiple($keys) |
|
71 | 71 | { |
72 | - foreach( $keys as $key ) { |
|
73 | - $this->object->forget( $key ); |
|
72 | + foreach ($keys as $key) { |
|
73 | + $this->object->forget($key); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @param string[] $tags List of tag strings that are associated to one or more |
84 | 84 | * cache entries that should be removed |
85 | 85 | */ |
86 | - public function deleteByTags( array $tags ) |
|
86 | + public function deleteByTags(array $tags) |
|
87 | 87 | { |
88 | 88 | // $this->object->tags( $tag )->flush(); |
89 | 89 | $this->object->flush(); |
@@ -99,9 +99,9 @@ discard block |
||
99 | 99 | * @param string $default Value returned if requested key isn't found |
100 | 100 | * @return mixed Value associated to the requested key |
101 | 101 | */ |
102 | - public function get( $name, $default = null ) |
|
102 | + public function get($name, $default = null) |
|
103 | 103 | { |
104 | - if( ( $entry = $this->object->get( $name ) ) !== null ) { |
|
104 | + if (($entry = $this->object->get($name)) !== null) { |
|
105 | 105 | return $entry; |
106 | 106 | } |
107 | 107 | |
@@ -120,13 +120,13 @@ discard block |
||
120 | 120 | * entries. If a cache entry doesn't exist, neither its key nor a value |
121 | 121 | * will be in the result list |
122 | 122 | */ |
123 | - public function getMultiple( $keys, $default = null ) |
|
123 | + public function getMultiple($keys, $default = null) |
|
124 | 124 | { |
125 | 125 | $result = []; |
126 | 126 | |
127 | - foreach( $keys as $key ) |
|
127 | + foreach ($keys as $key) |
|
128 | 128 | { |
129 | - if( ( $entry = $this->object->get( $key ) ) !== false ) { |
|
129 | + if (($entry = $this->object->get($key)) !== false) { |
|
130 | 130 | $result[$key] = $entry; |
131 | 131 | } else { |
132 | 132 | $result[$key] = $default; |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | * entries. If a tag isn't associated to any cache entry, nothing is returned |
148 | 148 | * for that tag |
149 | 149 | */ |
150 | - public function getMultipleByTags( array $tags ) |
|
150 | + public function getMultipleByTags(array $tags) |
|
151 | 151 | { |
152 | 152 | return []; |
153 | 153 | } |
@@ -165,14 +165,14 @@ discard block |
||
165 | 165 | * @param array $tags List of tag strings that should be assoicated to the |
166 | 166 | * given value in the cache |
167 | 167 | */ |
168 | - public function set( $key, $value, $expires = null, array $tags = [] ) |
|
168 | + public function set($key, $value, $expires = null, array $tags = []) |
|
169 | 169 | { |
170 | - if( is_string( $expires ) ) { |
|
171 | - $this->object->put( $key, $value, (int) ( date_create( $expires )->getTimestamp() - time() ) / 60 ); |
|
172 | - } elseif( is_int( $expires ) ) { |
|
173 | - $this->object->put( $key, $value, (int) $expires / 60 ); |
|
170 | + if (is_string($expires)) { |
|
171 | + $this->object->put($key, $value, (int) (date_create($expires)->getTimestamp() - time())/60); |
|
172 | + } elseif (is_int($expires)) { |
|
173 | + $this->object->put($key, $value, (int) $expires/60); |
|
174 | 174 | } else { |
175 | - $this->object->forever( $key, $value ); |
|
175 | + $this->object->forever($key, $value); |
|
176 | 176 | } |
177 | 177 | } |
178 | 178 | |
@@ -191,14 +191,14 @@ discard block |
||
191 | 191 | * should be associated to the values identified by their key. The value |
192 | 192 | * associated to the key can either be a tag string or an array of tag strings |
193 | 193 | */ |
194 | - public function setMultiple( $pairs, $expires = null, array $tags = [] ) |
|
194 | + public function setMultiple($pairs, $expires = null, array $tags = []) |
|
195 | 195 | { |
196 | - foreach( $pairs as $key => $value ) |
|
196 | + foreach ($pairs as $key => $value) |
|
197 | 197 | { |
198 | - $tagList = ( isset( $tags[$key] ) ? (array) $tags[$key] : [] ); |
|
199 | - $keyExpire = ( isset( $expires[$key] ) ? $expires[$key] : null ); |
|
198 | + $tagList = (isset($tags[$key]) ? (array) $tags[$key] : []); |
|
199 | + $keyExpire = (isset($expires[$key]) ? $expires[$key] : null); |
|
200 | 200 | |
201 | - $this->set( $key, $value, $keyExpire, $tagList ); |
|
201 | + $this->set($key, $value, $keyExpire, $tagList); |
|
202 | 202 | } |
203 | 203 | } |
204 | 204 | } |