| @@ -9,17 +9,17 @@ | ||
| 9 | 9 | * Set error reporting to maximum | 
| 10 | 10 | */ | 
| 11 | 11 | error_reporting( -1 ); | 
| 12 | -ini_set( 'display_errors', '1' ); | |
| 12 | +ini_set('display_errors', '1'); | |
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | /* | 
| 16 | 16 | * Set locale settings to reasonable defaults | 
| 17 | 17 | */ | 
| 18 | -setlocale( LC_ALL, 'en_US.UTF-8' ); | |
| 19 | -setlocale( LC_CTYPE, 'en_US.UTF-8' ); | |
| 20 | -setlocale( LC_NUMERIC, 'POSIX' ); | |
| 21 | -setlocale( LC_TIME, 'POSIX' ); | |
| 22 | -date_default_timezone_set( 'UTC' ); | |
| 18 | +setlocale(LC_ALL, 'en_US.UTF-8'); | |
| 19 | +setlocale(LC_CTYPE, 'en_US.UTF-8'); | |
| 20 | +setlocale(LC_NUMERIC, 'POSIX'); | |
| 21 | +setlocale(LC_TIME, 'POSIX'); | |
| 22 | +date_default_timezone_set('UTC'); | |
| 23 | 23 | |
| 24 | 24 | require_once 'TestHelper.php'; | 
| 25 | 25 | TestHelper::bootstrap(); | 
| @@ -53,8 +53,7 @@ | ||
| 53 | 53 | } | 
| 54 | 54 | |
| 55 | 55 | $this->logger->log( $message, $this->translatePriority( $priority ) ); | 
| 56 | - } | |
| 57 | -		catch( \Exception $e )	{ | |
| 56 | +		} catch( \Exception $e )	{ | |
| 58 | 57 | throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); | 
| 59 | 58 | } | 
| 60 | 59 | } | 
| @@ -29,7 +29,7 @@ discard block | ||
| 29 | 29 | * | 
| 30 | 30 | * @param \Neos\Flow\Log\SystemLoggerInterface $logger Flow logger object | 
| 31 | 31 | */ | 
| 32 | - public function __construct( \Neos\Flow\Log\SystemLoggerInterface $logger ) | |
| 32 | + public function __construct(\Neos\Flow\Log\SystemLoggerInterface $logger) | |
| 33 | 33 |  	{ | 
| 34 | 34 | $this->logger = $logger; | 
| 35 | 35 | } | 
| @@ -44,18 +44,18 @@ discard block | ||
| 44 | 44 | * @throws \Aimeos\MW\Logger\Exception If an error occurs in Zend_Log | 
| 45 | 45 | * @see \Aimeos\MW\Logger\Base for available log level constants | 
| 46 | 46 | */ | 
| 47 | - public function log( $message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message' ) | |
| 47 | + public function log($message, $priority = \Aimeos\MW\Logger\Base::ERR, $facility = 'message') | |
| 48 | 48 |  	{ | 
| 49 | 49 | try | 
| 50 | 50 |  		{ | 
| 51 | -			if( !is_scalar( $message ) ) { | |
| 52 | - $message = json_encode( $message ); | |
| 51 | +			if (!is_scalar($message)) { | |
| 52 | + $message = json_encode($message); | |
| 53 | 53 | } | 
| 54 | 54 | |
| 55 | - $this->logger->log( $message, $this->translatePriority( $priority ) ); | |
| 55 | + $this->logger->log($message, $this->translatePriority($priority)); | |
| 56 | 56 | } | 
| 57 | -		catch( \Exception $e )	{ | |
| 58 | - throw new \Aimeos\MW\Logger\Exception( $e->getMessage(), $e->getCode(), $e ); | |
| 57 | +		catch (\Exception $e) { | |
| 58 | + throw new \Aimeos\MW\Logger\Exception($e->getMessage(), $e->getCode(), $e); | |
| 59 | 59 | } | 
| 60 | 60 | } | 
| 61 | 61 | |
| @@ -67,9 +67,9 @@ discard block | ||
| 67 | 67 | * @return integer Log level from Monolog\Logger | 
| 68 | 68 | * @throws \Aimeos\MW\Logger\Exception If log level is unknown | 
| 69 | 69 | */ | 
| 70 | - protected function translatePriority( $priority ) | |
| 70 | + protected function translatePriority($priority) | |
| 71 | 71 |  	{ | 
| 72 | - switch( $priority ) | |
| 72 | + switch ($priority) | |
| 73 | 73 |  		{ | 
| 74 | 74 | case \Aimeos\MW\Logger\Base::EMERG: | 
| 75 | 75 | return LOG_EMERG; | 
| @@ -88,7 +88,7 @@ discard block | ||
| 88 | 88 | case \Aimeos\MW\Logger\Base::DEBUG: | 
| 89 | 89 | return LOG_DEBUG; | 
| 90 | 90 | default: | 
| 91 | - throw new \Aimeos\MW\Logger\Exception( 'Invalid log level' ); | |
| 91 | +				throw new \Aimeos\MW\Logger\Exception('Invalid log level'); | |
| 92 | 92 | } | 
| 93 | 93 | } | 
| 94 | 94 | } | 
| 95 | 95 | \ No newline at end of file | 
| @@ -16,23 +16,23 @@ | ||
| 16 | 16 | |
| 17 | 17 | protected function setUp() | 
| 18 | 18 |  	{ | 
| 19 | -		if( !class_exists( '\Zend\Diactoros\Response' ) ) { | |
| 20 | - $this->markTestSkipped( '\Zend\Diactoros\Response is not available' ); | |
| 19 | +		if (!class_exists('\Zend\Diactoros\Response')) { | |
| 20 | +			$this->markTestSkipped('\Zend\Diactoros\Response is not available'); | |
| 21 | 21 | } | 
| 22 | 22 | |
| 23 | 23 | $view = new \Aimeos\MW\View\Standard(); | 
| 24 | - $this->object = new \Aimeos\MW\View\Helper\Response\Flow( $view ); | |
| 24 | + $this->object = new \Aimeos\MW\View\Helper\Response\Flow($view); | |
| 25 | 25 | } | 
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | protected function tearDown() | 
| 29 | 29 |  	{ | 
| 30 | - unset( $this->object ); | |
| 30 | + unset($this->object); | |
| 31 | 31 | } | 
| 32 | 32 | |
| 33 | 33 | |
| 34 | 34 | public function testTransform() | 
| 35 | 35 |  	{ | 
| 36 | - $this->assertInstanceOf( '\Aimeos\MW\View\Helper\Response\Flow', $this->object->transform() ); | |
| 36 | +		$this->assertInstanceOf('\Aimeos\MW\View\Helper\Response\Flow', $this->object->transform()); | |
| 37 | 37 | } | 
| 38 | 38 | } | 
| @@ -26,8 +26,8 @@ | ||
| 26 | 26 | * | 
| 27 | 27 | * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers | 
| 28 | 28 | */ | 
| 29 | - public function __construct( \Aimeos\MW\View\Iface $view ) | |
| 29 | + public function __construct(\Aimeos\MW\View\Iface $view) | |
| 30 | 30 |  	{ | 
| 31 | - parent::__construct( $view, new \Zend\Diactoros\Response() ); | |
| 31 | + parent::__construct($view, new \Zend\Diactoros\Response()); | |
| 32 | 32 | } | 
| 33 | 33 | } | 
| @@ -31,7 +31,7 @@ | ||
| 31 | 31 | /** | 
| 32 | 32 | * Initializes the request view helper. | 
| 33 | 33 | * | 
| 34 | - * @param \\Aimeos\MW\View\Iface $view View instance with registered view helpers | |
| 34 | + * @param \Aimeos\MW\View\Iface $view View instance with registered view helpers | |
| 35 | 35 | * @param \Neos\Flow\Http\Request $request Flow request object | 
| 36 | 36 | * @param array $files List of uploaded files like in $_FILES | 
| 37 | 37 | * @param array $query List of uploaded files like in $_GET | 
| @@ -39,13 +39,13 @@ discard block | ||
| 39 | 39 | * @param array $cookies List of uploaded files like in $_COOKIES | 
| 40 | 40 | * @param array $server List of uploaded files like in $_SERVER | 
| 41 | 41 | */ | 
| 42 | - public function __construct( \Aimeos\MW\View\Iface $view, \Neos\Flow\Http\Request $request, array $files = array(), | |
| 43 | - array $query = array(), array $post = array(), array $cookies = array(), array $server = array() ) | |
| 42 | + public function __construct(\Aimeos\MW\View\Iface $view, \Neos\Flow\Http\Request $request, array $files = array(), | |
| 43 | + array $query = array(), array $post = array(), array $cookies = array(), array $server = array()) | |
| 44 | 44 |  	{ | 
| 45 | 45 | $this->request = $request; | 
| 46 | - $psr7request = $this->createRequest( $request, $files, $query, $post, $cookies, $server ); | |
| 46 | + $psr7request = $this->createRequest($request, $files, $query, $post, $cookies, $server); | |
| 47 | 47 | |
| 48 | - parent::__construct( $view, $psr7request ); | |
| 48 | + parent::__construct($view, $psr7request); | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 | |
| @@ -82,18 +82,18 @@ discard block | ||
| 82 | 82 | * @param array $server List of uploaded files like in $_SERVER | 
| 83 | 83 | * @return \Psr\Http\Message\ServerRequestInterface PSR-7 request object | 
| 84 | 84 | */ | 
| 85 | - protected function createRequest( \Neos\Flow\Http\Request $nativeRequest, array $files, | |
| 86 | - array $query, array $post, array $cookies, array $server ) | |
| 85 | + protected function createRequest(\Neos\Flow\Http\Request $nativeRequest, array $files, | |
| 86 | + array $query, array $post, array $cookies, array $server) | |
| 87 | 87 |  	{ | 
| 88 | - $server = ServerRequestFactory::normalizeServer( $server ); | |
| 89 | - $files = ServerRequestFactory::normalizeFiles( $files ); | |
| 88 | + $server = ServerRequestFactory::normalizeServer($server); | |
| 89 | + $files = ServerRequestFactory::normalizeFiles($files); | |
| 90 | 90 | $headers = $nativeRequest->getHeaders()->getAll(); | 
| 91 | 91 | $uri = (string) $nativeRequest->getUri(); | 
| 92 | 92 | $method = $nativeRequest->getMethod(); | 
| 93 | 93 | |
| 94 | 94 |  		$body = new Stream('php://temp', 'wb+'); | 
| 95 | - $body->write( $nativeRequest->getContent() ); | |
| 95 | + $body->write($nativeRequest->getContent()); | |
| 96 | 96 | |
| 97 | - return new ServerRequest( $server, $files, $uri, $method, $body, $headers, $cookies, $query, $post ); | |
| 97 | + return new ServerRequest($server, $files, $uri, $method, $body, $headers, $cookies, $query, $post); | |
| 98 | 98 | } | 
| 99 | 99 | } | 
| @@ -25,14 +25,14 @@ discard block | ||
| 25 | 25 | */ | 
| 26 | 26 | protected function setUp() | 
| 27 | 27 |  	{ | 
| 28 | -		if( class_exists( '\\Neos\\Flow\\Session\\Session' ) === false ) { | |
| 29 | - $this->markTestSkipped( 'Class \\Neos\\Flow\\Session\\Session not found' ); | |
| 28 | +		if (class_exists('\\Neos\\Flow\\Session\\Session') === false) { | |
| 29 | +			$this->markTestSkipped('Class \\Neos\\Flow\\Session\\Session not found'); | |
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | 32 | $session = new \Neos\Flow\Session\TransientSession(); | 
| 33 | 33 | $session->start(); | 
| 34 | 34 | |
| 35 | - $this->object = new \Aimeos\MW\Session\Flow( $session ); | |
| 35 | + $this->object = new \Aimeos\MW\Session\Flow($session); | |
| 36 | 36 | } | 
| 37 | 37 | |
| 38 | 38 | |
| @@ -44,26 +44,26 @@ discard block | ||
| 44 | 44 | */ | 
| 45 | 45 | protected function tearDown() | 
| 46 | 46 |  	{ | 
| 47 | - unset( $this->object ); | |
| 47 | + unset($this->object); | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | public function testGetDefault() | 
| 52 | 52 |  	{ | 
| 53 | - $this->assertEquals( null, $this->object->get( 'notexist' ) ); | |
| 53 | +		$this->assertEquals(null, $this->object->get('notexist')); | |
| 54 | 54 | } | 
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | public function testGetSet() | 
| 58 | 58 |  	{ | 
| 59 | - $this->object->set( 'key', 'value' ); | |
| 60 | - $this->assertEquals( 'value', $this->object->get( 'key' ) ); | |
| 59 | +		$this->object->set('key', 'value'); | |
| 60 | +		$this->assertEquals('value', $this->object->get('key')); | |
| 61 | 61 | } | 
| 62 | 62 | |
| 63 | 63 | |
| 64 | 64 | public function testGetSetArray() | 
| 65 | 65 |  	{ | 
| 66 | - $this->object->set( 'key', array( 'value' ) ); | |
| 67 | - $this->assertEquals( array( 'value' ), $this->object->get( 'key' ) ); | |
| 66 | +		$this->object->set('key', array('value')); | |
| 67 | +		$this->assertEquals(array('value'), $this->object->get('key')); | |
| 68 | 68 | } | 
| 69 | 69 | } | 
| @@ -25,18 +25,18 @@ discard block | ||
| 25 | 25 | */ | 
| 26 | 26 | protected function setUp() | 
| 27 | 27 |  	{ | 
| 28 | -		if( class_exists( '\\Neos\\Flow\\Log\\Logger' ) === false ) { | |
| 29 | - $this->markTestSkipped( 'Class \\Neos\\Flow\\Log\\Logger not found' ); | |
| 28 | +		if (class_exists('\\Neos\\Flow\\Log\\Logger') === false) { | |
| 29 | +			$this->markTestSkipped('Class \\Neos\\Flow\\Log\\Logger not found'); | |
| 30 | 30 | } | 
| 31 | 31 | |
| 32 | 32 | $be = new \Neos\Flow\Log\Backend\FileBackend(); | 
| 33 | - $be->setSeverityThreshold( LOG_ERR ); | |
| 34 | - $be->setLogFileURL( 'flow.log' ); | |
| 33 | + $be->setSeverityThreshold(LOG_ERR); | |
| 34 | +		$be->setLogFileURL('flow.log'); | |
| 35 | 35 | |
| 36 | 36 | $log = new \Neos\Flow\Log\Logger(); | 
| 37 | - $log->addBackend( $be ); | |
| 37 | + $log->addBackend($be); | |
| 38 | 38 | |
| 39 | - $this->object = new \Aimeos\MW\Logger\Flow( $log ); | |
| 39 | + $this->object = new \Aimeos\MW\Logger\Flow($log); | |
| 40 | 40 | } | 
| 41 | 41 | |
| 42 | 42 | |
| @@ -48,53 +48,53 @@ discard block | ||
| 48 | 48 | */ | 
| 49 | 49 | protected function tearDown() | 
| 50 | 50 |  	{ | 
| 51 | - @unlink( 'flow.log' ); | |
| 51 | +		@unlink('flow.log'); | |
| 52 | 52 | } | 
| 53 | 53 | |
| 54 | 54 | |
| 55 | 55 | public function testLog() | 
| 56 | 56 |  	{ | 
| 57 | - $this->object->log( 'error' ); | |
| 58 | - $this->assertRegExp( '/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+error/', file_get_contents( 'flow.log' ) ); | |
| 57 | +		$this->object->log('error'); | |
| 58 | +		$this->assertRegExp('/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+error/', file_get_contents('flow.log')); | |
| 59 | 59 | } | 
| 60 | 60 | |
| 61 | 61 | |
| 62 | 62 | public function testNonScalarLog() | 
| 63 | 63 |  	{ | 
| 64 | - $this->object->log( array( 'error', 'error2', 2 ) ); | |
| 65 | - $this->assertRegExp( '/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+\["error","error2",2\]/', file_get_contents( 'flow.log' ) ); | |
| 64 | +		$this->object->log(array('error', 'error2', 2)); | |
| 65 | +		$this->assertRegExp('/^[^ ]+ [^ ]+ [0-9]+[ ]+ERROR[ ]+MW[ ]+\["error","error2",2\]/', file_get_contents('flow.log')); | |
| 66 | 66 | } | 
| 67 | 67 | |
| 68 | 68 | |
| 69 | 69 | public function testLogDebug() | 
| 70 | 70 |  	{ | 
| 71 | - $this->object->log( 'debug', \Aimeos\MW\Logger\Base::DEBUG ); | |
| 72 | - $this->assertEquals( '', file_get_contents( 'flow.log' ) ); | |
| 71 | +		$this->object->log('debug', \Aimeos\MW\Logger\Base::DEBUG); | |
| 72 | +		$this->assertEquals('', file_get_contents('flow.log')); | |
| 73 | 73 | } | 
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | public function testBadPriority() | 
| 77 | 77 |  	{ | 
| 78 | - $this->setExpectedException( '\\Aimeos\\MW\\Logger\\Exception' ); | |
| 79 | - $this->object->log( 'error', -1 ); | |
| 78 | +		$this->setExpectedException('\\Aimeos\\MW\\Logger\\Exception'); | |
| 79 | +		$this->object->log('error', -1); | |
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | public function testLogPriorityTranslate() | 
| 84 | 84 |  	{ | 
| 85 | - $this->object->log( '', \Aimeos\MW\Logger\Base::EMERG ); | |
| 86 | - $this->object->log( '', \Aimeos\MW\Logger\Base::ALERT ); | |
| 87 | - $this->object->log( '', \Aimeos\MW\Logger\Base::CRIT ); | |
| 88 | - $this->object->log( '', \Aimeos\MW\Logger\Base::ERR ); | |
| 89 | - $this->object->log( '', \Aimeos\MW\Logger\Base::WARN ); | |
| 90 | - $this->object->log( '', \Aimeos\MW\Logger\Base::NOTICE ); | |
| 91 | - $this->object->log( '', \Aimeos\MW\Logger\Base::INFO ); | |
| 92 | - $this->object->log( '', \Aimeos\MW\Logger\Base::DEBUG ); | |
| 93 | - | |
| 94 | - $content = file_get_contents( 'flow.log' ); | |
| 95 | - $this->assertContains( 'EMERGENCY', $content ); | |
| 96 | - $this->assertContains( 'ALERT', $content ); | |
| 97 | - $this->assertContains( 'CRITICAL', $content ); | |
| 98 | - $this->assertContains( 'ERROR', $content ); | |
| 85 | +		$this->object->log('', \Aimeos\MW\Logger\Base::EMERG); | |
| 86 | +		$this->object->log('', \Aimeos\MW\Logger\Base::ALERT); | |
| 87 | +		$this->object->log('', \Aimeos\MW\Logger\Base::CRIT); | |
| 88 | +		$this->object->log('', \Aimeos\MW\Logger\Base::ERR); | |
| 89 | +		$this->object->log('', \Aimeos\MW\Logger\Base::WARN); | |
| 90 | +		$this->object->log('', \Aimeos\MW\Logger\Base::NOTICE); | |
| 91 | +		$this->object->log('', \Aimeos\MW\Logger\Base::INFO); | |
| 92 | +		$this->object->log('', \Aimeos\MW\Logger\Base::DEBUG); | |
| 93 | + | |
| 94 | +		$content = file_get_contents('flow.log'); | |
| 95 | +		$this->assertContains('EMERGENCY', $content); | |
| 96 | +		$this->assertContains('ALERT', $content); | |
| 97 | +		$this->assertContains('CRITICAL', $content); | |
| 98 | +		$this->assertContains('ERROR', $content); | |
| 99 | 99 | } | 
| 100 | 100 | } | 
| @@ -17,201 +17,201 @@ | ||
| 17 | 17 | |
| 18 | 18 | protected function setUp() | 
| 19 | 19 |  	{ | 
| 20 | -		if( interface_exists( 'Neos\Cache\Frontend\FrontendInterface' ) === false ) { | |
| 21 | - $this->markTestSkipped( 'Class \\Neos\\Cache\\Frontend\\FrontendInterface not found' ); | |
| 20 | +		if (interface_exists('Neos\Cache\Frontend\FrontendInterface') === false) { | |
| 21 | +			$this->markTestSkipped('Class \\Neos\\Cache\\Frontend\\FrontendInterface not found'); | |
| 22 | 22 | } | 
| 23 | 23 | |
| 24 | - $this->mock = $this->getMockBuilder( 'Neos\Cache\Frontend\FrontendInterface' )->getMock(); | |
| 25 | - $this->object = new \Aimeos\MW\Cache\Flow( array(), $this->mock ); | |
| 24 | +		$this->mock = $this->getMockBuilder('Neos\Cache\Frontend\FrontendInterface')->getMock(); | |
| 25 | + $this->object = new \Aimeos\MW\Cache\Flow(array(), $this->mock); | |
| 26 | 26 | } | 
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | protected function tearDown() | 
| 30 | 30 |  	{ | 
| 31 | - unset( $this->mock, $this->object ); | |
| 31 | + unset($this->mock, $this->object); | |
| 32 | 32 | } | 
| 33 | 33 | |
| 34 | 34 | |
| 35 | 35 | public function testDelete() | 
| 36 | 36 |  	{ | 
| 37 | - $this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( 'key' ) ); | |
| 38 | - $this->object->delete( 'key' ); | |
| 37 | +		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('key')); | |
| 38 | +		$this->object->delete('key'); | |
| 39 | 39 | } | 
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | public function testDeleteWithSiteId() | 
| 43 | 43 |  	{ | 
| 44 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 44 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 45 | 45 | |
| 46 | - $this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( '1-key' ) ); | |
| 47 | - $object->delete( 'key' ); | |
| 46 | +		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('1-key')); | |
| 47 | +		$object->delete('key'); | |
| 48 | 48 | } | 
| 49 | 49 | |
| 50 | 50 | |
| 51 | 51 | public function testDeleteMultiple() | 
| 52 | 52 |  	{ | 
| 53 | - $this->mock->expects( $this->exactly( 2 ) )->method( 'remove' )->with( $this->equalTo( 'key' ) ); | |
| 54 | - $this->object->deleteMultiple( array( 'key', 'key' ) ); | |
| 53 | +		$this->mock->expects($this->exactly(2))->method('remove')->with($this->equalTo('key')); | |
| 54 | +		$this->object->deleteMultiple(array('key', 'key')); | |
| 55 | 55 | } | 
| 56 | 56 | |
| 57 | 57 | |
| 58 | 58 | public function testDeleteMultipleWithSiteId() | 
| 59 | 59 |  	{ | 
| 60 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 60 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 61 | 61 | |
| 62 | - $this->mock->expects( $this->once() )->method( 'remove' )->with( $this->equalTo( '1-key' ) ); | |
| 63 | - $object->deleteMultiple( array( 'key' ) ); | |
| 62 | +		$this->mock->expects($this->once())->method('remove')->with($this->equalTo('1-key')); | |
| 63 | +		$object->deleteMultiple(array('key')); | |
| 64 | 64 | } | 
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | public function testDeleteByTags() | 
| 68 | 68 |  	{ | 
| 69 | - $this->mock->expects( $this->exactly( 2 ) )->method( 'flushByTag' )->with( $this->equalTo( 'tag' ) ); | |
| 70 | - $this->object->deleteByTags( array( 'tag', 'tag' ) ); | |
| 69 | +		$this->mock->expects($this->exactly(2))->method('flushByTag')->with($this->equalTo('tag')); | |
| 70 | +		$this->object->deleteByTags(array('tag', 'tag')); | |
| 71 | 71 | } | 
| 72 | 72 | |
| 73 | 73 | |
| 74 | 74 | public function testDeleteByTagsWithSiteId() | 
| 75 | 75 |  	{ | 
| 76 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 76 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 77 | 77 | |
| 78 | - $this->mock->expects( $this->once() )->method( 'flushByTag' )->with( $this->equalTo( '1-tag' ) ); | |
| 79 | - $object->deleteByTags( array( 'tag' ) ); | |
| 78 | +		$this->mock->expects($this->once())->method('flushByTag')->with($this->equalTo('1-tag')); | |
| 79 | +		$object->deleteByTags(array('tag')); | |
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | 82 | |
| 83 | 83 | public function testClear() | 
| 84 | 84 |  	{ | 
| 85 | - $this->mock->expects( $this->once() )->method( 'flush' ); | |
| 85 | +		$this->mock->expects($this->once())->method('flush'); | |
| 86 | 86 | $this->object->clear(); | 
| 87 | 87 | } | 
| 88 | 88 | |
| 89 | 89 | |
| 90 | 90 | public function testClearWithSiteId() | 
| 91 | 91 |  	{ | 
| 92 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 92 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 93 | 93 | |
| 94 | - $this->mock->expects( $this->once() )->method( 'flushByTag' )->with( $this->equalTo( '1-siteid' ) ); | |
| 94 | +		$this->mock->expects($this->once())->method('flushByTag')->with($this->equalTo('1-siteid')); | |
| 95 | 95 | $object->clear(); | 
| 96 | 96 | } | 
| 97 | 97 | |
| 98 | 98 | |
| 99 | 99 | public function testGet() | 
| 100 | 100 |  	{ | 
| 101 | - $this->mock->expects( $this->once() )->method( 'get' ) | |
| 102 | - ->with( $this->equalTo( 'key' ) )->will( $this->returnValue( 'value' ) ); | |
| 101 | +		$this->mock->expects($this->once())->method('get') | |
| 102 | +			->with($this->equalTo('key'))->will($this->returnValue('value')); | |
| 103 | 103 | |
| 104 | - $this->assertEquals( 'value', $this->object->get( 'key', 'default' ) ); | |
| 104 | +		$this->assertEquals('value', $this->object->get('key', 'default')); | |
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | 107 | |
| 108 | 108 | public function testGetDefault() | 
| 109 | 109 |  	{ | 
| 110 | - $this->mock->expects( $this->once() )->method( 'get' ) | |
| 111 | - ->with( $this->equalTo( 'key' ) )->will( $this->returnValue( false ) ); | |
| 110 | +		$this->mock->expects($this->once())->method('get') | |
| 111 | +		->with($this->equalTo('key'))->will($this->returnValue(false)); | |
| 112 | 112 | |
| 113 | - $this->assertEquals( 'default', $this->object->get( 'key', 'default' ) ); | |
| 113 | +		$this->assertEquals('default', $this->object->get('key', 'default')); | |
| 114 | 114 | } | 
| 115 | 115 | |
| 116 | 116 | |
| 117 | 117 | public function testGetWithSiteId() | 
| 118 | 118 |  	{ | 
| 119 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 119 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 120 | 120 | |
| 121 | - $this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( '1-key' ) ); | |
| 122 | - $object->get( 'key', 'default' ); | |
| 121 | +		$this->mock->expects($this->once())->method('get')->with($this->equalTo('1-key')); | |
| 122 | +		$object->get('key', 'default'); | |
| 123 | 123 | } | 
| 124 | 124 | |
| 125 | 125 | |
| 126 | 126 | public function testGetMultiple() | 
| 127 | 127 |  	{ | 
| 128 | - $this->mock->expects( $this->exactly( 2 ) )->method( 'get' ) | |
| 129 | - ->will( $this->returnValue( 'value' ) ); | |
| 128 | +		$this->mock->expects($this->exactly(2))->method('get') | |
| 129 | +			->will($this->returnValue('value')); | |
| 130 | 130 | |
| 131 | - $expected = array( 'key1' => 'value', 'key2' => 'value' ); | |
| 132 | - $this->assertEquals( $expected, $this->object->getMultiple( array( 'key1', 'key2' ) ) ); | |
| 131 | +		$expected = array('key1' => 'value', 'key2' => 'value'); | |
| 132 | +		$this->assertEquals($expected, $this->object->getMultiple(array('key1', 'key2'))); | |
| 133 | 133 | } | 
| 134 | 134 | |
| 135 | 135 | |
| 136 | 136 | public function testGetMultipleWithSiteId() | 
| 137 | 137 |  	{ | 
| 138 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 138 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 139 | 139 | |
| 140 | - $this->mock->expects( $this->once() )->method( 'get' )->with( $this->equalTo( '1-key' ) ); | |
| 141 | - $object->getMultiple( array( 'key' ) ); | |
| 140 | +		$this->mock->expects($this->once())->method('get')->with($this->equalTo('1-key')); | |
| 141 | +		$object->getMultiple(array('key')); | |
| 142 | 142 | } | 
| 143 | 143 | |
| 144 | 144 | |
| 145 | 145 | public function testGetMultipleByTags() | 
| 146 | 146 |  	{ | 
| 147 | - $this->mock->expects( $this->exactly( 2 ) )->method( 'getByTag' ) | |
| 148 | - ->with( $this->equalTo( 'key' ) )->will( $this->returnValue( array( 'key' => 'value' ) ) ); | |
| 147 | +		$this->mock->expects($this->exactly(2))->method('getByTag') | |
| 148 | +			->with($this->equalTo('key'))->will($this->returnValue(array('key' => 'value'))); | |
| 149 | 149 | |
| 150 | - $this->assertEquals( array( 'key' => 'value' ), $this->object->getMultipleByTags( array( 'key', 'key' ) ) ); | |
| 150 | +		$this->assertEquals(array('key' => 'value'), $this->object->getMultipleByTags(array('key', 'key'))); | |
| 151 | 151 | } | 
| 152 | 152 | |
| 153 | 153 | |
| 154 | 154 | public function testGetMultipleByTagsWithSiteId() | 
| 155 | 155 |  	{ | 
| 156 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 156 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 157 | 157 | |
| 158 | - $this->mock->expects( $this->once() )->method( 'getByTag' ) | |
| 159 | - ->with( $this->equalTo( '1-key' ) )->will( $this->returnValue( array( '1-key' => 'value' ) ) ); | |
| 158 | +		$this->mock->expects($this->once())->method('getByTag') | |
| 159 | +			->with($this->equalTo('1-key'))->will($this->returnValue(array('1-key' => 'value'))); | |
| 160 | 160 | |
| 161 | - $this->assertEquals( array( 'key' => 'value' ), $object->getMultipleByTags( array( 'key' ) ) ); | |
| 161 | +		$this->assertEquals(array('key' => 'value'), $object->getMultipleByTags(array('key'))); | |
| 162 | 162 | } | 
| 163 | 163 | |
| 164 | 164 | |
| 165 | 165 | public function testSet() | 
| 166 | 166 |  	{ | 
| 167 | - $this->mock->expects( $this->once() )->method( 'set' ) | |
| 167 | +		$this->mock->expects($this->once())->method('set') | |
| 168 | 168 | ->with( | 
| 169 | - $this->equalTo( 'key' ), $this->equalTo( 'value' ), | |
| 170 | - $this->equalTo( array( 'tag' ) ), $this->greaterThan( 0 ) | |
| 169 | +				$this->equalTo('key'), $this->equalTo('value'), | |
| 170 | +				$this->equalTo(array('tag')), $this->greaterThan(0) | |
| 171 | 171 | ); | 
| 172 | 172 | |
| 173 | - $this->object->set( 'key', 'value', '2100-01-01 00:00:00', array( 'tag' ) ); | |
| 173 | +		$this->object->set('key', 'value', '2100-01-01 00:00:00', array('tag')); | |
| 174 | 174 | } | 
| 175 | 175 | |
| 176 | 176 | |
| 177 | 177 | public function testSetWithSiteId() | 
| 178 | 178 |  	{ | 
| 179 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 179 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 180 | 180 | |
| 181 | - $this->mock->expects( $this->once() )->method( 'set' ) | |
| 181 | +		$this->mock->expects($this->once())->method('set') | |
| 182 | 182 | ->with( | 
| 183 | - $this->equalTo( '1-key' ), $this->equalTo( 'value' ), | |
| 184 | - $this->equalTo( array( '1-siteid', '1-tag' ) ), $this->equalTo( null ) | |
| 183 | +				$this->equalTo('1-key'), $this->equalTo('value'), | |
| 184 | +				$this->equalTo(array('1-siteid', '1-tag')), $this->equalTo(null) | |
| 185 | 185 | ); | 
| 186 | 186 | |
| 187 | - $object->set( 'key', 'value', null, array( 'tag' ) ); | |
| 187 | +		$object->set('key', 'value', null, array('tag')); | |
| 188 | 188 | } | 
| 189 | 189 | |
| 190 | 190 | |
| 191 | 191 | public function testSetMultiple() | 
| 192 | 192 |  	{ | 
| 193 | - $this->mock->expects( $this->once() )->method( 'set' ) | |
| 193 | +		$this->mock->expects($this->once())->method('set') | |
| 194 | 194 | ->with( | 
| 195 | - $this->equalTo( 'key' ), $this->equalTo( 'value' ), | |
| 196 | - $this->equalTo( array( 'tag' ) ), $this->greaterThan( 0 ) | |
| 195 | +				$this->equalTo('key'), $this->equalTo('value'), | |
| 196 | +				$this->equalTo(array('tag')), $this->greaterThan(0) | |
| 197 | 197 | ); | 
| 198 | 198 | |
| 199 | - $expires = array( 'key' => '2100-01-01 00:00:00' ); | |
| 200 | - $this->object->setMultiple( array( 'key' => 'value' ), $expires, array( 'key' => array( 'tag' ) ) ); | |
| 199 | +		$expires = array('key' => '2100-01-01 00:00:00'); | |
| 200 | +		$this->object->setMultiple(array('key' => 'value'), $expires, array('key' => array('tag'))); | |
| 201 | 201 | } | 
| 202 | 202 | |
| 203 | 203 | |
| 204 | 204 | public function testSetMultipleWithSiteId() | 
| 205 | 205 |  	{ | 
| 206 | - $object = new \Aimeos\MW\Cache\Flow( array( 'siteid' => 1 ), $this->mock ); | |
| 206 | +		$object = new \Aimeos\MW\Cache\Flow(array('siteid' => 1), $this->mock); | |
| 207 | 207 | |
| 208 | - $this->mock->expects( $this->once() )->method( 'set' ) | |
| 208 | +		$this->mock->expects($this->once())->method('set') | |
| 209 | 209 | ->with( | 
| 210 | - $this->equalTo( '1-key' ), $this->equalTo( 'value' ), | |
| 211 | - $this->equalTo( array( '1-siteid', '1-tag' ) ), $this->equalTo( null ) | |
| 210 | +				$this->equalTo('1-key'), $this->equalTo('value'), | |
| 211 | +				$this->equalTo(array('1-siteid', '1-tag')), $this->equalTo(null) | |
| 212 | 212 | ); | 
| 213 | 213 | |
| 214 | - $object->setMultiple( array( 'key' => 'value' ), null, array( 'key' => array( 'tag' ) ) ); | |
| 214 | +		$object->setMultiple(array('key' => 'value'), null, array('key' => array('tag'))); | |
| 215 | 215 | } | 
| 216 | 216 | |
| 217 | 217 | } | 
| @@ -16,32 +16,32 @@ | ||
| 16 | 16 | |
| 17 | 17 | protected function setUp() | 
| 18 | 18 |  	{ | 
| 19 | - $this->mock = $this->getMockBuilder( '\Neos\Fluid\View\StandaloneView' ) | |
| 20 | - ->setMethods( array( 'assign', 'assignMultiple', 'render', 'setTemplatePathAndFilename' ) ) | |
| 19 | +		$this->mock = $this->getMockBuilder('\Neos\Fluid\View\StandaloneView') | |
| 20 | +			->setMethods(array('assign', 'assignMultiple', 'render', 'setTemplatePathAndFilename')) | |
| 21 | 21 | ->disableOriginalConstructor() | 
| 22 | 22 | ->getMock(); | 
| 23 | 23 | |
| 24 | - $this->object = new \Aimeos\MW\View\Engine\Flow( $this->mock ); | |
| 24 | + $this->object = new \Aimeos\MW\View\Engine\Flow($this->mock); | |
| 25 | 25 | } | 
| 26 | 26 | |
| 27 | 27 | |
| 28 | 28 | protected function tearDown() | 
| 29 | 29 |  	{ | 
| 30 | - unset( $this->object, $this->mock ); | |
| 30 | + unset($this->object, $this->mock); | |
| 31 | 31 | } | 
| 32 | 32 | |
| 33 | 33 | |
| 34 | 34 | public function testRender() | 
| 35 | 35 |  	{ | 
| 36 | - $v = new \Aimeos\MW\View\Standard( array() ); | |
| 36 | + $v = new \Aimeos\MW\View\Standard(array()); | |
| 37 | 37 | |
| 38 | - $this->mock->expects( $this->once() )->method( 'setTemplatePathAndFilename' ); | |
| 39 | - $this->mock->expects( $this->once() )->method( 'assignMultiple' ); | |
| 40 | - $this->mock->expects( $this->once() )->method( 'assign' ); | |
| 41 | - $this->mock->expects( $this->once() )->method( 'render' ) | |
| 42 | - ->will( $this->returnValue( 'test' ) ); | |
| 38 | +		$this->mock->expects($this->once())->method('setTemplatePathAndFilename'); | |
| 39 | +		$this->mock->expects($this->once())->method('assignMultiple'); | |
| 40 | +		$this->mock->expects($this->once())->method('assign'); | |
| 41 | +		$this->mock->expects($this->once())->method('render') | |
| 42 | +			->will($this->returnValue('test')); | |
| 43 | 43 | |
| 44 | - $result = $this->object->render( $v, 'filepath', array( 'key' => 'value' ) ); | |
| 45 | - $this->assertEquals( 'test', $result ); | |
| 44 | +		$result = $this->object->render($v, 'filepath', array('key' => 'value')); | |
| 45 | +		$this->assertEquals('test', $result); | |
| 46 | 46 | } | 
| 47 | 47 | } |