switch

4 files changed, 213 insertions, 1231 deletions

diff --git a/REFLECTION b/REFLECTION
index cdec474..62a7fdd 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #198 yar version 1.2.5 ] {
+Extension [ <persistent> extension #175 yar version 2.0.2 ] {
 
   - Dependencies {
     Dependency [ json (Required) ]
@@ -33,7 +33,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
   }
 
   - Constants [18] {
-    Constant [ string YAR_VERSION ] { 1.2.5 }
+    Constant [ string YAR_VERSION ] { 2.0.2 }
     Constant [ integer YAR_OPT_PACKAGER ] { 1 }
     Constant [ integer YAR_OPT_PERSISTENT ] { 2 }
     Constant [ integer YAR_OPT_TIMEOUT ] { 4 }
@@ -49,7 +49,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
     Constant [ integer YAR_ERR_TRANSPORT ] { 16 }
     Constant [ integer YAR_ERR_REQUEST ] { 4 }
     Constant [ integer YAR_ERR_PROTOCOL ] { 2 }
-    Constant [ integer YAR_ERR_PACKAGER ] { 64 }
+    Constant [ integer YAR_ERR_PACKAGER ] { 1 }
     Constant [ integer YAR_ERR_EXCEPTION ] { 64 }
   }
 
@@ -188,7 +188,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
       }
     }
 
