Skip to content

Commit cb83f95

Browse files
mikebronnermikebronner
committed
Updated codespace configuration.
1 parent 6045f3d commit cb83f95

File tree

12 files changed

+85
-102
lines changed

12 files changed

+85
-102
lines changed

Diff for: ‎.devcontainer/devcontainer.json

+12-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"davidanson.vscode-markdownlint",
3030
"davidbwaters.macos-modern-theme",
3131
"eamodio.gitlens",
32-
"[email protected]",
3332
"editorconfig.editorconfig",
3433
"ericcheng.codesongclear",
3534
"faelv.composer-companion",
@@ -82,10 +81,18 @@
8281
},
8382
"remoteUser": "sail",
8483
"postCreateCommand": "sudo chown -R 1000:1000 /var/www/html",
85-
// "forwardPorts": [
86-
// ],
87-
// "portsAttributes": {
88-
// },
84+
"forwardPorts": [
85+
5432,
86+
6379
87+
],
88+
"portsAttributes": {
89+
"5432": {
90+
"label": "Postgres"
91+
},
92+
"6379": {
93+
"label": "Redis"
94+
}
95+
},
8996
"mounts": [
9097
"source=${localEnv:HOME}/.wakatime.cfg,target=/home/sail/.wakatime.cfg,type=bind,consistency=delegated"
9198
]

Diff for: ‎.editorconfig

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
indent_size = 2
14+
15+
[*.{yml,yaml}]
16+
indent_size = 2
17+
18+
[.blackfire.yaml]
19+
indent_size = 4

Diff for: ‎.github/workflows/laravel.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242

4343
- uses: harmon758/postgresql-action@v1
4444
with:
45-
postgresql version: '11'
45+
postgresql version: '15'
4646
postgresql db: 'testing'
4747
postgresql user: 'homestead'
4848
postgresql password: 'secret'

Diff for: ‎.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
.idea
2+
.phpunit.result.cache
3+
/.phpunit*
14
/build
25
/vendor
36
composer.lock
4-
.phpunit.result.cache
5-
phpunit.xml
6-
.idea

Diff for: ‎.vscode/extensions.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
"davidanson.vscode-markdownlint",
1515
"davidbwaters.macos-modern-theme",
1616
"eamodio.gitlens",
17-
"[email protected]",
1817
"editorconfig.editorconfig",
1918
"ericcheng.codesongclear",
2019
"faelv.composer-companion",
@@ -67,4 +66,4 @@
6766
"ikappas.phpcs",
6867
"linyang95.phpmd"
6968
]
70-
}
69+
}

Diff for: ‎.vscode/settings.json

+5-7
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
"editor.suggest.localityBonus": true,
146146
"editor.suggest.showValues": false,
147147
"editor.trimAutoWhitespace": true,
148-
"editor.wordBasedSuggestions": false,
148+
"editor.wordBasedSuggestions": "off",
149149
"editor.wordSeparators": "`~!@#%^&*()-=+[{]}\\|;:'\",.<>/?",
150150
"editor.wordWrapColumn": 100,
151151
"editor.wrappingIndent": "none",
@@ -270,9 +270,6 @@
270270
"php.validate.run": "onType",
271271
"phpcs.executablePath": "vendor/bin/phpcs",
272272
"phpcs.showSources": true,
273-
"phpmd.rules": "phpmd.xml",
274-
"phpmd.command": "vendor/bin/phpmd",
275-
"phpmd.verbose": true,
276273
"phpunit.args": [
277274
"--coverage-clover=coverage.xml",
278275
],
@@ -301,7 +298,7 @@
301298
"window.commandCenter": true,
302299
"workbench.editor.enablePreview": false,
303300
"workbench.editor.showIcons": false,
304-
"workbench.editor.showTabs": false,
301+
"workbench.editor.showTabs": "single",
305302
"workbench.editor.tabCloseButton": "left",
306303
"workbench.fontAliasing": "auto",
307304
"workbench.iconTheme": "file-icons",
@@ -316,5 +313,6 @@
316313
"[php]": {
317314
"editor.defaultFormatter": "bmewburn.vscode-intelephense-client"
318315
},
319-
"window.title": "totality"
320-
}
316+
"window.title": "totality",
317+
"workbench.editor.tabActionLocation": "left"
318+
}

