Skip to content

Commit f6986ab

Browse files
authored
Fix url to phpcs.xml.dist, ignore .ddev dir, support 'drupal' project type (#51)
* Fix url to phpcs.xml.dist * Support drupal project type
1 parent a758ddb commit f6986ab

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

commands/web/eslint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Description: Run eslint inside the web container
66
## Usage: eslint [flags] [args]
77
## Example: "ddev eslint"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
if "$DDEV_DOCROOT/core/node_modules/.bin/eslint" --version >/dev/null ; then

commands/web/nightwatch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Description: Run nightwatch inside the web container
66
## Usage: nightwatch [flags] [args]
77
## Example: "ddev nightwatch"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
yarn --cwd "$DDEV_DOCROOT/core" test:nightwatch "$DDEV_COMPOSER_ROOT/$DDEV_DOCROOT/modules/custom/" "$@"

commands/web/phpcbf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Description: Run phpcbf inside the web container
66
## Usage: phpcbf [flags] [args]
77
## Example: "ddev phpcbf" or "ddev phpcbf -n"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
if ! command -v phpcbf >/dev/null; then

commands/web/phpcs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
## Description: Run phpcs inside the web container
66
## Usage: phpcs [flags] [args]
77
## Example: "ddev phpcs" or "ddev phpcs -n"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
if ! command -v phpcs >/dev/null; then
1212
echo "phpcs is not available. You may need to 'ddev composer install'"
1313
exit 1
1414
fi
15-
test -e phpcs.xml.dist || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/scripts/phpcs.xml.dist
16-
phpcs -s --report-full --report-summary --report-source web/modules/custom "$@"
15+
test -e phpcs.xml.dist || curl -OL https://git.drupalcode.org/project/gitlab_templates/-/raw/default-ref/assets/phpcs.xml.dist
16+
phpcs -s --report-full --report-summary --report-source web/modules/custom --ignore=*/.ddev/* "$@"

commands/web/phpunit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Description: Run phpunit inside the web container
66
## Usage: phpunit [flags] [args]
77
## Example: "ddev phpunit" or "ddev phpunit --stop-on-failure"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
if ! command -v phpunit >/dev/null; then

commands/web/poser

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
## Description: Expand composer.json and run composer install.
66
## Usage: poser [flags] [args]
77
## Example: "ddev poser"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
export COMPOSER=composer.contrib.json
1212
.ddev/commands/web/expand-composer-json "$DDEV_PROJECT_NAME"
1313
composer install
1414
rm composer.contrib.json composer.contrib.lock
1515
yarn --cwd $DDEV_DOCROOT/core install
16-
touch $DDEV_DOCROOT/core/.env
16+
touch $DDEV_DOCROOT/core/.env

commands/web/stylelint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Description: Run stylelint inside the web container
66
## Usage: stylelint [flags] [args]
77
## Example: "ddev stylelint"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
if yarn --cwd "$DDEV_DOCROOT/core" stylelint --version >/dev/null ; then

commands/web/symlink-project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
## Description: Symlink all root files/dirs into web.modules/custom/[PROJECT_NAME]
66
## Usage: symlink-project [flags] [args]
77
## Example: "ddev symlink-project"
8-
## ProjectTypes: drupal8,drupal9,drupal10
8+
## ProjectTypes: drupal,drupal8,drupal9,drupal10
99
## ExecRaw: true
1010

1111
export _WEB_ROOT=$DDEV_DOCROOT

0 commit comments

Comments
 (0)