mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-05 15:08:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6113 from wallabag/dependabot/composer/friendsofphp/php-cs-fixer-3.4.0

Browse source 
Bump friendsofphp/php-cs-fixer from 2.19.3 to 3.4.0
This commit is contained in:
Jérémy Benoist 2022-12-13 10:30:58 +01:00 committed by GitHub
commit a57c815ddc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 51 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -122,7 +122,7 @@
"require-dev": { "require-dev": {
"dama/doctrine-test-bundle": "^6.0", "dama/doctrine-test-bundle": "^6.0",
"doctrine/doctrine-fixtures-bundle": "~3.0", "doctrine/doctrine-fixtures-bundle": "~3.0",
"friendsofphp/php-cs-fixer": "~2.13", "friendsofphp/php-cs-fixer": "~3.4",
"friendsoftwig/twigcs": "^6.0", "friendsoftwig/twigcs": "^6.0",
"m6web/redis-mock": "^5.0", "m6web/redis-mock": "^5.0",
"php-http/mock-client": "^1.0", "php-http/mock-client": "^1.0",

171
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "7b841fce4fa9254c6b7aeaf23ce1c63a", "content-hash": "a73815597d28c46c558e2acd00f04f26",
"packages": [ "packages": [
{ {
"name": "babdev/pagerfanta-bundle", "name": "babdev/pagerfanta-bundle",
@ -11919,85 +11919,65 @@
}, },
{ {
"name": "friendsofphp/php-cs-fixer", "name": "friendsofphp/php-cs-fixer",
"version": "v2.19.3", "version": "v3.4.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": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8" "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8", "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
"reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8", "reference": "47177af1cfb9dab5d1cc4daf91b7179c2efe7fad",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/semver": "^1.4 || ^2.0 || ^3.0", "composer/semver": "^3.2",
"composer/xdebug-handler": "^1.2 || ^2.0", "composer/xdebug-handler": "^2.0",
"doctrine/annotations": "^1.2", "doctrine/annotations": "^1.12",
"ext-json": "*", "ext-json": "*",
"ext-tokenizer": "*", "ext-tokenizer": "*",
"php": "^5.6 || ^7.0 || ^8.0", "php": "^7.2.5 || ^8.0",
"php-cs-fixer/diff": "^1.3", "php-cs-fixer/diff": "^2.0",
"symfony/console": "^3.4.43 || ^4.1.6 || ^5.0", "symfony/console": "^4.4.20 || ^5.1.3 || ^6.0",
"symfony/event-dispatcher": "^3.0 || ^4.0 || ^5.0", "symfony/event-dispatcher": "^4.4.20 || ^5.0 || ^6.0",
"symfony/filesystem": "^3.0 || ^4.0 || ^5.0", "symfony/filesystem": "^4.4.20 || ^5.0 || ^6.0",
"symfony/finder": "^3.0 || ^4.0 || ^5.0", "symfony/finder": "^4.4.20 || ^5.0 || ^6.0",
"symfony/options-resolver": "^3.0 || ^4.0 || ^5.0", "symfony/options-resolver": "^4.4.20 || ^5.0 || ^6.0",
"symfony/polyfill-php70": "^1.0", "symfony/polyfill-mbstring": "^1.23",
"symfony/polyfill-php72": "^1.4", "symfony/polyfill-php80": "^1.23",
"symfony/process": "^3.0 || ^4.0 || ^5.0", "symfony/polyfill-php81": "^1.23",
"symfony/stopwatch": "^3.0 || ^4.0 || ^5.0" "symfony/process": "^4.4.20 || ^5.0 || ^6.0",
"symfony/stopwatch": "^4.4.20 || ^5.0 || ^6.0"
}, },
"require-dev": { "require-dev": {
"justinrainbow/json-schema": "^5.0", "justinrainbow/json-schema": "^5.2",
"keradus/cli-executor": "^1.4", "keradus/cli-executor": "^1.5",
"mikey179/vfsstream": "^1.6", "mikey179/vfsstream": "^1.6.8",
"php-coveralls/php-coveralls": "^2.4.2", "php-coveralls/php-coveralls": "^2.5.2",
"php-cs-fixer/accessible-object": "^1.0", "php-cs-fixer/accessible-object": "^1.1",
"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": "^1.15",
"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.5", "phpunit/phpunit": "^8.5.21 || ^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", "symfony/phpunit-bridge": "^5.2.4 || ^6.0",
"symfony/phpunit-bridge": "^5.2.1", "symfony/yaml": "^4.4.20 || ^5.0 || ^6.0"
"symfony/yaml": "^3.0 || ^4.0 || ^5.0"
}, },
"suggest": { "suggest": {
"ext-dom": "For handling output formats in XML", "ext-dom": "For handling output formats in XML",
"ext-mbstring": "For handling non-UTF8 characters.", "ext-mbstring": "For handling non-UTF8 characters."
"php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
"php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
"symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
}, },
"bin": [ "bin": [
"php-cs-fixer" "php-cs-fixer"
], ],
"type": "application", "type": "application",
"extra": {
"branch-alias": {
"dev-master": "2.19-dev"
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"PhpCsFixer\\": "src/" "PhpCsFixer\\": "src/"
}, }
"classmap": [
"tests/Test/AbstractFixerTestCase.php",
"tests/Test/AbstractIntegrationCaseFactory.php",
"tests/Test/AbstractIntegrationTestCase.php",
"tests/Test/Assert/AssertTokensTrait.php",
"tests/Test/IntegrationCase.php",
"tests/Test/IntegrationCaseFactory.php",
"tests/Test/IntegrationCaseFactoryInterface.php",
"tests/Test/InternalIntegrationCaseFactory.php",
"tests/Test/IsIdenticalConstraint.php",
"tests/Test/TokensWithObservedTransformers.php",
"tests/TestCase.php"
]
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
"license": [ "license": [
@ -12016,7 +11996,7 @@
"description": "A tool to automatically fix PHP code style", "description": "A tool to automatically fix PHP code style",
"support": { "support": {
"issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues",
"source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v2.19.3" "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.4.0"
}, },
"funding": [ "funding": [
{ {
@ -12024,7 +12004,7 @@
"type": "github" "type": "github"
} }
], ],
"time": "2021-11-15T17:17:55+00:00" "time": "2021-12-11T16:25:08+00:00"
}, },
{ {
"name": "friendsoftwig/twigcs", "name": "friendsoftwig/twigcs",
@ -12182,16 +12162,16 @@
}, },
{ {
"name": "php-cs-fixer/diff", "name": "php-cs-fixer/diff",
"version": "v1.3.1", "version": "v2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/PHP-CS-Fixer/diff.git", "url": "https://github.com/PHP-CS-Fixer/diff.git",
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759" "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/dbd31aeb251639ac0b9e7e29405c1441907f5759", "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"reference": "dbd31aeb251639ac0b9e7e29405c1441907f5759", "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -12219,22 +12199,19 @@
{ {
"name": "Kore Nordmann", "name": "Kore Nordmann",
"email": "mail@kore-nordmann.de" "email": "mail@kore-nordmann.de"
},
{
"name": "SpacePossum"
} }
], ],
"description": "sebastian/diff v2 backport support for PHP5.6", "description": "sebastian/diff v3 backport support for PHP 5.6+",
"homepage": "https://github.com/PHP-CS-Fixer", "homepage": "https://github.com/PHP-CS-Fixer",
"keywords": [ "keywords": [
"diff" "diff"
], ],
"support": { "support": {
"issues": "https://github.com/PHP-CS-Fixer/diff/issues", "issues": "https://github.com/PHP-CS-Fixer/diff/issues",
"source": "https://github.com/PHP-CS-Fixer/diff/tree/v1.3.1" "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2"
}, },
"abandoned": true, "abandoned": true,
"time": "2020-10-14T08:39:05+00:00" "time": "2020-10-14T08:32:19+00:00"
}, },
{ {
"name": "php-http/mock-client", "name": "php-http/mock-client",
@ -12769,74 +12746,6 @@
} }
], ],
"time": "2022-11-18T19:08:09+00:00" "time": "2022-11-18T19:08:09+00:00"
},
{
"name": "symfony/polyfill-php70",
"version": "v1.20.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php70.git",
"reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
"reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "metapackage",
"extra": {
"branch-alias": {
"dev-main": "1.20-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-10-23T14:02:19+00:00"
} }
], ],
"aliases": [], "aliases": [],

