From 54e398f58de62da062d925343a12db2850341cca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Dec 2020 03:45:31 +0000 Subject: [PATCH 1/3] Bump friendsofphp/php-cs-fixer from 2.16.8 to 2.17.0 Bumps [friendsofphp/php-cs-fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer) from 2.16.8 to 2.17.0. - [Release notes](https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases) - [Changelog](https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/2.17/CHANGELOG.md) - [Commits](https://github.com/FriendsOfPHP/PHP-CS-Fixer/compare/v2.16.8...v2.17.0) Signed-off-by: dependabot[bot] --- composer.lock | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index f266d3cd2..b2e8c6c94 100644 --- a/composer.lock +++ b/composer.lock @@ -11077,16 +11077,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.8", + "version": "v2.17.0", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "0f8286f9601a211c83bebf7f3125610479ec084a" + "reference": "5274ce3d3200a2b374baa42143cb9dfcdcc2fa52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/0f8286f9601a211c83bebf7f3125610479ec084a", - "reference": "0f8286f9601a211c83bebf7f3125610479ec084a", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5274ce3d3200a2b374baa42143cb9dfcdcc2fa52", + "reference": "5274ce3d3200a2b374baa42143cb9dfcdcc2fa52", "shasum": "" }, "require": { @@ -11095,7 +11095,7 @@ "doctrine/annotations": "^1.2", "ext-json": "*", "ext-tokenizer": "*", - "php": "^5.6 || ^7.0", + "php": "^5.6 || ^7.0 || ^8.0", "php-cs-fixer/diff": "^1.3", "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", @@ -11133,6 +11133,11 @@ "php-cs-fixer" ], "type": "application", + "extra": { + "branch-alias": { + "dev-master": "2.17-dev" + } + }, "autoload": { "psr-4": { "PhpCsFixer\\": "src/" @@ -11171,7 +11176,7 @@ "type": "github" } ], - "time": "2020-12-06T22:38:21+00:00" + "time": "2020-12-07T20:43:00+00:00" }, { "name": "m6web/redis-mock", From a1734238202689e17359cdbf4ecc26ba2512cc92 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 8 Dec 2020 09:17:10 +0100 Subject: [PATCH 2/3] Fix CS issues --- .../AnnotationBundle/WallabagAnnotationTestCase.php | 2 +- tests/Wallabag/ApiBundle/WallabagApiTestCase.php | 2 +- .../CoreBundle/Command/InstallCommandTest.php | 4 ++-- .../CoreBundle/Command/ReloadEntryCommandTest.php | 2 +- .../Wallabag/CoreBundle/Helper/ContentProxyTest.php | 12 ++++++------ tests/Wallabag/CoreBundle/Helper/RedirectTest.php | 2 +- .../Helper/RuleBasedIgnoreOriginProcessorTest.php | 2 +- .../CoreBundle/Helper/RuleBasedTaggerTest.php | 2 +- tests/Wallabag/CoreBundle/WallabagCoreTestCase.php | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php index 136a980e2..180c044d7 100644 --- a/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php +++ b/tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php @@ -17,7 +17,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase */ protected $user; - public function setUp(): void + protected function setUp(): void { $this->client = $this->createAuthorizedClient(); } diff --git a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php index b7941caf5..49f5bcdc7 100644 --- a/tests/Wallabag/ApiBundle/WallabagApiTestCase.php +++ b/tests/Wallabag/ApiBundle/WallabagApiTestCase.php @@ -17,7 +17,7 @@ abstract class WallabagApiTestCase extends WebTestCase */ protected $user; - public function setUp(): void + protected function setUp(): void { $this->client = $this->createAuthorizedClient(); } diff --git a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php index d79636b16..5ab1750c3 100644 --- a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php +++ b/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php @@ -30,7 +30,7 @@ class InstallCommandTest extends WallabagCoreTestCase StaticDriver::setKeepStaticConnections(true); } - public function setUp(): void + protected function setUp(): void { parent::setUp(); @@ -66,7 +66,7 @@ class InstallCommandTest extends WallabagCoreTestCase $this->resetDatabase($this->getClient()); } - public function tearDown(): void + protected function tearDown(): void { $databasePath = getenv('TEST_DATABASE_PATH'); // Remove variable environnement diff --git a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php index f5233194e..0bd4a5780 100644 --- a/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php +++ b/tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php @@ -22,7 +22,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase */ public $bobEntry; - public function setUp(): void + protected function setUp(): void { parent::setUp(); diff --git a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php index b318cf2c5..54c992cc0 100644 --- a/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php +++ b/tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php @@ -665,7 +665,7 @@ class ContentProxyTest extends TestCase $this->assertSame('1.1.1.1', $entry->getDomainName()); } - public function testWebsiteWithValidUTF8Title_doNothing() + public function testWebsiteWithValidUTF8TitleDoNothing() { // You can use https://www.online-toolz.com/tools/text-hex-convertor.php to convert UTF-8 text <=> hex // See http://graphemica.com for more info about the characters @@ -704,7 +704,7 @@ class ContentProxyTest extends TestCase $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); } - public function testWebsiteWithInvalidUTF8Title_removeInvalidCharacter() + public function testWebsiteWithInvalidUTF8TitleRemoveInvalidCharacter() { // See http://graphemica.com for more info about the characters // 'a€b' (61;80;62) in hexadecimal and WINDOWS-1252 - but 80 is a invalid UTF-8 character. @@ -743,7 +743,7 @@ class ContentProxyTest extends TestCase $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); } - public function testPdfWithUTF16BETitle_convertToUTF8() + public function testPdfWithUTF16BETitleConvertToUTF8() { // See http://graphemica.com for more info about the characters // '😻' (U+1F63B;D83DDE3B) in hexadecimal and as UTF16BE @@ -781,7 +781,7 @@ class ContentProxyTest extends TestCase $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); } - public function testPdfWithUTF8Title_doNothing() + public function testPdfWithUTF8TitleDoNothing() { // See http://graphemica.com for more info about the characters // '😻' (U+1F63B;D83DDE3B) in hexadecimal and as UTF8 @@ -819,7 +819,7 @@ class ContentProxyTest extends TestCase $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); } - public function testPdfWithWINDOWS1252Title_convertToUTF8() + public function testPdfWithWINDOWS1252TitleConvertToUTF8() { // See http://graphemica.com for more info about the characters // '€' (80) in hexadecimal and WINDOWS-1252 @@ -857,7 +857,7 @@ class ContentProxyTest extends TestCase $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); } - public function testPdfWithInvalidCharacterInTitle_removeInvalidCharacter() + public function testPdfWithInvalidCharacterInTitleRemoveInvalidCharacter() { // See http://graphemica.com for more info about the characters // '😻ℤ�z' (U+1F63B or F09F98BB; U+2124 or E284A4; invalid character 81; U+007A or 7A) in hexadecimal and UTF-8 diff --git a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php index 69bec07e4..4a8864e3c 100644 --- a/tests/Wallabag/CoreBundle/Helper/RedirectTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RedirectTest.php @@ -20,7 +20,7 @@ class RedirectTest extends TestCase /** @var UsernamePasswordToken */ private $token; - public function setUp(): void + protected function setUp(): void { $this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router') ->disableOriginalConstructor() diff --git a/tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php b/tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php index ba697e4bc..afe8502f7 100644 --- a/tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php @@ -20,7 +20,7 @@ class RuleBasedIgnoreOriginProcessorTest extends TestCase private $logger; private $handler; - public function setUp(): void + protected function setUp(): void { $this->rulerz = $this->getRulerZMock(); $this->logger = $this->getLogger(); diff --git a/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php b/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php index db5089bbb..9500bff45 100644 --- a/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php +++ b/tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php @@ -21,7 +21,7 @@ class RuleBasedTaggerTest extends TestCase private $logger; private $handler; - public function setUp(): void + protected function setUp(): void { $this->rulerz = $this->getRulerZMock(); $this->tagRepository = $this->getTagRepositoryMock(); diff --git a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php index 10787ec1c..c0fd6ea53 100644 --- a/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php +++ b/tests/Wallabag/CoreBundle/WallabagCoreTestCase.php @@ -18,7 +18,7 @@ abstract class WallabagCoreTestCase extends WebTestCase */ private $client = null; - public function setUp(): void + protected function setUp(): void { parent::setUp(); From 289406f258f2f4c2f68aee61215a013c6ed0238f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 8 Dec 2020 09:34:17 +0100 Subject: [PATCH 3/3] Ensure manifest files are sorted properly --- app/config/webpack/prod.js | 1 + web/wallassets/manifest.json | 144 +++++++++++++++++------------------ 2 files changed, 73 insertions(+), 72 deletions(-) diff --git a/app/config/webpack/prod.js b/app/config/webpack/prod.js index 80a5d2561..b58e50794 100644 --- a/app/config/webpack/prod.js +++ b/app/config/webpack/prod.js @@ -35,6 +35,7 @@ module.exports = merge(commonConfig, { }), new WebpackManifestPlugin({ fileName: 'manifest.json', + sort: (file1, file2) => file1.path.localeCompare(file2.path), }), ], module: { diff --git a/web/wallassets/manifest.json b/web/wallassets/manifest.json index a16a2235b..03e01c5d8 100644 --- a/web/wallassets/manifest.json +++ b/web/wallassets/manifest.json @@ -1,87 +1,87 @@ { - "material.css": "material.css", - "material.js": "material.js", - "material.png": "themes/_global/img/icons/scuttle.png", - "material.eot": "fonts/MaterialIcons-Regular.eot", - "material.woff2": "fonts/lato-black-italic.woff2", - "material.woff": "fonts/lato-black-italic.woff", - "material.ttf": "fonts/IcoMoon-Free.ttf", - "material.css.map": "material.css.map", - "material.js.map": "material.js.map", "baggy.css": "baggy.css", - "baggy.js": "baggy.js", - "baggy.png": "themes/_global/img/list.png", - "baggy.eot": "fonts/MaterialIcons-Regular.eot", - "baggy.woff2": "fonts/lato-black-italic.woff2", - "baggy.woff": "fonts/lato-black-italic.woff", - "baggy.ttf": "fonts/IcoMoon-Free.ttf", - "baggy.svg": "themes/_global/img/icons/Diaspora-asterisk.svg", "baggy.css.map": "baggy.css.map", + "baggy.js": "baggy.js", "baggy.js.map": "baggy.js.map", - "public.css": "public.css", - "public.js": "public.js", - "public.css.map": "public.css.map", - "fonts/lato-normal-italic.woff": "fonts/lato-normal-italic.woff", - "fonts/lato-semibold-italic.woff": "fonts/lato-semibold-italic.woff", - "fonts/lato-medium-italic.woff": "fonts/lato-medium-italic.woff", - "fonts/lato-light-italic.woff": "fonts/lato-light-italic.woff", - "fonts/lato-thin-italic.woff": "fonts/lato-thin-italic.woff", - "fonts/lato-bold-italic.woff": "fonts/lato-bold-italic.woff", - "fonts/lato-heavy-italic.woff": "fonts/lato-heavy-italic.woff", - "fonts/lato-semibold.woff": "fonts/lato-semibold.woff", - "fonts/lato-light.woff": "fonts/lato-light.woff", - "fonts/lato-black-italic.woff": "fonts/lato-black-italic.woff", - "fonts/lato-heavy.woff": "fonts/lato-heavy.woff", - "fonts/lato-bold.woff": "fonts/lato-bold.woff", - "fonts/lato-normal.woff": "fonts/lato-normal.woff", - "fonts/lato-thin.woff": "fonts/lato-thin.woff", - "fonts/lato-medium.woff": "fonts/lato-medium.woff", - "fonts/lato-black.woff": "fonts/lato-black.woff", - "fonts/lato-hairline-italic.woff": "fonts/lato-hairline-italic.woff", - "fonts/lato-hairline.woff": "fonts/lato-hairline.woff", - "fonts/MaterialIcons-Regular.ttf": "fonts/MaterialIcons-Regular.ttf", - "fonts/lato-normal-italic.woff2": "fonts/lato-normal-italic.woff2", - "fonts/lato-semibold-italic.woff2": "fonts/lato-semibold-italic.woff2", - "fonts/lato-medium-italic.woff2": "fonts/lato-medium-italic.woff2", - "fonts/lato-heavy-italic.woff2": "fonts/lato-heavy-italic.woff2", - "fonts/lato-bold-italic.woff2": "fonts/lato-bold-italic.woff2", - "fonts/lato-light-italic.woff2": "fonts/lato-light-italic.woff2", - "fonts/lato-thin-italic.woff2": "fonts/lato-thin-italic.woff2", - "fonts/lato-black-italic.woff2": "fonts/lato-black-italic.woff2", - "fonts/lato-bold.woff2": "fonts/lato-bold.woff2", - "fonts/lato-heavy.woff2": "fonts/lato-heavy.woff2", - "fonts/lato-semibold.woff2": "fonts/lato-semibold.woff2", - "fonts/lato-normal.woff2": "fonts/lato-normal.woff2", - "fonts/lato-medium.woff2": "fonts/lato-medium.woff2", - "fonts/lato-light.woff2": "fonts/lato-light.woff2", - "fonts/lato-thin.woff2": "fonts/lato-thin.woff2", - "fonts/lato-black.woff2": "fonts/lato-black.woff2", - "fonts/lato-hairline-italic.woff2": "fonts/lato-hairline-italic.woff2", - "fonts/lato-hairline.woff2": "fonts/lato-hairline.woff2", + "material.ttf": "fonts/MaterialIcons-Regular.ttf", + "baggy.ttf": "fonts/MaterialIcons-Regular.ttf", "fonts/IcoMoon-Free.ttf": "fonts/IcoMoon-Free.ttf", - "fonts/MaterialIcons-Regular.woff": "fonts/MaterialIcons-Regular.woff", + "material.woff": "fonts/Roboto-Thin.woff", + "baggy.woff": "fonts/MaterialIcons-Regular.woff", + "fonts/lato-black-italic.woff": "fonts/lato-black-italic.woff", + "material.woff2": "fonts/Roboto-Thin.woff2", + "baggy.woff2": "fonts/MaterialIcons-Regular.woff2", + "fonts/lato-black-italic.woff2": "fonts/lato-black-italic.woff2", + "fonts/lato-black.woff": "fonts/lato-black.woff", + "fonts/lato-black.woff2": "fonts/lato-black.woff2", + "fonts/lato-bold-italic.woff": "fonts/lato-bold-italic.woff", + "fonts/lato-bold-italic.woff2": "fonts/lato-bold-italic.woff2", + "fonts/lato-bold.woff": "fonts/lato-bold.woff", + "fonts/lato-bold.woff2": "fonts/lato-bold.woff2", + "fonts/lato-hairline-italic.woff": "fonts/lato-hairline-italic.woff", + "fonts/lato-hairline-italic.woff2": "fonts/lato-hairline-italic.woff2", + "fonts/lato-hairline.woff": "fonts/lato-hairline.woff", + "fonts/lato-hairline.woff2": "fonts/lato-hairline.woff2", + "fonts/lato-heavy-italic.woff": "fonts/lato-heavy-italic.woff", + "fonts/lato-heavy-italic.woff2": "fonts/lato-heavy-italic.woff2", + "fonts/lato-heavy.woff": "fonts/lato-heavy.woff", + "fonts/lato-heavy.woff2": "fonts/lato-heavy.woff2", + "fonts/lato-light-italic.woff": "fonts/lato-light-italic.woff", + "fonts/lato-light-italic.woff2": "fonts/lato-light-italic.woff2", + "fonts/lato-light.woff": "fonts/lato-light.woff", + "fonts/lato-light.woff2": "fonts/lato-light.woff2", + "fonts/lato-medium-italic.woff": "fonts/lato-medium-italic.woff", + "fonts/lato-medium-italic.woff2": "fonts/lato-medium-italic.woff2", + "fonts/lato-medium.woff": "fonts/lato-medium.woff", + "fonts/lato-medium.woff2": "fonts/lato-medium.woff2", + "fonts/lato-normal-italic.woff": "fonts/lato-normal-italic.woff", + "fonts/lato-normal-italic.woff2": "fonts/lato-normal-italic.woff2", + "fonts/lato-normal.woff": "fonts/lato-normal.woff", + "fonts/lato-normal.woff2": "fonts/lato-normal.woff2", + "fonts/lato-semibold-italic.woff": "fonts/lato-semibold-italic.woff", + "fonts/lato-semibold-italic.woff2": "fonts/lato-semibold-italic.woff2", + "fonts/lato-semibold.woff": "fonts/lato-semibold.woff", + "fonts/lato-semibold.woff2": "fonts/lato-semibold.woff2", + "fonts/lato-thin-italic.woff": "fonts/lato-thin-italic.woff", + "fonts/lato-thin-italic.woff2": "fonts/lato-thin-italic.woff2", + "fonts/lato-thin.woff": "fonts/lato-thin.woff", + "fonts/lato-thin.woff2": "fonts/lato-thin.woff2", + "material.eot": "fonts/MaterialIcons-Regular.eot", + "baggy.eot": "fonts/MaterialIcons-Regular.eot", "fonts/MaterialIcons-Regular.eot": "fonts/MaterialIcons-Regular.eot", - "fonts/Roboto-Medium.woff": "fonts/Roboto-Medium.woff", - "fonts/Roboto-Bold.woff": "fonts/Roboto-Bold.woff", - "fonts/Roboto-Regular.woff": "fonts/Roboto-Regular.woff", - "fonts/Roboto-Light.woff": "fonts/Roboto-Light.woff", - "fonts/Roboto-Thin.woff": "fonts/Roboto-Thin.woff", + "fonts/MaterialIcons-Regular.ttf": "fonts/MaterialIcons-Regular.ttf", + "fonts/MaterialIcons-Regular.woff": "fonts/MaterialIcons-Regular.woff", "fonts/MaterialIcons-Regular.woff2": "fonts/MaterialIcons-Regular.woff2", - "fonts/Roboto-Medium.woff2": "fonts/Roboto-Medium.woff2", - "fonts/Roboto-Regular.woff2": "fonts/Roboto-Regular.woff2", + "fonts/Roboto-Bold.woff": "fonts/Roboto-Bold.woff", "fonts/Roboto-Bold.woff2": "fonts/Roboto-Bold.woff2", + "fonts/Roboto-Light.woff": "fonts/Roboto-Light.woff", "fonts/Roboto-Light.woff2": "fonts/Roboto-Light.woff2", + "fonts/Roboto-Medium.woff": "fonts/Roboto-Medium.woff", + "fonts/Roboto-Medium.woff2": "fonts/Roboto-Medium.woff2", + "fonts/Roboto-Regular.woff": "fonts/Roboto-Regular.woff", + "fonts/Roboto-Regular.woff2": "fonts/Roboto-Regular.woff2", + "fonts/Roboto-Thin.woff": "fonts/Roboto-Thin.woff", "fonts/Roboto-Thin.woff2": "fonts/Roboto-Thin.woff2", - "themes/_global/img/icons/Diaspora-asterisk.svg": "themes/_global/img/icons/Diaspora-asterisk.svg", - "img/annotator-icon-sprite.png?embed": "img/annotator-icon-sprite.png", + "material.png": "themes/_global/img/icons/unmark-icon--black.png", + "baggy.png": "themes/_global/img/table.png", "img/annotator-glyph-sprite.png?embed": "img/annotator-glyph-sprite.png", - "themes/_global/img/icons/shaarli.png": "themes/_global/img/icons/shaarli.png", - "themes/_global/img/icons/carrot-icon--white.png": "themes/_global/img/icons/carrot-icon--white.png", - "themes/_global/img/icons/diaspora-icon--black.png": "themes/_global/img/icons/diaspora-icon--black.png", - "themes/_global/img/icons/carrot-icon--black.png": "themes/_global/img/icons/carrot-icon--black.png", + "img/annotator-icon-sprite.png?embed": "img/annotator-icon-sprite.png", + "material.css": "material.css", + "material.css.map": "material.css.map", + "material.js": "material.js", + "material.js.map": "material.js.map", + "public.css": "public.css", + "public.css.map": "public.css.map", + "public.js": "public.js", "themes/_global/img/bg-select.png": "themes/_global/img/bg-select.png", + "themes/_global/img/icons/carrot-icon--black.png": "themes/_global/img/icons/carrot-icon--black.png", + "themes/_global/img/icons/carrot-icon--white.png": "themes/_global/img/icons/carrot-icon--white.png", + "baggy.svg": "themes/_global/img/icons/Diaspora-asterisk.svg", + "themes/_global/img/icons/Diaspora-asterisk.svg": "themes/_global/img/icons/Diaspora-asterisk.svg", + "themes/_global/img/icons/diaspora-icon--black.png": "themes/_global/img/icons/diaspora-icon--black.png", "themes/_global/img/icons/scuttle.png": "themes/_global/img/icons/scuttle.png", + "themes/_global/img/icons/shaarli.png": "themes/_global/img/icons/shaarli.png", "themes/_global/img/icons/unmark-icon--black.png": "themes/_global/img/icons/unmark-icon--black.png", - "themes/_global/img/table.png": "themes/_global/img/table.png", - "themes/_global/img/list.png": "themes/_global/img/list.png" + "themes/_global/img/list.png": "themes/_global/img/list.png", + "themes/_global/img/table.png": "themes/_global/img/table.png" } \ No newline at end of file