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

Coding style: Apply automatic PHPCBF to tests forlder (PSR12)

Browse source 
Related to #95
This commit is contained in:
ArthurHoaro 2021-04-05 09:39:34 +02:00
parent e1847ae5a7
commit 0681511699
85 changed files with 560 additions and 499 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpcs.xml
View file

@ -5,7 +5,7 @@
<file>index.php</file> <file>index.php</file>
<file>application</file> <file>application</file>
<file>plugins</file> <file>plugins</file>
<!-- <file>tests</file>--> <file>tests</file>
<exclude-pattern>*/*.css</exclude-pattern> <exclude-pattern>*/*.css</exclude-pattern>
<exclude-pattern>*/*.js</exclude-pattern> <exclude-pattern>*/*.js</exclude-pattern>

10
tests/PluginManagerTest.php
View file

@ -39,7 +39,7 @@ public function setUp(): void
public function testPlugin(): void public function testPlugin(): void
{ {
PluginManager::$PLUGINS_PATH = self::$pluginPath; PluginManager::$PLUGINS_PATH = self::$pluginPath;
$this->pluginManager->load(array(self::$pluginName)); $this->pluginManager->load([self::$pluginName]);
$this->assertTrue(function_exists('hook_test_random')); $this->assertTrue(function_exists('hook_test_random'));
@ -50,19 +50,19 @@ public function testPlugin(): void
static::assertSame('woot', $data[1]); static::assertSame('woot', $data[1]);
$data = [0 => 'woot']; $data = [0 => 'woot'];
$this->pluginManager->executeHooks('random', $data, array('target' => 'test')); $this->pluginManager->executeHooks('random', $data, ['target' => 'test']);
static::assertCount(2, $data); static::assertCount(2, $data);
static::assertSame('page test', $data[1]); static::assertSame('page test', $data[1]);
$data = [0 => 'woot']; $data = [0 => 'woot'];
$this->pluginManager->executeHooks('random', $data, array('loggedin' => true)); $this->pluginManager->executeHooks('random', $data, ['loggedin' => true]);
static::assertCount(2, $data); static::assertCount(2, $data);
static::assertEquals('loggedin', $data[1]); static::assertEquals('loggedin', $data[1]);
$data = [0 => 'woot']; $data = [0 => 'woot'];
$this->pluginManager->executeHooks('random', $data, array('loggedin' => null)); $this->pluginManager->executeHooks('random', $data, ['loggedin' => null]);
static::assertCount(3, $data); static::assertCount(3, $data);
static::assertEquals('loggedin', $data[1]); static::assertEquals('loggedin', $data[1]);
@ -76,7 +76,7 @@ public function testPlugin(): void
public function testPluginWithPhpError(): void public function testPluginWithPhpError(): void
{ {
PluginManager::$PLUGINS_PATH = self::$pluginPath; PluginManager::$PLUGINS_PATH = self::$pluginPath;
$this->pluginManager->load(array(self::$pluginName)); $this->pluginManager->load([self::$pluginName]);
$this->assertTrue(function_exists('hook_test_error')); $this->assertTrue(function_exists('hook_test_error'));

1
tests/TimeZoneTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* TimeZone's tests * TimeZone's tests
*/ */

3
tests/UtilsTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Utilities' tests * Utilities' tests
*/ */
@ -187,7 +188,7 @@ public function testGenerateLocation()
public function testGenerateLocationLoop() public function testGenerateLocationLoop()
{ {
$ref = 'http://localhost/?test'; $ref = 'http://localhost/?test';
$this->assertEquals('./?', generateLocation($ref, 'localhost', array('test'))); $this->assertEquals('./?', generateLocation($ref, 'localhost', ['test']));
} }
/** /**

1
tests/api/ApiMiddlewareTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Api; namespace Shaarli\Api;
use Shaarli\Config\ConfigManager; use Shaarli\Config\ConfigManager;

3
tests/api/controllers/info/InfoTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Api\Controllers; namespace Shaarli\Api\Controllers;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;
@ -106,7 +107,7 @@ public function testGetInfo()
$title = 'My bookmarks'; $title = 'My bookmarks';
$headerLink = 'http://shaarli.tld'; $headerLink = 'http://shaarli.tld';
$timezone = 'Europe/Paris'; $timezone = 'Europe/Paris';
$enabledPlugins = array('foo', 'bar'); $enabledPlugins = ['foo', 'bar'];
$defaultPrivateLinks = true; $defaultPrivateLinks = true;
$this->conf->set('general.title', $title); $this->conf->set('general.title', $title);
$this->conf->set('general.header_link', $headerLink); $this->conf->set('general.header_link', $headerLink);

1
tests/api/controllers/links/DeleteLinkTest.php
View file

@ -1,6 +1,5 @@
<?php <?php
namespace Shaarli\Api\Controllers; namespace Shaarli\Api\Controllers;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;

1
tests/api/controllers/links/GetLinksTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Api\Controllers; namespace Shaarli\Api\Controllers;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;

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

@ -1,6 +1,5 @@
<?php <?php
namespace Shaarli\Api\Controllers; namespace Shaarli\Api\Controllers;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;

1
tests/api/controllers/tags/DeleteTagTest.php
View file

@ -1,6 +1,5 @@
<?php <?php
namespace Shaarli\Api\Controllers; namespace Shaarli\Api\Controllers;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;

1
tests/api/controllers/tags/GetTagsTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Api\Controllers; namespace Shaarli\Api\Controllers;
use malkusch\lock\mutex\NoMutex; use malkusch\lock\mutex\NoMutex;

1
tests/bookmark/BookmarkFileServiceTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Link datastore tests * Link datastore tests
*/ */

8
tests/bookmark/BookmarkFilterTest.php
View file

@ -417,28 +417,28 @@ public function testFilterCrossedSearch()
1, 1,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT, BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT,
array($tags, $terms) [$tags, $terms]
)) ))
); );
$this->assertEquals( $this->assertEquals(
2, 2,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT, BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT,
array('', $terms) ['', $terms]
)) ))
); );
$this->assertEquals( $this->assertEquals(
1, 1,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT, BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT,
array(false, 'PSR-2') [false, 'PSR-2']
)) ))
); );
$this->assertEquals( $this->assertEquals(
1, 1,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT, BookmarkFilter::$FILTER_TAG | BookmarkFilter::$FILTER_TEXT,
array($tags, '') [$tags, '']
)) ))
); );
$this->assertEquals( $this->assertEquals(

11
tests/config/ConfigManagerTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Config; namespace Shaarli\Config;
/** /**
@ -29,13 +30,13 @@ public function testSetGet()
$this->conf->set('paramInt', 42); $this->conf->set('paramInt', 42);
$this->conf->set('paramString', 'value1'); $this->conf->set('paramString', 'value1');
$this->conf->set('paramBool', false); $this->conf->set('paramBool', false);
$this->conf->set('paramArray', array('foo' => 'bar')); $this->conf->set('paramArray', ['foo' => 'bar']);
$this->conf->set('paramNull', null); $this->conf->set('paramNull', null);
$this->assertEquals(42, $this->conf->get('paramInt')); $this->assertEquals(42, $this->conf->get('paramInt'));
$this->assertEquals('value1', $this->conf->get('paramString')); $this->assertEquals('value1', $this->conf->get('paramString'));
$this->assertFalse($this->conf->get('paramBool')); $this->assertFalse($this->conf->get('paramBool'));
$this->assertEquals(array('foo' => 'bar'), $this->conf->get('paramArray')); $this->assertEquals(['foo' => 'bar'], $this->conf->get('paramArray'));
$this->assertEquals(null, $this->conf->get('paramNull')); $this->assertEquals(null, $this->conf->get('paramNull'));
} }
@ -51,7 +52,7 @@ public function testSetWriteGet()
$this->conf->set('paramInt', 42); $this->conf->set('paramInt', 42);
$this->conf->set('paramString', 'value1'); $this->conf->set('paramString', 'value1');
$this->conf->set('paramBool', false); $this->conf->set('paramBool', false);
$this->conf->set('paramArray', array('foo' => 'bar')); $this->conf->set('paramArray', ['foo' => 'bar']);
$this->conf->set('paramNull', null); $this->conf->set('paramNull', null);
$this->conf->setConfigFile('tests/utils/config/configTmp'); $this->conf->setConfigFile('tests/utils/config/configTmp');
@ -62,7 +63,7 @@ public function testSetWriteGet()
$this->assertEquals(42, $this->conf->get('paramInt')); $this->assertEquals(42, $this->conf->get('paramInt'));
$this->assertEquals('value1', $this->conf->get('paramString')); $this->assertEquals('value1', $this->conf->get('paramString'));
$this->assertFalse($this->conf->get('paramBool')); $this->assertFalse($this->conf->get('paramBool'));
$this->assertEquals(array('foo' => 'bar'), $this->conf->get('paramArray')); $this->assertEquals(['foo' => 'bar'], $this->conf->get('paramArray'));
$this->assertEquals(null, $this->conf->get('paramNull')); $this->assertEquals(null, $this->conf->get('paramNull'));
} }
@ -112,7 +113,7 @@ public function testSetArrayKey()
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$this->expectExceptionMessageRegExp('#^Invalid setting key parameter. String expected, got.*#'); $this->expectExceptionMessageRegExp('#^Invalid setting key parameter. String expected, got.*#');
$this->conf->set(array('foo' => 'bar'), 'stuff'); $this->conf->set(['foo' => 'bar'], 'stuff');
} }
/** /**

15
tests/config/ConfigPhpTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Config; namespace Shaarli\Config;
/** /**
@ -37,7 +38,7 @@ public function testRead()
*/ */
public function testReadNonExistent() public function testReadNonExistent()
{ {
$this->assertEquals(array(), $this->configIO->read('nope')); $this->assertEquals([], $this->configIO->read('nope'));
} }
/** /**
@ -60,16 +61,16 @@ public function testReadEmpty()
public function testWriteNew() public function testWriteNew()
{ {
$dataFile = 'tests/utils/config/configWrite.php'; $dataFile = 'tests/utils/config/configWrite.php';
$data = array( $data = [
'login' => 'root', 'login' => 'root',
'redirector' => 'lala', 'redirector' => 'lala',
'config' => array( 'config' => [
'DATASTORE' => 'data/datastore.php', 'DATASTORE' => 'data/datastore.php',
), ],
'plugins' => array( 'plugins' => [
'WALLABAG_VERSION' => '1', 'WALLABAG_VERSION' => '1',
) ]
); ];
$this->configIO->write($dataFile, $data); $this->configIO->write($dataFile, $data);
$expected = '<?php $expected = '<?php
$GLOBALS[\'login\'] = \'root\'; $GLOBALS[\'login\'] = \'root\';

45
tests/config/ConfigPluginTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Config; namespace Shaarli\Config;
use Shaarli\Config\Exception\PluginConfigOrderException; use Shaarli\Config\Exception\PluginConfigOrderException;
@ -35,12 +36,16 @@ public function testSavePluginConfigValid()
mkdir($path = __DIR__ . '/folder'); mkdir($path = __DIR__ . '/folder');
PluginManager::$PLUGINS_PATH = $path; PluginManager::$PLUGINS_PATH = $path;
array_map(function (string $plugin) use ($path) { touch($path . '/' . $plugin); }, $expected); array_map(function (string $plugin) use ($path) {
touch($path . '/' . $plugin);
}, $expected);
$out = save_plugin_config($data); $out = save_plugin_config($data);
$this->assertEquals($expected, $out); $this->assertEquals($expected, $out);
array_map(function (string $plugin) use ($path) { unlink($path . '/' . $plugin); }, $expected); array_map(function (string $plugin) use ($path) {
unlink($path . '/' . $plugin);
}, $expected);
rmdir($path); rmdir($path);
} }
@ -51,13 +56,13 @@ public function testSavePluginConfigInvalid()
{ {
$this->expectException(\Shaarli\Config\Exception\PluginConfigOrderException::class); $this->expectException(\Shaarli\Config\Exception\PluginConfigOrderException::class);
$data = array( $data = [
'plugin2' => 0, 'plugin2' => 0,
'plugin3' => 0, 'plugin3' => 0,
'order_plugin3' => 0, 'order_plugin3' => 0,
'plugin4' => 0, 'plugin4' => 0,
'order_plugin4' => 0, 'order_plugin4' => 0,
); ];
save_plugin_config($data); save_plugin_config($data);
} }
@ -67,7 +72,7 @@ public function testSavePluginConfigInvalid()
*/ */
public function testSavePluginConfigEmpty() public function testSavePluginConfigEmpty()
{ {
$this->assertEquals(array(), save_plugin_config(array())); $this->assertEquals([], save_plugin_config([]));
} }
/** /**
@ -75,14 +80,14 @@ public function testSavePluginConfigEmpty()
*/ */
public function testValidatePluginOrderValid() public function testValidatePluginOrderValid()
{ {
$data = array( $data = [
'order_plugin1' => 2, 'order_plugin1' => 2,
'plugin2' => 0, 'plugin2' => 0,
'plugin3' => 0, 'plugin3' => 0,
'order_plugin3' => 1, 'order_plugin3' => 1,
'plugin4' => 0, 'plugin4' => 0,
'order_plugin4' => 5, 'order_plugin4' => 5,
); ];
$this->assertTrue(validate_plugin_order($data)); $this->assertTrue(validate_plugin_order($data));
} }
@ -92,11 +97,11 @@ public function testValidatePluginOrderValid()
*/ */
public function testValidatePluginOrderInvalid() public function testValidatePluginOrderInvalid()
{ {
$data = array( $data = [
'order_plugin1' => 2, 'order_plugin1' => 2,
'order_plugin3' => 1, 'order_plugin3' => 1,
'order_plugin4' => 1, 'order_plugin4' => 1,
); ];
$this->assertFalse(validate_plugin_order($data)); $this->assertFalse(validate_plugin_order($data));
} }
@ -106,20 +111,20 @@ public function testValidatePluginOrderInvalid()
*/ */
public function testLoadPluginParameterValues() public function testLoadPluginParameterValues()
{ {
$plugins = array( $plugins = [
'plugin_name' => array( 'plugin_name' => [
'parameters' => array( 'parameters' => [
'param1' => array('value' => true), 'param1' => ['value' => true],
'param2' => array('value' => false), 'param2' => ['value' => false],
'param3' => array('value' => ''), 'param3' => ['value' => ''],
) ]
) ]
); ];
$parameters = array( $parameters = [
'param1' => 'value1', 'param1' => 'value1',
'param2' => 'value2', 'param2' => 'value2',
); ];
$result = load_plugin_parameter_values($plugins, $parameters); $result = load_plugin_parameter_values($plugins, $parameters);
$this->assertEquals('value1', $result['plugin_name']['parameters']['param1']['value']); $this->assertEquals('value1', $result['plugin_name']['parameters']['param1']['value']);

2
tests/feed/CachedPageTest.php
View file

@ -1,7 +1,9 @@
<?php <?php
/** /**
* PageCache tests * PageCache tests
*/ */
namespace Shaarli\Feed; namespace Shaarli\Feed;
/** /**

16
tests/feed/FeedBuilderTest.php
View file

@ -66,13 +66,13 @@ public static function setUpBeforeClass(): void
true true
); );
self::$serverInfo = array( self::$serverInfo = [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/index.php', 'SCRIPT_NAME' => '/index.php',
'REQUEST_URI' => '/feed/atom', 'REQUEST_URI' => '/feed/atom',
); ];
} }
/** /**
@ -149,10 +149,10 @@ public function testAtomBuildData()
*/ */
public function testBuildDataFiltered() public function testBuildDataFiltered()
{ {
$criteria = array( $criteria = [
'searchtags' => 'stuff', 'searchtags' => 'stuff',
'searchterm' => 'beard', 'searchterm' => 'beard',
); ];
$feedBuilder = new FeedBuilder( $feedBuilder = new FeedBuilder(
self::$bookmarkService, self::$bookmarkService,
self::$formatter, self::$formatter,
@ -172,9 +172,9 @@ public function testBuildDataFiltered()
*/ */
public function testBuildDataCount() public function testBuildDataCount()
{ {
$criteria = array( $criteria = [
'nb' => '3', 'nb' => '3',
); ];
$feedBuilder = new FeedBuilder( $feedBuilder = new FeedBuilder(
self::$bookmarkService, self::$bookmarkService,
self::$formatter, self::$formatter,
@ -259,13 +259,13 @@ public function testBuildDataHideDates()
*/ */
public function testBuildDataServerSubdir() public function testBuildDataServerSubdir()
{ {
$serverInfo = array( $serverInfo = [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '8080', 'SERVER_PORT' => '8080',
'SCRIPT_NAME' => '/~user/shaarli/index.php', 'SCRIPT_NAME' => '/~user/shaarli/index.php',
'REQUEST_URI' => '/~user/shaarli/feed/atom', 'REQUEST_URI' => '/~user/shaarli/feed/atom',
); ];
$feedBuilder = new FeedBuilder( $feedBuilder = new FeedBuilder(
self::$bookmarkService, self::$bookmarkService,
self::$formatter, self::$formatter,

3
tests/front/ShaarliAdminMiddlewareTest.php
View file

@ -63,7 +63,8 @@ public function testMiddlewareWhileLoggedOut(): void
$response = new Response(); $response = new Response();
/** @var Response $result */ /** @var Response $result */
$result = $this->middleware->__invoke($request, $response, function () {}); $result = $this->middleware->__invoke($request, $response, function () {
});
static::assertSame(302, $result->getStatusCode()); static::assertSame(302, $result->getStatusCode());
static::assertSame( static::assertSame(

5
tests/front/ShaarliMiddlewareTest.php
View file

@ -91,7 +91,7 @@ public function testMiddlewareExecutionWithFrontException(): void
$controller = function (): void { $controller = function (): void {
$exception = new LoginBannedException(); $exception = new LoginBannedException();
throw new $exception; throw new $exception();
}; };
$pageBuilder = $this->createMock(PageBuilder::class); $pageBuilder = $this->createMock(PageBuilder::class);
@ -148,7 +148,8 @@ public function testMiddlewareExecutionWithServerException(): void
return $uri; return $uri;
}); });
$dummyException = new class() extends \Exception {}; $dummyException = new class () extends \Exception {
};
$response = new Response(); $response = new Response();
$controller = function () use ($dummyException): void { $controller = function () use ($dummyException): void {

6
tests/front/controller/admin/ConfigureControllerTest.php
View file

@ -122,8 +122,7 @@ public function testSaveNewConfig(): void
} }
return $parameters[$key]; return $parameters[$key];
} });
);
$response = new Response(); $response = new Response();
@ -137,8 +136,7 @@ public function testSaveNewConfig(): void
} }
static::assertSame($parametersConfigMapping[$key], $value); static::assertSame($parametersConfigMapping[$key], $value);
} });
);
$result = $this->controller->save($request, $response); $result = $this->controller->save($request, $response);
static::assertSame(302, $result->getStatusCode()); static::assertSame(302, $result->getStatusCode());

5
tests/front/controller/admin/ExportControllerTest.php
View file

@ -80,7 +80,10 @@ function (
string $selection, string $selection,
bool $prependNoteUrl, bool $prependNoteUrl,
string $indexUrl string $indexUrl
) use ($parameters, $bookmarks): array { ) use (
$parameters,
$bookmarks
): array {
static::assertInstanceOf(BookmarkRawFormatter::class, $formatter); static::assertInstanceOf(BookmarkRawFormatter::class, $formatter);
static::assertSame($parameters['selection'], $selection); static::assertSame($parameters['selection'], $selection);
static::assertTrue($prependNoteUrl); static::assertTrue($prependNoteUrl);

5
tests/front/controller/admin/ImportControllerTest.php
View file

@ -74,7 +74,10 @@ public function testImportDefault(): void
function ( function (
array $post, array $post,
UploadedFileInterface $file UploadedFileInterface $file
) use ($parameters, $requestFile): string { ) use (
$parameters,
$requestFile
): string {
static::assertSame($parameters, $post); static::assertSame($parameters, $post);
static::assertSame($requestFile, $file); static::assertSame($requestFile, $file);

8
tests/front/controller/admin/PluginsControllerTest.php
View file

@ -29,13 +29,17 @@ public function setUp(): void
mkdir($path = __DIR__ . '/folder'); mkdir($path = __DIR__ . '/folder');
PluginManager::$PLUGINS_PATH = $path; PluginManager::$PLUGINS_PATH = $path;
array_map(function (string $plugin) use ($path) { touch($path . '/' . $plugin); }, static::PLUGIN_NAMES); array_map(function (string $plugin) use ($path) {
touch($path . '/' . $plugin);
}, static::PLUGIN_NAMES);
} }
public function tearDown(): void public function tearDown(): void
{ {
$path = __DIR__ . '/folder'; $path = __DIR__ . '/folder';
array_map(function (string $plugin) use ($path) { unlink($path . '/' . $plugin); }, static::PLUGIN_NAMES); array_map(function (string $plugin) use ($path) {
unlink($path . '/' . $plugin);
}, static::PLUGIN_NAMES);
rmdir($path); rmdir($path);
} }

1
tests/front/controller/admin/ShaarePublishControllerTest/SaveBookmarkTest.php
View file

@ -365,5 +365,4 @@ public function testSaveBookmarkWrongToken(): void
$this->controller->save($request, $response); $this->controller->save($request, $response);
} }
} }

3
tests/front/controller/visitor/BookmarkListControllerTest.php
View file

@ -54,8 +54,7 @@ public function testIndexDefaultFirstPage(): void
(new Bookmark())->setId(1)->setUrl('http://url1.tld')->setTitle('Title 1'), (new Bookmark())->setId(1)->setUrl('http://url1.tld')->setTitle('Title 1'),
(new Bookmark())->setId(2)->setUrl('http://url2.tld')->setTitle('Title 2'), (new Bookmark())->setId(2)->setUrl('http://url2.tld')->setTitle('Title 2'),
(new Bookmark())->setId(3)->setUrl('http://url3.tld')->setTitle('Title 3'), (new Bookmark())->setId(3)->setUrl('http://url3.tld')->setTitle('Title 3'),
], 0, 2) ], 0, 2));
);
$this->container->sessionManager $this->container->sessionManager
->method('getSessionParameter') ->method('getSessionParameter')

