oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-16 18:01:38 +00:00
Code Wiki Activity

Merge pull request #4797 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.17.0

Browse source 
Bump friendsofphp/php-cs-fixer from 2.16.8 to 2.17.0
This commit is contained in:
Jérémy Benoist 2020-12-08 09:50:36 +01:00 • committed by GitHub
commit 725a42c934
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 99 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/config/webpack/prod.js
View file

@ -35,6 +35,7 @@ module.exports = merge(commonConfig, {
}), }),
new WebpackManifestPlugin({ new WebpackManifestPlugin({
fileName: 'manifest.json', fileName: 'manifest.json',
sort: (file1, file2) => file1.path.localeCompare(file2.path),
}), }),
], ],
module: { module: {

17
composer.lock generated
View file

@ -11077,16 +11077,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.16.8", "version": "v2.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "0f8286f9601a211c83bebf7f3125610479ec084a" "reference": "5274ce3d3200a2b374baa42143cb9dfcdcc2fa52"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/0f8286f9601a211c83bebf7f3125610479ec084a", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/5274ce3d3200a2b374baa42143cb9dfcdcc2fa52",
"reference": "0f8286f9601a211c83bebf7f3125610479ec084a", "reference": "5274ce3d3200a2b374baa42143cb9dfcdcc2fa52",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11095,7 +11095,7 @@
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.2",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^5.6 || ^7.0", "php": "^5.6 || ^7.0 || ^8.0",
"php-cs-fixer/diff": "^1.3", "php-cs-fixer/diff": "^1.3",
"symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/console": "^3.4.43 || ^4.1.6 || ^5.0",
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", "symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0",
@ -11133,6 +11133,11 @@
"php-cs-fixer" "php-cs-fixer"
], ],
"type": "application", "type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.17-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpCsFixer\\": "src/" "PhpCsFixer\\": "src/"
@ -11171,7 +11176,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-12-06T22:38:21+00:00" "time": "2020-12-07T20:43:00+00:00"
}, },
{ {
"name": "m6web/redis-mock", "name": "m6web/redis-mock",

2
tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php
View file

@ -17,7 +17,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
*/ */
protected $user; protected $user;
public function setUp(): void protected function setUp(): void
{ {
$this->client = $this->createAuthorizedClient(); $this->client = $this->createAuthorizedClient();
} }

2
tests/Wallabag/ApiBundle/WallabagApiTestCase.php
View file

@ -17,7 +17,7 @@ abstract class WallabagApiTestCase extends WebTestCase
*/ */
protected $user; protected $user;
public function setUp(): void protected function setUp(): void
{ {
$this->client = $this->createAuthorizedClient(); $this->client = $this->createAuthorizedClient();
} }

4
tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
View file

@ -30,7 +30,7 @@ class InstallCommandTest extends WallabagCoreTestCase
StaticDriver::setKeepStaticConnections(true); StaticDriver::setKeepStaticConnections(true);
} }
public function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
@ -66,7 +66,7 @@ class InstallCommandTest extends WallabagCoreTestCase
$this->resetDatabase($this->getClient()); $this->resetDatabase($this->getClient());
} }
public function tearDown(): void protected function tearDown(): void
{ {
$databasePath = getenv('TEST_DATABASE_PATH'); $databasePath = getenv('TEST_DATABASE_PATH');
// Remove variable environnement // Remove variable environnement

2
tests/Wallabag/CoreBundle/Command/ReloadEntryCommandTest.php
View file

@ -22,7 +22,7 @@ class ReloadEntryCommandTest extends WallabagCoreTestCase
*/ */
public $bobEntry; public $bobEntry;
public function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();

12
tests/Wallabag/CoreBundle/Helper/ContentProxyTest.php
View file

@ -665,7 +665,7 @@ class ContentProxyTest extends TestCase
$this->assertSame('1.1.1.1', $entry->getDomainName()); $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 // 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 // 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())); $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle()));
} }
public function testWebsiteWithInvalidUTF8Title_removeInvalidCharacter() public function testWebsiteWithInvalidUTF8TitleRemoveInvalidCharacter()
{ {
// See http://graphemica.com for more info about the characters // 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. // '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())); $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle()));
} }
public function testPdfWithUTF16BETitle_convertToUTF8() public function testPdfWithUTF16BETitleConvertToUTF8()
{ {
// See http://graphemica.com for more info about the characters // See http://graphemica.com for more info about the characters
// '😻' (U+1F63B;D83DDE3B) in hexadecimal and as UTF16BE // '😻' (U+1F63B;D83DDE3B) in hexadecimal and as UTF16BE
@ -781,7 +781,7 @@ class ContentProxyTest extends TestCase
$this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle()));
} }
public function testPdfWithUTF8Title_doNothing() public function testPdfWithUTF8TitleDoNothing()
{ {
// See http://graphemica.com for more info about the characters // See http://graphemica.com for more info about the characters
// '😻' (U+1F63B;D83DDE3B) in hexadecimal and as UTF8 // '😻' (U+1F63B;D83DDE3B) in hexadecimal and as UTF8
@ -819,7 +819,7 @@ class ContentProxyTest extends TestCase
$this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle()));
} }
public function testPdfWithWINDOWS1252Title_convertToUTF8() public function testPdfWithWINDOWS1252TitleConvertToUTF8()
{ {
// See http://graphemica.com for more info about the characters // See http://graphemica.com for more info about the characters
// '€' (80) in hexadecimal and WINDOWS-1252 // '€' (80) in hexadecimal and WINDOWS-1252
@ -857,7 +857,7 @@ class ContentProxyTest extends TestCase
$this->assertSame($expectedTitle, $this->strToHex($entry->getTitle())); $this->assertSame($expectedTitle, $this->strToHex($entry->getTitle()));
} }
public function testPdfWithInvalidCharacterInTitle_removeInvalidCharacter() public function testPdfWithInvalidCharacterInTitleRemoveInvalidCharacter()
{ {
// See http://graphemica.com for more info about the characters // See http://graphemica.com for more info about the characters
// '😻ℤ<F09F98BB>z' (U+1F63B or F09F98BB; U+2124 or E284A4; invalid character 81; U+007A or 7A) in hexadecimal and UTF-8 // '😻ℤ<F09F98BB>z' (U+1F63B or F09F98BB; U+2124 or E284A4; invalid character 81; U+007A or 7A) in hexadecimal and UTF-8

2
tests/Wallabag/CoreBundle/Helper/RedirectTest.php
View file

@ -20,7 +20,7 @@ class RedirectTest extends TestCase
/** @var UsernamePasswordToken */ /** @var UsernamePasswordToken */
private $token; private $token;
public function setUp(): void protected function setUp(): void
{ {
$this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router') $this->routerMock = $this->getMockBuilder('Symfony\Component\Routing\Router')
->disableOriginalConstructor() ->disableOriginalConstructor()

2
tests/Wallabag/CoreBundle/Helper/RuleBasedIgnoreOriginProcessorTest.php
View file

@ -20,7 +20,7 @@ class RuleBasedIgnoreOriginProcessorTest extends TestCase
private $logger; private $logger;
private $handler; private $handler;
public function setUp(): void protected function setUp(): void
{ {
$this->rulerz = $this->getRulerZMock(); $this->rulerz = $this->getRulerZMock();
$this->logger = $this->getLogger(); $this->logger = $this->getLogger();

2
tests/Wallabag/CoreBundle/Helper/RuleBasedTaggerTest.php
View file

@ -21,7 +21,7 @@ class RuleBasedTaggerTest extends TestCase
private $logger; private $logger;
private $handler; private $handler;
public function setUp(): void protected function setUp(): void
{ {
$this->rulerz = $this->getRulerZMock(); $this->rulerz = $this->getRulerZMock();
$this->tagRepository = $this->getTagRepositoryMock(); $this->tagRepository = $this->getTagRepositoryMock();

2
tests/Wallabag/CoreBundle/WallabagCoreTestCase.php
View file

@ -18,7 +18,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
*/ */
private $client = null; private $client = null;
public function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();

144
web/wallassets/manifest.json
View file

@ -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.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.css.map": "baggy.css.map",
"baggy.js": "baggy.js",
"baggy.js.map": "baggy.js.map", "baggy.js.map": "baggy.js.map",
"public.css": "public.css", "material.ttf": "fonts/MaterialIcons-Regular.ttf",
"public.js": "public.js", "baggy.ttf": "fonts/MaterialIcons-Regular.ttf",
"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",
"fonts/IcoMoon-Free.ttf": "fonts/IcoMoon-Free.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/MaterialIcons-Regular.eot": "fonts/MaterialIcons-Regular.eot",
"fonts/Roboto-Medium.woff": "fonts/Roboto-Medium.woff", "fonts/MaterialIcons-Regular.ttf": "fonts/MaterialIcons-Regular.ttf",
"fonts/Roboto-Bold.woff": "fonts/Roboto-Bold.woff", "fonts/MaterialIcons-Regular.woff": "fonts/MaterialIcons-Regular.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.woff2": "fonts/MaterialIcons-Regular.woff2", "fonts/MaterialIcons-Regular.woff2": "fonts/MaterialIcons-Regular.woff2",
"fonts/Roboto-Medium.woff2": "fonts/Roboto-Medium.woff2", "fonts/Roboto-Bold.woff": "fonts/Roboto-Bold.woff",
"fonts/Roboto-Regular.woff2": "fonts/Roboto-Regular.woff2",
"fonts/Roboto-Bold.woff2": "fonts/Roboto-Bold.woff2", "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-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", "fonts/Roboto-Thin.woff2": "fonts/Roboto-Thin.woff2",
"themes/_global/img/icons/Diaspora-asterisk.svg": "themes/_global/img/icons/Diaspora-asterisk.svg", "material.png": "themes/_global/img/icons/unmark-icon--black.png",
"img/annotator-icon-sprite.png?embed": "img/annotator-icon-sprite.png", "baggy.png": "themes/_global/img/table.png",
"img/annotator-glyph-sprite.png?embed": "img/annotator-glyph-sprite.png", "img/annotator-glyph-sprite.png?embed": "img/annotator-glyph-sprite.png",
"themes/_global/img/icons/shaarli.png": "themes/_global/img/icons/shaarli.png", "img/annotator-icon-sprite.png?embed": "img/annotator-icon-sprite.png",
"themes/_global/img/icons/carrot-icon--white.png": "themes/_global/img/icons/carrot-icon--white.png", "material.css": "material.css",
"themes/_global/img/icons/diaspora-icon--black.png": "themes/_global/img/icons/diaspora-icon--black.png", "material.css.map": "material.css.map",
"themes/_global/img/icons/carrot-icon--black.png": "themes/_global/img/icons/carrot-icon--black.png", "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/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/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/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"
} }