-    Class [ <internal:yar> class Yar_Server_Exception extends Exception ] {
+    Class [ <internal:yar> class Yar_Server_Exception extends Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -211,7 +211,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -223,33 +223,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Server_Request_Exception extends Yar_Server_Exception ] {
+    Class [ <internal:yar> class Yar_Server_Request_Exception extends Yar_Server_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -271,7 +271,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -283,33 +283,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Server_Protocol_Exception extends Yar_Server_Exception ] {
+    Class [ <internal:yar> class Yar_Server_Protocol_Exception extends Yar_Server_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -331,7 +331,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -343,33 +343,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Server_Packager_Exception extends Yar_Server_Exception ] {
+    Class [ <internal:yar> class Yar_Server_Packager_Exception extends Yar_Server_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -391,7 +391,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -403,33 +403,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Server_Output_Exception extends Yar_Server_Exception ] {
+    Class [ <internal:yar> class Yar_Server_Output_Exception extends Yar_Server_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -451,7 +451,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -463,33 +463,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Client_Exception extends Exception ] {
+    Class [ <internal:yar> class Yar_Client_Exception extends Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -511,7 +511,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -523,33 +523,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Client_Transport_Exception extends Yar_Client_Exception ] {
+    Class [ <internal:yar> class Yar_Client_Transport_Exception extends Yar_Client_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -571,7 +571,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Client_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -583,33 +583,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Client_Packager_Exception extends Yar_Client_Exception ] {
+    Class [ <internal:yar> class Yar_Client_Packager_Exception extends Yar_Client_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -631,7 +631,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Client_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -643,33 +643,33 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
 
-    Class [ <internal:yar> class Yar_Client_Protocol_Exception extends Yar_Client_Exception ] {
+    Class [ <internal:yar> class Yar_Client_Protocol_Exception extends Yar_Client_Exception implements Throwable ] {
 
       - Constants [0] {
       }
@@ -691,7 +691,7 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:yar, inherits Yar_Client_Exception> public method getType ] {
         }
 
-        Method [ <internal:Core, inherits Exception, ctor> <visibility error> method __construct ] {
+        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
 
           - Parameters [3] {
             Parameter #0 [ <optional> $message ]
@@ -703,28 +703,28 @@ Extension [ <persistent> extension #198 yar version 1.2.5 ] {
         Method [ <internal:Core, inherits Exception> public method __wakeup ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getMessage ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getCode ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getFile ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getLine ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTrace ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getPrevious ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
         }
 
-        Method [ <internal:Core, inherits Exception> final public method getTraceAsString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
         }
 
-        Method [ <internal:Core, inherits Exception> public method __toString ] {
+        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
         }
       }
     }
diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7
deleted file mode 100644
index 62a7fdd..0000000
--- a/REFLECTION-PHP7
+++ /dev/null
@@ -1,733 +0,0 @@
-Extension [ <persistent> extension #175 yar version 2.0.2 ] {
-
-  - Dependencies {
-    Dependency [ json (Required) ]
-    Dependency [ msgpack (Required) ]
-  }
-
-  - INI {
-    Entry [ yar.packager <PERDIR> ]
-      Current = 'msgpack'
-    }
-    Entry [ yar.transport <PERDIR> ]
-      Current = 'curl'
-    }
-    Entry [ yar.debug <ALL> ]
-      Current = 'Off'
-    }
-    Entry [ yar.expose_info <PERDIR> ]
-      Current = 'On'
-    }
-    Entry [ yar.connect_timeout <ALL> ]
-      Current = '1000'
-    }
-    Entry [ yar.timeout <ALL> ]
-      Current = '5000'
-    }
-    Entry [ yar.content_type <ALL> ]
-      Current = 'application/octet-stream'
-    }
-    Entry [ yar.allow_persistent <ALL> ]
-      Current = '0'
-    }
-  }
-
-  - Constants [18] {
-    Constant [ string YAR_VERSION ] { 2.0.2 }
-    Constant [ integer YAR_OPT_PACKAGER ] { 1 }
-    Constant [ integer YAR_OPT_PERSISTENT ] { 2 }
-    Constant [ integer YAR_OPT_TIMEOUT ] { 4 }
-    Constant [ integer YAR_OPT_CONNECT_TIMEOUT ] { 8 }
-    Constant [ integer YAR_CLIENT_PROTOCOL_HTTP ] { 1 }
-    Constant [ integer YAR_CLIENT_PROTOCOL_TCP ] { 2 }
-    Constant [ integer YAR_CLIENT_PROTOCOL_UNIX ] { 4 }
-    Constant [ string YAR_PACKAGER_PHP ] { PHP }
-    Constant [ string YAR_PACKAGER_JSON ] { JSON }
-    Constant [ string YAR_PACKAGER_MSGPACK ] { MSGPACK }
-    Constant [ integer YAR_ERR_OKEY ] { 0 }
-    Constant [ integer YAR_ERR_OUTPUT ] { 8 }
-    Constant [ integer YAR_ERR_TRANSPORT ] { 16 }
-    Constant [ integer YAR_ERR_REQUEST ] { 4 }
-    Constant [ integer YAR_ERR_PROTOCOL ] { 2 }
-    Constant [ integer YAR_ERR_PACKAGER ] { 1 }
-    Constant [ integer YAR_ERR_EXCEPTION ] { 64 }
-  }
-
-  - Classes [12] {
-    Class [ <internal:yar> class Yar_Server ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [1] {
-        Property [ <default> protected $_executor ]
-      }
-
-      - Methods [2] {
-        Method [ <internal:yar, ctor> final public method __construct ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> $obj ]
-            Parameter #1 [ <optional> $protocol ]
-          }
-        }
-
-        Method [ <internal:yar> public method handle ] {
-
-          - Parameters [0] {
-          }
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Client ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $_protocol ]
-        Property [ <default> protected $_uri ]
-        Property [ <default> protected $_options ]
-        Property [ <default> protected $_running ]
-      }
-
-      - Methods [5] {
-        Method [ <internal:yar, ctor> final public method __construct ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> $url ]
-            Parameter #1 [ <optional> $async ]
-          }
-        }
-
-        Method [ <internal:yar> public method call ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> $method ]
-            Parameter #1 [ <required> $parameters ]
-          }
-        }
-
-        Method [ <internal:yar> public method __call ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> $method ]
-            Parameter #1 [ <required> $parameters ]
-          }
-        }
-
-        Method [ <internal:yar> public method getOpt ] {
-
-          - Parameters [1] {
-            Parameter #0 [ <required> $type ]
-          }
-        }
-
-        Method [ <internal:yar> public method setOpt ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <required> $type ]
-            Parameter #1 [ <required> $value ]
-          }
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Concurrent_Client ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [4] {
-        Property [ protected static $_callstack ]
-        Property [ protected static $_callback ]
-        Property [ protected static $_error_callback ]
-        Property [ protected static $_start ]
-      }
-
-      - Static methods [3] {
-        Method [ <internal:yar> static public method call ] {
-
-          - Parameters [4] {
-            Parameter #0 [ <required> $uri ]
-            Parameter #1 [ <required> $method ]
-            Parameter #2 [ <required> $parameters ]
-            Parameter #3 [ <optional> $callback ]
-          }
-        }
-
-        Method [ <internal:yar> static public method loop ] {
-
-          - Parameters [2] {
-            Parameter #0 [ <optional> $callback ]
-            Parameter #1 [ <optional> $error_callback ]
-          }
-        }
-
-        Method [ <internal:yar> static public method reset ] {
-        }
-      }
-
-      - Properties [0] {
-      }
-
-      - Methods [0] {
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Server_Exception extends Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [5] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-        Property [ <default> protected $_type ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Server_Request_Exception extends Yar_Server_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Server_Protocol_Exception extends Yar_Server_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Server_Packager_Exception extends Yar_Server_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Server_Output_Exception extends Yar_Server_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Server_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Client_Exception extends Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Client_Transport_Exception extends Yar_Client_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Client_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Client_Packager_Exception extends Yar_Client_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Client_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-
-    Class [ <internal:yar> class Yar_Client_Protocol_Exception extends Yar_Client_Exception implements Throwable ] {
-
-      - Constants [0] {
-      }
-
-      - Static properties [0] {
-      }
-
-      - Static methods [0] {
-      }
-
-      - Properties [4] {
-        Property [ <default> protected $message ]
-        Property [ <default> protected $code ]
-        Property [ <default> protected $file ]
-        Property [ <default> protected $line ]
-      }
-
-      - Methods [11] {
-        Method [ <internal:yar, inherits Yar_Client_Exception> public method getType ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, ctor> public method __construct ] {
-
-          - Parameters [3] {
-            Parameter #0 [ <optional> $message ]
-            Parameter #1 [ <optional> $code ]
-            Parameter #2 [ <optional> $previous ]
-          }
-        }
-
-        Method [ <internal:Core, inherits Exception> public method __wakeup ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getMessage ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getCode ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getFile ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getLine ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTrace ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getPrevious ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> final public method getTraceAsString ] {
-        }
-
-        Method [ <internal:Core, inherits Exception, prototype Throwable> public method __toString ] {
-        }
-      }
-    }
-  }
-}
-
diff --git a/php-pecl-yar-php7.spec b/php-pecl-yar-php7.spec
deleted file mode 100644
index b202b97..0000000
--- a/php-pecl-yar-php7.spec
+++ /dev/null
@@ -1,366 +0,0 @@
-# remirepo spec file for php-pecl-yar
-#
-# Copyright (c) 2013-2017 Remi Collet
-# License: CC-BY-SA
-# http://creativecommons.org/licenses/by-sa/4.0/
-#
-# Please, preserve the changelog entries
-#
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package       php-pecl-yar
-%endif
-
-%global gh_commit  0e04a6a92347f7e95c9ddf8bbbad36b6286ed87f
-%global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_owner   laruence
-%global gh_project yar
-#global gh_date    20150914
-%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
-%global pecl_name  yar
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
-%if "%{php_version}" < "5.6"
-# After json, msgpack
-%global ini_name   %{pecl_name}.ini
-%else
-# After 40-json, 40-msgpack
-%global ini_name   50-%{pecl_name}.ini
-%endif
-
-Summary:        Light, concurrent RPC framework
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        2.0.2
-%if 0%{?gh_date:1}
-Release:        0.11.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
-%else
-Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
-%endif
-License:        PHP
-Group:          Development/Languages
-URL:            http://pecl.php.net/package/%{pecl_name}
-
-BuildRequires:  curl-devel
-BuildRequires:  %{?scl_prefix}php-devel > 7
-BuildRequires:  %{?scl_prefix}php-pear
-BuildRequires:  %{?scl_prefix}php-json
-BuildRequires:  %{?sub_prefix}php-pecl-msgpack-devel
-
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%if "%{php_version}" < "5.4"
-# php 5.3.3 in EL-6 don't use arched virtual provides
-# so only requires real packages instead
-Requires:       %{?scl_prefix}php-common%{?_isa}
-%else
-Requires:       %{?scl_prefix}php-curl%{?_isa}
-Requires:       %{?scl_prefix}php-json%{?_isa}
-%endif
-Requires:       %{?scl_prefix}php-pecl(msgpack)%{?_isa}
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
-
-Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
-Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%endif
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
-Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "7.1"
-Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
-Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
-
-%description
-Yar (Yet another RPC framework) is a light, concurrent RPC framework,
-supports multi package protocols (json, msgpack).
-
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
-
-
-%prep
-%setup -qc
-%if 0%{?gh_date:1}
-mv %{gh_project}-%{gh_commit} NTS
-mv NTS/package2.xml .
-%else
-mv %{pecl_name}-%{version} NTS
-%endif
-
-# Don't install/register tests
-sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
-    -i package2.xml
-
-cd NTS
-
-# Sanity check, really often broken
-extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h)
-if test "x${extver}" != "x%{version}%{?prever:-%{prever}}%{?gh_date:-dev}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}%{?gh_date:-dev}.
-   exit 1
-fi
-cd ..
-
-sed -e 's:tools/yar_debug.inc:yar_debug.inc:' \
-    -e 's:tools/yar_debug.php:yar_debug:' \
-    -i package2.xml
-
-%if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
-%endif
-
-# Create configuration file
-cat > %{ini_name} << 'EOF'
-; Enable %{pecl_name} extension module
-extension=%{pecl_name}.so
-
-; Configuration
-;yar.allow_persistent=0
-;yar.connect_timeout=1000
-;yar.content_type=application/octet-stream
-;yar.debug=Off
-;yar.expose_info=On
-;yar.packager=msgpack
-;yar.timeout=5000
-;yar.transport=curl
-EOF
-
-
-%build
-%{?dtsenable}
-
-cd NTS
-%{_bindir}/phpize
-%configure \
-    --enable-msgpack \
-    --with-php-config=%{_bindir}/php-config
-make %{?_smp_mflags}
-
-%if %{with_zts}
-cd ../ZTS
-%{_bindir}/zts-phpize
-%configure \
-    --enable-msgpack \
-    --with-php-config=%{_bindir}/zts-php-config
-make %{?_smp_mflags}
-%endif
-
-
-%install
-%{?dtsenable}
-
-make -C NTS install INSTALL_ROOT=%{buildroot}
-
-# install config file
-install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
-
-# Install XML package description
-install -D -m 644 package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
-
-%if %{with_zts}
-make -C ZTS install INSTALL_ROOT=%{buildroot}
-
-install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
-%endif
-
-# Tools
-install -Dpm 644 NTS/tools/yar_debug.inc %{buildroot}%{pear_phpdir}/yar_debug.inc
-install -Dpm 755 NTS/tools/yar_debug.php %{buildroot}%{_bindir}/yar_debug
-
-# Documentation
-cd NTS
-for i in $(grep 'role="doc"' ../package2.xml | sed -e 's/^.*name="//;s/".*$//')
-do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
-done
-
-
-%if 0%{?fedora} < 24
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
-%check
-: Minimal load test for NTS extension
-%{__php} --no-php-ini \
-    --define extension=json.so \
-    --define extension=msgpack.so \
-    --define extension=NTS/modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-
-%if %{with_zts}
-: Minimal load test for ZTS extension
-%{__ztsphp} --no-php-ini \
-    --define extension=json.so \
-    --define extension=msgpack.so \
-    --define extension=ZTS/modules/%{pecl_name}.so \
-    --modules | grep %{pecl_name}
-%endif
-
-%if %{with_tests}
-cd NTS
-
-: Create test configuration
-export TEST_PHP_EXECUTABLE=%{__php}
-export TEST_PHP_ARGS="-n -d extension=json.so -d extension=msgpack.so -d extension=$PWD/modules/%{pecl_name}.so"
-export NO_INTERACTION=1
-export REPORT_EXIT_STATUS=1
-
-%ifarch x86_64
-export YAR_API_PORT=8968
-%else
-export YAR_API_PORT=8964
-%endif
-
-: Run the upstream test suite
-%{__php} -n run-tests.php --show-diff
-%else
-: upstream test suite disabled
-%endif
-
-
-%files
-%{?_licensedir:%license NTS/LICENSE}
-%doc %{pecl_docdir}/%{pecl_name}
-%{pecl_xmldir}/%{name}.xml
-
-%config(noreplace) %{php_inidir}/%{ini_name}
-%{php_extdir}/%{pecl_name}.so
-%{_bindir}/yar_debug
-%{pear_phpdir}/yar_debug.inc
-
-%if %{with_zts}
-%config(noreplace) %{php_ztsinidir}/%{ini_name}
-%{php_ztsextdir}/%{pecl_name}.so
-%endif
-
-
-%changelog
-* Wed Mar 15 2017 Remi Collet <remi@remirepo.net> - 2.0.2-1
-- Update to 2.0.2
-
-* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
-- rebuild with PHP 7.1.0 GA
-
-* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
-- rebuild for PHP 7.1 new API version
-
-* Sat Jul  2 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
-- update to 2.0.1 (php 7)
-- sources from pecl
-- drop patch merged upstream
-
-* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-3
-- add patch for PHP 7.1
-  open https://github.com/laruence/yar/pull/83
-
-* Sun Mar  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-2
-- adapt for F24
-
-* Tue Oct 27 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
-- update to 2.0.0 (beta, php 7)
-
-* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.10.20150914git87e4850
-- rebuild for PHP 7.0.0RC5 new API version
-- new snapshot
-
-* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.9.20150724git47317d6
-- F23 rebuild with rh_layout
-
-* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.8.20150724git47317d6
-- new snapshot
-
-* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.7.20150717git07b6772
-- ignore 1 failed test on i386
-- open https://github.com/laruence/yar/issues/56 (1 failed test on i386)
-
-* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.6.20150717git07b6772
-- rebuild against php 7.0.0beta2
-
-* Wed Jul  8 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.5.20150701gita937b2f
-- rebuild against php 7.0.0beta1
-
-* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.4.20150617gitd1fb4b5
-- rebuild for "rh_layout"
-
-* Wed Jun 17 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.3.20150615git410ca7a
-- rebuild
-- open https://github.com/laruence/yar/pull/51
-
-* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.2.20150612git3b43b26
-- enable test suite during the build
-
-* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.1.20150612git7aca9e6
-- Update to 1.2.5-dev for PHP 7
-- sources from github
-- drop runtime dependency on pear, new scriptlets
-
-* Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.2.4-1.1
-- Fedora 21 SCL mass rebuild
-
-* Sat Oct 25 2014 Remi Collet <remi@fedoraproject.org> - 1.2.4-1
-- Update to 1.2.4
-- dont install test suite
-
-* Tue Aug 26 2014 Remi Collet <rcollet@redhat.com> - 1.2.3-3
-- improve SCL build
-
-* Thu Apr 17 2014 Remi Collet <remi@fedoraproject.org> - 1.2.3-2
-- add numerical prefix to extension configuration file (php 5.6)
-
-* Thu Jan 02 2014 Remi Collet <remi@fedoraproject.org> - 1.2.3-1
-- Update to 1.2.3 (stable)
-- provides yar_debug command
-- fix default options in comments
-- adapt for SCL
-
-* Tue Dec 31 2013 Remi Collet <remi@fedoraproject.org> - 1.2.2-1
-- Update to 1.2.2 (stable)
-
-* Tue Nov 19 2013 Remi Collet <remi@fedoraproject.org> - 1.2.1-1
-- Update to 1.2.1 (stable)
-- install doc in pecl doc_dir
-- install tests in pecl test_dir
-
-* Wed Jul 17 2013 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
-- initial package
-
diff --git a/php-pecl-yar.spec b/php-pecl-yar.spec
index 8947216..b202b97 100644
--- a/php-pecl-yar.spec
+++ b/php-pecl-yar.spec
@@ -7,17 +7,18 @@
 # Please, preserve the changelog entries
 #
 %if 0%{?scl:1}
