Contrib development

.ddev/config.yaml

@@ -12,15 +12,16 @@ database:
     type: mariadb
     version: "10.6"
 performance_mode: none
+hooks:
+    post-start:
+        - exec: mkdir -p repos
+        - exec: mkdir -p web/browser_output
+        - exec: chmod +w web/browser_output
 use_dns_when_possible: true
 composer_version: ""
 web_environment: []
 corepack_enable: true
-hooks:
-  post-start:
-    - exec: "mkdir -p repos"
-    - exec: "mkdir -p web/browser_output"
-    - exec: "chmod +w web/browser_output"
+ddev_version_constraint: '>= 1.23'
 
 # Key features of DDEV's config.yaml:
 

.vscode/settings.json

@@ -32,6 +32,12 @@
     "php.suggest.basic": false,
     "phpCodeSniffer.autoExecutable": true,
     "phpCodeSniffer.standard": "Custom",
-    "phpCodeSniffer.standardCustom": "Drupal,DrupalPractice"
+    "phpCodeSniffer.standardCustom": "Drupal,DrupalPractice",
+    "search.exclude": {
+      "**/node_modules": true,
+      "**/vendor": true
+    },
+    "search.useIgnoreFiles": false,
+    "search.useParentIgnoreFiles": true
 }
 

README.md

@@ -4,7 +4,6 @@
 
 - Drupal 11.x support
 - ARM-architechture support Selenium-Chrome image.
-- [joachim-n/drupal-project-contrib-development](https://github.com/joachim-n/drupal-core-development-project) for easier contrib development
 - Simpler setup
 - VSCode support
 
@@ -13,15 +12,18 @@
 - Install [DDEV](https://ddev.readthedocs.io/en/latest/users/install/ddev-installation/)
 - `ddev start`
 - Replace `MODULE_NAME` on following with name of your contrib module (use admin_toolbar).
-- `mkdir -p repos; cd repos`
-- `git clone git@git.drupal.org:project/MODULE_NAME`
-- `cd ..`
 - `ddev composer install`
 
-### Alternative way to include new modules.
+### Adding new modules:
+
+This is work-a-round until following issues are resolved:
+- https://github.com/joachim-n/drupal-core-development-project/issues/14
+- https://github.com/joachim-n/drupal-core-development-project/pull/28
+
 
 - `ddev composer require drupal/MODULE_NAME`
-- `ddev composer drupal-contrib:switch-clone MODULE_NAME`
+- `cd web/modules/contrib; rm -rf MODULE_NAME`
+- `git clone git@git.drupal.org:project/MODULE_NAME`
 
 ## PHPStan
 
@@ -64,6 +66,7 @@ ddev eslint web/modules/contrib/MODULE_NAME --fix
 
 ## Run PHPUnit tests
 
+- `ddev phpunit web/modules/contrib/MODULE_NAME`
 - `ddev phpunit --debug web/modules/contrib/MODULE_NAME`
 - `ddev phpunit --group MODULE_NAME`
 

composer.json

@@ -5,15 +5,6 @@
     "license": "GPL-2.0-or-later",
     "homepage": "https://github.com/mstrelan/ddev-phpunit-demo",
     "repositories": {
-        "admin_toolbar": {
-            "type": "path",
-            "url": "repos/admin_toolbar",
-            "options": {
-                "versions": {
-                    "drupal/admin_toolbar": "3.5.0"
-                }
-            }
-        },
         "0": {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
@@ -23,11 +14,14 @@
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
         "drupal/admin_toolbar": "^3.5",
-        "drupal/core-composer-scaffold": "^11",
-        "drupal/core-recommended": "^11",
+        "drupal/core-composer-scaffold": "^11.x-dev",
+        "drupal/core-recommended": "^11.x-dev",
         "drupal/devel": "^5.2",
+        "drupal/focal_point": "^2.1",
+        "drupal/openapi_jsonapi": "^3.0",
+        "drupal/paragraphs": "^1.18",
+        "drupal/term_merge": "^2.0@beta",
         "drush/drush": "^13.0",
-        "joachim-n/drupal-project-contrib-development": "dev-main",
         "weitzman/drupal-test-traits": "^2"
     },
     "conflict": {
@@ -39,12 +33,13 @@
         "sort-packages": true,
         "allow-plugins": {
             "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
             "drupal/core-composer-scaffold": true,
+            "joachim-n/drupal-project-contrib-development": true,
             "php-http/discovery": true,
             "phpstan/extension-installer": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "joachim-n/drupal-project-contrib-development": true,
-            "cweagans/composer-patches": true
+            "tbachert/spi": true
         }
     },
     "extra": {
@@ -90,7 +85,7 @@
     },
     "require-dev": {
         "dmore/chrome-mink-driver": "^2.8",
-        "drupal/core-dev": "^11.0",
+        "drupal/core-dev": "^11.x-dev",
         "phpspec/prophecy-phpunit": "^2.0"
     }
 }