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

lint: apply phpcbf to tests/ 

Signed-off-by: VirtualTam <virtualtam@flibidi.net>
This commit is contained in:
VirtualTam 2018-10-13 00:35:47 +02:00
parent 93bf0918fa
commit 067c2dd8f5
26 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/ApplicationUtilsTest.php
View File

@ -17,7 +17,7 @@ class FakeApplicationUtils extends ApplicationUtils
/**
* 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;
}
@ -67,7 +67,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
'0.5.4',
ApplicationUtils::getVersion(
'https://raw.githubusercontent.com/shaarli/Shaarli/'
.'v0.5.4/shaarli_version.php',
.'v0.5.4/shaarli_version.php',
$testTimeout
)
);
@ -75,7 +75,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase
self::$versionPattern,
ApplicationUtils::getVersion(
'https://raw.githubusercontent.com/shaarli/Shaarli/'
.'latest/shaarli_version.php',
.'latest/shaarli_version.php',
$testTimeout
)
);

2
tests/CacheTest.php
View File

@ -84,7 +84,7 @@ class CacheTest extends PHPUnit_Framework_TestCase
invalidateCaches(self::$testCacheDir);
foreach (self::$pages as $page) {
$this->assertFileNotExists(self::$testCacheDir.'/'.$page.'.cache');
}
}
$this->assertArrayNotHasKey('tags', $_SESSION);
}

3
tests/HttpUtils/GetIpAdressFromProxyTest.php
View File

@ -5,7 +5,8 @@ require_once 'application/HttpUtils.php';
/**
* Unitary tests for getIpAddressFromProxy()
*/
class GetIpAdressFromProxyTest extends PHPUnit_Framework_TestCase {
class GetIpAdressFromProxyTest extends PHPUnit_Framework_TestCase
{
/**
* Test without proxy

6
tests/LinkDBTest.php
View File

@ -362,7 +362,7 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
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']);
}
}
@ -374,13 +374,13 @@ class LinkDBTest extends PHPUnit_Framework_TestCase
{
$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('://')));
}

2
tests/LinkFilterTest.php
View File

@ -297,7 +297,7 @@ class LinkFilterTest extends PHPUnit_Framework_TestCase
$this->assertEquals(
3,
count(self::$linkFilter->filter(LinkFilter::$FILTER_TEXT, '"free software"'))
);
);
}
/**

1
tests/LinkUtilsTest.php
View File

@ -410,4 +410,3 @@ function ut_curl_getinfo_rs_ct_ko($ch, $type)
return 'text/plain';
}
}

1
tests/RouterTest.php
View File

@ -218,7 +218,6 @@ class RouterTest extends PHPUnit_Framework_TestCase
Router::$PAGE_CHANGEPASSWORD,
Router::findPage('do=changepasswd&stuff', array(), true)
);
}
/**

8
tests/ThumbnailerTest.php
View File

@ -98,15 +98,17 @@ class ThumbnailerTest extends TestCase
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);
}
}
}
}

8
tests/Updater/DummyUpdater.php
View File

@ -31,7 +31,7 @@ class DummyUpdater extends Updater
*
* @return bool true.
*/
private final function updateMethodDummy1()
final private function updateMethodDummy1()
{
return true;
}
@ -41,7 +41,7 @@ class DummyUpdater extends Updater
*
* @return bool true.
*/
private final function updateMethodDummy2()
final private function updateMethodDummy2()
{
return true;
}
@ -51,7 +51,7 @@ class DummyUpdater extends Updater
*
* @return bool true.
*/
private final function updateMethodDummy3()
final private function updateMethodDummy3()
{
return true;
}
@ -61,7 +61,7 @@ class DummyUpdater extends Updater
*
* @throws Exception error.
*/
private final function updateMethodException()
final private function updateMethodException()
{
throw new Exception('whatever');
}

1
tests/Url/CleanupUrlTest.php
View File

@ -107,4 +107,3 @@ class CleanupUrlTest extends PHPUnit_Framework_TestCase
);
}
}

1
tests/Url/GetUrlSchemeTest.php
View File

@ -28,4 +28,3 @@ class GetUrlSchemeTest extends PHPUnit_Framework_TestCase
$this->assertEquals('git', get_url_scheme('git://domain.tld/push?pull=clone#checkout'));
}
}

1
tests/Url/UnparseUrlTest.php
View File