-%if "%{scl}" == "rh-php56"
-%global sub_prefix more-php56-
-%else
 %global sub_prefix %{scl_prefix}
+%scl_package       php-pecl-yar
 %endif
-%endif
-
-%{?scl:          %scl_package        php-pecl-yar}
 
-%global with_zts   0%{?__ztsphp:1}
+%global gh_commit  0e04a6a92347f7e95c9ddf8bbbad36b6286ed87f
+%global gh_short   %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner   laruence
+%global gh_project yar
+#global gh_date    20150914
+%global with_zts   0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name  yar
+%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
 %if "%{php_version}" < "5.6"
 # After json, msgpack
 %global ini_name   %{pecl_name}.ini
@@ -28,23 +29,34 @@
 
 Summary:        Light, concurrent RPC framework
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.2.5
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:        BSD
+Version:        2.0.2
+%if 0%{?gh_date:1}
+Release:        0.11.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
+%else
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+%endif
+License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  curl-devel
-BuildRequires:  %{?scl_prefix}php-devel
+BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
+BuildRequires:  %{?scl_prefix}php-json
 BuildRequires:  %{?sub_prefix}php-pecl-msgpack-devel
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
+%if "%{php_version}" < "5.4"
+# php 5.3.3 in EL-6 don't use arched virtual provides
+# so only requires real packages instead
+Requires:       %{?scl_prefix}php-common%{?_isa}
+%else
 Requires:       %{?scl_prefix}php-curl%{?_isa}
 Requires:       %{?scl_prefix}php-json%{?_isa}
