Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Cleanup: explicit method visibility

Browse source 
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
This commit is contained in:
VirtualTam 2017-01-05 19:33:06 +01:00 committed by VirtualTam
parent 724f1e3229
commit 93b1fe54fb
16 changed files with 65 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/PageBuilder.php
View file

@ -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;

6
application/config/ConfigIO.php
View file

@ -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();
}

6
application/config/ConfigJson.php
View file

@ -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';
}

6
application/config/ConfigPhp.php
View file

@ -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 = '<?php '. PHP_EOL;
foreach (self::$ROOT_KEYS as $key) {
@ -125,7 +125,7 @@ class ConfigPhp implements ConfigIO
/**
* @inheritdoc
*/
function getExtension()
public function getExtension()
{
return '.php';
}

2
plugins/wallabag/WallabagInstance.php
View file

@ -35,7 +35,7 @@ class WallabagInstance
*/
private $apiVersion;
function __construct($instance, $version)
public function __construct($instance, $version)
{
if ($this->isVersionAllowed($version)) {
$this->apiVersion = self::$wallabagVersions[$version];

8
tests/Url/UrlTest.php
View file

@ -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/';

10
tests/plugins/PluginAddlinkTest.php
View file

@ -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);

10
tests/plugins/PluginArchiveorgTest.php
View file

@ -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);
}
}

14
tests/plugins/PluginIssoTest.php
View file

@ -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('');

20
tests/plugins/PluginMarkdownTest.php
View file

@ -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\');</script>';
@ -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);

6
tests/plugins/PluginPlayvideosTest.php
View file

@ -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);

6
tests/plugins/PluginPubsubhubbubTest.php
View file

@ -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);

12
tests/plugins/PlugQrcodeTest.php → tests/plugins/PluginQrcodeTest.php
View file

@ -1,29 +1,29 @@
<?php
/**
* PlugQrcodeTest.php
* PluginQrcodeTest.php
*/
require_once 'plugins/qrcode/qrcode.php';
require_once 'application/Router.php';
/**
* Class PlugQrcodeTest
* Class PluginQrcodeTest
* Unit test for the QR-Code plugin
*/
class PlugQrcodeTest extends PHPUnit_Framework_TestCase
class PluginQrcodeTest extends PHPUnit_Framework_TestCase
{
/**
* Reset plugin path
*/
function setUp() {
public function setUp() {
PluginManager::$PLUGINS_PATH = 'plugins';
}
/**
* Test render_linklist hook.
*/
function testQrcodeLinklist()
public function testQrcodeLinklist()
{
$str = 'http://randomstr.com/test';
$data = array(
@ -49,7 +49,7 @@ class PlugQrcodeTest extends PHPUnit_Framework_TestCase
/**
* Test render_footer hook.
*/
function testQrcodeFooter()
public function testQrcodeFooter()
{
$str = 'stuff';
$data = array($str => $str);

10
tests/plugins/PluginReadityourselfTest.php
View file

@ -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);

8
tests/plugins/PluginWallabagTest.php
View file

@ -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');

8
tests/plugins/WallabagInstanceTest.php
View file

@ -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=';