aimeos / ai-flow

lib/custom/src/MW/Cache/Flow.php

Doc Comments +2 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
 	 *
 	 * @inheritDoc
 	 *
-	 * @param \Traversable|array $keys List of key strings that identify the cache entries
+	 * @param string[] $keys List of key strings that identify the cache entries
 	 * 	that should be removed
 	 */
 	public function deleteMultiple( $keys )
@@ -122,7 +122,7 @@ 
 	 *
 	 * @inheritDoc
 	 *
-	 * @param \Traversable|array $keys List of key strings for the requested cache entries
+	 * @param string[] $keys List of key strings for the requested cache entries
 	 * @param mixed $default Default value to return for keys that do not exist
 	 * @return array Associative list of key/value pairs for the requested cache
 	 * 	entries. If a cache entry doesn't exist, neither its key nor a value
@@ -183,7 +183,6 @@ 
 	 *
 	 * @inheritDoc
 	 *
-	 * @param string $name Key string for the given value like product/id/123
 	 * @param mixed $value Value string that should be stored for the given key
 	 * @param int|string|null $expires Date/time string in "YYYY-MM-DD HH:mm:ss"
 	 * 	format when the cache entry expires

Spacing +35 added lines, -35 removed lines

@@ -31,9 +31,9 @@ 
 	 * @param array $config List of configuration values
 	 * @param \TYPO3\Flow\Cache\Frontend\FrontendInterface $cache TYPO3 cache object
 	 */
-	public function __construct( array $config, \TYPO3\Flow\Cache\Frontend\FrontendInterface $cache )
+	public function __construct(array $config, \TYPO3\Flow\Cache\Frontend\FrontendInterface $cache)
 	{
-		$this->prefix = ( isset( $config['siteid'] ) ? $config['siteid'] . '-' : '' );
+		$this->prefix = (isset($config['siteid']) ? $config['siteid'].'-' : '');
 		$this->object = $cache;
 	}
 
@@ -45,9 +45,9 @@ 
 	 *
 	 * @param string $key Key string that identifies the single cache entry
 	 */
-	public function delete( $key )
+	public function delete($key)
 	{
-		$this->object->remove( $this->prefix . $key );
+		$this->object->remove($this->prefix.$key);
 	}
 
 
@@ -59,10 +59,10 @@ 
 	 * @param \Traversable|array $keys List of key strings that identify the cache entries
 	 * 	that should be removed
 	 */