+%endif
 Requires:       %{?scl_prefix}php-pecl(msgpack)%{?_isa}
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
@@ -52,8 +64,10 @@ Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+%if "%{?scl_prefix}" != "%{?sub_prefix}"
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
+%endif
 
 %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
@@ -61,13 +75,15 @@ Obsoletes:     php53-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php53u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php54-pecl-%{pecl_name}  <= %{version}
 Obsoletes:     php54w-pecl-%{pecl_name} <= %{version}
-%if "%{php_version}" > "5.5"
 Obsoletes:     php55u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php55w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "5.6"
 Obsoletes:     php56u-pecl-%{pecl_name} <= %{version}
 Obsoletes:     php56w-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php70w-pecl-%{pecl_name} <= %{version}
+%if "%{php_version}" > "7.1"
+Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
+Obsoletes:     php71w-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
@@ -86,24 +102,25 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 
 %prep
-%setup -q -c
+%setup -qc
+%if 0%{?gh_date:1}
+mv %{gh_project}-%{gh_commit} NTS
+mv NTS/package2.xml .
+%else
 mv %{pecl_name}-%{version} NTS
+%endif
 
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
-    -i package.xml
+    -i package2.xml
 
 cd NTS
 
-# Add shebang
-sed -e 's:<?php:#!%{_bindir}/php\n<?php:' \
-     -i tools/yar_debug.php
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_YAR_VERSION/{s/.* "//;s/".*$//;p}' php_yar.h)
-if test "x${extver}" != "x%{version}%{?prever:-%{prever}}"; then
-   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}.
+if test "x${extver}" != "x%{version}%{?prever:-%{prever}}%{?gh_date:-dev}"; then
+   : Error: Upstream extension version is ${extver}, expecting %{version}%{?prever:-%{prever}}%{?gh_date:-dev}.
    exit 1
 fi
 cd ..
