Keep PhpStorm from fighting Composer on indentation.

This commit is contained in:
Buster "Silver Eagle" Neece 2021-01-21 13:26:38 -06:00
parent 092f4ebd9d
commit 5285024018
No known key found for this signature in database
GPG Key ID: 6D9E12FF03411F4E
2 changed files with 168 additions and 169 deletions

View File

@ -808,7 +808,6 @@ ij_php_while_brace_force = always
ij_php_while_on_new_line = false
[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .prettierrc, .stylelintrc, bowerrc, composer.lock, jest.config}]
indent_size = 2
ij_json_keep_blank_lines_in_code = 0
ij_json_keep_indents_on_empty_lines = false
ij_json_keep_line_breaks = true

View File

@ -1,173 +1,173 @@
{
"name": "azuracast/azuracast",
"description": "The AzuraCast self-hosted web radio station management suite.",
"license": "Apache-2.0",
"type": "project",
"require": {
"php": ">=7.4",
"ext-PDO": "*",
"ext-fileinfo": "*",
"ext-gd": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-redis": "*",
"ext-simplexml": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"azuracast/azuraforms": "dev-master",
"azuracast/nowplaying": "dev-master",
"bacon/bacon-qr-code": "^2.0",
"beberlei/doctrineextensions": "^1.2",
"brick/math": "^0.9",
"composer/ca-bundle": "^1.2",
"doctrine/annotations": "^1.6",
"doctrine/data-fixtures": "^1.3",
"doctrine/dbal": "^2.8",
"doctrine/migrations": "^3.0",
"doctrine/orm": "~2.6",
"gettext/gettext": "^4.4",
"guzzlehttp/guzzle": "^7.0",
"guzzlehttp/oauth-subscriber": "^0.4.0",
"http-interop/http-factory-guzzle": "^1.0",
"intervention/image": "^2.5",
"james-heinrich/getid3": "dev-master",
"jhofm/flysystem-iterator": "^2.1",
"laminas/laminas-config": "^3.3",
"league/flysystem": "^1.0",
"league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-cached-adapter": "^1.0",
"league/mime-type-detection": "^1.5",
"league/plates": "^3.1",
"lstrojny/fxmlrpc": "dev-master",
"matomo/device-detector": "^4.0",
"maxmind-db/reader": "~1.0",
"mezzio/mezzio-session": "^1.3",
"mezzio/mezzio-session-cache": "^1.4",
"mnapoli/silly-php-di": "^1.2",
"monolog/monolog": "^2",
"myclabs/deep-copy": "^1.10",
"nesbot/carbon": "^2.36",
"ocramius/doctrine-batch-utils": "^2.0",
"overtrue/phplint": "^2.0",
"pagerfanta/doctrine-collections-adapter": "^2.5",
"pagerfanta/doctrine-orm-adapter": "^2.5",
"php-di/php-di": "^6.0",
"php-di/slim-bridge": "^3.0",
"psr/http-factory": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^4.0",
"rlanvin/php-ip": "^2.0",
"slim/http": "^1.1",
"slim/slim": "^4.2",
"spatie/flysystem-dropbox": "^1.2",
"spomky-labs/otphp": "^10.0",
"supervisorphp/supervisor": "dev-master",
"symfony/cache": "^5.2",
"symfony/console": "^5",
"symfony/event-dispatcher": "^5",
"symfony/finder": "^5",
"symfony/lock": "^5.1",
"symfony/messenger": "^5",
"symfony/process": "^5",
"symfony/property-access": "^5",
"symfony/redis-messenger": "^5",
"symfony/serializer": "^5",
"symfony/validator": "^5",
"voku/portable-utf8": "^5.4",
"wikimedia/composer-merge-plugin": "dev-feature/composer-v2",
"zircote/swagger-php": "^3"
},
"require-dev": {
"codeception/codeception": "^4.0",
"codeception/module-asserts": "^1.1",
"codeception/module-cli": "^1.0",
"codeception/module-doctrine2": "^1.0",
"codeception/module-phpbrowser": "^1.0",
"codeception/module-rest": "^1.0",
"filp/whoops": "^2",
"mockery/mockery": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-doctrine": "^0.12",
"phpunit/php-timer": "^5.0",
"phpunit/phpunit": "^9.2",
"roave/security-advisories": "dev-master",
"slevomat/coding-standard": "^6.4",
"softcreatr/jsonpath": "^0.7.2",
"squizlabs/php_codesniffer": "^3.5",
"symfony/var-dumper": "^5.1"
},
"replace": {
"symfony/polyfill-php71": "1.99",
"symfony/polyfill-php72": "1.99",
"symfony/polyfill-php73": "1.99",
"symfony/polyfill-php74": "1.99",
"symfony/polyfill-iconv": "1.99",
"symfony/polyfill-intl-grapheme": "1.99",
"symfony/polyfill-intl-normalizer": "1.99",
"symfony/polyfill-mbstring": "1.99"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/mcaskill/composer-merge-plugin.git"
}
],
"scripts": {
"cleanup-and-test": [
"@phpcbf",
"@dev-test"
"name": "azuracast/azuracast",
"description": "The AzuraCast self-hosted web radio station management suite.",
"license": "Apache-2.0",
"type": "project",
"require": {
"php": ">=7.4",
"ext-PDO": "*",
"ext-fileinfo": "*",
"ext-gd": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-redis": "*",
"ext-simplexml": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"azuracast/azuraforms": "dev-master",
"azuracast/nowplaying": "dev-master",
"bacon/bacon-qr-code": "^2.0",
"beberlei/doctrineextensions": "^1.2",
"brick/math": "^0.9",
"composer/ca-bundle": "^1.2",
"doctrine/annotations": "^1.6",
"doctrine/data-fixtures": "^1.3",
"doctrine/dbal": "^2.8",
"doctrine/migrations": "^3.0",
"doctrine/orm": "~2.6",
"gettext/gettext": "^4.4",
"guzzlehttp/guzzle": "^7.0",
"guzzlehttp/oauth-subscriber": "^0.4.0",
"http-interop/http-factory-guzzle": "^1.0",
"intervention/image": "^2.5",
"james-heinrich/getid3": "dev-master",
"jhofm/flysystem-iterator": "^2.1",
"laminas/laminas-config": "^3.3",
"league/flysystem": "^1.0",
"league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-cached-adapter": "^1.0",
"league/mime-type-detection": "^1.5",
"league/plates": "^3.1",
"lstrojny/fxmlrpc": "dev-master",
"matomo/device-detector": "^4.0",
"maxmind-db/reader": "~1.0",
"mezzio/mezzio-session": "^1.3",
"mezzio/mezzio-session-cache": "^1.4",
"mnapoli/silly-php-di": "^1.2",
"monolog/monolog": "^2",
"myclabs/deep-copy": "^1.10",
"nesbot/carbon": "^2.36",
"ocramius/doctrine-batch-utils": "^2.0",
"overtrue/phplint": "^2.0",
"pagerfanta/doctrine-collections-adapter": "^2.5",
"pagerfanta/doctrine-orm-adapter": "^2.5",
"php-di/php-di": "^6.0",
"php-di/slim-bridge": "^3.0",
"psr/http-factory": "^1.0",
"psr/simple-cache": "^1.0",
"ramsey/uuid": "^4.0",
"rlanvin/php-ip": "^2.0",
"slim/http": "^1.1",
"slim/slim": "^4.2",
"spatie/flysystem-dropbox": "^1.2",
"spomky-labs/otphp": "^10.0",
"supervisorphp/supervisor": "dev-master",
"symfony/cache": "^5.2",
"symfony/console": "^5",
"symfony/event-dispatcher": "^5",
"symfony/finder": "^5",
"symfony/lock": "^5.1",
"symfony/messenger": "^5",
"symfony/process": "^5",
"symfony/property-access": "^5",
"symfony/redis-messenger": "^5",
"symfony/serializer": "^5",
"symfony/validator": "^5",
"voku/portable-utf8": "^5.4",
"wikimedia/composer-merge-plugin": "dev-feature/composer-v2",
"zircote/swagger-php": "^3"
},
"require-dev": {
"codeception/codeception": "^4.0",
"codeception/module-asserts": "^1.1",
"codeception/module-cli": "^1.0",
"codeception/module-doctrine2": "^1.0",
"codeception/module-phpbrowser": "^1.0",
"codeception/module-rest": "^1.0",
"filp/whoops": "^2",
"mockery/mockery": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-doctrine": "^0.12",
"phpunit/php-timer": "^5.0",
"phpunit/phpunit": "^9.2",
"roave/security-advisories": "dev-master",
"slevomat/coding-standard": "^6.4",
"softcreatr/jsonpath": "^0.7.2",
"squizlabs/php_codesniffer": "^3.5",
"symfony/var-dumper": "^5.1"
},
"replace": {
"symfony/polyfill-php71": "1.99",
"symfony/polyfill-php72": "1.99",
"symfony/polyfill-php73": "1.99",
"symfony/polyfill-php74": "1.99",
"symfony/polyfill-iconv": "1.99",
"symfony/polyfill-intl-grapheme": "1.99",
"symfony/polyfill-intl-normalizer": "1.99",
"symfony/polyfill-mbstring": "1.99"
},
"repositories": [
{
"type": "git",
"url": "https://github.com/mcaskill/composer-merge-plugin.git"
}
],
"dev-test": [
"@phplint",
"@phpstan",
"@phpcs",
"@codeception-no-coverage"
"scripts": {
"cleanup-and-test": [
"@phpcbf",
"@dev-test"
],
"dev-test": [
"@phplint",
"@phpstan",
"@phpcs",
"@codeception-no-coverage"
],
"phplint": "phplint",
"phpstan": "phpstan analyze",
"phpcs": "phpcs",
"phpcbf": "phpcbf",
"codeception": "codecept run --no-interaction --coverage --coverage-xml --fail-fast",
"codeception-no-coverage": "codecept run --no-interaction",
"ci-import-locales": [
"bin/console locale:import"
]
},
"authors": [
{
"name": "Buster Neece",
"email": "buster@busterneece.com"
}
],
"phplint": "phplint",
"phpstan": "phpstan analyze",
"phpcs": "phpcs",
"phpcbf": "phpcbf",
"codeception": "codecept run --no-interaction --coverage --coverage-xml --fail-fast",
"codeception-no-coverage": "codecept run --no-interaction",
"ci-import-locales": [
"bin/console locale:import"
]
},
"authors": [
{
"name": "Buster Neece",
"email": "buster@busterneece.com"
"autoload": {
"psr-4": {
"App\\": "src"
}
},
"bin": [
"bin/console"
],
"config": {
"preferred-install": "dist",
"discard-changes": true,
"sort-packages": true
},
"prefer-stable": true,
"minimum-stability": "dev",
"extra": {
"merge-plugin": {
"include": [
"plugins/*/composer.json"
],
"recurse": true,
"replace": true,
"ignore-duplicates": false,
"merge-dev": true,
"merge-extra": false,
"merge-extra-deep": false,
"merge-scripts": false
}
}
],
"autoload": {
"psr-4": {
"App\\": "src"
}
},
"bin": [
"bin/console"
],
"config": {
"preferred-install": "dist",
"discard-changes": true,
"sort-packages": true
},
"prefer-stable": true,
"minimum-stability": "dev",
"extra": {
"merge-plugin": {
"include": [
"plugins/*/composer.json"
],
"recurse": true,
"replace": true,
"ignore-duplicates": false,
"merge-dev": true,
"merge-extra": false,
"merge-extra-deep": false,
"merge-scripts": false
}
}
}