Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix EditorConfig configuration #15

Closed
wants to merge 2 commits into from
Closed

Fix EditorConfig configuration #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35d3f14
Fix EditorConfig configuration
szepeviktor Nov 1, 2023
af7b428
Merge branch 'develop' into ec
szepeviktor Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,12 @@ charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = tab
indent_size = 4

[*.{js,jsx,scss,css,json,yaml,yml,feature,xml}]
indent_style = space
indent_size = 2

# Composer File
[composer.{json,lock}]
indent_style = space
[*.php]
indent_style = tab
indent_size = 4

# Dotfiles
[.*]
indent_style = space
indent_size = 2
[LICENSE]
indent_style = unset
2 changes: 1 addition & 1 deletion .phpcs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<arg value="ps"/>

<!-- Enable colors in report -->
<arg name="colors" />
<arg name="colors" />

<!-- Whenever possible, cache the scan results and re-use those for unchanged files on the next scan. -->
<arg name="cache" value=".phpcs/cache.json" />
Expand Down
30 changes: 15 additions & 15 deletions phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<phpunit
bootstrap="tests/bootstrap.php"
backupGlobals="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
bootstrap="tests/bootstrap.php"
backupGlobals="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
printerClass="NunoMaduro\Collision\Adapters\Phpunit\Printer"
>
<testsuites>
<testsuite name="Feature">
<directory prefix="test-" suffix=".php">tests/feature</directory>
</testsuite>
<testsuite name="Unit">
<directory prefix="test-" suffix=".php">tests/unit</directory>
</testsuite>
</testsuites>
<testsuites>
<testsuite name="Feature">
<directory prefix="test-" suffix=".php">tests/feature</directory>
</testsuite>
<testsuite name="Unit">
<directory prefix="test-" suffix=".php">tests/unit</directory>
</testsuite>
</testsuites>
</phpunit>