-	public function deleteMultiple( $keys )
+	public function deleteMultiple($keys)
 	{
-		foreach( $keys as $key ) {
-			$this->object->remove( $this->prefix . $key );
+		foreach ($keys as $key) {
+			$this->object->remove($this->prefix.$key);
 		}
 	}
 
@@ -75,10 +75,10 @@ 
 	 * @param string[] $tags List of tag strings that are associated to one or more
 	 * 	cache entries that should be removed
 	 */
-	public function deleteByTags( array $tags )
+	public function deleteByTags(array $tags)
 	{
-		foreach( $tags as $tag ) {
-			$this->object->flushByTag( $this->prefix . $tag );
+		foreach ($tags as $tag) {
+			$this->object->flushByTag($this->prefix.$tag);
 		}
 	}
 
@@ -90,8 +90,8 @@ 
 	 */
 	public function clear()
 	{
-		if( $this->prefix ) {
-			$this->object->flushByTag( $this->prefix . 'siteid' );
+		if ($this->prefix) {
+			$this->object->flushByTag($this->prefix.'siteid');
 		} else {
 			$this->object->flush();
 		}
@@ -107,9 +107,9 @@ 
 	 * @param string $default Value returned if requested key isn't found
 	 * @return mixed Value associated to the requested key
 	 */
-	public function get( $name, $default = null )
+	public function get($name, $default = null)
 	{
-		if( ( $entry = $this->object->get( $this->prefix . $name ) ) !== false ) {
+		if (($entry = $this->object->get($this->prefix.$name)) !== false) {
 			return $entry;
 		}
 
@@ -129,13 +129,13 @@ 
 	 * 	will be in the result list
 	 * @throws \Aimeos\MW\Cache\Exception If the cache server doesn't respond
 	 */
-	public function getMultiple( $keys, $default = null )
+	public function getMultiple($keys, $default = null)
 	{
 		$result = array();
 
-		foreach( $keys as $key )
+		foreach ($keys as $key)
 		{
-			if( ( $entry = $this->object->get( $this->prefix . $key ) ) !== false ) {
+			if (($entry = $this->object->get($this->prefix.$key)) !== false) {
 				$result[$key] = $entry;
 			} else {
 				$result[$key] = $default;
@@ -156,17 +156,17 @@ 
 	 * 	entries. If a tag isn't associated to any cache entry, nothing is returned
 	 * 	for that tag
 	 */
-	public function getMultipleByTags( array $tags )
+	public function getMultipleByTags(array $tags)
 	{
 		$result = array();
-		$len = strlen( $this->prefix );
+		$len = strlen($this->prefix);
 
-		foreach( $tags as $tag )
+		foreach ($tags as $tag)
 		{
-			foreach( $this->object->getByTag( $this->prefix . $tag ) as $key => $value )
+			foreach ($this->object->getByTag($this->prefix.$tag) as $key => $value)
 			{
-				if( strncmp( $key, $this->prefix, $len ) === 0 ) {
-					$result[ substr( $key, $len ) ] = $value;
+				if (strncmp($key, $this->prefix, $len) === 0) {
+					$result[substr($key, $len)] = $value;
 				} else {
 					$result[$key] = $value;
 				}
@@ -190,19 +190,19 @@ 
 	 * @param array $tags List of tag strings that should be assoicated to the
 	 * 	given value in the cache
 	 */
-	public function set( $key, $value, $expires = null, array $tags = array() )
+	public function set($key, $value, $expires = null, array $tags = array())
 	{
-		if( is_string( $expires ) ) {
-			$expires = date_create( $expires )->getTimestamp() - time();
+		if (is_string($expires)) {
+			$expires = date_create($expires)->getTimestamp() - time();
 		}
 
-		$tagList = ( $this->prefix ? array( $this->prefix . 'siteid' ) : array() );
+		$tagList = ($this->prefix ? array($this->prefix.'siteid') : array());
 
-		foreach( $tags as $tag ) {
-			$tagList[] = $this->prefix . $tag;
+		foreach ($tags as $tag) {
+			$tagList[] = $this->prefix.$tag;
 		}
 
-		$this->object->set( $this->prefix . $key, $value, $tagList, $expires );
+		$this->object->set($this->prefix.$key, $value, $tagList, $expires);
 	}
 
 
@@ -222,14 +222,14 @@ 
 	 * @return null
 	 * @throws \Aimeos\MW\Cache\Exception If the cache server doesn't respond
 	 */
-	public function setMultiple( $pairs, $expires = null, array $tags = array() )
+	public function setMultiple($pairs, $expires = null, array $tags = array())
 	{
-		foreach( $pairs as $key => $value )
+		foreach ($pairs as $key => $value)
 		{
-			$tagList = ( isset( $tags[$key] ) ? (array) $tags[$key] : array() );
-			$keyExpire = ( isset( $expires[$key] ) ? $expires[$key] : $expires );
+			$tagList = (isset($tags[$key]) ? (array) $tags[$key] : array());
+			$keyExpire = (isset($expires[$key]) ? $expires[$key] : $expires);
 
-			$this->set( $key, $value, $keyExpire, $tagList );
+			$this->set($key, $value, $keyExpire, $tagList);
 		}
 	}
 }

lib/custom/tests/MW/Cache/FlowTest.php

Spacing +65 added lines, -65 removed lines

@@ -17,201 +17,201 @@
 
 	protected function setUp()
 	{
-		if( interface_exists( 'TYPO3\Flow\Cache\Frontend\FrontendInterface' ) === false ) {
-			$this->markTestSkipped( 'Class \\TYPO3\\Flow\\Cache\\Frontend\\FrontendInterface not found' );
+		if (interface_exists('TYPO3\Flow\Cache\Frontend\FrontendInterface') === false) {
+			$this->markTestSkipped('Class \\TYPO3\\Flow\\Cache\\Frontend\\FrontendInterface not found');
 		}
 
-		$this->mock = $this->getMockBuilder( 'TYPO3\Flow\Cache\Frontend\FrontendInterface' )->getMock();
-		$this->object = new \Aimeos\MW\Cache\Flow( array(), $this->mock );
+		$this->mock = $this->getMockBuilder('TYPO3\Flow\Cache\Frontend\FrontendInterface')->getMock();
+		$this->object = new \Aimeos\MW\Cache\Flow(array(), $this->mock);
 	}
 
 
 	protected function tearDown()
 	{
-		unset( $this->mock, $this->object );
+		unset($this->mock, $this->object);
 	}
 
 
 	public function testDelete()
 	{
-		$this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( 'key' ) );
-		$this->object->delete( 'key' );
+		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('key'));
+		$this->object->delete('key');
 	}
 
 
 	public function testDeleteWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( '1-key' ) );
-		$object->delete( 'key' );
+		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('1-key'));
+		$object->delete('key');
 	}
 
 
 	public function testDeleteMultiple()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'remove' )->with( $this->equalTo( 'key' ) );
-		$this->object->deleteMultiple( array( 'key', 'key' ) );
+		$this->mock->expects($this->exactly(2))->method('remove')->with($this->equalTo('key'));
+		$this->object->deleteMultiple(array('key', 'key'));
 	}
 
 
 	public function testDeleteMultipleWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( '1-key' ) );
-		$object->deleteMultiple( array( 'key' ) );
+		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('1-key'));
+		$object->deleteMultiple(array('key'));
 	}
 
 
 	public function testDeleteByTags()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'flushByTag' )->with( $this->equalTo( 'tag' ) );
-		$this->object->deleteByTags( array( 'tag', 'tag' ) );
+		$this->mock->expects($this->exactly(2))->method('flushByTag')->with($this->equalTo('tag'));
+		$this->object->deleteByTags(array('tag', 'tag'));
 	}
 
 
 	public function testDeleteByTagsWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'flushByTag' )->with( $this->equalTo( '1-tag' ) );
-		$object->deleteByTags( array( 'tag' ) );
+		$this->mock->expects($this->once())->method('flushByTag')->with($this->equalTo('1-tag'));
+		$object->deleteByTags(array('tag'));
 	}
 
 
 	public function testClear()
 	{
-		$this->mock->expects( $this->once() )->method( 'flush' );
+		$this->mock->expects($this->once())->method('flush');
 		$this->object->clear();
 	}
 
 
 	public function testClearWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'flushByTag' )->with( $this->equalTo( '1-siteid' ) );
+		$this->mock->expects($this->once())->method('flushByTag')->with($this->equalTo('1-siteid'));
 		$object->clear();
 	}
 
 
 	public function testGet()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-			->with( $this->equalTo( 'key' ) )->will( $this->returnValue( 'value' ) );