@ -28,4 +28,3 @@ class UnparseUrlTest extends PHPUnit_Framework_TestCase
$this->assertEquals($ref, unparse_url(parse_url($ref)));
}
}

6
tests/Url/UrlTest.php
View File

@ -16,7 +16,7 @@ class UrlTest extends PHPUnit_Framework_TestCase
/**
* Helper method
*/
private function assertUrlIsCleaned($query='', $fragment='')
private function assertUrlIsCleaned($query = '', $fragment = '')
{
$url = new Url(self::$baseUrl.$query.$fragment);
$url->cleanup();
@ -135,13 +135,13 @@ class UrlTest extends PHPUnit_Framework_TestCase
'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');

9
tests/UtilsTest.php
View File

@ -187,7 +187,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
/**
* 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';
@ -199,7 +200,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
/**
* Test generate location - anti loop.
*/
public function testGenerateLocationLoop() {
public function testGenerateLocationLoop()
{
$ref = 'http://localhost/?test';
$this->assertEquals('?', generateLocation($ref, 'localhost', array('test')));
}
@ -207,7 +209,8 @@ class UtilsTest extends PHPUnit_Framework_TestCase
/**
* Test generate location - from other domain.
*/
public function testGenerateLocationOut() {
public function testGenerateLocationOut()
{
$ref = 'http://somewebsite.com/?test';
$this->assertEquals('?', generateLocation($ref, 'localhost'));
}

3
tests/api/ApiUtilsTest.php
View File

@ -4,7 +4,6 @@ namespace Shaarli\Api;
use Shaarli\Base64Url;
/**
* Class ApiUtilsTest
*/
@ -34,7 +33,7 @@ class ApiUtilsTest extends \PHPUnit_Framework_TestCase
$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;
}

1
tests/api/controllers/history/HistoryTest.php
View File

@ -3,7 +3,6 @@
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;

4
tests/api/controllers/info/InfoTest.php
View File

@ -10,9 +10,9 @@ use Slim\Http\Response;
/**
* Class InfoTest
*
*
* Test REST API controller Info.
*
*
* @package Api\Controllers
*/
class InfoTest extends \PHPUnit_Framework_TestCase

1
tests/api/controllers/links/PostLinkTest.php
View File

@ -2,7 +2,6 @@
namespace Shaarli\Api\Controllers;
use PHPUnit\Framework\TestCase;
use Shaarli\Config\ConfigManager;
use Slim\Container;

1
tests/api/controllers/links/PutLinkTest.php
View File

@ -3,7 +3,6 @@
namespace Shaarli\Api\Controllers;
use Shaarli\Config\ConfigManager;
use Slim\Container;
use Slim\Http\Environment;

1
tests/api/controllers/tags/PutTagTest.php
View File

@ -3,7 +3,6 @@
namespace Shaarli\Api\Controllers;
use Shaarli\Api\Exceptions\ApiBadParametersException;
use Shaarli\Config\ConfigManager;
use Slim\Container;

2
tests/languages/de/UtilsDeTest.php
View File

@ -20,7 +20,7 @@ class UtilsDeTest extends UtilsTest
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));
}
/**

1
tests/languages/fr/LanguagesFrTest.php
View File

@ -3,7 +3,6 @@
namespace Shaarli;
use Shaarli\Config\ConfigManager;
/**

3
tests/plugins/PluginQrcodeTest.php
View File

@ -15,7 +15,8 @@ class PluginQrcodeTest extends PHPUnit_Framework_TestCase
/**
* Reset plugin path
*/
public function setUp() {
public function setUp()
{
PluginManager::$PLUGINS_PATH = 'plugins';
}

1
tests/security/SessionManagerTest.php
View File

@ -8,7 +8,6 @@ ReferenceSessionIdHashes::genAllHashes();
use \Shaarli\Security\SessionManager;
use \PHPUnit\Framework\TestCase;
/**
* Test coverage for SessionManager
*/

6
tests/utils/ReferenceLinkDB.php
View File

@ -150,8 +150,8 @@ class ReferenceLinkDB
$tags,
$updated = '',
$shorturl = '',
$pinned = false)
{
$pinned = false
) {
$link = array(
'id' => $id,
'title' => $title,
@ -201,7 +201,7 @@ class ReferenceLinkDB
$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;
}

2
tests/utils/config/configPhp.php
View File

@ -1,4 +1,4 @@
<?php
<?php
$GLOBALS['login'] = 'root';
$GLOBALS['hash'] = 'hash';
$GLOBALS['salt'] = 'salt';