From: Sam Reed Date: Sun, 27 Mar 2011 01:27:02 +0000 (+0000) Subject: Fixup whitespace from r80445 X-Git-Tag: 1.31.0-rc.0~31167 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/?a=commitdiff_plain;h=8c0292520bf573b7f68a64ce58783a585a53b4d0;p=lhc%2Fweb%2Fwiklou.git Fixup whitespace from r80445 --- diff --git a/tests/phpunit/includes/HooksTest.php b/tests/phpunit/includes/HooksTest.php index ee8a3fc4d3..2f9d9f8d3c 100644 --- a/tests/phpunit/includes/HooksTest.php +++ b/tests/phpunit/includes/HooksTest.php @@ -1,130 +1,102 @@ assertEquals( 'fOO', $foo, 'Standard method' ); $foo = 'Foo'; - - + $wgHooks['MediaWikiHooksTest001'][] = $i; - + wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'foo', $foo, 'onEventName style' ); $foo = 'Foo'; - - + $wgHooks['MediaWikiHooksTest001'][] = array( $i, 'someNonStaticWithData', 'baz' ); - + wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'baz', $foo, 'Data included' ); $foo = 'Foo'; - - + $wgHooks['MediaWikiHooksTest001'][] = array( $i, 'someStatic' ); - + wfRunHooks( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'bah', $foo, 'Standard static method' ); - $foo = 'Foo'; - - + //$foo = 'Foo'; + unset( $wgHooks['MediaWikiHooksTest001'] ); - + } - + public function testNewStyleHooks() { - $foo = 'Foo'; $bar = 'Bar'; - + $i = new NothingClass(); - - + Hooks::register( 'MediaWikiHooksTest001', array( $i, 'someNonStatic' ) ); - + Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'fOO', $foo, 'Standard method' ); $foo = 'Foo'; - - + Hooks::register( 'MediaWikiHooksTest001', $i ); - + Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'foo', $foo, 'onEventName style' ); $foo = 'Foo'; - - + Hooks::register( 'MediaWikiHooksTest001', array( $i, 'someNonStaticWithData', 'baz' ) ); - + Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'baz', $foo, 'Data included' ); $foo = 'Foo'; - - + Hooks::register( 'MediaWikiHooksTest001', array( $i, 'someStatic' ) ); - + Hooks::run( 'MediaWikiHooksTest001', array( &$foo, &$bar ) ); - + $this->assertEquals( 'bah', $foo, 'Standard static method' ); $foo = 'Foo'; - } - } class NothingClass { - static public function someStatic( &$foo, &$bar ) { - $foo = 'bah'; - return true; - } - + public function someNonStatic( &$foo, &$bar ) { - $foo = 'fOO'; $bar = 'bAR'; - return true; - } - + public function onMediaWikiHooksTest001( &$foo, &$bar ) { - $foo = 'foo'; - return true; - } - + public function someNonStaticWithData( $foo, &$bar ) { - $bar = $foo; - return true; - } - }