Merge commit 'refs/pull/3830/head' of github.com:zendframework/zf2 in…

…to hotfix/phpdoc-fix
mnapoli · Mar 5, 2013 · 61d2609 · 61d2609
2 parents 493b8e0 + 3b01784
commit 61d2609
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php b/library/Zend/Db/Adapter/Driver/Mysqli/Statement.php
@@ -220,7 +220,7 @@ public function prepare($sql = null)
     /**
      * Execute
      *
-     * @param  ParameterContainer $parameters
+     * @param  ParameterContainer|array $parameters
      * @throws Exception\RuntimeException
      * @return mixed
      */