@@ -135,6 +152,8 @@ EOF
 
 
 %build
+%{?dtsenable}
+
 cd NTS
 %{_bindir}/phpize
 %configure \
@@ -153,10 +172,9 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
+%{?dtsenable}
 
-make -C NTS \
-     install INSTALL_ROOT=%{buildroot}
+make -C NTS install INSTALL_ROOT=%{buildroot}
 
 # install config file
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -165,8 +183,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
 install -D -m 644 package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %if %{with_zts}
-make -C ZTS \
-     install INSTALL_ROOT=%{buildroot}
+make -C ZTS install INSTALL_ROOT=%{buildroot}
 
 install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
@@ -203,7 +220,6 @@ fi
 
 
 %check
-# Upstream test suite requires a web server
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
     --define extension=json.so \
@@ -220,13 +236,29 @@ fi
     --modules | grep %{pecl_name}
 %endif
 
+%if %{with_tests}
+cd NTS
+
+: Create test configuration
+export TEST_PHP_EXECUTABLE=%{__php}
+export TEST_PHP_ARGS="-n -d extension=json.so -d extension=msgpack.so -d extension=$PWD/modules/%{pecl_name}.so"
+export NO_INTERACTION=1
+export REPORT_EXIT_STATUS=1
+
+%ifarch x86_64
+export YAR_API_PORT=8968
+%else
+export YAR_API_PORT=8964
+%endif
 
