From a807a2f3445387fa9f5bc8956d97cc0bc776e5fd Mon Sep 17 00:00:00 2001 From: Florian Engelhardt Date: Fri, 3 Jul 2020 14:28:02 +0200 Subject: [PATCH] OXDEV-3559 Fix indention --- .editorconfig | 6 +-- composer.json | 134 +++++++++++++++++++++++++------------------------- 2 files changed, 68 insertions(+), 72 deletions(-) diff --git a/.editorconfig b/.editorconfig index db7ef88..df49ec4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,9 +13,5 @@ indent_size = 4 trim_trailing_whitespace = true # Tab indentation (no size specified) -[Makefile,phpstan-baseline.neon] +[Makefile] indent_style = tab - -[{composer.json,.travis.yml}] -indent_style = space -indent_size = 2 diff --git a/composer.json b/composer.json index bad4b1a..2fc7b85 100644 --- a/composer.json +++ b/composer.json @@ -1,70 +1,70 @@ { - "name": "oxid-esales/graphql-module-skeleton", - "description": "OXID eSales GraphQL module skeleton", - "type": "oxideshop-module", - "keywords": ["oxid", "modules", "eShop", "GraphQL"], - "license": ["GPL-3.0"], - "extra": { - "oxideshop": { - "target-directory": "oe/graphql-module", - "blacklist-filter": [ - "src/**/*.php", - "tests/**/*.php" - ] + "name": "oxid-esales/graphql-module-skeleton", + "description": "OXID eSales GraphQL module skeleton", + "type": "oxideshop-module", + "keywords": ["oxid", "modules", "eShop", "GraphQL"], + "license": ["GPL-3.0"], + "extra": { + "oxideshop": { + "target-directory": "oe/graphql-module", + "blacklist-filter": [ + "src/**/*.php", + "tests/**/*.php" + ] + } + }, + "require": { + "php": "^7.1", + "oxid-esales/graphql-base": "^2.3" + }, + "require-dev": { + "phpunit/phpunit": "^7.5", + "squizlabs/php_codesniffer": "^3.5.2", + "jakub-onderka/php-parallel-lint": "^1.0", + "phpstan/phpstan": "^0.12", + "oxid-esales/oxideshop-ce": "^6.5", + "oxid-esales/oxideshop-unified-namespace-generator": "^2.0", + "friendsofphp/php-cs-fixer": "^2.16" + }, + "autoload": { + "psr-4": { + "OxidEsales\\GraphQL\\Skeleton\\": "src" + } + }, + "autoload-dev": { + "psr-4": { + "OxidEslaes\\GraphQL\\Skeleton\\Tests\\": "tests" + } + }, + "scripts": { + "pre-install-cmd": [ + "OxidEsales\\GraphQL\\Skeleton\\Installer::preInstall" + ], + "pre-update-cmd": [ + "OxidEsales\\GraphQL\\Skeleton\\Installer::preInstall" + ], + "post-create-project-cmd": [ + "OxidEsales\\GraphQL\\Skeleton\\Installer::postInstall", + "composer update", + "@fix" + ], + "fix:cbf": "phpcbf", + "fix:fixer": "php-cs-fixer fix", + "fix": [ + "@fix:cbf", + "@fix:fixer" + ], + "test:syntax": "parallel-lint src/", + "test:lint": "phpcs", + "test:lint-fixer": "php-cs-fixer fix --dry-run", + "test:static": "phpstan analyse src/", + "test:unit": "phpunit -c tests/phpunit.xml tests/Unit/", + "test": [ + "@test:syntax", + "@test:lint", + "@test:lint-fixer", + "@test:static", + "@test:unit" + ] } - }, - "require": { - "php": "^7.1", - "oxid-esales/graphql-base": "^2.3" - }, - "require-dev": { - "phpunit/phpunit": "^7.5", - "squizlabs/php_codesniffer": "^3.5.2", - "jakub-onderka/php-parallel-lint": "^1.0", - "phpstan/phpstan": "^0.12", - "oxid-esales/oxideshop-ce": "^6.5", - "oxid-esales/oxideshop-unified-namespace-generator": "^2.0", - "friendsofphp/php-cs-fixer": "^2.16" - }, - "autoload": { - "psr-4": { - "OxidEsales\\GraphQL\\Skeleton\\": "src" - } - }, - "autoload-dev": { - "psr-4": { - "OxidEslaes\\GraphQL\\Skeleton\\Tests\\": "tests" - } - }, - "scripts": { - "pre-install-cmd": [ - "OxidEsales\\GraphQL\\Skeleton\\Installer::preInstall" - ], - "pre-update-cmd": [ - "OxidEsales\\GraphQL\\Skeleton\\Installer::preInstall" - ], - "post-create-project-cmd": [ - "OxidEsales\\GraphQL\\Skeleton\\Installer::postInstall", - "composer update", - "@fix" - ], - "fix:cbf": "phpcbf", - "fix:fixer": "php-cs-fixer fix", - "fix": [ - "@fix:cbf", - "@fix:fixer" - ], - "test:syntax": "parallel-lint src/", - "test:lint": "phpcs", - "test:lint-fixer": "php-cs-fixer fix --dry-run", - "test:static": "phpstan analyse src/", - "test:unit": "phpunit -c tests/phpunit.xml tests/Unit/", - "test": [ - "@test:syntax", - "@test:lint", - "@test:lint-fixer", - "@test:static", - "@test:unit" - ] - } }