7
tests/front/controller/visitor/DailyControllerTest.php
View file

@ -285,7 +285,9 @@ public function testValidIndexControllerInvokeHeightAdjustment(): void
static::assertCount(7, $assignedVariables['linksToDisplay']); static::assertCount(7, $assignedVariables['linksToDisplay']);
$columnIds = function (array $column): array { $columnIds = function (array $column): array {
return array_map(function (array $item): int { return $item['id']; }, $column); return array_map(function (array $item): int {
return $item['id'];
}, $column);
}; };
static::assertSame([1, 4, 6], $columnIds($assignedVariables['cols'][0])); static::assertSame([1, 4, 6], $columnIds($assignedVariables['cols'][0]));
@ -366,8 +368,7 @@ public function testValidRssControllerInvokeDefault(): void
$cachedPage->expects(static::once())->method('cache')->with('dailyrss'); $cachedPage->expects(static::once())->method('cache')->with('dailyrss');
return $cachedPage; return $cachedPage;
} });
);
// Save RainTPL assigned variables // Save RainTPL assigned variables
$assignedVariables = []; $assignedVariables = [];

3
tests/front/controller/visitor/ErrorControllerTest.php
View file

@ -41,7 +41,8 @@ public function testDisplayFrontExceptionError(): void
$result = ($this->controller)( $result = ($this->controller)(
$request, $request,
$response, $response,
new class($message, $errorCode) extends ShaarliFrontException {} new class ($message, $errorCode) extends ShaarliFrontException {
}
); );
static::assertSame($errorCode, $result->getStatusCode()); static::assertSame($errorCode, $result->getStatusCode());

