Merge branch 'dev'

App/Commands/Ddevadmin.php

@@ -15,12 +15,20 @@ public function config()
 
   public function handle()
   {
-    $user = $this->argument('user') ?: 41;
-    $u = $this->wire()->users->get("name|id=$user");
+    $user = $this->argument('user');
+    $u = $user
+      ? $this->wire()->users->get("name=$user")
+      : $this->wire()->users->get('roles=superuser');
+
     if ($u->id) {
+      $name = $u->name;
       $u->setAndSave('name', 'ddevadmin');
       $u->setAndSave('pass', 'ddevadmin');
-      $this->success("Reset user $u");
+      $url = $this->wire()->pages->get(2)->httpUrl();
+      $this->success("Reset user $name with ID $u");
+      $this->write("  New username: ddevadmin");
+      $this->write("  New password: ddevadmin");
+      $this->write("  Login url: $url");
     } else {
       $this->warn("User $user not found");
       $users = $this->wire()->pages->find("include=all,template=user,sort=id,limit=50");

Application.php

@@ -120,6 +120,7 @@ public function findCommandFiles()
         if (strpos($filename, "/lib/")) continue;
         if (strpos($filename, "/tracy-")) continue;
         if (!strpos($filename, "/RockShell/")) continue;
+        if (strpos($filename, '/site/modules/.')) continue;
 
         // if we find a new base command file we load it now
         // see readme about adding new base-commands to your project