Require Drush 12, Drupal 10 (#103)

* Update README

* Require Drush ^12.2, Drupal ^10.1

* Remove README line breaks

* Actually require Drupal ^10.1

* Ignore drush dir

* Delete drush/drush.yml

* Write drush config in test bootstrap

* Update test docs

* Fix typeError in toggle test

* Require Drush ^12.2

* Remove drush.services.yml

---------

Co-authored-by: Richard B. Porter <rbp@richardbporter.com>

Author: richardbporter

.gitignore

@@ -6,4 +6,5 @@ vendor
 sut
 .phpunit.result.cache
 .DS_Store
-phpunit.xml
+phpunit.xml
+drush

README.md

@@ -4,13 +4,11 @@
 Drush commands to interact with multiple Drupal users.
 
 ## Requirements
-- Drush ^11.0.5
-- Drupal ^9.3 || ^10.0
+- Drush ^12.2
+- Drupal ^10.1
 
 ## Installation
-Since this is a [site-wide Drush command](https://www.drush.org/latest/commands/#site-wide-drush-commands), it will only be
-found when installed in certain directories. It is recommended to update your Composer installers path for drupal-drush
-packages to:
+Since this is a [site-wide Drush command](https://www.drush.org/latest/commands/#site-wide-commands), it will only be found when installed in certain directories. It is recommended to update your Composer installers path for drupal-drush packages to:
  ```
  "drush/Commands/{$name}": ["type:drupal-drush"]
  ```
@@ -19,7 +17,7 @@ packages to:
  composer require richardbporter/drush-users-commands
  ```
  Note that the directory the package is installed to (UsersCommands) differs from the repository name (drush-users-commands) due to the [installer name property]( https://github.com/composer/installers#custom-install-names).
- 
+
 ## Commands
 
 ### drush users:list

composer.json

@@ -13,13 +13,13 @@
   "require": {
     "php": ">=8.1",
     "composer/installers": "^2.1",
-    "drush/drush": "^11.0.5"
+    "drush/drush": "^12.2"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",
     "squizlabs/php_codesniffer": "^3",
-    "drupal/core-recommended": "^9.3 || ^10.0",
-    "drupal/core-composer-scaffold": "^9.3 || ^10.0",
+    "drupal/core-recommended": "^10.1",
+    "drupal/core-composer-scaffold": "^10.1",
     "mglaman/drupal-check": "^1.4",
     "symfony/phpunit-bridge": "^6.1",
     "drupal/coder": "^8.3"
@@ -30,11 +30,6 @@
     }
   },
   "extra": {
-    "drush": {
-      "services": {
-        "drush.services.yml": "^11.0.5"
-      }
-    },
     "installer-name": "UsersCommands",
     "installer-paths": {
       "sut/core": ["type:drupal-core"],

drush.services.yml

@@ -1,5 +1,8 @@
 # Testing
-Since this is a [site-wide Drush command](https://docs.drush.org/en/master/commands/#site-wide-drush-commands), it will only be
-found when installed in certain directories. Cloning this repository into a directory named "Commands/UsersCommands" is the easiest option, e.g. path/to/Commands/UsersCommands. This directory is included when running tests via the `--include` option in TestBase.php.
+Since this is a [site-wide Drush command](https://docs.drush.org/en/latest/commands/#site-wide-commands), it will only be found when installed in certain directories. These directories are hard to mimic in the project structure. Therefore, we leverage the `commands` configuration to load the command in the System Under Test (SUT): https://github.com/drush-ops/drush/blob/12.x/src/Runtime/ServiceManager.php#L127
 
-Instead of creating our own SUT, we piggyback off of Drush's by parsing and installing Drush's dev dependencies using wikimedia/composer-merge-plugin. This was a little quicker to set up and allows us to use Unish internals like `$this->webroot` and others. In order to do this, you must install Drush from source, i.e. `composer install --prefer-source`.
+Note that this may be deprecated in the future: https://www.drush.org/12.x/commands/#global-commands-discovered-by-configuration
+
+The example-drush-extension project used the `cwd` enviroment variable for this but that seemingly stopped working in 12.x: https://github.com/drush-ops/example-drush-extension/blob/master/sut/drush/drush.yml
+
+The test bootstrap now writes out the absolute path to the command file in the `drush/drush.yml` file. It does this using the `GITHUB_WORKSPACE` environment variable, mostly for convenience in GitHub Actions CI. This variable must be set in `phpunit.xml` when running the tests locally.

drush/drush.yml

@@ -22,8 +22,8 @@ public function setUp() :void {
       'db-url' => getenv('DRUPAL_TEST_DB_URL'),
     ]);
 
-    $this->drush('config:set', ['user.settings', 'notify.status_activated', 0]);
-    $this->drush('config:set', ['user.settings', 'notify.status_blocked', 0]);
+    $this->drush('config:set', ['user.settings', 'notify.status_activated', '0']);
+    $this->drush('config:set', ['user.settings', 'notify.status_blocked', '0']);
     $this->drush('user:create', ['foo']);
     $this->drush('user:create', ['bar']);
     $this->drush('user:block', ['bar']);

tests/README.md

@@ -5,4 +5,21 @@
  * Test bootstrap.
  */
 
+use Symfony\Component\Filesystem\Filesystem;
+
 require __DIR__ . '/../vendor/autoload.php';
+
+$fs = new Filesystem();
+$path = __DIR__ . '/../drush';
+$fs->mkdir($path);
+$fs->touch("$path/drush.yml");
+$workspace = getenv('GITHUB_WORKSPACE');
+
+$contents = <<<EOD
+# Register the command in the SUT.
+drush:
+  commands:
+    '\Drush\Commands\UsersCommands\UsersCommands': '$workspace/UsersCommands.php'
+EOD;
+
+file_put_contents("$path/drush.yml", $contents);