From 93b1fe54fb99efff30eec0d405cc7319fbbc1f95 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Thu, 5 Jan 2017 19:33:06 +0100 Subject: [PATCH] Cleanup: explicit method visibility Signed-off-by: VirtualTam --- application/PageBuilder.php | 2 +- application/config/ConfigIO.php | 6 +++--- application/config/ConfigJson.php | 6 +++--- application/config/ConfigPhp.php | 6 +++--- plugins/wallabag/WallabagInstance.php | 2 +- tests/Url/UrlTest.php | 8 ++++---- tests/plugins/PluginAddlinkTest.php | 10 +++++----- tests/plugins/PluginArchiveorgTest.php | 10 +++------- tests/plugins/PluginIssoTest.php | 14 ++++++------- tests/plugins/PluginMarkdownTest.php | 20 +++++++++---------- tests/plugins/PluginPlayvideosTest.php | 6 +++--- tests/plugins/PluginPubsubhubbubTest.php | 6 +++--- ...lugQrcodeTest.php => PluginQrcodeTest.php} | 12 +++++------ tests/plugins/PluginReadityourselfTest.php | 10 +++++----- tests/plugins/PluginWallabagTest.php | 8 ++++---- tests/plugins/WallabagInstanceTest.php | 8 ++++---- 16 files changed, 65 insertions(+), 69 deletions(-) rename tests/plugins/{PlugQrcodeTest.php => PluginQrcodeTest.php} (86%) diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 32c7f9f1..544aba7c 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php @@ -25,7 +25,7 @@ class PageBuilder * * @param ConfigManager $conf Configuration Manager instance (reference). */ - function __construct(&$conf) + public function __construct(&$conf) { $this->tpl = false; $this->conf = $conf; diff --git a/application/config/ConfigIO.php b/application/config/ConfigIO.php index 2b68fe6a..be78b1c7 100644 --- a/application/config/ConfigIO.php +++ b/application/config/ConfigIO.php @@ -14,7 +14,7 @@ interface ConfigIO * * @return array All configuration in an array. */ - function read($filepath); + public function read($filepath); /** * Write configuration. @@ -22,12 +22,12 @@ interface ConfigIO * @param string $filepath Config file absolute path. * @param array $conf All configuration in an array. */ - function write($filepath, $conf); + public function write($filepath, $conf); /** * Get config file extension according to config type. * * @return string Config file extension. */ - function getExtension(); + public function getExtension(); } diff --git a/application/config/ConfigJson.php b/application/config/ConfigJson.php index 30007eb4..6b5d73f1 100644 --- a/application/config/ConfigJson.php +++ b/application/config/ConfigJson.php @@ -10,7 +10,7 @@ class ConfigJson implements ConfigIO /** * @inheritdoc */ - function read($filepath) + public function read($filepath) { if (! is_readable($filepath)) { return array(); @@ -29,7 +29,7 @@ class ConfigJson implements ConfigIO /** * @inheritdoc */ - function write($filepath, $conf) + public function write($filepath, $conf) { // JSON_PRETTY_PRINT is available from PHP 5.4. $print = defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0; @@ -46,7 +46,7 @@ class ConfigJson implements ConfigIO /** * @inheritdoc */ - function getExtension() + public function getExtension() { return '.json.php'; } diff --git a/application/config/ConfigPhp.php b/application/config/ConfigPhp.php index 27187b66..9dd9a65d 100644 --- a/application/config/ConfigPhp.php +++ b/application/config/ConfigPhp.php @@ -71,7 +71,7 @@ class ConfigPhp implements ConfigIO /** * @inheritdoc */ - function read($filepath) + public function read($filepath) { if (! file_exists($filepath) || ! is_readable($filepath)) { return array(); @@ -91,7 +91,7 @@ class ConfigPhp implements ConfigIO /** * @inheritdoc */ - function write($filepath, $conf) + public function write($filepath, $conf) { $configStr = 'isVersionAllowed($version)) { $this->apiVersion = self::$wallabagVersions[$version]; diff --git a/tests/Url/UrlTest.php b/tests/Url/UrlTest.php index 05862372..aa2f2234 100644 --- a/tests/Url/UrlTest.php +++ b/tests/Url/UrlTest.php @@ -157,7 +157,7 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * Test add trailing slash. */ - function testAddTrailingSlash() + public function testAddTrailingSlash() { $strOn = 'http://randomstr.com/test/'; $strOff = 'http://randomstr.com/test'; @@ -168,7 +168,7 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * Test valid HTTP url. */ - function testUrlIsHttp() + public function testUrlIsHttp() { $url = new Url(self::$baseUrl); $this->assertTrue($url->isHttp()); @@ -177,7 +177,7 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * Test non HTTP url. */ - function testUrlIsNotHttp() + public function testUrlIsNotHttp() { $url = new Url('ftp://save.tld/mysave'); $this->assertFalse($url->isHttp()); @@ -186,7 +186,7 @@ class UrlTest extends PHPUnit_Framework_TestCase /** * Test International Domain Name to ASCII conversion */ - function testIdnToAscii() + public function testIdnToAscii() { $ind = 'http://www.académie-française.fr/'; $expected = 'http://www.xn--acadmie-franaise-npb1a.fr/'; diff --git a/tests/plugins/PluginAddlinkTest.php b/tests/plugins/PluginAddlinkTest.php index a2f25bec..b77fe12a 100644 --- a/tests/plugins/PluginAddlinkTest.php +++ b/tests/plugins/PluginAddlinkTest.php @@ -16,7 +16,7 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase /** * Reset plugin path. */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -24,7 +24,7 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase /** * Test render_header hook while logged in. */ - function testAddlinkHeaderLoggedIn() + public function testAddlinkHeaderLoggedIn() { $str = 'stuff'; $data = array($str => $str); @@ -46,7 +46,7 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase /** * Test render_header hook while logged out. */ - function testAddlinkHeaderLoggedOut() + public function testAddlinkHeaderLoggedOut() { $str = 'stuff'; $data = array($str => $str); @@ -61,7 +61,7 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase /** * Test render_includes hook while logged in. */ - function testAddlinkIncludesLoggedIn() + public function testAddlinkIncludesLoggedIn() { $str = 'stuff'; $data = array($str => $str); @@ -86,7 +86,7 @@ class PluginAddlinkTest extends PHPUnit_Framework_TestCase * Test render_includes hook. * Should not affect css files while logged out. */ - function testAddlinkIncludesLoggedOut() + public function testAddlinkIncludesLoggedOut() { $str = 'stuff'; $data = array($str => $str); diff --git a/tests/plugins/PluginArchiveorgTest.php b/tests/plugins/PluginArchiveorgTest.php index 4daa4c9d..fecd5f2c 100644 --- a/tests/plugins/PluginArchiveorgTest.php +++ b/tests/plugins/PluginArchiveorgTest.php @@ -15,7 +15,7 @@ class PluginArchiveorgTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -23,7 +23,7 @@ class PluginArchiveorgTest extends PHPUnit_Framework_TestCase /** * Test render_linklist hook on external links. */ - function testArchiveorgLinklistOnExternalLinks() + public function testArchiveorgLinklistOnExternalLinks() { $str = 'http://randomstr.com/test'; @@ -48,13 +48,12 @@ class PluginArchiveorgTest extends PHPUnit_Framework_TestCase // plugin data $this->assertEquals(1, count($link['link_plugin'])); $this->assertNotFalse(strpos($link['link_plugin'][0], $str)); - } /** * Test render_linklist hook on internal links. */ - function testArchiveorgLinklistOnInternalLinks() + public function testArchiveorgLinklistOnInternalLinks() { $internalLink1 = 'http://shaarli.shaarli/?qvMAqg'; $internalLinkRealURL1 = '?qvMAqg'; @@ -101,7 +100,6 @@ class PluginArchiveorgTest extends PHPUnit_Framework_TestCase ) ); - $data = hook_archiveorg_render_linklist($data); // Case n°1: first link type, public @@ -136,7 +134,5 @@ class PluginArchiveorgTest extends PHPUnit_Framework_TestCase $link = $data['links'][5]; $this->assertArrayNotHasKey('link_plugin', $link); - } - } diff --git a/tests/plugins/PluginIssoTest.php b/tests/plugins/PluginIssoTest.php index 6b7904dd..03def208 100644 --- a/tests/plugins/PluginIssoTest.php +++ b/tests/plugins/PluginIssoTest.php @@ -12,7 +12,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -20,7 +20,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Test Isso init without errors. */ - function testWallabagInitNoError() + public function testWallabagInitNoError() { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -31,7 +31,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Test Isso init with errors. */ - function testWallabagInitError() + public function testWallabagInitError() { $conf = new ConfigManager(''); $errors = isso_init($conf); @@ -41,7 +41,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Test render_linklist hook with valid settings to display the comment form. */ - function testIssoDisplayed() + public function testIssoDisplayed() { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -81,7 +81,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Test isso plugin when multiple links are displayed (shouldn't be displayed). */ - function testIssoMultipleLinks() + public function testIssoMultipleLinks() { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -113,7 +113,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Test isso plugin when using search (shouldn't be displayed). */ - function testIssoNotDisplayedWhenSearch() + public function testIssoNotDisplayedWhenSearch() { $conf = new ConfigManager(''); $conf->set('plugins.ISSO_SERVER', 'value'); @@ -141,7 +141,7 @@ class PluginIssoTest extends PHPUnit_Framework_TestCase /** * Test isso plugin without server configuration (shouldn't be displayed). */ - function testIssoWithoutConf() + public function testIssoWithoutConf() { $data = 'abc'; $conf = new ConfigManager(''); diff --git a/tests/plugins/PluginMarkdownTest.php b/tests/plugins/PluginMarkdownTest.php index 17ef2280..d359b2a1 100644 --- a/tests/plugins/PluginMarkdownTest.php +++ b/tests/plugins/PluginMarkdownTest.php @@ -16,7 +16,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -25,7 +25,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase * Test render_linklist hook. * Only check that there is basic markdown rendering. */ - function testMarkdownLinklist() + public function testMarkdownLinklist() { $markdown = '# My title' . PHP_EOL . 'Very interesting content.'; $data = array( @@ -45,7 +45,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase * Test render_daily hook. * Only check that there is basic markdown rendering. */ - function testMarkdownDaily() + public function testMarkdownDaily() { $markdown = '# My title' . PHP_EOL . 'Very interesting content.'; $data = array( @@ -69,7 +69,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test reverse_text2clickable(). */ - function testReverseText2clickable() + public function testReverseText2clickable() { $text = 'stuff http://hello.there/is=someone#here otherstuff'; $clickableText = text2clickable($text, ''); @@ -80,7 +80,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test reverse_nl2br(). */ - function testReverseNl2br() + public function testReverseNl2br() { $text = 'stuff' . PHP_EOL . 'otherstuff'; $processedText = nl2br($text); @@ -91,7 +91,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test reverse_space2nbsp(). */ - function testReverseSpace2nbsp() + public function testReverseSpace2nbsp() { $text = ' stuff' . PHP_EOL . ' otherstuff and another'; $processedText = space2nbsp($text); @@ -102,7 +102,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test sanitize_html(). */ - function testSanitizeHtml() + public function testSanitizeHtml() { $input = '< script src="js.js"/>'; $input .= '< script attr>alert(\'xss\');'; @@ -119,7 +119,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test the no markdown tag. */ - function testNoMarkdownTag() + public function testNoMarkdownTag() { $str = 'All _work_ and `no play` makes Jack a *dull* boy.'; $data = array( @@ -158,7 +158,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test that a close value to nomarkdown is not understand as nomarkdown (previous value `.nomarkdown`). */ - function testNoMarkdownNotExcactlyMatching() + public function testNoMarkdownNotExcactlyMatching() { $str = 'All _work_ and `no play` makes Jack a *dull* boy.'; $data = array( @@ -176,7 +176,7 @@ class PluginMarkdownTest extends PHPUnit_Framework_TestCase /** * Test hashtag links processed with markdown. */ - function testMarkdownHashtagLinks() + public function testMarkdownHashtagLinks() { $md = file_get_contents('tests/plugins/resources/markdown.md'); $md = format_description($md); diff --git a/tests/plugins/PluginPlayvideosTest.php b/tests/plugins/PluginPlayvideosTest.php index be1ef774..29ad047f 100644 --- a/tests/plugins/PluginPlayvideosTest.php +++ b/tests/plugins/PluginPlayvideosTest.php @@ -16,7 +16,7 @@ class PluginPlayvideosTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -24,7 +24,7 @@ class PluginPlayvideosTest extends PHPUnit_Framework_TestCase /** * Test render_linklist hook. */ - function testPlayvideosHeader() + public function testPlayvideosHeader() { $str = 'stuff'; $data = array($str => $str); @@ -43,7 +43,7 @@ class PluginPlayvideosTest extends PHPUnit_Framework_TestCase /** * Test render_footer hook. */ - function testPlayvideosFooter() + public function testPlayvideosFooter() { $str = 'stuff'; $data = array($str => $str); diff --git a/tests/plugins/PluginPubsubhubbubTest.php b/tests/plugins/PluginPubsubhubbubTest.php index 24dd7a11..1bd87935 100644 --- a/tests/plugins/PluginPubsubhubbubTest.php +++ b/tests/plugins/PluginPubsubhubbubTest.php @@ -17,7 +17,7 @@ class PluginPubsubhubbubTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -25,7 +25,7 @@ class PluginPubsubhubbubTest extends PHPUnit_Framework_TestCase /** * Test render_feed hook with an RSS feed. */ - function testPubSubRssRenderFeed() + public function testPubSubRssRenderFeed() { $hub = 'http://domain.hub'; $conf = new ConfigManager(self::$configFile); @@ -40,7 +40,7 @@ class PluginPubsubhubbubTest extends PHPUnit_Framework_TestCase /** * Test render_feed hook with an ATOM feed. */ - function testPubSubAtomRenderFeed() + public function testPubSubAtomRenderFeed() { $hub = 'http://domain.hub'; $conf = new ConfigManager(self::$configFile); diff --git a/tests/plugins/PlugQrcodeTest.php b/tests/plugins/PluginQrcodeTest.php similarity index 86% rename from tests/plugins/PlugQrcodeTest.php rename to tests/plugins/PluginQrcodeTest.php index 86dc7f29..211ee89c 100644 --- a/tests/plugins/PlugQrcodeTest.php +++ b/tests/plugins/PluginQrcodeTest.php @@ -1,29 +1,29 @@ $str); diff --git a/tests/plugins/PluginReadityourselfTest.php b/tests/plugins/PluginReadityourselfTest.php index 532db146..30470ab7 100644 --- a/tests/plugins/PluginReadityourselfTest.php +++ b/tests/plugins/PluginReadityourselfTest.php @@ -15,7 +15,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -23,7 +23,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase /** * Test Readityourself init without errors. */ - function testReadityourselfInitNoError() + public function testReadityourselfInitNoError() { $conf = new ConfigManager(''); $conf->set('plugins.READITYOUSELF_URL', 'value'); @@ -34,7 +34,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase /** * Test Readityourself init with errors. */ - function testReadityourselfInitError() + public function testReadityourselfInitError() { $conf = new ConfigManager(''); $errors = readityourself_init($conf); @@ -44,7 +44,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase /** * Test render_linklist hook. */ - function testReadityourselfLinklist() + public function testReadityourselfLinklist() { $conf = new ConfigManager(''); $conf->set('plugins.READITYOUSELF_URL', 'value'); @@ -72,7 +72,7 @@ class PluginReadityourselfTest extends PHPUnit_Framework_TestCase /** * Test without config: nothing should happened. */ - function testReadityourselfLinklistWithoutConfig() + public function testReadityourselfLinklistWithoutConfig() { $conf = new ConfigManager(''); $conf->set('plugins.READITYOUSELF_URL', null); diff --git a/tests/plugins/PluginWallabagTest.php b/tests/plugins/PluginWallabagTest.php index 2c268cbd..30351f46 100644 --- a/tests/plugins/PluginWallabagTest.php +++ b/tests/plugins/PluginWallabagTest.php @@ -15,7 +15,7 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { PluginManager::$PLUGINS_PATH = 'plugins'; } @@ -23,7 +23,7 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase /** * Test wallabag init without errors. */ - function testWallabagInitNoError() + public function testWallabagInitNoError() { $conf = new ConfigManager(''); $conf->set('plugins.WALLABAG_URL', 'value'); @@ -34,7 +34,7 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase /** * Test wallabag init with errors. */ - function testWallabagInitError() + public function testWallabagInitError() { $conf = new ConfigManager(''); $errors = wallabag_init($conf); @@ -44,7 +44,7 @@ class PluginWallabagTest extends PHPUnit_Framework_TestCase /** * Test render_linklist hook. */ - function testWallabagLinklist() + public function testWallabagLinklist() { $conf = new ConfigManager(''); $conf->set('plugins.WALLABAG_URL', 'value'); diff --git a/tests/plugins/WallabagInstanceTest.php b/tests/plugins/WallabagInstanceTest.php index 7c14c1df..2c466871 100644 --- a/tests/plugins/WallabagInstanceTest.php +++ b/tests/plugins/WallabagInstanceTest.php @@ -15,7 +15,7 @@ class WallabagInstanceTest extends PHPUnit_Framework_TestCase /** * Reset plugin path */ - function setUp() + public function setUp() { $this->instance = 'http://some.url'; } @@ -23,7 +23,7 @@ class WallabagInstanceTest extends PHPUnit_Framework_TestCase /** * Test WallabagInstance with API V1. */ - function testWallabagInstanceV1() + public function testWallabagInstanceV1() { $instance = new WallabagInstance($this->instance, 1); $expected = $this->instance . '/?plainurl='; @@ -34,7 +34,7 @@ class WallabagInstanceTest extends PHPUnit_Framework_TestCase /** * Test WallabagInstance with API V2. */ - function testWallabagInstanceV2() + public function testWallabagInstanceV2() { $instance = new WallabagInstance($this->instance, 2); $expected = $this->instance . '/bookmarklet?url='; @@ -45,7 +45,7 @@ class WallabagInstanceTest extends PHPUnit_Framework_TestCase /** * Test WallabagInstance with an invalid API version. */ - function testWallabagInstanceInvalidVersion() + public function testWallabagInstanceInvalidVersion() { $instance = new WallabagInstance($this->instance, false); $expected = $this->instance . '/?plainurl='; -- 2.41.0