diff --git a/Client.php b/Client.php
index 98cdeae..3eb98fe 100644
--- a/Client.php
+++ b/Client.php
@@ -11,6 +11,9 @@ use FOS\ElasticaBundle\Logger\ElasticaLogger;
  */
 class Client extends ElasticaClient
 {
+    /**
+     * {@inheritdoc}
+     */
     public function request($path, $method = Request::GET, $data = array(), array $query = array())
     {
         $start = microtime(true);
diff --git a/FOSElasticaBundle.php b/FOSElasticaBundle.php
index 5ac1f2a..44424d3 100644
--- a/FOSElasticaBundle.php
+++ b/FOSElasticaBundle.php
@@ -8,10 +8,14 @@ use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Compiler\PassConfig;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
+/**
+ * Bundle.
+ *
+ */
 class FOSElasticaBundle extends Bundle
 {
     /**
-     * @see Symfony\Component\HttpKernel\Bundle\Bundle::build()
+     * {@inheritdoc}
      */
     public function build(ContainerBuilder $container)
     {
diff --git a/Paginator/RawPaginatorAdapter.php b/Paginator/RawPaginatorAdapter.php
index b74a9e4..8bd4ee2 100644
--- a/Paginator/RawPaginatorAdapter.php
+++ b/Paginator/RawPaginatorAdapter.php
@@ -41,7 +41,8 @@ class RawPaginatorAdapter implements PaginatorAdapterInterface
      * @see PaginatorAdapterInterface::__construct
      *
      * @param SearchableInterface $searchable the object to search in
-     * @param Query $query the query to search
+     * @param Query               $query the query to search
+     * @param array               $options
      */
     public function __construct(SearchableInterface $searchable, Query $query, array $options = array())
     {
diff --git a/Paginator/TransformedPaginatorAdapter.php b/Paginator/TransformedPaginatorAdapter.php
index 10976f7..3b4716f 100644
--- a/Paginator/TransformedPaginatorAdapter.php
+++ b/Paginator/TransformedPaginatorAdapter.php
@@ -14,8 +14,9 @@ class TransformedPaginatorAdapter extends RawPaginatorAdapter
     private $transformer;
 
     /**
-     * @param SearchableInterface $searchable the object to search in
-     * @param Query $query the query to search
+     * @param SearchableInterface                 $searchable the object to search in
+     * @param Query                               $query the query to search
+     * @param array                               $options
      * @param ElasticaToModelTransformerInterface $transformer the transformer for fetching the results
      */
     public function __construct(SearchableInterface $searchable, Query $query, array $options = array(), ElasticaToModelTransformerInterface $transformer)
diff --git a/Resetter.php b/Resetter.php
index c7f4638..fe963d0 100644
--- a/Resetter.php
+++ b/Resetter.php
@@ -62,6 +62,7 @@ class Resetter
      * @param string $indexName
      * @param string $typeName
      * @throws \InvalidArgumentException if no index or type mapping exists for the given names
+     * @throws ResponseException
      */
     public function resetIndexType($indexName, $typeName)
     {