From 78c4918c388b6551422dd51726980e2e875e6b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill.mueller@ivt.baug.ethz.ch>
Date: Fri, 1 Jul 2016 02:23:30 +0200
Subject: [PATCH 1/2] as_data_frame() is S3 generic again

---
 NAMESPACE     |  7 +++++++
 R/dataframe.R | 24 +++++++++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/NAMESPACE b/NAMESPACE
index 7eea0e743..bc4c5a1ea 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -6,6 +6,13 @@ S3method("[[",tbl_df)
 S3method("row.names<-",tbl_df)
 S3method(all.equal,tbl_df)
 S3method(as.data.frame,tbl_df)
+S3method(as_data_frame,"NULL")
+S3method(as_data_frame,data.frame)
+S3method(as_data_frame,default)
+S3method(as_data_frame,list)
+S3method(as_data_frame,matrix)
+S3method(as_data_frame,table)
+S3method(as_data_frame,tbl_df)
 S3method(as_tibble,"NULL")
 S3method(as_tibble,data.frame)
 S3method(as_tibble,default)
diff --git a/R/dataframe.R b/R/dataframe.R
index 53e24b5cb..cfa885793 100644
--- a/R/dataframe.R
+++ b/R/dataframe.R
@@ -225,8 +225,30 @@ as_tibble.default <- function(x, ...) {
 
 #' @export
 #' @rdname as_tibble
-as_data_frame <- as_tibble
+as_data_frame <- function(x, ...) {
+  UseMethod("as_data_frame")
+}
+
+#' @export
+as_data_frame.tbl_df <- as_tibble.tbl_df
+
+#' @export
+as_data_frame.data.frame <- as_tibble.data.frame
+
+#' @export
+as_data_frame.list <- as_tibble.list
 
+#' @export
+as_data_frame.matrix <- as_tibble.matrix
+
+#' @export
+as_data_frame.table <- as_tibble.table
+
+#' @export
+as_data_frame.NULL <- as_tibble.NULL
+
+#' @export
+as_data_frame.default <- as_tibble.default
 
 #' Test if the object is a tibble.
 #'

From 17ef5ac16f29570c4f4a8c3b1ce88978082615ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kirill=20M=C3=BCller?= <kirill.mueller@ivt.baug.ethz.ch>
Date: Fri, 1 Jul 2016 02:26:23 +0200
Subject: [PATCH 2/2] fix alias test

---
 tests/testthat/test-data_frame.R | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/testthat/test-data_frame.R b/tests/testthat/test-data_frame.R
index ab58b766f..41dca5696 100644
--- a/tests/testthat/test-data_frame.R
+++ b/tests/testthat/test-data_frame.R
@@ -147,7 +147,7 @@ test_that("Can convert named atomic vectors to data frame", {
 
 
 test_that("as_tibble alias", {
-  expect_identical(as_data_frame, as_tibble)
+  expect_identical(as_data_frame(NULL), as_tibble(NULL))
 })