2
tests/front/controller/visitor/FrontControllerMockHelper.php
View file

@ -118,5 +118,5 @@ protected static function generateString(int $length): string
/** /**
* Force to be used in PHPUnit context. * Force to be used in PHPUnit context.
*/ */
protected abstract function isInTestsContext(): bool; abstract protected function isInTestsContext(): bool;
} }

7
tests/helper/ApplicationUtilsTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Helper; namespace Shaarli\Helper;
use Shaarli\Config\ConfigManager; use Shaarli\Config\ConfigManager;
@ -301,7 +302,7 @@ public function testCheckCurrentResourcePermissions()
$conf->set('resource.update_check', 'data/lastupdatecheck.txt'); $conf->set('resource.update_check', 'data/lastupdatecheck.txt');
$this->assertEquals( $this->assertEquals(
array(), [],
ApplicationUtils::checkResourcePermissions($conf) ApplicationUtils::checkResourcePermissions($conf)
); );
} }
@ -324,7 +325,7 @@ public function testCheckCurrentResourcePermissionsErrors()
$conf->set('resource.raintpl_theme', 'null/tpl/default'); $conf->set('resource.raintpl_theme', 'null/tpl/default');
$conf->set('resource.update_check', 'null/data/lastupdatecheck.txt'); $conf->set('resource.update_check', 'null/data/lastupdatecheck.txt');
$this->assertEquals( $this->assertEquals(
array( [
'"null/tpl" directory is not readable', '"null/tpl" directory is not readable',
'"null/tpl/default" directory is not readable', '"null/tpl/default" directory is not readable',
'"null/cache" directory is not readable', '"null/cache" directory is not readable',
@ -335,7 +336,7 @@ public function testCheckCurrentResourcePermissionsErrors()
'"null/pagecache" directory is not writable', '"null/pagecache" directory is not writable',
'"null/tmp" directory is not readable', '"null/tmp" directory is not readable',
'"null/tmp" directory is not writable' '"null/tmp" directory is not writable'
), ],
ApplicationUtils::checkResourcePermissions($conf) ApplicationUtils::checkResourcePermissions($conf)
); );
} }

3
tests/helper/DailyPageHelperTest.php
View file

@ -147,7 +147,8 @@ public function getDescriptionByTypeExceptionUnknownType(): void
/** /**
* @dataProvider getRssLengthsByType * @dataProvider getRssLengthsByType
*/ */
public function testGeRssLengthsByType(string $type): void { public function testGeRssLengthsByType(string $type): void
{
$length = DailyPageHelper::getRssLengthByType($type); $length = DailyPageHelper::getRssLengthByType($type);
static::assertIsInt($length); static::assertIsInt($length);

1
tests/http/HttpUtils/ClientIpIdTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* HttpUtils' tests * HttpUtils' tests
*/ */

1
tests/http/HttpUtils/GetHttpUrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* HttpUtils' tests * HttpUtils' tests
*/ */

24
tests/http/HttpUtils/GetIpAdressFromProxyTest.php
View file

@ -15,7 +15,7 @@ class GetIpAdressFromProxyTest extends \Shaarli\TestCase
*/ */
public function testWithoutProxy() public function testWithoutProxy()
{ {
$this->assertFalse(getIpAddressFromProxy(array(), array())); $this->assertFalse(getIpAddressFromProxy([], []));
} }
/** /**
@ -24,8 +24,8 @@ public function testWithoutProxy()
public function testWithOneForwardedIp() public function testWithOneForwardedIp()
{ {
$ip = '1.1.1.1'; $ip = '1.1.1.1';
$server = array('HTTP_X_FORWARDED_FOR' => $ip); $server = ['HTTP_X_FORWARDED_FOR' => $ip];
$this->assertEquals($ip, getIpAddressFromProxy($server, array())); $this->assertEquals($ip, getIpAddressFromProxy($server, []));
} }
/** /**
@ -36,11 +36,11 @@ public function testWithMultipleForwardedIp()
$ip = '1.1.1.1'; $ip = '1.1.1.1';
$ip2 = '2.2.2.2'; $ip2 = '2.2.2.2';
$server = array('HTTP_X_FORWARDED_FOR' => $ip .','. $ip2); $server = ['HTTP_X_FORWARDED_FOR' => $ip . ',' . $ip2];
$this->assertEquals($ip2, getIpAddressFromProxy($server, array())); $this->assertEquals($ip2, getIpAddressFromProxy($server, []));
$server = array('HTTP_X_FORWARDED_FOR' => $ip .' , '. $ip2); $server = ['HTTP_X_FORWARDED_FOR' => $ip . ' , ' . $ip2];
$this->assertEquals($ip2, getIpAddressFromProxy($server, array())); $this->assertEquals($ip2, getIpAddressFromProxy($server, []));
} }
/** /**
@ -51,11 +51,11 @@ public function testWithTrustedIp()
$ip = '1.1.1.1'; $ip = '1.1.1.1';
$ip2 = '2.2.2.2'; $ip2 = '2.2.2.2';
$server = array('HTTP_X_FORWARDED_FOR' => $ip); $server = ['HTTP_X_FORWARDED_FOR' => $ip];
$this->assertFalse(getIpAddressFromProxy($server, array($ip))); $this->assertFalse(getIpAddressFromProxy($server, [$ip]));
$server = array('HTTP_X_FORWARDED_FOR' => $ip .','. $ip2); $server = ['HTTP_X_FORWARDED_FOR' => $ip . ',' . $ip2];
$this->assertEquals($ip2, getIpAddressFromProxy($server, array($ip))); $this->assertEquals($ip2, getIpAddressFromProxy($server, [$ip]));
$this->assertFalse(getIpAddressFromProxy($server, array($ip, $ip2))); $this->assertFalse(getIpAddressFromProxy($server, [$ip, $ip2]));
} }
} }

33
tests/http/HttpUtils/IndexUrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* HttpUtils' tests * HttpUtils' tests
*/ */
@ -22,24 +23,24 @@ public function testRemoveIndex()
$this->assertEquals( $this->assertEquals(
'http://host.tld/', 'http://host.tld/',
index_url( index_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/index.php' 'SCRIPT_NAME' => '/index.php'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://host.tld/admin/', 'http://host.tld/admin/',
index_url( index_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/admin/index.php' 'SCRIPT_NAME' => '/admin/index.php'
) ]
) )
); );
} }
@ -52,24 +53,24 @@ public function testOtherResource()
$this->assertEquals( $this->assertEquals(
'http://host.tld/page.php', 'http://host.tld/page.php',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/page.php' 'SCRIPT_NAME' => '/page.php'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://host.tld/admin/page.php', 'http://host.tld/admin/page.php',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/admin/page.php' 'SCRIPT_NAME' => '/admin/page.php'
) ]
) )
); );
} }
@ -82,26 +83,26 @@ public function testPageUrlWithRoute()
$this->assertEquals( $this->assertEquals(
'http://host.tld/picture-wall', 'http://host.tld/picture-wall',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/index.php', 'SCRIPT_NAME' => '/index.php',
'REQUEST_URI' => '/picture-wall', 'REQUEST_URI' => '/picture-wall',
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://host.tld/admin/picture-wall', 'http://host.tld/admin/picture-wall',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/admin/index.php', 'SCRIPT_NAME' => '/admin/index.php',
'REQUEST_URI' => '/admin/picture-wall', 'REQUEST_URI' => '/admin/picture-wall',
) ]
) )
); );
} }
@ -114,26 +115,26 @@ public function testPageUrlWithRouteUnderSubfolder()
$this->assertEquals( $this->assertEquals(
'http://host.tld/subfolder/picture-wall', 'http://host.tld/subfolder/picture-wall',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/subfolder/index.php', 'SCRIPT_NAME' => '/subfolder/index.php',
'REQUEST_URI' => '/subfolder/picture-wall', 'REQUEST_URI' => '/subfolder/picture-wall',
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://host.tld/subfolder/admin/picture-wall', 'http://host.tld/subfolder/admin/picture-wall',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/subfolder/admin/index.php', 'SCRIPT_NAME' => '/subfolder/admin/index.php',
'REQUEST_URI' => '/subfolder/admin/picture-wall', 'REQUEST_URI' => '/subfolder/admin/picture-wall',
) ]
) )
); );
} }

8
tests/http/HttpUtils/IndexUrlTestWithConstant.php
View file

@ -25,26 +25,26 @@ public function testIndexUrlWithConstantDefined()
$this->assertEquals( $this->assertEquals(
'http://other-host.tld/subfolder/', 'http://other-host.tld/subfolder/',
index_url( index_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/index.php', 'SCRIPT_NAME' => '/index.php',
'REQUEST_URI' => '/picture-wall', 'REQUEST_URI' => '/picture-wall',
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://other-host.tld/subfolder/', 'http://other-host.tld/subfolder/',
index_url( index_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/admin/index.php', 'SCRIPT_NAME' => '/admin/index.php',
'REQUEST_URI' => '/admin/picture-wall', 'REQUEST_URI' => '/admin/picture-wall',
) ]
) )
); );
} }

