Update deprecation messages (#711)

ongr-io · Nov 16, 2016 · c8d5454 · c8d5454
1 parent e8afb4b
commit c8d5454
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/DependencyInjection/Compiler/MappingPass.php b/DependencyInjection/Compiler/MappingPass.php
@@ -49,7 +49,7 @@ public function process(ContainerBuilder $container)
             if (isset($connection['auth'])) {
                 trigger_error(
                     '`auth` usage in elasticsearch bundle configuration is deprecated, ' .
-                    'add your auth configuration directly in the host. This will be removed in v3.0. More: ' .
+                    'add your auth configuration directly in the host. This will be removed in v2.0. More: ' .
                     'https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_security.html',
                     E_USER_DEPRECATED
                 );

diff --git a/Result/Result.php b/Result/Result.php
@@ -15,7 +15,7 @@
  * This class holds available types of results.
  *
  * @deprecated There was introduced strict type find functions and these constants are no more necessary.
- *   Will remove in 3.0
+ *   Will remove in 2.0
  */
 final class Result
 {

diff --git a/Service/Manager.php b/Service/Manager.php
@@ -722,7 +722,7 @@ public function scroll(
         } else {
             trigger_error(
                 '$resultsType parameter was deprecated in scroll() fucntion. ' .
-                'Use strict type findXXX functions from repository instead. Will be removed in 3.0',
+                'Use strict type findXXX functions from repository instead. Will be removed in 2.0',
                 E_USER_DEPRECATED
             );
             return $this->parseResult($results, $resultsType, $scrollDuration);

diff --git a/Service/Repository.php b/Service/Repository.php
@@ -232,7 +232,7 @@ private function getScrollConfiguration($raw, $scrollDuration)
     /**
      * Returns DocumentIterator with composed Document objects from array response.
      *
-     * @deprecated Miss type in the function name, use findDocuments() instead. Will remove in 3.0
+     * @deprecated Miss type in the function name, use findDocuments() instead. Will remove in 2.0
      *
      * @param Search $search
      * @return DocumentIterator

diff --git a/Tests/Functional/Result/DocumentScanIteratorTest.php b/Tests/Functional/Result/DocumentScanIteratorTest.php
@@ -80,7 +80,7 @@ public function getIterationData()
     /**
      * Iteration test.
      *
-     * @deprecated Tested function will be removed in 3.0
+     * @deprecated Tested function will be removed in 2.0
      *
      * @param Search $search
      * @param bool   $isSorted

diff --git a/Tests/Functional/Service/ManagerTest.php b/Tests/Functional/Service/ManagerTest.php
@@ -348,7 +348,7 @@ public function testParseResultsWithDifferentResultTypes()
      * Tests exception that is thrown by parseResults()
      * when a bad result type is provided
      *
-     * @deprecated Function will be removed in 3.0
+     * @deprecated Function will be removed in 2.0
      *
      * @expectedException \Exception
      */