tests: removed deprecated ArrayAccess syntax

dg · dg · commit a0175ad74cee · 2015-02-18T02:17:50.000+01:00
diff --git a/tests/Caching/Cache.save.phpt b/tests/Caching/Cache.save.phpt
@@ -20,8 +20,9 @@ $dependencies = array(Cache::TAGS => 'tag');
 
 $cache->save('key', 'value', $dependencies);
 
-Assert::equal('value', $cache['key']['data']);
-Assert::equal($dependencies, $cache['key']['dependencies']);
+$res = $cache->load('key');
+Assert::equal('value', $res['data']);
+Assert::equal($dependencies, $res['dependencies']);
 
 
 // save callback return value
@@ -32,8 +33,9 @@ $cache->save('key', function() {
 	return 'value';
 });
 
-Assert::equal('value', $cache['key']['data']);
-Assert::equal(array(), $cache['key']['dependencies']);
+$res = $cache->load('key');
+Assert::equal('value', $res['data']);
+Assert::equal(array(), $res['dependencies']);
 
 
 // save callback return value with dependencies
@@ -45,5 +47,6 @@ $cache->save('key', function() {
 	return 'value';
 }, $dependencies);
 
-Assert::equal('value', $cache['key']['data']);
-Assert::equal($dependencies, $cache['key']['dependencies']);
+$res = $cache->load('key');
+Assert::equal('value', $res['data']);
+Assert::equal($dependencies, $res['dependencies']);
diff --git a/tests/Caching/DevNullStorage.phpt b/tests/Caching/DevNullStorage.phpt
@@ -19,27 +19,23 @@ $value = '"Hello World"';
 $cache = new Cache(new DevNullStorage, 'myspace');
 
 
-Assert::false( isset($cache[$key]) );
-
-Assert::null( $cache[$key] );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
-$cache[$key] = $value;
-
-Assert::false( isset($cache[$key]) );
+$cache->save($key, $value);
 
-Assert::notSame( $cache[$key], $value );
+Assert::null( $cache->load($key) );
 
 
-// Removing from cache using unset()...
-unset($cache[$key]);
+// Removing from cache using remove()...
+$cache->remove($key);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Removing from cache using set NULL...
-$cache[$key] = $value;
-$cache[$key] = NULL;
+$cache->save($key, $value);
+$cache->save($key, NULL);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.basic.phpt b/tests/Caching/FileStorage.basic.phpt
@@ -18,30 +18,26 @@ $value = range("\x00", "\xFF");
 
 $cache = new Cache(new FileStorage(TEMP_DIR));
 
-Assert::false( isset($cache[$key]) );
-
-Assert::null( $cache[$key] );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
-$cache[$key] = $value;
-
-Assert::true( isset($cache[$key]) );
+$cache->save($key, $value);
 