17
tests/http/HttpUtils/PageUrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* HttpUtils' tests * HttpUtils' tests
*/ */
@ -20,26 +21,26 @@ public function testRemoveIndex()
$this->assertEquals( $this->assertEquals(
'http://host.tld/?p1=v1&p2=v2', 'http://host.tld/?p1=v1&p2=v2',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/index.php', 'SCRIPT_NAME' => '/index.php',
'QUERY_STRING' => 'p1=v1&p2=v2' 'QUERY_STRING' => 'p1=v1&p2=v2'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://host.tld/admin/?action=edit_tag', 'http://host.tld/admin/?action=edit_tag',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/admin/index.php', 'SCRIPT_NAME' => '/admin/index.php',
'QUERY_STRING' => 'action=edit_tag' 'QUERY_STRING' => 'action=edit_tag'
) ]
) )
); );
} }
@ -52,26 +53,26 @@ public function testOtherResource()
$this->assertEquals( $this->assertEquals(
'http://host.tld/page.php?p1=v1&p2=v2', 'http://host.tld/page.php?p1=v1&p2=v2',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/page.php', 'SCRIPT_NAME' => '/page.php',
'QUERY_STRING' => 'p1=v1&p2=v2' 'QUERY_STRING' => 'p1=v1&p2=v2'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'http://host.tld/admin/page.php?action=edit_tag', 'http://host.tld/admin/page.php?action=edit_tag',
page_url( page_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'SCRIPT_NAME' => '/admin/page.php', 'SCRIPT_NAME' => '/admin/page.php',
'QUERY_STRING' => 'action=edit_tag' 'QUERY_STRING' => 'action=edit_tag'
) ]
) )
); );
} }

57
tests/http/HttpUtils/ServerUrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* HttpUtils' tests * HttpUtils' tests
*/ */
@ -20,22 +21,22 @@ public function testHttpsScheme()
$this->assertEquals( $this->assertEquals(
'https://host.tld', 'https://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'ON', 'HTTPS' => 'ON',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '443' 'SERVER_PORT' => '443'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'https://host.tld:8080', 'https://host.tld:8080',
server_url( server_url(
array( [
'HTTPS' => 'ON', 'HTTPS' => 'ON',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '8080' 'SERVER_PORT' => '8080'
) ]
) )
); );
} }
@ -48,22 +49,22 @@ public function testHttpsProxyForwardedHost()
$this->assertEquals( $this->assertEquals(
'https://host.tld:8080', 'https://host.tld:8080',
server_url( server_url(
array( [
'HTTP_X_FORWARDED_PROTO' => 'https', 'HTTP_X_FORWARDED_PROTO' => 'https',
'HTTP_X_FORWARDED_PORT' => '8080', 'HTTP_X_FORWARDED_PORT' => '8080',
'HTTP_X_FORWARDED_HOST' => 'host.tld' 'HTTP_X_FORWARDED_HOST' => 'host.tld'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'https://host.tld:4974', 'https://host.tld:4974',
server_url( server_url(
array( [
'HTTP_X_FORWARDED_PROTO' => 'https, https', 'HTTP_X_FORWARDED_PROTO' => 'https, https',
'HTTP_X_FORWARDED_PORT' => '4974, 80', 'HTTP_X_FORWARDED_PORT' => '4974, 80',
'HTTP_X_FORWARDED_HOST' => 'host.tld, example.com' 'HTTP_X_FORWARDED_HOST' => 'host.tld, example.com'
) ]
) )
); );
} }
@ -76,51 +77,51 @@ public function testHttpsProxyForward()
$this->assertEquals( $this->assertEquals(
'https://host.tld:8080', 'https://host.tld:8080',
server_url( server_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'https', 'HTTP_X_FORWARDED_PROTO' => 'https',
'HTTP_X_FORWARDED_PORT' => '8080' 'HTTP_X_FORWARDED_PORT' => '8080'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'https://host.tld', 'https://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'https' 'HTTP_X_FORWARDED_PROTO' => 'https'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'https://host.tld', 'https://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'https', 'HTTP_X_FORWARDED_PROTO' => 'https',
'HTTP_X_FORWARDED_PORT' => '443' 'HTTP_X_FORWARDED_PORT' => '443'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'https://host.tld:4974', 'https://host.tld:4974',
server_url( server_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'https, https', 'HTTP_X_FORWARDED_PROTO' => 'https, https',
'HTTP_X_FORWARDED_PORT' => '4974, 80' 'HTTP_X_FORWARDED_PORT' => '4974, 80'
) ]
) )
); );
} }
@ -134,11 +135,11 @@ public function testPort()
$this->assertEquals( $this->assertEquals(
'http://host.tld:8080', 'http://host.tld:8080',
server_url( server_url(
array( [
'HTTPS' => 'OFF', 'HTTPS' => 'OFF',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '8080' 'SERVER_PORT' => '8080'
) ]
) )
); );
@ -146,11 +147,11 @@ public function testPort()
$this->assertEquals( $this->assertEquals(
'https://host.tld:8080', 'https://host.tld:8080',
server_url( server_url(
array( [
'HTTPS' => 'ON', 'HTTPS' => 'ON',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '8080' 'SERVER_PORT' => '8080'
) ]
) )
); );
} }
@ -163,11 +164,11 @@ public function testStandardHttpPort()
$this->assertEquals( $this->assertEquals(
'http://host.tld', 'http://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'OFF', 'HTTPS' => 'OFF',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80' 'SERVER_PORT' => '80'
) ]
) )
); );
} }
@ -180,11 +181,11 @@ public function testStandardHttpsPort()
$this->assertEquals( $this->assertEquals(
'https://host.tld', 'https://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'ON', 'HTTPS' => 'ON',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '443' 'SERVER_PORT' => '443'
) ]
) )
); );
} }
@ -197,26 +198,26 @@ public function testHttpWithPort433()
$this->assertEquals( $this->assertEquals(
'https://host.tld', 'https://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'http', 'HTTP_X_FORWARDED_PROTO' => 'http',
'HTTP_X_FORWARDED_PORT' => '443' 'HTTP_X_FORWARDED_PORT' => '443'
) ]
) )
); );
$this->assertEquals( $this->assertEquals(
'https://host.tld', 'https://host.tld',
server_url( server_url(
array( [
'HTTPS' => 'Off', 'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld', 'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '80', 'SERVER_PORT' => '80',
'HTTP_X_FORWARDED_PROTO' => 'https, http', 'HTTP_X_FORWARDED_PROTO' => 'https, http',
'HTTP_X_FORWARDED_PORT' => '443, 80' 'HTTP_X_FORWARDED_PORT' => '443, 80'
) ]
) )
); );
} }

13
tests/http/MetadataRetrieverTest.php
View file

