Merge branch '11.x' into feature/Command_to_rebuild_all_display_config

* 11.x: (125 commits)
  Add a default value for the field widget choice in field:create (drush-ops#5060)
  Fix drush-ops#5058. Load/delete entities that are access controlled. (drush-ops#5059)
  Ignore services on invalid reference (drush-ops#5056)
  Fix tests on Drupal 10 (drush-ops#5054)
  Fix usage example in core:route command (drush-ops#5053)
  Back to dev.
  Prep for 11.0.4
  Update SecurityUpdateCommands endpoint (drush-ops#5043)
  Remove drush_get_global_options() (drush-ops#5046)
  Remove unused global options remote-host and remote-user. (drush-ops#5045)
  sql:sync minor cleanup (drush-ops#5044)
  Add back semver_example test on highest. (drush-ops#5031)
  Return values instead of keys in discoverCommandsFromConfiguration. (drush-ops#5039)
  Back to dev.
  Prep for 11.0.3
  Dont define entity-updates (drush-ops#5038)
  Back to dev.
  Prep for 11.0.2
  Remove dead code and re-enbale --partial test. (drush-ops#5036)
  Bump site-process for less verbose exceptions. (drush-ops#5034)
  ...

Merge conflicts
- src/Drupal/Commands/core/drush.services.yml

.circleci/config.yml

@@ -18,13 +18,13 @@ test_74_steps: &test74steps
   steps:
     - checkout
     - run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
-    - run: composer install -n
+    - run: composer -n install
     - run: mkdir -p /tmp/results
-    - run: composer lint
-    - run: composer unit -- --log-junit /tmp/results/unit.junit.xml
-    - run: composer functional -- --log-junit /tmp/results/functional.junit.xml
+    - run: composer -n lint
+    - run: composer -n unit -- --log-junit /tmp/results/unit.junit.xml
+    - run: composer -n functional -- --log-junit /tmp/results/functional.junit.xml
     # @todo was getting missing key_value table failure when this comes before functional. See https://circleci.com/gh/drush-ops/drush/8828.
-    - run: composer integration -- --log-junit /tmp/results/integration.junit.xml
+    - run: composer -n integration -- --log-junit /tmp/results/integration.junit.xml
     - store_test_results:
         path: /tmp/results
     - store_artifacts:
@@ -42,8 +42,8 @@ jobs:
     steps:
       - checkout
       - run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
-      - run: composer install -n
-      - run: composer cs
+      - run: composer -n install
+      - run: composer -n cs
 
   # Mergeable test:
   #   FAIL if merging test branch with 11.x produces conflicts
@@ -73,7 +73,7 @@ jobs:
     docker:
       - image: wodby/php:7.4
         environment:
-          - UNISH_DB_URL=sqlite://sut/sites/dev/files/.ht.sqlite
+          - "UNISH_DB_URL=sqlite://:memory:"
     <<: *test74steps
 
   test_74_drupal9_postgres:
@@ -89,8 +89,8 @@ jobs:
           POSTGRES_USER: unish
     <<: *test74steps
 
-  # Drupal 9.1.0 for Security test coverage for drupal/core
-  test_74_drupal91_security:
+  # Drupal 9.2.8 for Security test coverage for drupal/core
+  test_74_drupal92_security:
     <<: *defaults
     docker:
       - image: wodby/php:7.4
@@ -101,19 +101,18 @@ jobs:
     steps:
       - checkout
       - run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
-      - run: composer require --dev drupal/core-recommended:9.1.0 --no-update
-      - run: composer require symfony/polyfill-php80:"1.23 as 1.20" --no-update
+      - run: composer -n require --dev drupal/core-recommended:9.2.8 --no-update
+      - run: composer -n require symfony/polyfill-php80:"1.23 as 1.20" --no-update
       - run: php --version
-      - run: composer update
-      - run: composer phpunit -- --testsuite integration --filter=testInsecureDrupalPackage --stop-on-skipped
+      - run: composer -n update
+      - run: composer -n phpunit -- --testsuite integration --filter=testInsecureDrupalPackage --stop-on-skipped
 
   # PHP 8 test with Drupal tip
   #   Determines whether a newer version of a dependency has broken Drush.
-  test_81_drupal93_highest:
+  test_81_drupal10_highest:
     <<: *defaults
     docker:
-#      @todo After release change to wodby/php:latest
-      - image: wodby/php:8.1-rc-dev
+      - image: wodby/php:latest
         environment:
           - MYSQL_HOST=127.0.0.1
           - UNISH_DB_URL=mysql://root:@127.0.0.1
@@ -122,26 +121,30 @@ jobs:
       - checkout
       - run: cp .docker/zz-php.ini /usr/local/etc/php/conf.d/
       - run: php --version
-      - run: composer config platform.php --unset
-      - run: composer require --dev drupal/core-recommended:9.3.x-dev --no-update
-      - run: composer update
+      - 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: mkdir -p /tmp/results
-      - run: composer lint
-      - run: composer unit -- --log-junit /tmp/results/unit.junit.xml
-      - run: composer functional -- --log-junit /tmp/results/functional.junit.xml
-      - run: composer integration -- --log-junit /tmp/results/integration.junit.xml
+      - run: composer -n lint
+      - run: composer -n unit -- --log-junit /tmp/results/unit.junit.xml
+      - run: composer -n functional -- --log-junit /tmp/results/functional.junit.xml
+      - run: composer -n integration -- --log-junit /tmp/results/integration.junit.xml
+      - store_test_results:
+          path: /tmp/results
+      - store_artifacts:
+          path: /tmp/results
 
 workflows:
   version: 2
   drush:
     jobs:
       - code_style
       - check_mergable
-      - test_74_drupal91_security:
+      - test_74_drupal92_security:
           <<: *requires
       - test_74_drupal9_mysql:
           <<: *requires
-      - test_81_drupal93_highest:
+      - test_81_drupal10_highest:
           <<: *requires
       - test_74_drupal9_sqlite:
           <<: *requires

.ddev/config.yaml

@@ -17,4 +17,6 @@ composer_version: ""
 disable_settings_management: true
 web_environment:
   - UNISH_DB_URL=mysql://root:root@db
+#  - "UNISH_DB_URL=sqlite://:memory:"
+#  - UNISH_DB_URL=pgsql://postgres:@localhost
   - DRUSH_OPTIONS_URI=$DDEV_PRIMARY_URL

.docker/zz-php.ini

@@ -3,3 +3,4 @@ variables_order = GPCS
 error_reporting = E_ALL & ~E_DEPRECATED
 date.timezone = "UTC"
 sendmail_path = "true"
+memory_limit = 256M

.github/workflows/main.yml

@@ -1,12 +1,10 @@
 name: Build static sites
 
-# Controls when the action will run. Triggers the workflow on push or pull request
+# Controls when the action will run. Triggers the workflow on push
 # events but only for the 11.x branch
 on:
   push:
     branches: [11.x]
-#  pull_request:
-#    branches: [11.x]
 
 jobs:
   build:
@@ -15,12 +13,15 @@ jobs:
     steps:
       - name: Checkout 11.x
         uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
 
       - name: Checkout gh-pages branch
         uses: actions/checkout@v2
         with:
           ref: gh-pages
           path: gh-pages
+          fetch-depth: 0
 
       - name: Set up Python 3.8
         uses: actions/setup-python@v2
@@ -30,7 +31,7 @@ jobs:
       - name: Install Python dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install mkdocs-material pymdown-extensions git+https://gitlab.com/blacs30/mkdocs-edit-url.git
+          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
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

CODEOWNERS

@@ -0,0 +1,36 @@
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+#
+# We are always looking for more maintainers! Please submit a couple PRs in an
+# area and then submit a PR to add yourself to this file :).
+#
+
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+*       @weitzman @greg-1-anderson
+
+/src/Commands/Config/ @bircher
+/src/Drupal/Commands/config/ @bircher
+
+/src/Drupal/Commands/core/MigrateRunnerCommands.php @claudiu-cristea
+/src/Drupal/Migrate/ @claudiu-cristea
+
+/src/Drupal/Commands/field/ @DieterHolvoet
+
+/src/Commands/core/RunServerCommands.php @grugnog
+
+/includes/batch.inc @jonhattan
+/src/Drupal/Commands/core/BatchCommands.php @jonhattan
+
+/src/Drupal/Commands/core/CLICommands.php @damiankloip
+/src/Psysh @damiankloip
+
+/src/Commands/core/UpdateDBCommands.php @pfrenssen
+
+/src/Drupal/Commands/core/LocaleCommands.php @Sutharsan
+
+/src/Drupal/Commands/core/QueueCommands.php @davereid
+
+

appveyor.yml

@@ -20,17 +20,12 @@ init:
 # Inspired by https://github.com/Codeception/base/blob/master/appveyor.yml and https://github.com/phpmd/phpmd/blob/master/appveyor.yml
 install:
   - ps: Set-Service wuauserv -StartupType Manual
-  - ps: appveyor-retry cinst -y curl
-  - SET PATH=C:\Program Files\curl;%PATH%
-  #which is only needed by the test suite.
-  - cinst --limit-output -y which
-  - SET PATH=C:\Program Files\which;%PATH%
   - git clone -q https://github.com/acquia/DevDesktopCommon.git #For tar, cksum, ...
   - SET PATH=%APPVEYOR_BUILD_FOLDER%/DevDesktopCommon/bintools-win/msys/bin;%PATH%
   - SET PATH=C:\Program Files\MySql\MySQL Server 5.7\bin\;%PATH%
   - choco search php --exact --all-versions -r
   #Install PHP per https://blog.wyrihaximus.net/2016/11/running-php-unit-tests-on-windows-using-appveyor-and-chocolatey/
-  - ps: appveyor-retry cinst --limit-output --ignore-checksums -y php --version 7.4.26
+  - ps: appveyor-retry cinst --limit-output --ignore-checksums -y php --version 7.4.27
   - cd c:\tools\php74
   - copy php.ini-production php.ini
 

composer.json

@@ -32,49 +32,47 @@
   "require": {
     "php": ">=7.4",
     "ext-dom": "*",
-    "chi-teck/drupal-code-generator": "^2.3",
+    "chi-teck/drupal-code-generator": "^2.4",
     "composer/semver": "^1.4 || ^3",
-    "consolidation/annotated-command": "^4.4",
+    "consolidation/annotated-command": "^4.5",
     "consolidation/config": "^1.2",
     "consolidation/filter-via-dot-access-data": "^1",
     "consolidation/robo": "^3",
-    "consolidation/site-alias": "^3.0.0@stable",
-    "consolidation/site-process": "^4",
+    "consolidation/site-alias": "^3.1.3",
+    "consolidation/site-process": "^4.1.3",
     "enlightn/security-checker": "^1",
-    "grasmash/yaml-expander": "^1.1.1",
     "guzzlehttp/guzzle": "^6.3 || ^7.0",
     "league/container": "^3.4",
     "psr/log": "~1.0",
     "psy/psysh": "~0.11",
-    "symfony/event-dispatcher": "^4.0",
-    "symfony/finder": "^4.0 || ^5",
+    "symfony/event-dispatcher": "^4.0 || ^5.0 || ^6.0",
+    "symfony/finder": "^4.0 || ^5 || ^6",
     "symfony/polyfill-php80": "^1.23",
-    "symfony/var-dumper": "^4.0 || ^5.0",
-    "symfony/yaml": "^4.0",
+    "symfony/var-dumper": "^4.0 || ^5.0 || ^6.0",
+    "symfony/yaml": "^4.0 || ^5.0 || ^6.0",
     "webflo/drupal-finder": "^1.2",
     "webmozart/path-util": "^2.1.0"
   },
   "require-dev": {
     "composer/installers": "^1.7",
     "cweagans/composer-patches": "~1.0",
     "david-garcia/phpwhois": "4.3.0",
-    "drupal/core-recommended": "^9",
-    "drupal/semver_example": "2.2.0",
+    "drupal/core-recommended": "^9 || ^10",
+    "drupal/semver_example": "2.3.0",
     "phpunit/phpunit": ">=7.5.20",
-    "rector/rector": "^0.11.58",
-    "squizlabs/php_codesniffer": "^2.7 || ^3",
+    "rector/rector": "^0.12",
+    "squizlabs/php_codesniffer": "^3.6",
     "vlucas/phpdotenv": "^2.4",
     "yoast/phpunit-polyfills": "^0.2.0"
   },
   "conflict": {
-    "drupal/core": "<= 8",
+    "drupal/core": "< 9.2",
     "drupal/migrate_run": "*",
     "drupal/migrate_tools": "<= 5"
   },
   "autoload": {
     "psr-4": {
-      "Drush\\":            "src/",
-      "Drush\\Internal\\":  "src/internal-forks"
+      "Drush\\":            "src/"
     }
   },
   "autoload-dev": {
@@ -88,6 +86,10 @@
     "files": ["tests/load.environment.php"]
   },
   "config": {
+    "allow-plugins": {
+      "composer/installers": true,
+      "cweagans/composer-patches": true
+    },
     "optimize-autoloader": true,
     "preferred-install": "dist",
     "sort-packages": true,
@@ -112,7 +114,7 @@
     "api": "php $HOME/bin/doctum.phar --ansi --ignore-parse-errors update doctum-config.php",
     "doctum-install": "mkdir -p $HOME/bin && curl --output $HOME/bin/doctum.phar https://doctum.long-term.support/releases/latest/doctum.phar && chmod +x $HOME/bin/doctum.phar",
     "mk:docs": "./drush --uri=dev -v mk:docs",
-    "rector": "rector process src/Boot src/Preflight src/Runtime src/SiteAlias src/Symfony src/Config",
+    "rector": "rector process",
     "sut": "./drush --uri=dev",
     "sut:si": "./drush --uri=dev site:install testing --sites-subdir=dev --db-url=${UNISH_DB_URL:-mysql://root:password@mariadb}/unish_dev -v",
     "phpunit": "php -d sendmail_path='true' vendor/bin/phpunit --colors=always --configuration tests",