Merge branch 'master' into development

* master:
  Bug 1960099 - When a revision has enters the needs-review state with a reviewer group assigned, query Phab for list of group users and update the reviewer
  Bumped version to 202500722.2
  Bug 1978644 - With the removal of circleci config in bug 1977941, the t/docker.t test is failing as it looks for those files
  Bumped version to 202500722.1

Author: dklawren

Bugzilla.pm

@@ -13,7 +13,7 @@ use warnings;
 
 use Bugzilla::Logging;
 
-our $VERSION = '20250708.1';
+our $VERSION = '20250722.2';
 
 use Bugzilla::Auth;
 use Bugzilla::Auth::Persist::Cookie;

Bugzilla/Util.pm

@@ -1023,16 +1023,13 @@ sub fetch_product_versions {
 }
 
 sub mojo_user_agent {
-  my ($params)           = @_;
-  my $request_timeout    = $params->{request_timeout}    // 30;
-  my $connect_timeout    = $params->{connect_timeout}    // 5;
-  my $inactivity_timeout = $params->{inactivity_timeout} // 30;
-
-  my $ua = Mojo::UserAgent->new(
-    request_timeout    => $request_timeout,
-    connect_timeout    => $connect_timeout,
-    inactivity_timeout => $inactivity_timeout,
-  );
+  my ($params) = @_;
+
+  state $ua = Mojo::UserAgent->new;
+
+  $ua->request_timeout($params->{request_timeout}       // 30);
+  $ua->connect_timeout($params->{connect_timeout}       // 5);
+  $ua->inactivity_timeout($params->{inactivity_timeout} // 30);
 
   if (my $proxy = Bugzilla->params->{proxy_url}) {
     $ua->proxy->http($proxy)->https($proxy);

extensions/PhabBugz/lib/Revision.pm

@@ -16,6 +16,7 @@ use Types::Standard -all;
 use Type::Utils;
 
 use Bugzilla::Bug;
+use Bugzilla::Logging;
 use Bugzilla::Types qw(JSONBool);
 use Bugzilla::Error;
 use Bugzilla::Util qw(trim);
@@ -96,7 +97,7 @@ has reviewers_extra_raw => (
     Dict [reviewerPHID => Str, voidedPHID => Maybe [Str], diffPHID => Maybe [Str]]
   ]
 );
-has stack_graph => (is => 'lazy', isa => Tuple[ArrayRef, ArrayRef]);
+has stack_graph => (is => 'lazy');
 
 sub new_from_query {
   my ($class, $params) = @_;
@@ -337,6 +338,7 @@ sub _build_reviews {
 
   my @reviewers;
   foreach my $raw (@{$self->reviewers_raw}) {
+<<<<<<< HEAD
     my $reviewer_data = {
       is_blocking => ($raw->{isBlocking} ? 1 : 0),
       is_project  => 0,
@@ -352,6 +354,26 @@ sub _build_reviews {
       $reviewer_data->{user} = Bugzilla::Extension::PhabBugz::User->new_from_query({phids => [$reviewer_phid]});
     }
 
+    # Only interests in user or project objects (would there ever be something else?)
+    my $reviewer_phid = $raw->{reviewerPHID};
+    next if $reviewer_phid !~ /^PHID-(?:PROJ|USER)/;
+
+    my $reviewer_data = {
+      is_blocking => ($raw->{isBlocking} ? 1 : 0),
+      is_project  => 0,
+      status      => $raw->{status},
+    };
+
+    if ($reviewer_phid =~ /^PHID-PROJ/) {
+      $reviewer_data->{user} = Bugzilla::Extension::PhabBugz::Project->new_from_query({phids => [$reviewer_phid]});
+      $reviewer_data->{is_project} = 1;
+    }
+    elsif ($reviewer_phid =~ /^PHID-USER/) {
+      $reviewer_data->{user} = Bugzilla::Extension::PhabBugz::User->new_from_query({phids => [$reviewer_phid]});
+    }
+
+    next if !$reviewer_data->{user}; # Skip if user or project was not found.
+
     # Set to accepted-prior if the diffs reviewer are different and the reviewer status is accepted
     foreach my $reviewer_extra (@{$self->reviewers_extra_raw}) {
       if ($reviewer_extra->{reviewerPHID} eq $reviewer_phid) {
@@ -436,7 +458,7 @@ sub _build_stack_graph {
     }
   }
 
-  return (\@phids, \@edges);
+  return {phids => \@phids, edges => \@edges};
 }
 
 #########################