Remove internal files from Git archive and cleanup comments. (#42)

* Update readme to reflect changes

* Add .gitattributes file to export-ignore internal files

* Replace deprecated assertions

* Remove unencessary curly braces

* Make user name one word in comment

* Comment cleanup

Author: richardbporter

.gitattributes

@@ -0,0 +1,5 @@
+/.github            export-ignore
+/drush              export-ignore
+/tests              export-ignore
+/travis.yml         export-ignore
+/phpunit.xml.dist   export-ignore

README.md

@@ -4,8 +4,8 @@
 Drush commands to interact with multiple Drupal users.
 
 ## Requirements
-- Drush ^9.6 || ^10.2
-- Drupal 8
+- Drush ^11.0.5
+- Drupal ^9.3
 
 ## Installation
 Since this is a [site-wide Drush command](https://docs.drush.org/en/master/commands/#site-wide-drush-commands), it will only be

UsersCommands.php

@@ -37,7 +37,7 @@ class UsersCommands extends DrushCommands implements SiteAliasManagerAwareInterf
    * @bootstrap full
    * @field-labels
    *   uid: User ID
-   *   name: User name
+   *   name: Username
    *   pass: Password
    *   mail: User mail
    *   theme: User theme
@@ -261,7 +261,7 @@ public function toggle()
      * A flatter and simpler array presentation of a Drupal $user object.
      *
      * @param \Drupal\user\Entity\User $account
-     *   A user account.
+     *   A user account object.
      *
      * @return array
      */

tests/ListTest.php

@@ -41,10 +41,10 @@ public function testAllUsers()
         $this->drush('users:list', []);
 
         $output = $this->getOutput();
-        $this->assertContains('foo', $output);
-        $this->assertContains('bar', $output);
-        $this->assertContains('admin', $output);
-        $this->assertNotContains('anonymous', $output);
+        $this->assertStringContainsString('foo', $output);
+        $this->assertStringContainsString('bar', $output);
+        $this->assertStringContainsString('admin', $output);
+        $this->assertStringNotContainsString('anonymous', $output);
     }
 
     /**
@@ -63,10 +63,10 @@ public function testUsersReturnedByMultipleRoles()
         );
 
         $output = $this->getOutput();
-        $this->assertContains('foo', $output);
-        $this->assertContains('baz', $output);
-        $this->assertNotContains('bar', $output);
-        $this->assertNotContains('admin', $output);
+        $this->assertStringContainsString('foo', $output);
+        $this->assertStringContainsString('baz', $output);
+        $this->assertStringNotContainsString('bar', $output);
+        $this->assertStringNotContainsString('admin', $output);
     }
 
     /**
@@ -85,9 +85,9 @@ public function testUsersReturnedByMultipleNoRoles()
         $this->drush('users:list', [], ['no-roles' => 'editor,publisher']);
 
         $output = $this->getOutput();
-        $this->assertContains('qux', $output);
-        $this->assertNotContains('foo', $output);
-        $this->assertNotContains('baz', $output);
+        $this->assertStringContainsString('qux', $output);
+        $this->assertStringNotContainsString('foo', $output);
+        $this->assertStringNotContainsString('baz', $output);
     }
 
     /**
@@ -102,9 +102,9 @@ public function testUsersReturnedByStatus()
         );
 
         $output = $this->getOutput();
-        $this->assertNotContains('foo', $output);
-        $this->assertContains('bar', $output);
-        $this->assertNotContains('admin', $output);
+        $this->assertStringNotContainsString('foo', $output);
+        $this->assertStringContainsString('bar', $output);
+        $this->assertStringNotContainsString('admin', $output);
     }
 
     /**
@@ -117,7 +117,7 @@ public function testUsersReturnedByLogin()
 
         $this->drush(
             'sql:query',
-            ["UPDATE users_field_data SET login={$now} WHERE uid=1;"],
+            ["UPDATE users_field_data SET login=$now WHERE uid=1;"],
         );
 
         $this->drush(
@@ -127,9 +127,9 @@ public function testUsersReturnedByLogin()
         );
 
         $output = $this->getOutput();
-        $this->assertContains('admin', $output);
-        $this->assertNotContains('foo', $output);
-        $this->assertNotContains('bar', $output);
+        $this->assertStringContainsString('admin', $output);
+        $this->assertStringNotContainsString('foo', $output);
+        $this->assertStringNotContainsString('bar', $output);
     }
 
     /**
@@ -148,10 +148,10 @@ public function testUsersReturnedByStatusRole()
         );
 
         $output = $this->getOutput();
-        $this->assertNotContains('foo', $output);
-        $this->assertNotContains('bar', $output);
-        $this->assertNotContains('admin', $output);
-        $this->assertContains('baz', $output);
+        $this->assertStringNotContainsString('foo', $output);
+        $this->assertStringNotContainsString('bar', $output);
+        $this->assertStringNotContainsString('admin', $output);
+        $this->assertStringContainsString('baz', $output);
     }
 
     /**
@@ -164,7 +164,7 @@ public function testUsersReturnedByStatusRoleLogin()
 
         $this->drush(
             'sql:query',
-            ["UPDATE users_field_data SET login={$now} WHERE uid=1;"],
+            ["UPDATE users_field_data SET login=$now WHERE uid=1;"],
         );
 
         // Create another administrator.
@@ -193,11 +193,11 @@ public function testUsersReturnedByStatusRoleLogin()
         );
 
         $output = $this->getOutput();
-        $this->assertNotContains('baz', $output);
-        $this->assertNotContains('foo', $output);
+        $this->assertStringNotContainsString('baz', $output);
+        $this->assertStringNotContainsString('foo', $output);
 
-        // If baz is not in the output then 'admin' has to match user name.
-        $this->assertContains('admin', $output);
+        // If baz is not in the output then 'admin' has to match username.
+        $this->assertStringContainsString('admin', $output);
     }
 
     /**
@@ -215,7 +215,7 @@ public function testValidation()
             1
         );
 
-        $this->assertContains('Role garbage does not exist.', $this->getErrorOutput());
+        $this->assertStringContainsString('Role garbage does not exist.', $this->getErrorOutput());
 
         // Status 'garbage' does not exist;
         $this->drush(
@@ -227,6 +227,6 @@ public function testValidation()
             1
         );
 
-        $this->assertContains('Unknown status garbage.', $this->getErrorOutput());
+        $this->assertStringContainsString('Unknown status garbage.', $this->getErrorOutput());
     }
 }