2
src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php
View file

@ -9,7 +9,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
abstract class WallabagMigration extends AbstractMigration implements ContainerAwareInterface abstract class WallabagMigration extends AbstractMigration implements ContainerAwareInterface
{ {
const UN_ESCAPED_TABLE = true; public const UN_ESCAPED_TABLE = true;
/** /**
* @var ContainerInterface * @var ContainerInterface

4
src/Wallabag/CoreBundle/Entity/Config.php
View file

@ -21,8 +21,8 @@ use Wallabag\UserBundle\Entity\User;
*/ */
class Config class Config
{ {
const REDIRECT_TO_HOMEPAGE = 0; public const REDIRECT_TO_HOMEPAGE = 0;
const REDIRECT_TO_CURRENT_PAGE = 1; public const REDIRECT_TO_CURRENT_PAGE = 1;
/** /**
* @var int * @var int

2
src/Wallabag/CoreBundle/Event/EntryDeletedEvent.php
View file

@ -10,7 +10,7 @@ use Wallabag\CoreBundle\Entity\Entry;
*/ */
class EntryDeletedEvent extends Event class EntryDeletedEvent extends Event
{ {
const NAME = 'entry.deleted'; public const NAME = 'entry.deleted';
protected $entry; protected $entry;

2
src/Wallabag/CoreBundle/Event/EntrySavedEvent.php
View file

@ -10,7 +10,7 @@ use Wallabag\CoreBundle\Entity\Entry;
*/ */
class EntrySavedEvent extends Event class EntrySavedEvent extends Event
{ {
const NAME = 'entry.saved'; public const NAME = 'entry.saved';
protected $entry; protected $entry;

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

@ -19,7 +19,7 @@ use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
class DownloadImages class DownloadImages
{ {
const REGENERATE_PICTURES_QUALITY = 80; public const REGENERATE_PICTURES_QUALITY = 80;
private $client; private $client;
private $baseFolder; private $baseFolder;

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

@ -47,7 +47,7 @@ class TagsAssigner
$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 ('' === $label) {
continue; continue;
} }

2
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View file

@ -383,7 +383,7 @@ class EntryRepository extends ServiceEntityRepository
* Remove tags from all user entries. * Remove tags from all user entries.
* *
* @param int $userId * @param int $userId
* @param Array<Tag> $tags * @param array<Tag> $tags
*/ */
public function removeTags($userId, $tags) public function removeTags($userId, $tags)
{ {

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

@ -14,7 +14,7 @@ use Wallabag\CoreBundle\Entity\Entry;
class PocketImport extends AbstractImport class PocketImport extends AbstractImport
{ {
const NB_ELEMENTS = 5000; public const NB_ELEMENTS = 5000;
/** /**
* @var HttpMethodsClient * @var HttpMethodsClient
*/ */

2
tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
View file

@ -17,7 +17,7 @@ use Wallabag\UserBundle\Entity\User;
class EntryControllerTest extends WallabagCoreTestCase class EntryControllerTest extends WallabagCoreTestCase
{ {
const AN_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE = 'https://www.lemonde.fr/judo/article/2017/11/11/judo-la-decima-de-teddy-riner_5213605_1556020.html'; public const AN_URL_CONTAINING_AN_ARTICLE_WITH_IMAGE = 'https://www.lemonde.fr/judo/article/2017/11/11/judo-la-decima-de-teddy-riner_5213605_1556020.html';
public $downloadImagesEnabled = false; public $downloadImagesEnabled = false;
public $url = 'https://www.lemonde.fr/pixels/article/2019/06/18/ce-qu-il-faut-savoir-sur-le-libra-la-cryptomonnaie-de-facebook_5477887_4408996.html'; public $url = 'https://www.lemonde.fr/pixels/article/2019/06/18/ce-qu-il-faut-savoir-sur-le-libra-la-cryptomonnaie-de-facebook_5477887_4408996.html';
private $entryDataTestAttribute = '[data-test="entry"]'; private $entryDataTestAttribute = '[data-test="entry"]';