Merge branch '11.x' into 4867-enable-dependency-modules

.circleci/config.yml

@@ -124,6 +124,8 @@ jobs:
       - run: composer -n config platform.php --unset
       - run: composer -n require --dev drupal/core-recommended:10.0.x-dev --no-update
       - run: composer -n update
+      - run: composer info consolidation/*
+      - run: composer info psr/*
       - run: mkdir -p /tmp/results
       - run: composer -n lint
       - run: composer -n unit -- --log-junit /tmp/results/unit.junit.xml

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install mkdocs-material mkdocs-git-authors-plugin mkdocs-git-revision-date-localized-plugin pymdown-extensions git+https://gitlab.com/blacs30/mkdocs-edit-url.git
+          pip install mkdocs-material mkdocs-git-authors-plugin mkdocs-redirects mkdocs-git-revision-date-localized-plugin pymdown-extensions git+https://gitlab.com/blacs30/mkdocs-edit-url.git
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

CONTRIBUTING.md

@@ -6,7 +6,6 @@ Drush is built by people like you! Please [join us](https://github.com/drush-ops
 ## Git and Pull requests
 * Contributions are submitted, reviewed, and accepted using GitHub pull requests.
 * The latest changes are in the `11.x` branch. PR's should initially target this branch.
-* Try to make clean commits that are easily readable (including descriptive commit messages!)
 * See the test-specific [README.md](https://github.com/drush-ops/drush/blob/11.x/docs/contribute/unish.md) for instructions on running the test suite. Test before you push. Get familiar with Unish, our test suite. Optionally run tests in the provided Docker containers.
 * We maintain branches named 11.x, 10.x, etc. These are release branches. From these branches, we make new tags for patch and minor versions.
 
@@ -16,7 +15,7 @@ Drush is built by people like you! Please [join us](https://github.com/drush-ops
 
 ## Coding style
 * Do write comments. You don't have to comment every line, but if you come up with something that's a bit complex/weird, just leave a comment. Bear in mind that you will probably leave the project at some point and that other people will read your code. Undocumented huge amounts of code are nearly worthless!
-* We use [PSR-2](https://www.php-fig.org/psr/psr-2/) in the /src directory. [Drupal's coding standards](https://drupal.org/coding-standards) are still used in the includes directory (deprecated code).
+* We use [PSR-12](https://www.php-fig.org/psr/psr-12/).
 * Keep it compatible. Do not introduce changes to the public API, or configurations too casually. Don't make incompatible changes without good reasons!
 * Run `composer cs` to check the project for coding style issues and run `composer cbf` to fix them automatically where possible. These scripts use [`PHP_CodeSniffer`](https://github.com/squizlabs/PHP_CodeSniffer) in background.
 

composer.json

@@ -34,10 +34,10 @@
     "ext-dom": "*",
     "chi-teck/drupal-code-generator": "^2.4",
     "composer/semver": "^1.4 || ^3",
-    "consolidation/annotated-command": "^4.5",
+    "consolidation/annotated-command": "^4.5.3",
     "consolidation/config": "^2",
     "consolidation/filter-via-dot-access-data": "^2",
-    "consolidation/robo": "^3.0.9",
+    "consolidation/robo": "^3.0.9 || ^4.0.0-alpha1",
     "consolidation/site-alias": "^3.1.3",
     "consolidation/site-process": "^4.1.3 || ^5",
     "enlightn/security-checker": "^1",