-%clean
-rm -rf %{buildroot}
+: Run the upstream test suite
+%{__php} -n run-tests.php --show-diff
+%else
+: upstream test suite disabled
+%endif
 
 
 %files
-%defattr(-,root,root,-)
 %{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
@@ -243,15 +275,63 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Mar  9 2016 Remi Collet <remi@fedoraproject.org> - 1.2.5-2
+* Wed Mar 15 2017 Remi Collet <remi@remirepo.net> - 2.0.2-1
+- Update to 2.0.2
+
+* Thu Dec  1 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-3
+- rebuild with PHP 7.1.0 GA
+
+* Wed Sep 14 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-2
+- rebuild for PHP 7.1 new API version
+
+* Sat Jul  2 2016 Remi Collet <remi@fedoraproject.org> - 2.0.1-1
+- update to 2.0.1 (php 7)
+- sources from pecl
+- drop patch merged upstream
+
+* Sat Jun 11 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-3
+- add patch for PHP 7.1
+  open https://github.com/laruence/yar/pull/83
+
+* Sun Mar  6 2016 Remi Collet <remi@fedoraproject.org> - 2.0.0-2
 - adapt for F24
-- fix license management
 
-* Tue Oct 27 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-1
-- update to 1.2.5 (stable, php 5)
+* Tue Oct 27 2015 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
+- update to 2.0.0 (beta, php 7)
+
+* Tue Oct 13 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.10.20150914git87e4850
+- rebuild for PHP 7.0.0RC5 new API version
+- new snapshot
 
-* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.4-2
-- allow build against rh-php56 (as more-php56)
+* Fri Sep 18 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.9.20150724git47317d6
+- F23 rebuild with rh_layout
+
+* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.8.20150724git47317d6
+- new snapshot
+
+* Fri Jul 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.7.20150717git07b6772
+- ignore 1 failed test on i386
+- open https://github.com/laruence/yar/issues/56 (1 failed test on i386)
+
+* Wed Jul 22 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.6.20150717git07b6772
+- rebuild against php 7.0.0beta2
+
+* Wed Jul  8 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.5.20150701gita937b2f
+- rebuild against php 7.0.0beta1
+
+* Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.4.20150617gitd1fb4b5
+- rebuild for "rh_layout"
+
+* Wed Jun 17 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.3.20150615git410ca7a
+- rebuild
+- open https://github.com/laruence/yar/pull/51
+
+* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.2.20150612git3b43b26
+- enable test suite during the build
+
+* Fri Jun 12 2015 Remi Collet <remi@fedoraproject.org> - 1.2.5-0.1.20150612git7aca9e6
+- Update to 1.2.5-dev for PHP 7
+- sources from github
 - drop runtime dependency on pear, new scriptlets
 
 * Wed Dec 24 2014 Remi Collet <remi@fedoraproject.org> - 1.2.4-1.1
@@ -283,3 +363,4 @@ rm -rf %{buildroot}
 
 * Wed Jul 17 2013 Remi Collet <remi@fedoraproject.org> - 1.2.0-1
 - initial package
+