Skip to content

Commit d50c8c9

Browse files
authored
Merge pull request #682 from flightphp/simplify-git-attributes
Simplify git attributes
2 parents 59f0502 + 9ef15cf commit d50c8c9

File tree

5 files changed

+61
-6
lines changed

5 files changed

+61
-6
lines changed

.gitattributes

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1+
/.gemini export-ignore
12
/.github export-ignore
23
/tests export-ignore
34
/.editorconfig export-ignore
45
/.gitattributes export-ignore
56
/.gitignore export-ignore
6-
/phpcs.xml export-ignore
7-
/phpstan.neon export-ignore
7+
/CONTRIBUTING.md export-ignore
8+
/index.php export-ignore
9+
/phpcs.xml.dist export-ignore
810
/phpstan-baseline.neon export-ignore
9-
/phpunit.xml export-ignore
11+
/phpstan.dist.neon export-ignore
12+
/phpunit-watcher.yml export-ignore
13+
/phpunit.xml.dist export-ignore

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ coverage/
88
*.sublime*
99
clover.xml
1010
phpcs.xml
11+
phpstan.neon
12+
phpunit.xml
1113
.runway-config.json
1214
.runway-creds.json
1315
.DS_Store

composer.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,13 @@
8282
"rm server.pid",
8383
"echo \"Performance Tests Completed.\""
8484
],
85-
"lint": "phpstan --no-progress --memory-limit=256M -cphpstan.neon",
85+
"lint": "phpstan --no-progress --memory-limit=256M",
8686
"beautify": "phpcbf --standard=phpcs.xml",
8787
"phpcs": "phpcs --standard=phpcs.xml -n",
8888
"post-install-cmd": [
89-
"php -r \"if (!file_exists('phpcs.xml')) copy('phpcs.xml.dist', 'phpcs.xml');\""
89+
"php -r \"if (!file_exists('phpcs.xml')) copy('phpcs.xml.dist', 'phpcs.xml');\"",
90+
"php -r \"if (!file_exists('phpstan.neon')) copy('phpstan.dist.neon', 'phpstan.neon');\"",
91+
"php -r \"if (!file_exists('phpunit.xml')) copy('phpunit.xml.dist', 'phpunit.xml');\""
9092
]
9193
},
9294
"suggest": {
@@ -97,4 +99,4 @@
9799
"replace": {
98100
"mikecao/flight": "2.0.2"
99101
}
100-
}
102+
}

phpstan.dist.neon

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
includes:
2+
- vendor/phpstan/phpstan/conf/bleedingEdge.neon
3+
- phpstan-baseline.neon
4+
5+
parameters:
6+
level: 6
7+
excludePaths:
8+
- vendor
9+
- flight/util/ReturnTypeWillChange.php
10+
- tests/named-arguments
11+
paths:
12+
- flight
13+
- index.php
14+
treatPhpDocTypesAsCertain: false

phpunit.xml.dist

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
5+
bootstrap="tests/phpunit_autoload.php"
6+
executionOrder="random"
7+
beStrictAboutOutputDuringTests="true"
8+
beStrictAboutTodoAnnotatedTests="true"
9+
convertDeprecationsToExceptions="true"
10+
stopOnError="true"
11+
stopOnFailure="true"
12+
verbose="true"
13+
colors="true">
14+
<coverage processUncoveredFiles="false">
15+
<include>
16+
<directory suffix=".php">flight/</directory>
17+
</include>
18+
<exclude>
19+
<file>flight/autoload.php</file>
20+
</exclude>
21+
</coverage>
22+
<testsuites>
23+
<testsuite name="default">
24+
<directory>tests/</directory>
25+
<exclude>tests/named-arguments/</exclude>
26+
</testsuite>
27+
</testsuites>
28+
<logging />
29+
<php>
30+
<ini name="error_reporting" value="-1"/>
31+
<env name="PHPUNIT_TEST" value="true" force="true" />
32+
</php>
33+
</phpunit>

0 commit comments

Comments
 (0)