Diff for: ‎composer.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232
"orchestra/testbench-browser-kit": "^8.0",
3333
"orchestra/testbench": "^8.0",
3434
"php-coveralls/php-coveralls" : "^2.2",
35-
"phpmd/phpmd": "^2.11",
36-
"phpunit/phpunit": "^9.5",
35+
"phpunit/phpunit": "^10.0",
3736
"slevomat/coding-standard": "^7.0",
3837
"squizlabs/php_codesniffer": "^3.6",
3938
"symfony/thanks": "^1.2",

Diff for: ‎phpmd.xml

-47
This file was deleted.

Diff for: ‎phpunit.xml

+43-32
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,45 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
3-
<coverage processUncoveredFiles="false">
4-
<include>
5-
<directory suffix=".php">./src</directory>
6-
</include>
7-
</coverage>
8-
<testsuites>
9-
<testsuite name="Feature">
10-
<directory suffix="Test.php">./tests/Feature</directory>
11-
</testsuite>
12-
<testsuite name="Integration">
13-
<directory suffix="Test.php">./tests/Integration</directory>
14-
</testsuite>
15-
<testsuite name="Nova">
16-
<directory suffix="Test.php">./tests/Nova</directory>
17-
</testsuite>
18-
</testsuites>
19-
<php>
20-
<env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
21-
<env name="APP_ENV" value="testing"/>
22-
<env name="APP_URL" value="http://127.0.0.1"/>
23-
<env name="CACHE_DRIVER" value="redis"/>
24-
<env name="SESSION_DRIVER" value="array"/>
25-
<env name="QUEUE_DRIVER" value="sync"/>
26-
<env name="DB_CONNECTION" value="sqlite"/>
27-
<env name="DB_DATABASE" value=":memory:"/>
28-
<env name="REDIS_HOST" value="redis"/>
29-
<env name="PGSQL_HOST" value="pgsql"/>
30-
<env name="PGSQL_USERNAME" value="forge"/>
31-
<env name="PGSQL_PASSWORD" value="secret"/>
32-
<env name="PGSQL_DATABASE" value="testing"/>
33-
</php>
2+
<phpunit
3+
backupGlobals="false"
4+
backupStaticProperties="false"
5+
bootstrap="vendor/autoload.php"
6+
cacheDirectory=".phpunit.cache"
7+
colors="true"
8+
processIsolation="false"
9+
stopOnFailure="true"
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
12+
>
13+
<coverage/>
14+
<testsuites>
15+
<testsuite name="Feature">
16+
<directory suffix="Test.php">./tests/Feature</directory>
17+
</testsuite>
18+
<testsuite name="Integration">
19+
<directory suffix="Test.php">./tests/Integration</directory>
20+
</testsuite>
21+
<testsuite name="Nova">
22+
<directory suffix="Test.php">./tests/Nova</directory>
23+
</testsuite>
24+
</testsuites>
25+
<php>
26+
<env name="APP_KEY" value="base64:Xgs1LQt1GdVHhD6qyYCXnyq61DE3UKqJ5k2SJc+Nw2g="/>
27+
<env name="APP_ENV" value="testing"/>
28+
<env name="APP_URL" value="http://127.0.0.1"/>
29+
<env name="CACHE_DRIVER" value="redis"/>
30+
<env name="SESSION_DRIVER" value="array"/>
31+
<env name="QUEUE_DRIVER" value="sync"/>
32+
<env name="DB_CONNECTION" value="sqlite"/>
33+
<env name="DB_DATABASE" value=":memory:"/>
34+
<env name="REDIS_HOST" value="redis"/>
35+
<env name="PGSQL_HOST" value="pgsql"/>
36+
<env name="PGSQL_USERNAME" value="forge"/>
37+
<env name="PGSQL_PASSWORD" value="secret"/>
38+
<env name="PGSQL_DATABASE" value="testing"/>
39+
</php>
40+
<source>
41+
<include>
42+
<directory suffix=".php">./src</directory>
43+
</include>
44+
</source>
3445
</phpunit>

Diff for: ‎tools/phpcs

-1
This file was deleted.

Diff for: ‎tools/phpmd

-1
This file was deleted.

Diff for: ‎tools/phpunit

-1
This file was deleted.

0 commit comments

Comments
 (0)