+		$this->mock->expects($this->once())->method('get')
+			->with($this->equalTo('key'))->will($this->returnValue('value'));
 
-		$this->assertEquals( 'value', $this->object->get( 'key', 'default' ) );
+		$this->assertEquals('value', $this->object->get('key', 'default'));
 	}
 
 
 	public function testGetDefault()
 	{
-		$this->mock->expects( $this->once() )->method( 'get' )
-		->with( $this->equalTo( 'key' ) )->will( $this->returnValue( false ) );
+		$this->mock->expects($this->once())->method('get')
+		->with($this->equalTo('key'))->will($this->returnValue(false));
 
-		$this->assertEquals( 'default', $this->object->get( 'key', 'default' ) );
+		$this->assertEquals('default', $this->object->get('key', 'default'));
 	}
 
 
 	public function testGetWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( '1-key' ) );
-		$object->get( 'key', 'default' );
+		$this->mock->expects($this->once())->method('get')->with($this->equalTo('1-key'));
+		$object->get('key', 'default');
 	}
 
 
 	public function testGetMultiple()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'get' )
-			->will( $this->returnValue( 'value' ) );
+		$this->mock->expects($this->exactly(2))->method('get')
+			->will($this->returnValue('value'));
 
-		$expected = array( 'key1' => 'value', 'key2' => 'value' );
-		$this->assertEquals( $expected, $this->object->getMultiple( array( 'key1', 'key2' ) ) );
+		$expected = array('key1' => 'value', 'key2' => 'value');
+		$this->assertEquals($expected, $this->object->getMultiple(array('key1', 'key2')));
 	}
 
 
 	public function testGetMultipleWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( '1-key' ) );
