Merge branch 'master' into rc-v2.2.1

* master:
  Safeguard suggested `{intergraph}` package in tests (#491)
  Use `{testthat}` edition 3 (#490)
  Work around `scale_y_continuous()` behavior in {ggplot2@3.5} (#488)
  Update test snapshots using `{ggplot2@3.5}` (#489)

DESCRIPTION

@@ -71,8 +71,11 @@ Suggests:
     emmeans,
     vdiffr
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 SystemRequirements: openssl
 Encoding: UTF-8
 Language: en-US
 RdMacros: lifecycle
+Remotes:
+    tidyverse/ggplot2@rc/3.5.0
+Config/testthat/edition: 3

NAMESPACE

@@ -4,6 +4,8 @@ S3method("+",gg)
 S3method("[",ggmatrix)
 S3method("[",glyphplot)
 S3method("[<-",ggmatrix)
+S3method(as.character,ggmatrix_fn_with_params)
+S3method(as.character,ggmatrix_plot_obj)
 S3method(grid.draw,ggmatrix)
 S3method(print,ggmatrix)
 S3method(print,glyphplot)

R/ggnet.R

@@ -386,7 +386,7 @@ ggnet <- function(
 
       y = ifelse(is_dir == "digraph", "directed", "undirected")
       z = c("indegree" = "in", "outdegree" = "out", "degree" = "all", "freeman" = "all")[x]
-      data$weight = igraph::degree(igraph::graph.adjacency(as.matrix(net), mode = y), mode = z)
+      data$weight = igraph::degree(igraph_graph_adjacency_matrix(as.matrix(net), mode = y), mode = z)
 
     } else {
       data$weight = sna::degree(net, gmode = is_dir, cmode = ifelse(x == "degree", "freeman", x))
@@ -736,3 +736,12 @@ ggnet <- function(
   return(p)
 
 }
+
+
+igraph_graph_adjacency_matrix <- function(...) {
+  if (packageVersion("igraph") >= "2.0.0") {
+    igraph::graph_from_adjacency_matrix(...)
+  } else {
+    igraph::graph.adjacency(...)
+  }
+}

R/ggnet2.R

@@ -505,7 +505,7 @@ ggnet2 <- function(
 
       y = ifelse(is_dir == "digraph", "directed", "undirected")
       z = c("indegree" = "in", "outdegree" = "out", "degree" = "all", "freeman" = "all")[x]
-      data$size = igraph::degree(igraph::graph.adjacency(as.matrix(net), mode = y), mode = z)
+      data$size = igraph::degree(igraph_graph_adjacency_matrix(as.matrix(net), mode = y), mode = z)
 
     } else {
       data$size = sna::degree(net, gmode = is_dir, cmode = ifelse(x == "degree", "freeman", x))

R/ggpairs_internal_plots.R

@@ -124,7 +124,7 @@ wrap_fn_with_param_arg <- function(
     allParams$mapping <- mapping
     argsList <- list(...)
     allParams[names(argsList)] <- argsList
-    do.call(original_fn, allParams)
+    rlang::inject(original_fn(!!!allParams))
   }
 
   class(ret_fn) <- "ggmatrix_fn_with_params"
@@ -166,6 +166,7 @@ wrap <- function(funcVal, ..., funcArgName = deparse(substitute(funcVal))) {
 wrap_fn_with_params <- wrap
 
 
+#' @export
 as.character.ggmatrix_fn_with_params <- function(x, ...) {
   params <- attr(x, "params")
   fnName <- attr(x, "name")
@@ -220,6 +221,7 @@ mapping_as_string <- function(mapping) {
   str_c("c(", str_c(names(mapping), as.character(mapping), sep = " = ", collapse = ", "), ")")
 }
 
+#' @export
 as.character.ggmatrix_plot_obj <- function(x, ...) {
   hasGg <- (!is.null(x$gg))
   mappingTxt <- mapping_as_string(x$mapping)