@ -66,7 +66,12 @@ function (&$charset) use (
->expects(static::once()) ->expects(static::once())
->method('getCurlDownloadCallback') ->method('getCurlDownloadCallback')
->willReturnCallback( ->willReturnCallback(
function (&$charset, &$title, &$description, &$tags) use ( function (
&$charset,
&$title,
&$description,
&$tags
) use (
$remoteCharset, $remoteCharset,
$remoteTitle, $remoteTitle,
$remoteDesc, $remoteDesc,
@ -124,7 +129,8 @@ public function testEmptyRetrieval(): void
->method('getCurlDownloadCallback') ->method('getCurlDownloadCallback')
->willReturnCallback( ->willReturnCallback(
function (): callable { function (): callable {
return function (): void {}; return function (): void {
};
} }
) )
; ;
@ -133,7 +139,8 @@ function (): callable {
->method('getCurlHeaderCallback') ->method('getCurlHeaderCallback')
->willReturnCallback( ->willReturnCallback(
function (): callable { function (): callable {
return function (): void {}; return function (): void {
};
} }
) )
; ;

1
tests/http/UrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* UrlUtils's tests * UrlUtils's tests
*/ */

1
tests/http/UrlUtils/CleanupUrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Unitary tests for cleanup_url() * Unitary tests for cleanup_url()
*/ */

1
tests/http/UrlUtils/GetUrlSchemeTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Unitary tests for get_url_scheme() * Unitary tests for get_url_scheme()
*/ */

3
tests/http/UrlUtils/UnparseUrlTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Unpares UrlUtils's tests * Unpares UrlUtils's tests
*/ */
@ -17,7 +18,7 @@ class UnparseUrlTest extends \Shaarli\TestCase
*/ */
public function testUnparseEmptyArray() public function testUnparseEmptyArray()
{ {
$this->assertEquals('', unparse_url(array())); $this->assertEquals('', unparse_url([]));
} }
/** /**

1
tests/languages/bootstrap.php
View file

@ -1,4 +1,5 @@
<?php <?php
require_once 'tests/bootstrap.php'; require_once 'tests/bootstrap.php';
if (! empty(getenv('UT_LOCALE'))) { if (! empty(getenv('UT_LOCALE'))) {

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

@ -1,6 +1,5 @@
<?php <?php
namespace Shaarli; namespace Shaarli;
use Shaarli\Config\ConfigManager; use Shaarli\Config\ConfigManager;

1
tests/legacy/LegacyDummyUpdater.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Updater; namespace Shaarli\Updater;
use Exception; use Exception;

37
tests/legacy/LegacyLinkDBTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Link datastore tests * Link datastore tests
*/ */
@ -118,7 +119,7 @@ public function testCheckDBNew()
$this->assertFileNotExists(self::$testDatastore); $this->assertFileNotExists(self::$testDatastore);
$checkDB = self::getMethod('check'); $checkDB = self::getMethod('check');
$checkDB->invokeArgs($linkDB, array()); $checkDB->invokeArgs($linkDB, []);
$this->assertFileExists(self::$testDatastore); $this->assertFileExists(self::$testDatastore);
// ensure the correct data has been written // ensure the correct data has been written
@ -135,7 +136,7 @@ public function testCheckDBLoad()
$this->assertGreaterThan(0, $datastoreSize); $this->assertGreaterThan(0, $datastoreSize);
$checkDB = self::getMethod('check'); $checkDB = self::getMethod('check');
$checkDB->invokeArgs($linkDB, array()); $checkDB->invokeArgs($linkDB, []);
// ensure the datastore is left unmodified // ensure the datastore is left unmodified
$this->assertEquals( $this->assertEquals(
@ -185,7 +186,7 @@ public function testSave()
$testDB = new LegacyLinkDB(self::$testDatastore, true, false); $testDB = new LegacyLinkDB(self::$testDatastore, true, false);
$dbSize = sizeof($testDB); $dbSize = sizeof($testDB);
$link = array( $link = [
'id' => 43, 'id' => 43,
'title' => 'an additional link', 'title' => 'an additional link',
'url' => 'http://dum.my', 'url' => 'http://dum.my',
@ -193,7 +194,7 @@ public function testSave()
'private' => 0, 'private' => 0,
'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20150518_190000'), 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, '20150518_190000'),
'tags' => 'unit test' 'tags' => 'unit test'
); ];
$testDB[$link['id']] = $link; $testDB[$link['id']] = $link;
$testDB->save('tests'); $testDB->save('tests');
@ -239,12 +240,12 @@ public function testCountHiddenPublic()
public function testDays() public function testDays()
{ {
$this->assertEquals( $this->assertEquals(
array('20100309', '20100310', '20121206', '20121207', '20130614', '20150310'), ['20100309', '20100310', '20121206', '20121207', '20130614', '20150310'],
self::$publicLinkDB->days() self::$publicLinkDB->days()
); );
$this->assertEquals( $this->assertEquals(
array('20100309', '20100310', '20121206', '20121207', '20130614', '20141125', '20150310'), ['20100309', '20100310', '20121206', '20121207', '20130614', '20141125', '20150310'],
self::$privateLinkDB->days() self::$privateLinkDB->days()
); );
} }
@ -280,7 +281,7 @@ public function testGetUnknownLinkFromURL()
public function testAllTags() public function testAllTags()
{ {
$this->assertEquals( $this->assertEquals(
array( [
'web' => 3, 'web' => 3,
'cartoon' => 2, 'cartoon' => 2,
'gnu' => 2, 'gnu' => 2,
@ -300,12 +301,12 @@ public function testAllTags()
'coding-style' => 1, 'coding-style' => 1,
'quality' => 1, 'quality' => 1,
'standards' => 1, 'standards' => 1,
), ],
self::$publicLinkDB->linksCountPerTag() self::$publicLinkDB->linksCountPerTag()
); );
$this->assertEquals( $this->assertEquals(
array( [
'web' => 4, 'web' => 4,
'cartoon' => 3, 'cartoon' => 3,
'gnu' => 2, 'gnu' => 2,
@ -332,11 +333,11 @@ public function testAllTags()
'coding-style' => 1, 'coding-style' => 1,
'quality' => 1, 'quality' => 1,
'standards' => 1, 'standards' => 1,
), ],
self::$privateLinkDB->linksCountPerTag() self::$privateLinkDB->linksCountPerTag()
); );
$this->assertEquals( $this->assertEquals(
array( [
'web' => 4, 'web' => 4,
'cartoon' => 2, 'cartoon' => 2,
'gnu' => 1, 'gnu' => 1,
@ -349,17 +350,17 @@ public function testAllTags()
'Mercurial' => 1, 'Mercurial' => 1,
'.hidden' => 1, '.hidden' => 1,
'hashtag' => 1, 'hashtag' => 1,
), ],
self::$privateLinkDB->linksCountPerTag(['web']) self::$privateLinkDB->linksCountPerTag(['web'])
); );
$this->assertEquals( $this->assertEquals(
array( [
'web' => 1, 'web' => 1,
'html' => 1, 'html' => 1,
'w3c' => 1, 'w3c' => 1,
'css' => 1, 'css' => 1,
'Mercurial' => 1, 'Mercurial' => 1,
), ],
self::$privateLinkDB->linksCountPerTag(['web'], 'private') self::$privateLinkDB->linksCountPerTag(['web'], 'private')
); );
} }
@ -370,7 +371,7 @@ public function testAllTags()
public function testFilterString() public function testFilterString()
{ {
$tags = 'dev cartoon'; $tags = 'dev cartoon';
$request = array('searchtags' => $tags); $request = ['searchtags' => $tags];
$this->assertEquals( $this->assertEquals(
2, 2,
count(self::$privateLinkDB->filterSearch($request, true, false)) count(self::$privateLinkDB->filterSearch($request, true, false))
@ -382,8 +383,8 @@ public function testFilterString()
*/ */
public function testFilterArray() public function testFilterArray()
{ {
$tags = array('dev', 'cartoon'); $tags = ['dev', 'cartoon'];
$request = array('searchtags' => $tags); $request = ['searchtags' => $tags];
$this->assertEquals( $this->assertEquals(
2, 2,
count(self::$privateLinkDB->filterSearch($request, true, false)) count(self::$privateLinkDB->filterSearch($request, true, false))
@ -397,7 +398,7 @@ public function testFilterArray()
public function testHiddenTags() public function testHiddenTags()
{ {
$tags = '.hidden'; $tags = '.hidden';
$request = array('searchtags' => $tags); $request = ['searchtags' => $tags];
$this->assertEquals( $this->assertEquals(
1, 1,
count(self::$privateLinkDB->filterSearch($request, true, false)) count(self::$privateLinkDB->filterSearch($request, true, false))

8
tests/legacy/LegacyLinkFilterTest.php
View file

@ -450,28 +450,28 @@ public function testFilterCrossedSearch()
1, 1,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT, LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT,
array($tags, $terms) [$tags, $terms]
)) ))
); );
$this->assertEquals( $this->assertEquals(
2, 2,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT, LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT,
array('', $terms) ['', $terms]
)) ))
); );
$this->assertEquals( $this->assertEquals(
1, 1,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT, LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT,
array(false, 'PSR-2') [false, 'PSR-2']
)) ))
); );
$this->assertEquals( $this->assertEquals(
1, 1,
count(self::$linkFilter->filter( count(self::$linkFilter->filter(
LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT, LegacyLinkFilter::$FILTER_TAG | LegacyLinkFilter::$FILTER_TEXT,
array($tags, '') [$tags, '']
)) ))
); );
$this->assertEquals( $this->assertEquals(

89
tests/legacy/LegacyUpdaterTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Updater; namespace Shaarli\Updater;
use DateTime; use DateTime;
@ -51,10 +52,10 @@ protected function setUp(): void
*/ */
public function testReadEmptyUpdatesFile() public function testReadEmptyUpdatesFile()
{ {
$this->assertEquals(array(), UpdaterUtils::readUpdatesFile('')); $this->assertEquals([], UpdaterUtils::readUpdatesFile(''));
$updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt'; $updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt';
touch($updatesFile); touch($updatesFile);
$this->assertEquals(array(), UpdaterUtils::readUpdatesFile($updatesFile)); $this->assertEquals([], UpdaterUtils::readUpdatesFile($updatesFile));
unlink($updatesFile); unlink($updatesFile);
} }
@ -64,7 +65,7 @@ public function testReadEmptyUpdatesFile()
public function testReadWriteUpdatesFile() public function testReadWriteUpdatesFile()
{ {
$updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt'; $updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt';
$updatesMethods = array('m1', 'm2', 'm3'); $updatesMethods = ['m1', 'm2', 'm3'];
UpdaterUtils::writeUpdatesFile($updatesFile, $updatesMethods); UpdaterUtils::writeUpdatesFile($updatesFile, $updatesMethods);
$readMethods = UpdaterUtils::readUpdatesFile($updatesFile); $readMethods = UpdaterUtils::readUpdatesFile($updatesFile);
@ -86,7 +87,7 @@ public function testWriteEmptyUpdatesFile()
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$this->expectExceptionMessageRegExp('/Updates file path is not set(.*)/'); $this->expectExceptionMessageRegExp('/Updates file path is not set(.*)/');
UpdaterUtils::writeUpdatesFile('', array('test')); UpdaterUtils::writeUpdatesFile('', ['test']);
} }
/** /**
@ -101,7 +102,7 @@ public function testWriteUpdatesFileNotWritable()
touch($updatesFile); touch($updatesFile);
chmod($updatesFile, 0444); chmod($updatesFile, 0444);
try { try {
@UpdaterUtils::writeUpdatesFile($updatesFile, array('test')); @UpdaterUtils::writeUpdatesFile($updatesFile, ['test']);
} catch (Exception $e) { } catch (Exception $e) {
unlink($updatesFile); unlink($updatesFile);
throw $e; throw $e;
@ -115,17 +116,17 @@ public function testWriteUpdatesFileNotWritable()
*/ */
public function testNoUpdates() public function testNoUpdates()
{ {
$updates = array( $updates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy2', 'updateMethodDummy2',
'updateMethodDummy3', 'updateMethodDummy3',
'updateMethodException', 'updateMethodException',
); ];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$this->assertEquals(array(), $updater->update()); $this->assertEquals([], $updater->update());
$updater = new DummyUpdater(array(), array(), $this->conf, false); $updater = new DummyUpdater([], [], $this->conf, false);
$this->assertEquals(array(), $updater->update()); $this->assertEquals([], $updater->update());
} }
/** /**
@ -133,13 +134,13 @@ public function testNoUpdates()
*/ */
public function testUpdatesFirstTime() public function testUpdatesFirstTime()
{ {
$updates = array('updateMethodException',); $updates = ['updateMethodException',];
$expectedUpdates = array( $expectedUpdates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy2', 'updateMethodDummy2',
'updateMethodDummy3', 'updateMethodDummy3',
); ];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$this->assertEquals($expectedUpdates, $updater->update()); $this->assertEquals($expectedUpdates, $updater->update());
} }
@ -148,14 +149,14 @@ public function testUpdatesFirstTime()
*/ */
public function testOneUpdate() public function testOneUpdate()
{ {
$updates = array( $updates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy3', 'updateMethodDummy3',
'updateMethodException', 'updateMethodException',
); ];
$expectedUpdate = array('updateMethodDummy2'); $expectedUpdate = ['updateMethodDummy2'];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$this->assertEquals($expectedUpdate, $updater->update()); $this->assertEquals($expectedUpdate, $updater->update());
} }
@ -166,13 +167,13 @@ public function testUpdateFailed()
{ {
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$updates = array( $updates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy2', 'updateMethodDummy2',
'updateMethodDummy3', 'updateMethodDummy3',
); ];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$updater->update(); $updater->update();
} }
@ -197,7 +198,7 @@ public function testUpdateMergeDeprecatedConfig()
$this->conf->setConfigFile('tests/updater/config'); $this->conf->setConfigFile('tests/updater/config');
// merge configs // merge configs
$updater = new LegacyUpdater(array(), array(), $this->conf, true); $updater = new LegacyUpdater([], [], $this->conf, true);
// This writes a new config file in tests/updater/config.php // This writes a new config file in tests/updater/config.php
$updater->updateMethodMergeDeprecatedConfigFile(); $updater->updateMethodMergeDeprecatedConfigFile();
@ -214,7 +215,7 @@ public function testUpdateMergeDeprecatedConfig()
*/ */
public function testMergeDeprecatedConfigNoFile() public function testMergeDeprecatedConfigNoFile()
{ {
$updater = new LegacyUpdater(array(), array(), $this->conf, true); $updater = new LegacyUpdater([], [], $this->conf, true);
$updater->updateMethodMergeDeprecatedConfigFile(); $updater->updateMethodMergeDeprecatedConfigFile();
$this->assertEquals('root', $this->conf->get('credentials.login')); $this->assertEquals('root', $this->conf->get('credentials.login'));
@ -229,10 +230,10 @@ public function testRenameDashTags()
$refDB->write(self::$testDatastore); $refDB->write(self::$testDatastore);
$linkDB = new LegacyLinkDB(self::$testDatastore, true, false); $linkDB = new LegacyLinkDB(self::$testDatastore, true, false);
$this->assertEmpty($linkDB->filterSearch(array('searchtags' => 'exclude'))); $this->assertEmpty($linkDB->filterSearch(['searchtags' => 'exclude']));
$updater = new LegacyUpdater(array(), $linkDB, $this->conf, true); $updater = new LegacyUpdater([], $linkDB, $this->conf, true);
$updater->updateMethodRenameDashTags(); $updater->updateMethodRenameDashTags();
$this->assertNotEmpty($linkDB->filterSearch(array('searchtags' => 'exclude'))); $this->assertNotEmpty($linkDB->filterSearch(['searchtags' => 'exclude']));
} }
/** /**
@ -247,7 +248,7 @@ public function testConfigToJson()
// The ConfigIO is initialized with ConfigPhp. // The ConfigIO is initialized with ConfigPhp.
$this->assertTrue($this->conf->getConfigIO() instanceof ConfigPhp); $this->assertTrue($this->conf->getConfigIO() instanceof ConfigPhp);
$updater = new LegacyUpdater(array(), array(), $this->conf, false); $updater = new LegacyUpdater([], [], $this->conf, false);
$done = $updater->updateMethodConfigToJson(); $done = $updater->updateMethodConfigToJson();
$this->assertTrue($done); $this->assertTrue($done);
@ -272,7 +273,7 @@ public function testConfigToJson()
public function testConfigToJsonNothingToDo() public function testConfigToJsonNothingToDo()
{ {
$filetime = filemtime($this->conf->getConfigFileExt()); $filetime = filemtime($this->conf->getConfigFileExt());
$updater = new LegacyUpdater(array(), array(), $this->conf, false); $updater = new LegacyUpdater([], [], $this->conf, false);
$done = $updater->updateMethodConfigToJson(); $done = $updater->updateMethodConfigToJson();
$this->assertTrue($done); $this->assertTrue($done);
$expected = filemtime($this->conf->getConfigFileExt()); $expected = filemtime($this->conf->getConfigFileExt());
@ -291,7 +292,7 @@ public function testEscapeConfig()
$headerLink = '<script>alert("header_link");</script>'; $headerLink = '<script>alert("header_link");</script>';
$this->conf->set('general.title', $title); $this->conf->set('general.title', $title);
$this->conf->set('general.header_link', $headerLink); $this->conf->set('general.header_link', $headerLink);
$updater = new LegacyUpdater(array(), array(), $this->conf, true); $updater = new LegacyUpdater([], [], $this->conf, true);
$done = $updater->updateMethodEscapeUnescapedConfig(); $done = $updater->updateMethodEscapeUnescapedConfig();
$this->assertTrue($done); $this->assertTrue($done);
$this->conf->reload(); $this->conf->reload();
@ -308,7 +309,7 @@ public function testUpdateApiSettings()
$confFile = 'sandbox/config'; $confFile = 'sandbox/config';
copy(self::$configFile . '.json.php', $confFile . '.json.php'); copy(self::$configFile . '.json.php', $confFile . '.json.php');
$conf = new ConfigManager($confFile); $conf = new ConfigManager($confFile);
$updater = new LegacyUpdater(array(), array(), $conf, true); $updater = new LegacyUpdater([], [], $conf, true);
$this->assertFalse($conf->exists('api.enabled')); $this->assertFalse($conf->exists('api.enabled'));
$this->assertFalse($conf->exists('api.secret')); $this->assertFalse($conf->exists('api.secret'));
@ -329,7 +330,7 @@ public function testUpdateApiSettingsNothingToDo()
$conf = new ConfigManager($confFile); $conf = new ConfigManager($confFile);
$conf->set('api.enabled', false); $conf->set('api.enabled', false);
$conf->set('api.secret', ''); $conf->set('api.secret', '');
$updater = new LegacyUpdater(array(), array(), $conf, true); $updater = new LegacyUpdater([], [], $conf, true);
$updater->updateMethodApiSettings(); $updater->updateMethodApiSettings();
$this->assertFalse($conf->get('api.enabled')); $this->assertFalse($conf->get('api.enabled'));
$this->assertEmpty($conf->get('api.secret')); $this->assertEmpty($conf->get('api.secret'));
@ -341,8 +342,8 @@ public function testUpdateApiSettingsNothingToDo()
*/ */
public function testDatastoreIds() public function testDatastoreIds()
{ {
$links = array( $links = [
'20121206_182539' => array( '20121206_182539' => [
'linkdate' => '20121206_182539', 'linkdate' => '20121206_182539',
'title' => 'Geek and Poke', 'title' => 'Geek and Poke',
'url' => 'http://geek-and-poke.com/', 'url' => 'http://geek-and-poke.com/',
@ -350,24 +351,24 @@ public function testDatastoreIds()
'tags' => 'dev cartoon tag1 tag2 tag3 tag4 ', 'tags' => 'dev cartoon tag1 tag2 tag3 tag4 ',
'updated' => '20121206_190301', 'updated' => '20121206_190301',
'private' => false, 'private' => false,
), ],
'20121206_172539' => array( '20121206_172539' => [
'linkdate' => '20121206_172539', 'linkdate' => '20121206_172539',
'title' => 'UserFriendly - Samba', 'title' => 'UserFriendly - Samba',
'url' => 'http://ars.userfriendly.org/cartoons/?id=20010306', 'url' => 'http://ars.userfriendly.org/cartoons/?id=20010306',
'description' => '', 'description' => '',
'tags' => 'samba cartoon web', 'tags' => 'samba cartoon web',
'private' => false, 'private' => false,
), ],
'20121206_142300' => array( '20121206_142300' => [
'linkdate' => '20121206_142300', 'linkdate' => '20121206_142300',
'title' => 'UserFriendly - Web Designer', 'title' => 'UserFriendly - Web Designer',
'url' => 'http://ars.userfriendly.org/cartoons/?id=20121206', 'url' => 'http://ars.userfriendly.org/cartoons/?id=20121206',
'description' => 'Naming conventions... #private', 'description' => 'Naming conventions... #private',
'tags' => 'samba cartoon web', 'tags' => 'samba cartoon web',
'private' => true, 'private' => true,
), ],
); ];
$refDB = new \ReferenceLinkDB(true); $refDB = new \ReferenceLinkDB(true);
$refDB->setLinks($links); $refDB->setLinks($links);
$refDB->write(self::$testDatastore); $refDB->write(self::$testDatastore);
@ -378,7 +379,7 @@ public function testDatastoreIds()
$this->conf->set('resource.data_dir', 'sandbox'); $this->conf->set('resource.data_dir', 'sandbox');
$this->conf->set('resource.datastore', self::$testDatastore); $this->conf->set('resource.datastore', self::$testDatastore);
$updater = new LegacyUpdater(array(), $linkDB, $this->conf, true); $updater = new LegacyUpdater([], $linkDB, $this->conf, true);
$this->assertTrue($updater->updateMethodDatastoreIds()); $this->assertTrue($updater->updateMethodDatastoreIds());
$linkDB = new LegacyLinkDB(self::$testDatastore, true, false); $linkDB = new LegacyLinkDB(self::$testDatastore, true, false);
@ -445,7 +446,7 @@ public function testDatastoreIdsNothingToDo()
$this->conf->set('resource.datastore', self::$testDatastore); $this->conf->set('resource.datastore', self::$testDatastore);
$checksum = hash_file('sha1', self::$testDatastore); $checksum = hash_file('sha1', self::$testDatastore);
$updater = new LegacyUpdater(array(), $linkDB, $this->conf, true); $updater = new LegacyUpdater([], $linkDB, $this->conf, true);
$this->assertTrue($updater->updateMethodDatastoreIds()); $this->assertTrue($updater->updateMethodDatastoreIds());
$this->assertEquals($checksum, hash_file('sha1', self::$testDatastore)); $this->assertEquals($checksum, hash_file('sha1', self::$testDatastore));
} }
@ -786,7 +787,7 @@ public function testUpdateStickyValid()
$refDB->write(self::$testDatastore); $refDB->write(self::$testDatastore);
$linkDB = new LegacyLinkDB(self::$testDatastore, true, false); $linkDB = new LegacyLinkDB(self::$testDatastore, true, false);
$updater = new LegacyUpdater(array(), $linkDB, $this->conf, true); $updater = new LegacyUpdater([], $linkDB, $this->conf, true);
$this->assertTrue($updater->updateMethodSetSticky()); $this->assertTrue($updater->updateMethodSetSticky());
$linkDB = new LegacyLinkDB(self::$testDatastore, true, false); $linkDB = new LegacyLinkDB(self::$testDatastore, true, false);
@ -817,7 +818,7 @@ public function testUpdateStickyNothingToDo()
$refDB->write(self::$testDatastore); $refDB->write(self::$testDatastore);
$linkDB = new LegacyLinkDB(self::$testDatastore, true, false); $linkDB = new LegacyLinkDB(self::$testDatastore, true, false);
$updater = new LegacyUpdater(array(), $linkDB, $this->conf, true); $updater = new LegacyUpdater([], $linkDB, $this->conf, true);
$this->assertTrue($updater->updateMethodSetSticky()); $this->assertTrue($updater->updateMethodSetSticky());
$linkDB = new LegacyLinkDB(self::$testDatastore, true, false); $linkDB = new LegacyLinkDB(self::$testDatastore, true, false);

32
tests/netscape/BookmarkImportTest.php
View file

@ -365,7 +365,7 @@ public function testImportDefaultPrivacyNoPost()
*/ */
public function testImportKeepPrivacy() public function testImportKeepPrivacy()
{ {
$post = array('privacy' => 'default'); $post = ['privacy' => 'default'];
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
@ -408,7 +408,7 @@ public function testImportKeepPrivacy()
*/ */
public function testImportAsPublic() public function testImportAsPublic()
{ {
$post = array('privacy' => 'public'); $post = ['privacy' => 'public'];
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
@ -426,7 +426,7 @@ public function testImportAsPublic()
*/ */
public function testImportAsPrivate() public function testImportAsPrivate()
{ {
$post = array('privacy' => 'private'); $post = ['privacy' => 'private'];
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
@ -447,7 +447,7 @@ public function testOverwriteAsPublic()
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
// import bookmarks as private // import bookmarks as private
$post = array('privacy' => 'private'); $post = ['privacy' => 'private'];
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
. ' 2 bookmarks imported, 0 bookmarks overwritten, 0 bookmarks skipped.', . ' 2 bookmarks imported, 0 bookmarks overwritten, 0 bookmarks skipped.',
@ -459,10 +459,10 @@ public function testOverwriteAsPublic()
$this->assertTrue($this->bookmarkService->get(1)->isPrivate()); $this->assertTrue($this->bookmarkService->get(1)->isPrivate());
// re-import as public, enable overwriting // re-import as public, enable overwriting
$post = array( $post = [
'privacy' => 'public', 'privacy' => 'public',
'overwrite' => 'true' 'overwrite' => 'true'
); ];
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
. ' 2 bookmarks imported, 2 bookmarks overwritten, 0 bookmarks skipped.', . ' 2 bookmarks imported, 2 bookmarks overwritten, 0 bookmarks skipped.',
@ -482,7 +482,7 @@ public function testOverwriteAsPrivate()
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
// import bookmarks as public // import bookmarks as public
$post = array('privacy' => 'public'); $post = ['privacy' => 'public'];
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
. ' 2 bookmarks imported, 0 bookmarks overwritten, 0 bookmarks skipped.', . ' 2 bookmarks imported, 0 bookmarks overwritten, 0 bookmarks skipped.',
@ -494,10 +494,10 @@ public function testOverwriteAsPrivate()
$this->assertFalse($this->bookmarkService->get(1)->isPrivate()); $this->assertFalse($this->bookmarkService->get(1)->isPrivate());
// re-import as private, enable overwriting // re-import as private, enable overwriting
$post = array( $post = [
'privacy' => 'private', 'privacy' => 'private',
'overwrite' => 'true' 'overwrite' => 'true'
); ];
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
. ' 2 bookmarks imported, 2 bookmarks overwritten, 0 bookmarks skipped.', . ' 2 bookmarks imported, 2 bookmarks overwritten, 0 bookmarks skipped.',
@ -514,7 +514,7 @@ public function testOverwriteAsPrivate()
*/ */
public function testSkipOverwrite() public function testSkipOverwrite()
{ {
$post = array('privacy' => 'public'); $post = ['privacy' => 'public'];
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
@ -525,7 +525,7 @@ public function testSkipOverwrite()
$this->assertEquals(0, $this->bookmarkService->count(BookmarkFilter::$PRIVATE)); $this->assertEquals(0, $this->bookmarkService->count(BookmarkFilter::$PRIVATE));
// re-import as private, DO NOT enable overwriting // re-import as private, DO NOT enable overwriting
$post = array('privacy' => 'private'); $post = ['privacy' => 'private'];
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
. ' 0 bookmarks imported, 0 bookmarks overwritten, 2 bookmarks skipped.', . ' 0 bookmarks imported, 0 bookmarks overwritten, 2 bookmarks skipped.',
@ -540,10 +540,10 @@ public function testSkipOverwrite()
*/ */
public function testSetDefaultTags() public function testSetDefaultTags()
{ {
$post = array( $post = [
'privacy' => 'public', 'privacy' => 'public',
'default_tags' => 'tag1 tag2 tag3' 'default_tags' => 'tag1 tag2 tag3'
); ];
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
@ -561,10 +561,10 @@ public function testSetDefaultTags()
*/ */
public function testSanitizeDefaultTags() public function testSanitizeDefaultTags()
{ {
$post = array( $post = [
'privacy' => 'public', 'privacy' => 'public',
'default_tags' => 'tag1& tag2 "tag3"' 'default_tags' => 'tag1& tag2 "tag3"'
); ];
$files = file2array('netscape_basic.htm'); $files = file2array('netscape_basic.htm');
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:' 'File netscape_basic.htm (482 bytes) was successfully processed in %d seconds:'
@ -631,7 +631,7 @@ public function testImportSameDate()
$this->assertStringMatchesFormat( $this->assertStringMatchesFormat(
'File same_date.htm (453 bytes) was successfully processed in %d seconds:' 'File same_date.htm (453 bytes) was successfully processed in %d seconds:'
. ' 3 bookmarks imported, 0 bookmarks overwritten, 0 bookmarks skipped.', . ' 3 bookmarks imported, 0 bookmarks overwritten, 0 bookmarks skipped.',
$this->netscapeBookmarkUtils->import(array(), $files) $this->netscapeBookmarkUtils->import([], $files)
); );
$this->assertEquals(3, $this->bookmarkService->count()); $this->assertEquals(3, $this->bookmarkService->count());
$this->assertEquals(0, $this->bookmarkService->count(BookmarkFilter::$PRIVATE)); $this->assertEquals(0, $this->bookmarkService->count(BookmarkFilter::$PRIVATE));

7
tests/plugins/PluginAddlinkTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Addlink; namespace Shaarli\Plugin\Addlink;
use Shaarli\Plugin\PluginManager; use Shaarli\Plugin\PluginManager;
@ -25,7 +26,7 @@ protected function setUp(): void
public function testAddlinkHeaderLoggedIn() public function testAddlinkHeaderLoggedIn()
{ {
$str = 'stuff'; $str = 'stuff';
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = TemplatePage::LINKLIST; $data['_PAGE_'] = TemplatePage::LINKLIST;
$data['_LOGGEDIN_'] = true; $data['_LOGGEDIN_'] = true;
$data['_BASE_PATH_'] = '/subfolder'; $data['_BASE_PATH_'] = '/subfolder';
@ -34,7 +35,7 @@ public function testAddlinkHeaderLoggedIn()
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertEquals(1, count($data['fields_toolbar'])); $this->assertEquals(1, count($data['fields_toolbar']));
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = $str; $data['_PAGE_'] = $str;
$data['_LOGGEDIN_'] = true; $data['_LOGGEDIN_'] = true;
$data['_BASE_PATH_'] = '/subfolder'; $data['_BASE_PATH_'] = '/subfolder';
@ -50,7 +51,7 @@ public function testAddlinkHeaderLoggedIn()
public function testAddlinkHeaderLoggedOut() public function testAddlinkHeaderLoggedOut()
{ {
$str = 'stuff'; $str = 'stuff';
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = TemplatePage::LINKLIST; $data['_PAGE_'] = TemplatePage::LINKLIST;
$data['_LOGGEDIN_'] = false; $data['_LOGGEDIN_'] = false;
$data['_BASE_PATH_'] = '/subfolder'; $data['_BASE_PATH_'] = '/subfolder';

44
tests/plugins/PluginArchiveorgTest.php
View file

@ -47,16 +47,16 @@ public function testArchiveorgLinklistOnExternalLinks(): void
{ {
$str = 'http://randomstr.com/test'; $str = 'http://randomstr.com/test';
$data = array( $data = [
'title' => $str, 'title' => $str,
'links' => array( 'links' => [
array( [
'url' => $str, 'url' => $str,
'private' => 0, 'private' => 0,
'real_url' => $str 'real_url' => $str
) ]
) ]
); ];
$data = hook_archiveorg_render_linklist($data); $data = hook_archiveorg_render_linklist($data);
@ -84,41 +84,41 @@ public function testArchiveorgLinklistOnInternalLinks(): void
$internalLink3 = 'http://shaarli.shaarli/shaare/z7u-_Q'; $internalLink3 = 'http://shaarli.shaarli/shaare/z7u-_Q';
$internalLinkRealURL3 = '/shaare/z7u-_Q'; $internalLinkRealURL3 = '/shaare/z7u-_Q';
$data = array( $data = [
'title' => $internalLink1, 'title' => $internalLink1,
'links' => array( 'links' => [
array( [
'url' => $internalLink1, 'url' => $internalLink1,
'private' => 0, 'private' => 0,
'real_url' => $internalLinkRealURL1 'real_url' => $internalLinkRealURL1
), ],
array( [
'url' => $internalLink1, 'url' => $internalLink1,
'private' => 1, 'private' => 1,
'real_url' => $internalLinkRealURL1 'real_url' => $internalLinkRealURL1
), ],
array( [
'url' => $internalLink2, 'url' => $internalLink2,
'private' => 0, 'private' => 0,
'real_url' => $internalLinkRealURL2 'real_url' => $internalLinkRealURL2
), ],
array( [
'url' => $internalLink2, 'url' => $internalLink2,
'private' => 1, 'private' => 1,
'real_url' => $internalLinkRealURL2 'real_url' => $internalLinkRealURL2
), ],
array( [
'url' => $internalLink3, 'url' => $internalLink3,
'private' => 0, 'private' => 0,
'real_url' => $internalLinkRealURL3 'real_url' => $internalLinkRealURL3
), ],
array( [
'url' => $internalLink3, 'url' => $internalLink3,
'private' => 1, 'private' => 1,
'real_url' => $internalLinkRealURL3 'real_url' => $internalLinkRealURL3
) ]
) ]
); ];
$data = hook_archiveorg_render_linklist($data); $data = hook_archiveorg_render_linklist($data);

41
tests/plugins/PluginIssoTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Isso; namespace Shaarli\Plugin\Isso;
use DateTime; use DateTime;
@ -55,16 +56,16 @@ public function testIssoDisplayed(): void
$str = 'http://randomstr.com/test'; $str = 'http://randomstr.com/test';
$date = '20161118_100001'; $date = '20161118_100001';
$data = array( $data = [
'title' => $str, 'title' => $str,
'links' => array( 'links' => [
array( [
'id' => 12, 'id' => 12,
'url' => $str, 'url' => $str,
'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date), 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date),
) ]
) ]
); ];
$data = hook_isso_render_linklist($data, $conf); $data = hook_isso_render_linklist($data, $conf);
@ -96,23 +97,23 @@ public function testIssoMultipleLinks(): void
$str = 'http://randomstr.com/test'; $str = 'http://randomstr.com/test';
$date1 = '20161118_100001'; $date1 = '20161118_100001';
$date2 = '20161118_100002'; $date2 = '20161118_100002';
$data = array( $data = [
'title' => $str, 'title' => $str,
'links' => array( 'links' => [
array( [
'id' => 12, 'id' => 12,
'url' => $str, 'url' => $str,
'shorturl' => $short1 = 'abcd', 'shorturl' => $short1 = 'abcd',
'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date1), 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date1),
), ],
array( [
'id' => 13, 'id' => 13,
'url' => $str . '2', 'url' => $str . '2',
'shorturl' => $short2 = 'efgh', 'shorturl' => $short2 = 'efgh',
'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date2), 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date2),
), ],
) ]
); ];
$processed = hook_isso_render_linklist($data, $conf); $processed = hook_isso_render_linklist($data, $conf);
// link_plugin should be added for the icon // link_plugin should be added for the icon
@ -130,18 +131,18 @@ public function testIssoNotDisplayedWhenSearch(): void
$str = 'http://randomstr.com/test'; $str = 'http://randomstr.com/test';
$date = '20161118_100001'; $date = '20161118_100001';
$data = array( $data = [
'title' => $str, 'title' => $str,
'links' => array( 'links' => [
array( [
'id' => 12, 'id' => 12,
'url' => $str, 'url' => $str,
'shorturl' => $short1 = 'abcd', 'shorturl' => $short1 = 'abcd',
'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date), 'created' => DateTime::createFromFormat(Bookmark::LINK_DATE_FORMAT, $date),
) ]
), ],
'search_term' => $str 'search_term' => $str
); ];
$processed = hook_isso_render_linklist($data, $conf); $processed = hook_isso_render_linklist($data, $conf);

9
tests/plugins/PluginPlayvideosTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Playvideos; namespace Shaarli\Plugin\Playvideos;
/** /**
@ -30,14 +31,14 @@ protected function setUp(): void
public function testPlayvideosHeader() public function testPlayvideosHeader()
{ {
$str = 'stuff'; $str = 'stuff';
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = TemplatePage::LINKLIST; $data['_PAGE_'] = TemplatePage::LINKLIST;
$data = hook_playvideos_render_header($data); $data = hook_playvideos_render_header($data);
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertEquals(1, count($data['buttons_toolbar'])); $this->assertEquals(1, count($data['buttons_toolbar']));
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = $str; $data['_PAGE_'] = $str;
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertArrayNotHasKey('buttons_toolbar', $data); $this->assertArrayNotHasKey('buttons_toolbar', $data);
@ -49,14 +50,14 @@ public function testPlayvideosHeader()
public function testPlayvideosFooter() public function testPlayvideosFooter()
{ {
$str = 'stuff'; $str = 'stuff';
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = TemplatePage::LINKLIST; $data['_PAGE_'] = TemplatePage::LINKLIST;
$data = hook_playvideos_render_footer($data); $data = hook_playvideos_render_footer($data);
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertEquals(2, count($data['js_files'])); $this->assertEquals(2, count($data['js_files']));
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = $str; $data['_PAGE_'] = $str;
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertArrayNotHasKey('js_files', $data); $this->assertArrayNotHasKey('js_files', $data);

1
tests/plugins/PluginPubsubhubbubTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Pubsubhubbub; namespace Shaarli\Plugin\Pubsubhubbub;
use Shaarli\Config\ConfigManager; use Shaarli\Config\ConfigManager;

17
tests/plugins/PluginQrcodeTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Qrcode; namespace Shaarli\Plugin\Qrcode;
/** /**
@ -30,14 +31,14 @@ protected function setUp(): void
public function testQrcodeLinklist() public function testQrcodeLinklist()
{ {
$str = 'http://randomstr.com/test'; $str = 'http://randomstr.com/test';
$data = array( $data = [
'title' => $str, 'title' => $str,
'links' => array( 'links' => [
array( [
'url' => $str, 'url' => $str,
) ]
) ]
); ];
$data = hook_qrcode_render_linklist($data); $data = hook_qrcode_render_linklist($data);
$link = $data['links'][0]; $link = $data['links'][0];
@ -56,14 +57,14 @@ public function testQrcodeLinklist()
public function testQrcodeFooter() public function testQrcodeFooter()
{ {
$str = 'stuff'; $str = 'stuff';
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = TemplatePage::LINKLIST; $data['_PAGE_'] = TemplatePage::LINKLIST;
$data = hook_qrcode_render_footer($data); $data = hook_qrcode_render_footer($data);
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertEquals(1, count($data['js_files'])); $this->assertEquals(1, count($data['js_files']));
$data = array($str => $str); $data = [$str => $str];
$data['_PAGE_'] = $str; $data['_PAGE_'] = $str;
$this->assertEquals($str, $data[$str]); $this->assertEquals($str, $data[$str]);
$this->assertArrayNotHasKey('js_files', $data); $this->assertArrayNotHasKey('js_files', $data);

1
tests/plugins/PluginWallabagTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Wallabag; namespace Shaarli\Plugin\Wallabag;
use Shaarli\Config\ConfigManager; use Shaarli\Config\ConfigManager;

1
tests/plugins/WallabagInstanceTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Plugin\Wallabag; namespace Shaarli\Plugin\Wallabag;
/** /**

2
tests/render/PageCacheManagerTest.php
View file

@ -18,7 +18,7 @@ class PageCacheManagerTest extends TestCase
protected static $testCacheDir = 'sandbox/dummycache'; protected static $testCacheDir = 'sandbox/dummycache';
// dummy cached file names / content // dummy cached file names / content
protected static $pages = array('a', 'toto', 'd7b59c'); protected static $pages = ['a', 'toto', 'd7b59c'];
/** @var PageCacheManager */ /** @var PageCacheManager */
protected $cacheManager; protected $cacheManager;

1
tests/security/BanManagerTest.php
View file

@ -1,6 +1,5 @@
<?php <?php
namespace Shaarli\Security; namespace Shaarli\Security;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;

12
tests/security/LoginManagerTest.php
View file

@ -349,7 +349,11 @@ public function testCheckCredentialsFromLdapWrongLoginAndPassword()
{ {
$this->configManager->set('ldap.host', 'dummy'); $this->configManager->set('ldap.host', 'dummy');
$this->assertFalse( $this->assertFalse(
$this->loginManager->checkCredentialsFromLdap($this->login, $this->password, function() { return null; }, function() { return false; }) $this->loginManager->checkCredentialsFromLdap($this->login, $this->password, function () {
return null;
}, function () {
return false;
})
); );
} }
@ -360,7 +364,11 @@ public function testCheckCredentialsFromLdapGoodLoginAndPassword()
{ {
$this->configManager->set('ldap.host', 'dummy'); $this->configManager->set('ldap.host', 'dummy');
$this->assertTrue( $this->assertTrue(
$this->loginManager->checkCredentialsFromLdap($this->login, $this->password, function() { return null; }, function() { return true; }) $this->loginManager->checkCredentialsFromLdap($this->login, $this->password, function () {
return null;
}, function () {
return true;
})
); );
} }
} }

1
tests/updater/DummyUpdater.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Updater; namespace Shaarli\Updater;
use Exception; use Exception;

46
tests/updater/UpdaterTest.php
View file

@ -1,4 +1,5 @@
<?php <?php
namespace Shaarli\Updater; namespace Shaarli\Updater;
use Exception; use Exception;
@ -10,7 +11,6 @@
use Shaarli\Plugin\PluginManager; use Shaarli\Plugin\PluginManager;
use Shaarli\TestCase; use Shaarli\TestCase;
/** /**
* Class UpdaterTest. * Class UpdaterTest.
* Runs unit tests against the updater class. * Runs unit tests against the updater class.
@ -67,10 +67,10 @@ protected function setUp(): void
*/ */
public function testReadEmptyUpdatesFile() public function testReadEmptyUpdatesFile()
{ {
$this->assertEquals(array(), UpdaterUtils::readUpdatesFile('')); $this->assertEquals([], UpdaterUtils::readUpdatesFile(''));
$updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt'; $updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt';
touch($updatesFile); touch($updatesFile);
$this->assertEquals(array(), UpdaterUtils::readUpdatesFile($updatesFile)); $this->assertEquals([], UpdaterUtils::readUpdatesFile($updatesFile));
unlink($updatesFile); unlink($updatesFile);
} }
@ -80,7 +80,7 @@ public function testReadEmptyUpdatesFile()
public function testReadWriteUpdatesFile() public function testReadWriteUpdatesFile()
{ {
$updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt'; $updatesFile = $this->conf->get('resource.data_dir') . '/updates.txt';
$updatesMethods = array('m1', 'm2', 'm3'); $updatesMethods = ['m1', 'm2', 'm3'];
UpdaterUtils::writeUpdatesFile($updatesFile, $updatesMethods); UpdaterUtils::writeUpdatesFile($updatesFile, $updatesMethods);
$readMethods = UpdaterUtils::readUpdatesFile($updatesFile); $readMethods = UpdaterUtils::readUpdatesFile($updatesFile);
@ -102,7 +102,7 @@ public function testWriteEmptyUpdatesFile()
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$this->expectExceptionMessageRegExp('/Updates file path is not set(.*)/'); $this->expectExceptionMessageRegExp('/Updates file path is not set(.*)/');
UpdaterUtils::writeUpdatesFile('', array('test')); UpdaterUtils::writeUpdatesFile('', ['test']);
} }
/** /**
@ -117,7 +117,7 @@ public function testWriteUpdatesFileNotWritable()
touch($updatesFile); touch($updatesFile);
chmod($updatesFile, 0444); chmod($updatesFile, 0444);
try { try {
@UpdaterUtils::writeUpdatesFile($updatesFile, array('test')); @UpdaterUtils::writeUpdatesFile($updatesFile, ['test']);
} catch (Exception $e) { } catch (Exception $e) {
unlink($updatesFile); unlink($updatesFile);
throw $e; throw $e;
@ -131,17 +131,17 @@ public function testWriteUpdatesFileNotWritable()
*/ */
public function testNoUpdates() public function testNoUpdates()
{ {
$updates = array( $updates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy2', 'updateMethodDummy2',
'updateMethodDummy3', 'updateMethodDummy3',
'updateMethodException', 'updateMethodException',
); ];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$this->assertEquals(array(), $updater->update()); $this->assertEquals([], $updater->update());
$updater = new DummyUpdater(array(), array(), $this->conf, false); $updater = new DummyUpdater([], [], $this->conf, false);
$this->assertEquals(array(), $updater->update()); $this->assertEquals([], $updater->update());
} }
/** /**
@ -149,13 +149,13 @@ public function testNoUpdates()
*/ */
public function testUpdatesFirstTime() public function testUpdatesFirstTime()
{ {
$updates = array('updateMethodException',); $updates = ['updateMethodException',];
$expectedUpdates = array( $expectedUpdates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy2', 'updateMethodDummy2',
'updateMethodDummy3', 'updateMethodDummy3',
); ];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$this->assertEquals($expectedUpdates, $updater->update()); $this->assertEquals($expectedUpdates, $updater->update());
} }
@ -164,14 +164,14 @@ public function testUpdatesFirstTime()
*/ */
public function testOneUpdate() public function testOneUpdate()
{ {
$updates = array( $updates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy3', 'updateMethodDummy3',
'updateMethodException', 'updateMethodException',
); ];
$expectedUpdate = array('updateMethodDummy2'); $expectedUpdate = ['updateMethodDummy2'];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$this->assertEquals($expectedUpdate, $updater->update()); $this->assertEquals($expectedUpdate, $updater->update());
} }
@ -182,13 +182,13 @@ public function testUpdateFailed()
{ {
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$updates = array( $updates = [
'updateMethodDummy1', 'updateMethodDummy1',
'updateMethodDummy2', 'updateMethodDummy2',
'updateMethodDummy3', 'updateMethodDummy3',
); ];
$updater = new DummyUpdater($updates, array(), $this->conf, true); $updater = new DummyUpdater($updates, [], $this->conf, true);
$updater->update(); $updater->update();
} }

1
tests/utils/CurlUtils.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Old-style mock for cURL, as PHPUnit doesn't allow to mock global functions * Old-style mock for cURL, as PHPUnit doesn't allow to mock global functions
*/ */

1
tests/utils/FakeBookmarkService.php
View file

@ -1,6 +1,5 @@
<?php <?php
use Shaarli\Bookmark\BookmarkArray; use Shaarli\Bookmark\BookmarkArray;
use Shaarli\Bookmark\BookmarkFilter; use Shaarli\Bookmark\BookmarkFilter;
use Shaarli\Bookmark\BookmarkIO; use Shaarli\Bookmark\BookmarkIO;

6
tests/utils/ReferenceLinkDB.php
View file

@ -10,7 +10,7 @@ class ReferenceLinkDB
{ {
public static $NB_LINKS_TOTAL = 11; public static $NB_LINKS_TOTAL = 11;
private $bookmarks = array(); private $bookmarks = [];
private $_publicCount = 0; private $_publicCount = 0;
private $_privateCount = 0; private $_privateCount = 0;
@ -164,7 +164,7 @@ protected function addLink(
$shorturl = '', $shorturl = '',
$pinned = false $pinned = false
) { ) {
$link = array( $link = [
'id' => $id, 'id' => $id,
'title' => $title, 'title' => $title,
'url' => $url, 'url' => $url,
@ -175,7 +175,7 @@ protected function addLink(
'updated' => $updated, 'updated' => $updated,
'shorturl' => $shorturl ? $shorturl : smallHash($date->format(Bookmark::LINK_DATE_FORMAT) . $id), 'shorturl' => $shorturl ? $shorturl : smallHash($date->format(Bookmark::LINK_DATE_FORMAT) . $id),
'sticky' => $pinned 'sticky' => $pinned
); ];
if (! $this->isLegacy) { if (! $this->isLegacy) {
$bookmark = new Bookmark(); $bookmark = new Bookmark();
$this->bookmarks[$id] = $bookmark->fromArray($link); $this->bookmarks[$id] = $bookmark->fromArray($link);

5
tests/utils/ReferenceSessionIdHashes.php
View file

@ -1,4 +1,5 @@
<?php <?php
/** /**
* Testing the untestable - Session ID generation * Testing the untestable - Session ID generation
*/ */
@ -13,9 +14,9 @@ class ReferenceSessionIdHashes
public static function genAllHashes() public static function genAllHashes()
{ {
foreach (hash_algos() as $algo) { foreach (hash_algos() as $algo) {
self::$sidHashes[$algo] = array(); self::$sidHashes[$algo] = [];
foreach (array(4, 5, 6) as $bpc) { foreach ([4, 5, 6] as $bpc) {
self::$sidHashes[$algo][$bpc] = self::genSidHash($algo, $bpc); self::$sidHashes[$algo][$bpc] = self::genSidHash($algo, $bpc);
} }
} }

1
tests/utils/config/configPhp.php
View file

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