-		$object->getMultiple( array( 'key' ) );
+		$this->mock->expects($this->once())->method('get')->with($this->equalTo('1-key'));
+		$object->getMultiple(array('key'));
 	}
 
 
 	public function testGetMultipleByTags()
 	{
-		$this->mock->expects( $this->exactly( 2 ) )->method( 'getByTag' )
-			->with( $this->equalTo( 'key' ) )->will( $this->returnValue( array( 'key' => 'value' ) ) );
+		$this->mock->expects($this->exactly(2))->method('getByTag')
+			->with($this->equalTo('key'))->will($this->returnValue(array('key' => 'value')));
 
-		$this->assertEquals( array( 'key' => 'value' ), $this->object->getMultipleByTags( array( 'key', 'key' ) ) );
+		$this->assertEquals(array('key' => 'value'), $this->object->getMultipleByTags(array('key', 'key')));
 	}
 
 
 	public function testGetMultipleByTagsWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'getByTag' )
-			->with( $this->equalTo( '1-key' ) )->will( $this->returnValue( array( '1-key' => 'value' ) ) );
+		$this->mock->expects($this->once())->method('getByTag')
+			->with($this->equalTo('1-key'))->will($this->returnValue(array('1-key' => 'value')));
 
-		$this->assertEquals( array( 'key' => 'value' ), $object->getMultipleByTags( array( 'key' ) ) );
+		$this->assertEquals(array('key' => 'value'), $object->getMultipleByTags(array('key')));
 	}
 
 
 	public function testSet()
 	{
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( 'key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( 'tag' ) ), $this->greaterThan( 0 )
+				$this->equalTo('key'), $this->equalTo('value'),
+				$this->equalTo(array('tag')), $this->greaterThan(0)
 			);
 
-		$this->object->set( 'key', 'value', '2100-01-01 00:00:00', array( 'tag' ) );
+		$this->object->set('key', 'value', '2100-01-01 00:00:00', array('tag'));
 	}
 
 
 	public function testSetWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( '1-key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( '1-siteid', '1-tag' ) ), $this->equalTo( null )
+				$this->equalTo('1-key'), $this->equalTo('value'),
+				$this->equalTo(array('1-siteid', '1-tag')), $this->equalTo(null)
 			);
 
-		$object->set( 'key', 'value', null, array( 'tag' ) );
+		$object->set('key', 'value', null, array('tag'));
 	}
 
 
 	public function testSetMultiple()
 	{
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( 'key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( 'tag' ) ), $this->greaterThan( 0 )
+				$this->equalTo('key'), $this->equalTo('value'),
+				$this->equalTo(array('tag')), $this->greaterThan(0)
 			);
 
-		$expires = array( 'key' => '2100-01-01 00:00:00' );
-		$this->object->setMultiple( array( 'key' => 'value' ), $expires, array( 'key' => array( 'tag' ) ) );
+		$expires = array('key' => '2100-01-01 00:00:00');
+		$this->object->setMultiple(array('key' => 'value'), $expires, array('key' => array('tag')));
 	}
 
 
 	public function testSetMultipleWithSiteId()
 	{
-		$object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock );
+		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock);
 
-		$this->mock->expects( $this->once() )->method( 'set' )
+		$this->mock->expects($this->once())->method('set')
 			->with(
-				$this->equalTo( '1-key' ), $this->equalTo( 'value' ),
-				$this->equalTo( array( '1-siteid', '1-tag' ) ), $this->equalTo( null )
+				$this->equalTo('1-key'), $this->equalTo('value'),
+				$this->equalTo(array('1-siteid', '1-tag')), $this->equalTo(null)
 			);
 
-		$object->setMultiple( array( 'key' => 'value' ), null, array( 'key' => array( 'tag' ) ) );
+		$object->setMultiple(array('key' => 'value'), null, array('key' => array('tag')));
 	}
 
 }