chore: rename drupal-project to drupal

This commit is contained in:
Oliver Davies 2023-07-22 10:40:02 +01:00
parent b3f61a43da
commit c68bca3d56
7 changed files with 8 additions and 8 deletions

View file

@ -100,9 +100,9 @@ final class CreateListOfFilesToGenerate
); );
} }
if ('drupal-project' === Arr::get($configurationData, 'type')) { if ('drupal' === Arr::get($configurationData, 'type')) {
// Add a Drupal version of phpunit.xml.dist. // Add a Drupal version of phpunit.xml.dist.
$filesToGenerate[] = new TemplateFile(data: 'drupal-project/phpunit.xml.dist', name: 'phpunit.xml.dist'); $filesToGenerate[] = new TemplateFile(data: 'drupal/phpunit.xml.dist', name: 'phpunit.xml.dist');
} }
if (Arr::get($configurationData, 'experimental.createGitHubActionsConfiguration', false) === true) { if (Arr::get($configurationData, 'experimental.createGitHubActionsConfiguration', false) === true) {

View file

@ -54,7 +54,7 @@ final class Config
#[Assert\NotBlank] #[Assert\NotBlank]
public string $name; public string $name;
#[Assert\Choice(choices: ['drupal-project', 'fractal', 'laravel', 'php-library', 'vuejs'])] #[Assert\Choice(choices: ['drupal', 'fractal', 'laravel', 'php-library', 'vuejs'])]
#[Assert\NotBlank] #[Assert\NotBlank]
public string $type; public string $type;

View file

@ -15,7 +15,7 @@ x-proxy: &default-proxy
x-app: &default-app x-app: &default-app
volumes: volumes:
- "${DOCKER_WEB_VOLUME:-./{{ "drupal-project" == type ? drupal.docroot : '' }}:{{ project_root }}{{ "drupal-project" == type ? '/' ~ drupal.docroot : '' }}}" - "${DOCKER_WEB_VOLUME:-./{{ "drupal" == type ? drupal.docroot : '' }}:{{ project_root }}{{ "drupal" == type ? '/' ~ drupal.docroot : '' }}}"
env_file: env_file:
- .env - .env
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}" restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"

View file

@ -13,7 +13,7 @@ export COMPOSE_PROFILES=node
export DOCKER_WEB_VOLUME=.:{{ project_root }} export DOCKER_WEB_VOLUME=.:{{ project_root }}
{% endif %} {% endif %}
{% if "drupal-project" == type %} {% if "drupal" == type %}
{% if experimental.useNewDatabaseCredentials %} {% if experimental.useNewDatabaseCredentials %}
export MYSQL_DATABASE=app export MYSQL_DATABASE=app
export MYSQL_PASSWORD=app export MYSQL_PASSWORD=app

View file

@ -21,7 +21,7 @@ composer *args:
alias phpunit := test alias phpunit := test
test *args: test *args:
{% if "drupal-project" is same as type %} {% if "drupal" is same as type %}
{{ "just _exec php phpunit --colors=always {{ args }}" | raw }} {{ "just _exec php phpunit --colors=always {{ args }}" | raw }}
{% else %} {% else %}
{{ "just _run php phpunit --colors=always {{ args }}" | raw }} {{ "just _run php phpunit --colors=always {{ args }}" | raw }}
@ -31,7 +31,7 @@ test-watch *args:
nodemon --ext "*" --watch "." --exec "just test {{ args }} || exit 1" --ignore */sites/simpletest nodemon --ext "*" --watch "." --exec "just test {{ args }} || exit 1" --ignore */sites/simpletest
{% endif %} {% endif %}
{% if "drupal-project" is same as type %} {% if "drupal" is same as type %}
drush *args: drush *args:
{{ "just _exec php drush {{ args }}" | raw }} {{ "just _exec php drush {{ args }}" | raw }}

View file

@ -16,7 +16,7 @@
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% if type is same as "drupal-project" and "Drupal" in php.phpcs.standards or php.phpcs.standards is empty %} {% if type is same as "drupal" and "Drupal" in php.phpcs.standards or php.phpcs.standards is empty %}
<rule ref="Drupal"> <rule ref="Drupal">
<exclude name="Drupal.Commenting.ClassComment.Missing"/> <exclude name="Drupal.Commenting.ClassComment.Missing"/>
<exclude name="Drupal.Commenting.DataTypeNamespace.DataTypeNamespace"/> <exclude name="Drupal.Commenting.DataTypeNamespace.DataTypeNamespace"/>