mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-23 09:31:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4953 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-2.18.0

Browse source 
Bump friendsofphp/php-cs-fixer from 2.17.3 to 2.18.0
This commit is contained in:
Jérémy Benoist 2021-01-18 11:01:45 +01:00 committed by GitHub
commit b267e967e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
composer.lock generated
View file

@ -9477,16 +9477,16 @@
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.20.0", "version": "v1.22.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
"reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", "reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -9495,7 +9495,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-main": "1.20-dev" "dev-main": "1.22-dev"
}, },
"thanks": { "thanks": {
"name": "symfony/polyfill", "name": "symfony/polyfill",
@ -9546,7 +9546,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-10-23T14:02:19+00:00" "time": "2021-01-07T16:49:33+00:00"
}, },
{ {
"name": "symfony/polyfill-php73", "name": "symfony/polyfill-php73",
@ -11138,16 +11138,16 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.17.3", "version": "v2.18.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": "bd32f5dd72cdfc7b53f54077f980e144bfa2f595" "reference": "cbc5b50bfa2688a1afca20e5a8c71f058e9ccbef"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/bd32f5dd72cdfc7b53f54077f980e144bfa2f595", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbc5b50bfa2688a1afca20e5a8c71f058e9ccbef",
"reference": "bd32f5dd72cdfc7b53f54077f980e144bfa2f595", "reference": "cbc5b50bfa2688a1afca20e5a8c71f058e9ccbef",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -11169,7 +11169,6 @@
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" "symfony/stopwatch": "^3.0 || ^4.0 || ^5.0"
}, },
"require-dev": { "require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0", "justinrainbow/json-schema": "^5.0",
"keradus/cli-executor": "^1.4", "keradus/cli-executor": "^1.4",
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6",
@ -11178,11 +11177,11 @@
"php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1",
"phpspec/prophecy-phpunit": "^1.1 || ^2.0", "phpspec/prophecy-phpunit": "^1.1 || ^2.0",
"phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.4.4 <9.5", "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.13 || ^9.5",
"phpunitgoodpractices/polyfill": "^1.5", "phpunitgoodpractices/polyfill": "^1.5",
"phpunitgoodpractices/traits": "^1.9.1", "phpunitgoodpractices/traits": "^1.9.1",
"sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1", "sanmai/phpunit-legacy-adapter": "^6.4 || ^8.2.1",
"symfony/phpunit-bridge": "^5.1", "symfony/phpunit-bridge": "^5.2.1",
"symfony/yaml": "^3.0 || ^4.0 || ^5.0" "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
}, },
"suggest": { "suggest": {
@ -11234,7 +11233,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2020-12-24T11:14:44+00:00" "time": "2021-01-18T03:31:06+00:00"
}, },
{ {
"name": "m6web/redis-mock", "name": "m6web/redis-mock",

2
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -327,7 +327,7 @@ class ConfigController extends Controller
$backupCodes = (new BackupCodes())->toArray(); $backupCodes = (new BackupCodes())->toArray();
$backupCodesHashed = array_map( $backupCodesHashed = array_map(
function ($backupCode) { function ($backupCode) {
return password_hash($backupCode, PASSWORD_DEFAULT); return password_hash($backupCode, \PASSWORD_DEFAULT);
}, },
$backupCodes $backupCodes
); );

2
src/Wallabag/CoreBundle/Entity/Tag.php
View file

@ -84,7 +84,7 @@ class Tag
*/ */
public function setLabel($label) public function setLabel($label)
{ {
$this->label = mb_convert_case($label, MB_CASE_LOWER); $this->label = mb_convert_case($label, \MB_CASE_LOWER);
return $this; return $this;
} }

6
src/Wallabag/CoreBundle/Helper/ContentProxy.php
View file

@ -141,7 +141,7 @@ class ContentProxy
$date = $value; $date = $value;
// is it a timestamp? // is it a timestamp?
if (false !== filter_var($date, FILTER_VALIDATE_INT)) { if (false !== filter_var($date, \FILTER_VALIDATE_INT)) {
$date = '@' . $date; $date = '@' . $date;
} }
@ -163,7 +163,7 @@ class ContentProxy
*/ */
public function setEntryDomainName(Entry $entry) public function setEntryDomainName(Entry $entry)
{ {
$domainName = parse_url($entry->getUrl(), PHP_URL_HOST); $domainName = parse_url($entry->getUrl(), \PHP_URL_HOST);
if (false !== $domainName) { if (false !== $domainName) {
$entry->setDomainName($domainName); $entry->setDomainName($domainName);
} }
@ -177,7 +177,7 @@ class ContentProxy
public function setDefaultEntryTitle(Entry $entry) public function setDefaultEntryTitle(Entry $entry)
{ {
$url = parse_url($entry->getUrl()); $url = parse_url($entry->getUrl());
$path = pathinfo($url['path'], PATHINFO_BASENAME); $path = pathinfo($url['path'], \PATHINFO_BASENAME);
if (empty($path)) { if (empty($path)) {
$path = $url['host']; $path = $url['host'];

2
src/Wallabag/CoreBundle/Helper/TagsAssigner.php
View file

@ -44,7 +44,7 @@ class TagsAssigner
} }
foreach ($tags as $label) { foreach ($tags as $label) {
$label = trim(mb_convert_case($label, MB_CASE_LOWER)); $label = trim(mb_convert_case($label, \MB_CASE_LOWER));
// avoid empty tag // avoid empty tag
if (0 === \strlen($label)) { if (0 === \strlen($label)) {

2
src/Wallabag/CoreBundle/Twig/WallabagExtension.php
View file

@ -158,7 +158,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
$nbDays = (int) $interval->format('%a') ?: 1; $nbDays = (int) $interval->format('%a') ?: 1;
// force setlocale for date translation // force setlocale for date translation
setlocale(LC_TIME, strtolower($user->getConfig()->getLanguage()) . '_' . strtoupper(strtolower($user->getConfig()->getLanguage()))); setlocale(\LC_TIME, strtolower($user->getConfig()->getLanguage()) . '_' . strtoupper(strtolower($user->getConfig()->getLanguage())));
return $this->translator->trans('footer.stats', [ return $this->translator->trans('footer.stats', [
'%user_creation%' => strftime('%e %B %Y', $user->getCreatedAt()->getTimestamp()), '%user_creation%' => strftime('%e %B %Y', $user->getCreatedAt()->getTimestamp()),

2
src/Wallabag/ImportBundle/Import/PocketImport.php
View file

@ -246,7 +246,7 @@ class PocketImport extends AbstractImport
{ {
$data = json_decode((string) $response->getBody(), true); $data = json_decode((string) $response->getBody(), true);
if (JSON_ERROR_NONE !== json_last_error()) { if (\JSON_ERROR_NONE !== json_last_error()) {
throw new \InvalidArgumentException('Unable to parse JSON data: ' . json_last_error_msg()); throw new \InvalidArgumentException('Unable to parse JSON data: ' . json_last_error_msg());
} }

2
tests/Wallabag/ApiBundle/Controller/EntryRestControllerTest.php
View file

@ -832,7 +832,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
$this->client->request('GET', '/api/entries/' . $entry->getId() . '/tags'); $this->client->request('GET', '/api/entries/' . $entry->getId() . '/tags');
$this->assertSame(json_encode($tags, JSON_HEX_QUOT), $this->client->getResponse()->getContent()); $this->assertSame(json_encode($tags, \JSON_HEX_QUOT), $this->client->getResponse()->getContent());
} }
public function testPostTagsOnEntry() public function testPostTagsOnEntry()