/**
* Toggle HTTP requests, allow overriding the version code
*/
- public static function getVersion($url, $timeout=0)
+ public static function getVersion($url, $timeout = 0)
{
return self::$VERSION_CODE;
}
'0.5.4',
ApplicationUtils::getVersion(
'https://raw.githubusercontent.com/shaarli/Shaarli/'
- .'v0.5.4/shaarli_version.php',
+ .'v0.5.4/shaarli_version.php',
$testTimeout
)
);
self::$versionPattern,
ApplicationUtils::getVersion(
'https://raw.githubusercontent.com/shaarli/Shaarli/'
- .'latest/shaarli_version.php',
+ .'latest/shaarli_version.php',
$testTimeout
)
);
invalidateCaches(self::$testCacheDir);
foreach (self::$pages as $page) {
$this->assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache');
- }
+ }
$this->assertArrayNotHasKey('tags', $_SESSION);
}
/**
* Unitary tests for getIpAddressFromProxy()
*/
-class GetIpAdressFromProxyTest extends PHPUnit_Framework_TestCase {
+class GetIpAdressFromProxyTest extends PHPUnit_Framework_TestCase
+{
/**
* Test without proxy
public function testLinkRealUrlWithoutRedirector()
{
$db = new LinkDB(self::$testDatastore, false, false);
- foreach($db as $link) {
+ foreach ($db as $link) {
$this->assertEquals($link['url'], $link['real_url']);
}
}
{
$redirector = 'http://redirector.to?';
$db = new LinkDB(self::$testDatastore, false, false, $redirector);
- foreach($db as $link) {
+ foreach ($db as $link) {
$this->assertStringStartsWith($redirector, $link['real_url']);
$this->assertNotFalse(strpos($link['real_url'], urlencode('://')));
}
$db = new LinkDB(self::$testDatastore, false, false, $redirector, false);
- foreach($db as $link) {
+ foreach ($db as $link) {
$this->assertStringStartsWith($redirector, $link['real_url']);
$this->assertFalse(strpos($link['real_url'], urlencode('://')));
}
$this->assertEquals(
3,
count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"free software"'))
- );
+ );
}
/**
return 'text/plain';
}
}
-
Router::$PAGE_CHANGEPASSWORD,
Router::findPage('do=changepasswd&stuff', array(), true)
);
-
}
/**
ini_set('error_log', $oldlog);
}
- protected function rrmdirContent($dir) {
+ protected function rrmdirContent($dir)
+ {
if (is_dir($dir)) {
$objects = scandir($dir);
foreach ($objects as $object) {
if ($object != "." && $object != "..") {
- if (is_dir($dir."/".$object))
+ if (is_dir($dir."/".$object)) {
$this->rrmdirContent($dir."/".$object);
- else
+ } else {
unlink($dir."/".$object);
+ }
}
}
}
*
* @return bool true.
*/
- private final function updateMethodDummy1()
+ final private function updateMethodDummy1()
{
return true;
}
*
* @return bool true.
*/
- private final function updateMethodDummy2()
+ final private function updateMethodDummy2()
{
return true;
}
*
* @return bool true.
*/
- private final function updateMethodDummy3()
+ final private function updateMethodDummy3()
{
return true;
}
*
* @throws Exception error.
*/
- private final function updateMethodException()
+ final private function updateMethodException()
{
throw new Exception('whatever');
}
$this->assertEquals('git', get_url_scheme('git://domain.tld/push?pull=clone#checkout'));
}
}
-
$this->assertEquals($ref, unparse_url(parse_url($ref)));
}
}
-
/**
* Helper method
*/
- private function assertUrlIsCleaned($query='', $fragment='')
+ private function assertUrlIsCleaned($query = '', $fragment = '')
{
$url = new Url(self::$baseUrl.$query.$fragment);
$url->cleanup();
'about://reader?url=' . urlencode(self::$baseUrl .'?my=stuff&is=kept')
);
$this->assertEquals(self::$baseUrl.'?my=stuff&is=kept', $url->cleanup());
-
}
/**
* Test default http scheme.
*/
- public function testDefaultScheme() {
+ public function testDefaultScheme()
+ {
$url = new Url(self::$baseUrl);
$this->assertEquals('http', $url->getScheme());
$url = new Url('domain.tld');
/**
* Test generate location with valid data.
*/
- public function testGenerateLocation() {
+ public function testGenerateLocation()
+ {
$ref = 'http://localhost/?test';
$this->assertEquals($ref, generateLocation($ref, 'localhost'));
$ref = 'http://localhost:8080/?test';
/**
* Test generate location - anti loop.
*/
- public function testGenerateLocationLoop() {
+ public function testGenerateLocationLoop()
+ {
$ref = 'http://localhost/?test';
$this->assertEquals('?', generateLocation($ref, 'localhost', array('test')));
}
/**
* Test generate location - from other domain.
*/
- public function testGenerateLocationOut() {
+ public function testGenerateLocationOut()
+ {
$ref = 'http://somewebsite.com/?test';
$this->assertEquals('?', generateLocation($ref, 'localhost'));
}
use Shaarli\Base64Url;
-
/**
* Class ApiUtilsTest
*/
$payload = Base64Url::encode('{
"iat": '. time() .'
}');
- $signature = Base64Url::encode(hash_hmac('sha512', $header .'.'. $payload , $secret, true));
+ $signature = Base64Url::encode(hash_hmac('sha512', $header .'.'. $payload, $secret, true));
return $header .'.'. $payload .'.'. $signature;
}
namespace Shaarli\Api\Controllers;
-
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
/**
* Class InfoTest
- *
+ *
* Test REST API controller Info.
- *
+ *
* @package Api\Controllers
*/
class InfoTest extends \PHPUnit_Framework_TestCase
namespace Shaarli\Api\Controllers;
-
use PHPUnit\Framework\TestCase;
use Shaarli\Config\ConfigManager;
use Slim\Container;
namespace Shaarli\Api\Controllers;
-
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;
namespace Shaarli\Api\Controllers;
-
use Shaarli\Api\Exceptions\ApiBadParametersException;
use Shaarli\Config\ConfigManager;
use Slim\Container;
public function testDateFormatNoTime()
{
$date = DateTime::createFromFormat('Ymd_His', '20170101_101112');
- $this->assertRegExp('/1\. Januar 2017/', format_date($date, false,true));
+ $this->assertRegExp('/1\. Januar 2017/', format_date($date, false, true));
}
/**
namespace Shaarli;
-
use Shaarli\Config\ConfigManager;
/**
/**
* Reset plugin path
*/
- public function setUp() {
+ public function setUp()
+ {
PluginManager::$PLUGINS_PATH = 'plugins';
}
use \Shaarli\Security\SessionManager;
use \PHPUnit\Framework\TestCase;
-
/**
* Test coverage for SessionManager
*/
$tags,
$updated = '',
$shorturl = '',
- $pinned = false)
- {
+ $pinned = false
+ ) {
$link = array(
'id' => $id,
'title' => $title,
$order = $order === 'ASC' ? -1 : 1;
// Reorder array by dates.
- usort($this->_links, function($a, $b) use ($order) {
+ usort($this->_links, function ($a, $b) use ($order) {
if (isset($a['sticky']) && isset($b['sticky']) && $a['sticky'] !== $b['sticky']) {
return $a['sticky'] ? -1 : 1;
}
-<?php
+<?php
$GLOBALS['login'] = 'root';
$GLOBALS['hash'] = 'hash';
$GLOBALS['salt'] = 'salt';
projects / github / shaarli / Shaarli.git / commitdiff
