Remove deprecated asio_* methods

Remove unused deprecated methods:

- asio_enter_context()
- asio_exit_context()
- asio_get_current()

hphp/idl/asio.idl.json

@@ -3,30 +3,6 @@
     "consts": [
     ],
     "funcs": [
-        {
-            "name": "asio_enter_context",
-            "desc": "DEPRECATED: does nothing",
-            "flags": [
-                "HasDocComment"
-            ],
-            "return": {
-                "type": null
-            },
-            "args": [
-            ]
-        },
-        {
-            "name": "asio_exit_context",
-            "desc": "DEPRECATED: does nothing",
-            "flags": [
-                "HasDocComment"
-            ],
-            "return": {
-                "type": null
-            },
-            "args": [
-            ]
-        },
         {
             "name": "asio_get_current_context_idx",
             "desc": "Get index of the current scheduler context, or 0 if there is none",
@@ -71,19 +47,6 @@
             "args": [
             ]
         },
-        {
-            "name": "asio_get_current",
-            "desc": "DEPRECATED: use asio_get_running",
-            "flags": [
-                "HasDocComment"
-            ],
-            "return": {
-                "type": "Object",
-                "desc": "A ContinuationWaitHandle that is running in the current context"
-            },
-            "args": [
-            ]
-        },
         {
             "name": "asio_set_on_failed_callback",
             "desc": "Set callback to be called when wait handle fails",
@@ -703,4 +666,4 @@
             ]
         }
     ]
-}
+}

hphp/runtime/ext/ext_asio.cpp

@@ -24,14 +24,6 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-void f_asio_enter_context() {
-  // TODO: remove from API
-}
-
-void f_asio_exit_context() {
-  // TODO: remove from API
-}
-
 int f_asio_get_current_context_idx() {
   return AsioSession::Get()->getCurrentContextIdx();
 }
@@ -59,10 +51,6 @@ Object f_asio_get_running() {
   return AsioSession::Get()->getCurrentWaitHandle();
 }
 
-Object f_asio_get_current() {
-  return AsioSession::Get()->getCurrentWaitHandle();
-}
-
 void f_asio_set_on_failed_callback(CVarRef on_failed_cb) {
   if (!on_failed_cb.isNull() && !on_failed_cb.instanceof(c_Closure::s_cls)) {
     Object e(SystemLib::AllocInvalidArgumentExceptionObject(

hphp/runtime/ext/ext_asio.h

@@ -24,12 +24,9 @@
 namespace HPHP {
 ///////////////////////////////////////////////////////////////////////////////
 
-void f_asio_enter_context();
-void f_asio_exit_context();
 int f_asio_get_current_context_idx();
 Object f_asio_get_running_in_context(int ctx_idx);
 Object f_asio_get_running();
-Object f_asio_get_current();
 void f_asio_set_on_failed_callback(CVarRef on_failed_cb);
 void f_asio_set_on_started_callback(CVarRef on_started_cb);
 

hphp/system/class_map.cpp

@@ -13,6 +13,7 @@
    | license@php.net so we can mail you a copy immediately.               |
    +----------------------------------------------------------------------+
 */
+// @generated by idl/class_map.php
 #include <runtime/base/base_includes.h>
 #include <runtime/ext/ext.h>
 namespace HPHP {
@@ -13815,16 +13816,6 @@ const char *g_class_map[] = {
   NULL,
   NULL,
   NULL,
-  (const char *)0x10006040, "asio_enter_context", "", (const char*)0, (const char*)0,
-  "/**\n * ( excerpt from http://php.net/manual/en/function.asio-enter-context.php\n * )\n *\n * DEPRECATED: does nothing\n *\n */",
-  (const char *)0x8 /* KindOfNull */, NULL,
-  NULL,
-  NULL,
-  (const char *)0x10006040, "asio_exit_context", "", (const char*)0, (const char*)0,
-  "/**\n * ( excerpt from http://php.net/manual/en/function.asio-exit-context.php )\n *\n * DEPRECATED: does nothing\n *\n */",
-  (const char *)0x8 /* KindOfNull */, NULL,
-  NULL,
-  NULL,
   (const char *)0x10006040, "asio_get_current_context_idx", "", (const char*)0, (const char*)0,
   "/**\n * ( excerpt from\n * http://php.net/manual/en/function.asio-get-current-context-idx.php )\n *\n * Get index of the current scheduler context, or 0 if there is none\n *\n * @return     int     An index of the current scheduler context\n */",
   (const char *)0xa /* KindOfInt64 */, NULL,
@@ -13841,11 +13832,6 @@ const char *g_class_map[] = {
   (const char *)0x40 /* KindOfObject */, NULL,
   NULL,
   NULL,
-  (const char *)0x10006040, "asio_get_current", "", (const char*)0, (const char*)0,
-  "/**\n * ( excerpt from http://php.net/manual/en/function.asio-get-current.php )\n *\n * DEPRECATED: use asio_get_running\n *\n * @return     object  A ContinuationWaitHandle that is running in the\n *                     current context\n */",
-  (const char *)0x40 /* KindOfObject */, NULL,
-  NULL,
-  NULL,
   (const char *)0x10006040, "asio_set_on_failed_callback", "", (const char*)0, (const char*)0,
   "/**\n * ( excerpt from\n * http://php.net/manual/en/function.asio-set-on-failed-callback.php )\n *\n * Set callback to be called when wait handle fails\n *\n * @on_failed_cb\n *             mixed   A Closure to be called when wait handle fails\n */",
   (const char *)0x8 /* KindOfNull */, (const char *)0x2000, "on_failed_cb", "", (const char *)0xffffffff /* KindOfUnknown: $t: Variant */, "", (const char *)0, "", (const char *)0, NULL,

hphp/test/test_ext_asio.cpp

@@ -23,9 +23,6 @@ IMPLEMENT_SEP_EXTENSION_TEST(Asio);
 bool TestExtAsio::RunTests(const std::string &which) {
   bool ret = true;
 
-  RUN_TEST(test_asio_enter_context);
-  RUN_TEST(test_asio_exit_context);
-  RUN_TEST(test_asio_get_current);
   RUN_TEST(test_asio_set_on_failed_callback);
   RUN_TEST(test_WaitHandle);
   RUN_TEST(test_StaticWaitHandle);
@@ -42,18 +39,6 @@ bool TestExtAsio::RunTests(const std::string &which) {
 
 ///////////////////////////////////////////////////////////////////////////////
 
-bool TestExtAsio::test_asio_enter_context() {
-  return Count(true);
-}
-
-bool TestExtAsio::test_asio_exit_context() {
-  return Count(true);
-}
-
-bool TestExtAsio::test_asio_get_current() {
-  return Count(true);
-}
-
 bool TestExtAsio::test_asio_set_on_failed_callback() {
   return Count(true);
 }