-Assert::same( $cache[$key], $value );
+Assert::same( $cache->load($key), $value );
 
 
-// Removing from cache using unset()...
-unset($cache[$key]);
+// Removing from cache using remove()...
+$cache->remove($key);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Removing from cache using set NULL...
-$cache[$key] = $value;
-$cache[$key] = NULL;
+$cache->save($key, $value);
+$cache->save($key, NULL);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
diff --git a/tests/Caching/FileStorage.callbacks.phpt b/tests/Caching/FileStorage.callbacks.phpt
@@ -29,12 +29,12 @@ $cache->save($key, $value, array(
 	Cache::CALLBACKS => array(array('dependency', 1)),
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Writing cache...
 $cache->save($key, $value, array(
 	Cache::CALLBACKS => array(array('dependency', 0)),
 ));
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.clean-all.phpt b/tests/Caching/FileStorage.clean-all.phpt
@@ -16,24 +16,21 @@ $storage = new FileStorage(TEMP_DIR);
 $cacheA = new Cache($storage);
 $cacheB = new Cache($storage,'B');
 
-$cacheA['test1'] = 'David';
-$cacheA['test2'] = 'Grudl';
-$cacheB['test1'] = 'divaD';
-$cacheB['test2'] = 'ldurG';
+$cacheA->save('test1', 'David');
+$cacheA->save('test2', 'Grudl');
+$cacheB->save('test1', 'divaD');
+$cacheB->save('test2', 'ldurG');
 
 Assert::same( 'David Grudl divaD ldurG', implode(' ',array(
-	$cacheA['test1'],
-	$cacheA['test2'],
-	$cacheB['test1'],
-	$cacheB['test2'],
+	$cacheA->load('test1'),
+	$cacheA->load('test2'),
+	$cacheB->load('test1'),
+	$cacheB->load('test2'),
 )));
 
 $storage->clean(array(Cache::ALL => TRUE));
 
-Assert::null( $cacheA['test1'] );
-
-Assert::null( $cacheA['test2'] );
-
-Assert::null( $cacheB['test1'] );
-
-Assert::null( $cacheB['test2'] );
+Assert::null( $cacheA->load('test1') );
+Assert::null( $cacheA->load('test2') );
+Assert::null( $cacheB->load('test1') );
+Assert::null( $cacheB->load('test2') );
diff --git a/tests/Caching/FileStorage.closure.phpt b/tests/Caching/FileStorage.closure.phpt
@@ -18,7 +18,7 @@ $value = range("\x00", "\xFF");
 
 $cache = new Cache(new FileStorage(TEMP_DIR));
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache using Closure...
@@ -36,4 +36,4 @@ $cache->save($key, function() {
 	return NULL;
 });
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.const.001.phpt b/tests/Caching/FileStorage.const.001.phpt
@@ -26,4 +26,4 @@ $cache->save($key, $value, array(
 	Cache::CONSTS => 'ANY_CONST',
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.const.002.phpt b/tests/Caching/FileStorage.const.002.phpt
@@ -21,4 +21,4 @@ $cache = new Cache(new FileStorage(TEMP_DIR));
 
 // Deleting dependent const
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.expiration.phpt b/tests/Caching/FileStorage.expiration.phpt
@@ -27,10 +27,10 @@ $cache->save($key, $value, array(
 // Sleeping 1 second
 sleep(1);
 clearstatcache();
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Sleeping 3 seconds
 sleep(3);
 clearstatcache();
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.files.phpt b/tests/Caching/FileStorage.files.phpt
@@ -29,26 +29,26 @@ $cache->save($key, $value, array(
 	),
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Modifing dependent file
 file_put_contents($dependentFile, 'a');
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
 $cache->save($key, $value, array(
 	Cache::FILES => $dependentFile,
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Modifing dependent file
 sleep(2);
 file_put_contents($dependentFile, 'b');
 clearstatcache();
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.int.phpt b/tests/Caching/FileStorage.int.phpt
@@ -18,27 +18,23 @@ $value = range("\x00", "\xFF");
 
 $cache = new Cache(new FileStorage(TEMP_DIR));
 
-Assert::false( isset($cache[$key]) );
-
-Assert::null( $cache[$key] );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
-$cache[$key] = $value;
-
-Assert::true( isset($cache[$key]) );
+$cache->save($key, $value);
 
-Assert::same( $cache[$key], $value );
+Assert::same( $cache->load($key), $value );
 
 
-// Removing from cache using unset()...
-unset($cache[$key]);
+// Removing from cache using remove()...
+$cache->remove($key);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Removing from cache using set NULL...
-$cache[$key] = $value;
-$cache[$key] = NULL;
+$cache->save($key, $value);
+$cache->save($key, NULL);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.items.phpt b/tests/Caching/FileStorage.items.phpt
@@ -23,39 +23,39 @@ $cache->save($key, $value, array(
 	Cache::ITEMS => array('dependent'),
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Modifing dependent cached item
-$cache['dependent'] = 'hello world';
+$cache->save('dependent', 'hello world');
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
 $cache->save($key, $value, array(
 	Cache::ITEMS => 'dependent',
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Modifing dependent cached item
 sleep(2);
-$cache['dependent'] = 'hello europe';
+$cache->save('dependent', 'hello europe');
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache...
 $cache->save($key, $value, array(
 	Cache::ITEMS => 'dependent',
 ));
 
-Assert::true( isset($cache[$key]) );
+Assert::truthy( $cache->load($key) );
 
 
 // Deleting dependent cached item
-$cache['dependent'] = NULL;
+$cache->save('dependent', NULL);
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.loadOrSave.phpt b/tests/Caching/FileStorage.loadOrSave.phpt
@@ -18,7 +18,7 @@ $value = range("\x00", "\xFF");
 
 $cache = new Cache(new FileStorage(TEMP_DIR));
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
 
 
 // Writing cache using Closure...
@@ -36,4 +36,4 @@ Assert::same( $cache->load($key), $value );
 // Sleeping 3 seconds
 sleep(3);
 clearstatcache();
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.namespace.phpt b/tests/Caching/FileStorage.namespace.phpt
@@ -18,17 +18,15 @@ $cacheB = new Cache($storage, 'b');
 
 
 // Writing cache...
-$cacheA['key'] = 'hello';
-$cacheB['key'] = 'world';
+$cacheA->save('key', 'hello');
+$cacheB->save('key', 'world');
 
-Assert::true( isset($cacheA['key']) );
-Assert::true( isset($cacheB['key']) );
-Assert::same( $cacheA['key'], 'hello' );
-Assert::same( $cacheB['key'], 'world' );
+Assert::same( $cacheA->load('key'), 'hello' );
+Assert::same( $cacheB->load('key'), 'world' );
 
 
-// Removing from cache #2 using unset()...
-unset($cacheB['key']);
+// Removing from cache #2 using remove()...
+$cacheB->remove('key');
 
-Assert::true( isset($cacheA['key']) );
-Assert::false( isset($cacheB['key']) );
+Assert::truthy( $cacheA->load('key') );
+Assert::null( $cacheB->load('key') );
diff --git a/tests/Caching/FileStorage.priority.phpt b/tests/Caching/FileStorage.priority.phpt
@@ -30,15 +30,15 @@ $cache->save('key3', 'value3', array(
 	Cache::PRIORITY => 300,
 ));
 
-$cache['key4'] = 'value4';
+$cache->save('key4', 'value4');
 
 
 // Cleaning by priority...
 $cache->clean(array(
 	Cache::PRIORITY => '200',
 ));
 
-Assert::false( isset($cache['key1']) );
-Assert::false( isset($cache['key2']) );
-Assert::true( isset($cache['key3']) );
-Assert::true( isset($cache['key4']) );
+Assert::null( $cache->load('key1') );
+Assert::null( $cache->load('key2') );
+Assert::truthy( $cache->load('key3') );
+Assert::truthy( $cache->load('key4') );
diff --git a/tests/Caching/FileStorage.sliding.phpt b/tests/Caching/FileStorage.sliding.phpt
@@ -30,12 +30,12 @@ for ($i = 0; $i < 5; $i++) {
 	sleep(1);
 	clearstatcache();
 
-	Assert::true( isset($cache[$key]) );
+	Assert::truthy( $cache->load($key) );
 
 }
 
 // Sleeping few seconds...
 sleep(5);
 clearstatcache();
 
-Assert::false( isset($cache[$key]) );
+Assert::null( $cache->load($key) );
diff --git a/tests/Caching/FileStorage.tags.phpt b/tests/Caching/FileStorage.tags.phpt
diff --git a/tests/Caching/Memcached.expiration.phpt b/tests/Caching/Memcached.expiration.phpt
diff --git a/tests/Caching/Memcached.files.phpt b/tests/Caching/Memcached.files.phpt
diff --git a/tests/Caching/Memcached.priority.phpt b/tests/Caching/Memcached.priority.phpt
diff --git a/tests/Caching/Memcached.sliding.phpt b/tests/Caching/Memcached.sliding.phpt
diff --git a/tests/Caching/Memcached.tags.phpt b/tests/Caching/Memcached.tags.phpt
diff --git a/tests/Caching/SQLiteStorage.basic.phpt b/tests/Caching/SQLiteStorage.basic.phpt
diff --git a/tests/Caching/SQLiteStorage.tags.phpt b/tests/Caching/SQLiteStorage.tags.phpt

Original file line number	Diff line number	Diff line change
`@@ -21,4 +21,4 @@ $cache = new Cache(new FileStorage(TEMP_DIR));`
`21`	`21`
`22`	`22`	`// Deleting dependent const`
`23`	`23`
`24`		`-Assert::false( isset($cache[$key]) );`
	`24`	`+Assert::null( $cache->load($key) );`