Skip to content

Commit dbc8996

Browse files
committed
Merge branch 'master' of github.com:mixerapi/mixerapi-dev
2 parents 12c5ad4 + 52dcfb2 commit dbc8996

60 files changed

Lines changed: 2723 additions & 464 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,3 +115,4 @@ To build:
115115
```console
116116
composer mkdocs-build
117117
```
118+

composer.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"MixerApi\\Bake\\": "plugins/bake/src/",
4747
"MixerApi\\CollectionView\\": "plugins/collection-view/src/",
4848
"MixerApi\\Core\\": "plugins/core/src/",
49+
"MixerApi\\Crud\\": "plugins/crud/src/",
4950
"MixerApi\\ExceptionRender\\": "plugins/exception-render/src/",
5051
"MixerApi\\HalView\\": "plugins/hal-view/src/",
5152
"MixerApi\\JsonLdView\\": "plugins/json-ld-view/src/",
@@ -62,6 +63,8 @@
6263
"MixerApi\\CollectionView\\Test\\App\\": "plugins/collection-view/tests/test_app/src/",
6364
"MixerApi\\Core\\Test\\": "plugins/core/tests/",
6465
"MixerApi\\Core\\Test\\App\\": "plugins/core/tests/test_app/src/",
66+
"MixerApi\\Crud\\Test\\": "plugins/crud/tests/",
67+
"MixerApi\\Crud\\Test\\App\\": "plugins/crud/tests/test_app/src/",
6568
"MixerApi\\ExceptionRender\\Test\\": "plugins/exception-render/tests/",
6669
"MixerApi\\ExceptionRender\\Test\\App\\": "plugins/exception-render/tests/test_app/src/",
6770
"MixerApi\\HalView\\Test\\": "plugins/hal-view/tests/",
@@ -83,16 +86,16 @@
8386
"@phpmd"
8487
],
8588
"test": "phpunit --colors=always",
86-
"phpcs": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP plugins/*/src",
89+
"phpcs": "phpcs --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP plugins/*/src",
8790
"phpcbf": "phpcbf --colors -p --standard=vendor/cakephp/cakephp-codesniffer/CakePHP plugins/*/src",
8891
"phpstan": "phpstan analyse plugins/*/src",
8992
"phpmd": "phpmd plugins --exclude tests,assets,config ansi phpmd.xml",
9093
"coverage": "phpunit --coverage-html coverage-reports/",
9194
"mkdocs-run": "docker run --rm -it --network=host -v ${PWD}:/docs --user $(id -u):$(id -g) systematical/mixerapidocs:latest",
9295
"mkdocs-build": [
93-
"docker pull systematical/mixerapidocs:latest",
94-
"git pull",
95-
"docker run --rm --network=host -v ${PWD}:/docs --user $(id -u):$(id -g) systematical/mixerapidocs:latest mkdocs build"
96+
"docker pull systematical/mixerapidocs:latest",
97+
"git pull",
98+
"docker run --rm --network=host -v ${PWD}:/docs --user $(id -u):$(id -g) systematical/mixerapidocs:latest mkdocs build"
9699
]
97100
},
98101
"prefer-stable": true,

0 commit comments

Comments
 (0)