muted all variadic method arguments per facebook/hhvm#4858 (comment)

titon · Feb 22, 2015 · 1243aa2 · 1243aa2
1 parent af7b023
commit 1243aa2
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 23 deletions.
diff --git a/src/Titon/Context/Definition.hh b/src/Titon/Context/Definition.hh
@@ -22,7 +22,7 @@ interface Definition {
      *
      * @return $this    The definition for fluent method chaining
      */
-    public function with(...$arguments): this;
+    public function with(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): this;
 
     /**
      * Use reflection to construct a new object instance of the definition's class
@@ -32,6 +32,6 @@ interface Definition {
      *
      * @return $this    The definition for fluent method chaining
      */
-    public function create<T>(...$arguments): T;
+    public function create<T>(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): T;
 
 }
diff --git a/src/Titon/Context/Definition/AbstractDefinition.hh b/src/Titon/Context/Definition/AbstractDefinition.hh
@@ -60,7 +60,7 @@ abstract class AbstractDefinition implements Definition {
      *
      * @return $this    The definition for fluent method chaining
      */
-    public function with(...$arguments): this {
+    public function with(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): this {
         foreach ($arguments as $argument) {
             $this->arguments[] = $argument;
         }
@@ -77,7 +77,7 @@ abstract class AbstractDefinition implements Definition {
      *
      * @return array<mixed> The resolved arguments
      */
-    public function resolveArguments(...$arguments): array<mixed> {
+    public function resolveArguments(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): array<mixed> {
         if ($arguments) {
             $this->arguments = $arguments;
         }

diff --git a/src/Titon/Context/Definition/CallableDefinition.hh b/src/Titon/Context/Definition/CallableDefinition.hh
@@ -45,7 +45,7 @@ class CallableDefinition extends AbstractDefinition {
     /**
      * {@inheritdoc}
      */
-    public function create<T>(...$arguments): T {
+    public function create<T>(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): T {
         $arguments = $this->resolveArguments(...$arguments);
 
         if ($this->class) {

diff --git a/src/Titon/Context/Definition/ClassDefinition.hh b/src/Titon/Context/Definition/ClassDefinition.hh
@@ -53,7 +53,7 @@ class ClassDefinition extends AbstractDefinition {
     /**
      * {@inheritdoc}
      */
-    public function create<T>(...$arguments): T {
+    public function create<T>(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): T {
         $reflection = new ReflectionClass($this->class);
         $object = $reflection->newInstanceArgs(
             $this->resolveArguments(...$arguments)
@@ -70,7 +70,7 @@ class ClassDefinition extends AbstractDefinition {
      *
      * @return $this    The definition for fluent method chaining
      */
-    public function call(string $method, ...$arguments): this {
+    public function call(string $method, /* HH_FIXME[4033]: variadic + strict */ ...$arguments): this {
         $this->methods[] = shape(
             'method'    => $method,
             'arguments' => $arguments,

diff --git a/src/Titon/Context/Definition/ClosureDefinition.hh b/src/Titon/Context/Definition/ClosureDefinition.hh
@@ -38,7 +38,7 @@ class ClosureDefinition extends AbstractDefinition {
     /**
      * {@inheritdoc}
      */
-    public function create<T>(...$arguments): T {
+    public function create<T>(/* HH_FIXME[4033]: variadic + strict */ ...$arguments): T {
         $arguments = $this->resolveArguments(...$arguments);
 
         return call_user_func_array(

diff --git a/src/Titon/Context/Depository.hh b/src/Titon/Context/Depository.hh
@@ -161,7 +161,7 @@ class Depository {
      *
      * @return mixed    The resolved registered item or return value
      */
-    public function make(mixed $alias, ...$arguments): mixed {
+    public function make(mixed $alias, /* HH_FIXME[4033]: variadic + strict */ ...$arguments): mixed {
         if (is_string($alias) && $this->isRegistered($alias)) {
             return $this->getRegisteredItem($alias, ...$arguments);
         }
@@ -302,7 +302,7 @@ class Depository {
      * @return Definition|mixed
      * @throws ReflectionException
      */
-    protected function buildClass(string $class, ...$arguments): Definition {
+    protected function buildClass(string $class, /* HH_FIXME[4033]: variadic + strict */ ...$arguments): Definition {
         $reflection = new ReflectionClass($class);
         if (!$reflection->isInstantiable()) {
             $message = "Target [$class] is not instantiable.";
@@ -395,7 +395,7 @@ class Depository {
      *
      * @return mixed
      */
-    protected function getRegisteredItem(string $alias, ...$arguments): mixed {
+    protected function getRegisteredItem(string $alias, /* HH_FIXME[4033]: variadic + strict */ ...$arguments): mixed {
         if ($this->aliases->contains($alias)) {
             return $this->make($this->aliases[$alias], ...$arguments);
         }

diff --git a/src/Titon/Debug/Debugger.hh b/src/Titon/Debug/Debugger.hh
@@ -87,7 +87,7 @@ class Debugger {
     /**
      * @see \Titon\Debug\Dumper::debug()
      */
-    public static function debug(...$vars): string {
+    public static function debug(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string {
         return (string) call_user_func_array(inst_meth(static::getDumper(), 'debug'), $vars);
     }
 
@@ -101,7 +101,7 @@ class Debugger {
     /**
      * @see \Titon\Debug\Dumper::dump()
      */
-    public static function dump(...$vars): string {
+    public static function dump(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string {
         return (string) call_user_func_array(inst_meth(static::getDumper(), 'dump'), $vars);
     }
 
@@ -301,7 +301,7 @@ class Debugger {
      * @param string $message
      * @param array $args
      */
-    public static function handleInvariant(string $message, ...$args): void {
+    public static function handleInvariant(string $message, /* HH_FIXME[4033]: variadic + strict */ ...$args): void {
         static::getLogger()?->log(Logger::INFO, $message, $args);
     }
 

diff --git a/src/Titon/Debug/Dumper.hh b/src/Titon/Debug/Dumper.hh
@@ -32,7 +32,7 @@ interface Dumper {
      * @param mixed ...$vars
      * @return string
      */
-    public function debug(...$vars): string;
+    public function debug(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string;
 
     /**
      * Output a variable, or multiple variables, and include type information.
@@ -41,7 +41,7 @@ interface Dumper {
      * @param mixed ...$vars
      * @return string
      */
-    public function dump(...$vars): string;
+    public function dump(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string;
 
     /**
      * Output an exception including any meta data and stack trace.

diff --git a/src/Titon/Debug/Dumper/CliDumper.hh b/src/Titon/Debug/Dumper/CliDumper.hh
@@ -56,7 +56,7 @@ class CliDumper implements Dumper {
     /**
      * {@inheritdoc}
      */
-    public function debug(...$vars): string {
+    public function debug(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string {
         $caller = Debugger::getCaller('debug');
         $output = Path::alias($caller['file']) . ':' . $caller['line'];
         $length = strlen($output);
@@ -72,7 +72,7 @@ class CliDumper implements Dumper {
     /**
      * {@inheritdoc}
      */
-    public function dump(...$vars): string {
+    public function dump(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string {
         $caller = Debugger::getCaller('dump');
         $output = Path::alias($caller['file']) . ':' . $caller['line'];
         $length = strlen($output);

diff --git a/src/Titon/Debug/Dumper/HtmlDumper.hh b/src/Titon/Debug/Dumper/HtmlDumper.hh
@@ -69,7 +69,7 @@ class HtmlDumper implements Dumper {
     /**
      * {@inheritdoc}
      */
-    public function debug(...$vars): string {
+    public function debug(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string {
         $caller = Debugger::getCaller('debug');
 
         return static::renderTemplate('debug', [
@@ -82,7 +82,7 @@ class HtmlDumper implements Dumper {
     /**
      * {@inheritdoc}
      */
-    public function dump(...$vars): string {
+    public function dump(/* HH_FIXME[4033]: variadic + strict */ ...$vars): string {
         $caller = Debugger::getCaller('dump');
 
         return static::renderTemplate('debug', [

diff --git a/src/Titon/Utility/Col.hh b/src/Titon/Utility/Col.hh
@@ -335,7 +335,7 @@ class Col {
      * @param Map<Tk, Tv> $merges
      * @return Map<Tk, Tv>
      */
-    public static function merge<Tk, Tv>(...$merges): Map<Tk, Tv> { // @todo - Variadic doesn't support type hints
+    public static function merge<Tk, Tv>(/* HH_FIXME[4033]: variadic + strict */ ...$merges): Map<Tk, Tv> {
         $base = Map {};
 
         foreach ($merges as $merge) {

diff --git a/src/Titon/View/Engine.hh b/src/Titon/View/Engine.hh
@@ -104,6 +104,6 @@ interface Engine {
      * @param string $names
      * @return $this
      */
-    public function wrapWith(...$names): this; // todo - type hint once variadic supports it
+    public function wrapWith(/* HH_FIXME[4033]: variadic + strict */ ...$names): this;
 
 }
diff --git a/src/Titon/View/Engine/AbstractEngine.hh b/src/Titon/View/Engine/AbstractEngine.hh
@@ -138,7 +138,7 @@ abstract class AbstractEngine implements Engine {
     /**
      * {@inheritdoc}
      */
-    public function wrapWith(...$names): this {
+    public function wrapWith(/* HH_FIXME[4033]: variadic + strict */ ...$names): this {
         $this->wrapper = new Vector($names);
 
         return $this;