Merge pull request #2022 from alcaeus/use-package-name-in-deprecation

Reword most deprecation notices

Author: alcaeus

lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php

@@ -73,7 +73,7 @@ public function field($fieldName)
     protected function ensureArray($expression)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The "%s" method will be private in MongoDB ODM 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" method will be private in doctrine/mongodb-odm 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         // Convert field names in expressions

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Bucket.php

@@ -48,7 +48,7 @@ public function __construct(Builder $builder, DocumentManager $documentManager,
     protected function convertExpression($expression)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The "%s" method will be private in MongoDB ODM 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" method will be private in doctrine/mongodb-odm 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (is_array($expression)) {

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/BucketAuto.php

@@ -48,7 +48,7 @@ public function __construct(Builder $builder, DocumentManager $documentManager,
     protected function convertExpression($expression)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The "%s" method will be private in MongoDB ODM 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" method will be private in doctrine/mongodb-odm 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (is_array($expression)) {

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup.php

@@ -156,7 +156,7 @@ private function fromReference($fieldName)
     protected function convertExpression($expression)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The "%s" method will be private in MongoDB ODM 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" method will be private in doctrine/mongodb-odm 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (is_array($expression)) {
@@ -171,7 +171,7 @@ protected function convertExpression($expression)
     protected function convertTargetFieldName($fieldName)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The "%s" method will be private in MongoDB ODM 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" method will be private in doctrine/mongodb-odm 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (is_array($fieldName)) {

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/Match.php

@@ -60,7 +60,7 @@ public function includesReferenceTo($document)
      */
     public function debug($name = null)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::debug($name);
     }
@@ -71,7 +71,7 @@ public function debug($name = null)
     public function geoWithinPolygon()
     {
         if (func_num_args() < 3) {
-            @trigger_error(sprintf('Calling "%s" with fewer than 3 arguments was deprecated in MongoDB ODM 1.3 and will require at least 3 arguments in 2.0.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Calling "%s" with fewer than 3 arguments was deprecated in doctrine/mongodb-odm 1.3 and will require at least 3 arguments in 2.0.', __METHOD__), E_USER_DEPRECATED);
         }
 
         return parent::geoWithinPolygon(...func_get_args());
@@ -84,7 +84,7 @@ public function geoWithinPolygon()
      */
     public function maxDistance($maxDistance)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::maxDistance($maxDistance);
     }
@@ -96,7 +96,7 @@ public function maxDistance($maxDistance)
      */
     public function minDistance($minDistance)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::minDistance($minDistance);
     }

lib/Doctrine/ODM/MongoDB/Aggregation/Stage/ReplaceRoot.php

@@ -48,7 +48,7 @@ public function __construct(Builder $builder, DocumentManager $documentManager,
     protected function convertExpression($expression)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The "%s" method will be private in MongoDB ODM 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The "%s" method will be private in doctrine/mongodb-odm 2.0. You should not rely on calling this method.', __METHOD__), E_USER_DEPRECATED);
         }
 
         if (is_array($expression)) {

lib/Doctrine/ODM/MongoDB/Configuration.php

@@ -247,14 +247,14 @@ public function setAutoGenerateProxyClasses($autoGenerateProxyClasses)
     {
         if (is_bool($autoGenerateProxyClasses)) {
             @trigger_error(
-                sprintf('Passing boolean value to %s is deprecated, please use constants of %s instead.', __METHOD__, AbstractProxyFactory::class),
+                sprintf('Passing boolean value to "%s" is deprecated, please use constants of "%s" instead.', __METHOD__, AbstractProxyFactory::class),
                 E_USER_DEPRECATED
             );
         }
 
         if ($autoGenerateProxyClasses === AbstractProxyFactory::AUTOGENERATE_ALWAYS || $autoGenerateProxyClasses === AbstractProxyFactory::AUTOGENERATE_NEVER) {
             @trigger_error(
-                sprintf('The "AUTOGENERATE_ALWAYS" and "AUTOGENERATE_NEVER" strategies for proxy generation are deprecated and will be dropped in 2.0. Please use "AUTOGENERATE_FILE_NOT_EXISTS" and "AUTOGENERATE_EVAL".'),
+                sprintf('The "AUTOGENERATE_ALWAYS" and "AUTOGENERATE_NEVER" strategies for proxy generation are deprecated and will be dropped in doctrine/mongodb-odm 2.0. Please use "AUTOGENERATE_FILE_NOT_EXISTS" and "AUTOGENERATE_EVAL".'),
                 E_USER_DEPRECATED
             );
         }
@@ -326,7 +326,7 @@ public function setAutoGenerateHydratorClasses($bool)
     {
         if (is_bool($bool)) {
             @trigger_error(
-                sprintf('Passing boolean value to %s is deprecated, please use AUTOGENERATE_* constants of %s instead.', __METHOD__, self::class),
+                sprintf('Passing boolean value to "%s" is deprecated, please use "AUTOGENERATE_*" constants of "%s" instead.', __METHOD__, self::class),
                 E_USER_DEPRECATED
             );
         }
@@ -545,7 +545,7 @@ public function getFilterParameters($name)
     public function setDefaultRepositoryClassName($className)
     {
         @trigger_error(
-            sprintf('"%s" was deprecated in MongoDB ODM 1.2 and will be removed in 2.0. Please use "%s::setDefaultDocumentRepositoryClassName" instead.', __METHOD__, __CLASS__),
+            sprintf('"%s" was deprecated in doctrine/mongodb-odm 1.2 and will be removed in 2.0. Please use "%s::setDefaultDocumentRepositoryClassName" instead.', __METHOD__, __CLASS__),
             E_USER_DEPRECATED
         );
         $this->setDefaultDocumentRepositoryClassName($className);
@@ -561,7 +561,7 @@ public function setDefaultRepositoryClassName($className)
     public function getDefaultRepositoryClassName()
     {
         @trigger_error(
-            sprintf('"%s" was deprecated in MongoDB ODM 1.2 and will be removed in 2.0. Please use "%s::getDefaultDocumentRepositoryClassName" instead.', __METHOD__, __CLASS__),
+            sprintf('"%s" was deprecated in doctrine/mongodb-odm 1.2 and will be removed in 2.0. Please use "%s::getDefaultDocumentRepositoryClassName" instead.', __METHOD__, __CLASS__),
             E_USER_DEPRECATED
         );
         return $this->getDefaultDocumentRepositoryClassName();
@@ -669,7 +669,7 @@ public function getPersistentCollectionGenerator()
      */
     public function getLoggerCallable()
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::getLoggerCallable();
     }
@@ -681,7 +681,7 @@ public function getLoggerCallable()
      */
     public function setLoggerCallable($loggerCallable)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         parent::setLoggerCallable($loggerCallable);
     }
@@ -693,7 +693,7 @@ public function setLoggerCallable($loggerCallable)
      */
     public function getMongoCmd()
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::getMongoCmd();
     }
@@ -705,7 +705,7 @@ public function getMongoCmd()
      */
     public function setMongoCmd($cmd)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         parent::setMongoCmd($cmd);
     }
@@ -717,7 +717,7 @@ public function setMongoCmd($cmd)
      */
     public function getRetryConnect()
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::getRetryConnect();
     }
@@ -729,7 +729,7 @@ public function getRetryConnect()
      */
     public function setRetryConnect($retryConnect)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         parent::setRetryConnect($retryConnect);
     }
@@ -741,7 +741,7 @@ public function setRetryConnect($retryConnect)
      */
     public function getRetryQuery()
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         return parent::getRetryQuery();
     }
@@ -753,7 +753,7 @@ public function getRetryQuery()
      */
     public function setRetryQuery($retryQuery)
     {
-        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in MongoDB ODM 2.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method is deprecated and will be removed in doctrine/mongodb-odm 2.0.', __METHOD__), E_USER_DEPRECATED);
 
         parent::setRetryQuery($retryQuery);
     }

lib/Doctrine/ODM/MongoDB/Cursor.php

@@ -559,7 +559,7 @@ public function slaveOkay($ok = true)
         $ok = (boolean) $ok;
         if ($ok) {
             @trigger_error(
-                sprintf('%s was deprecated in version 1.2 - use setReadPreference on the query instead.', __METHOD__),
+                sprintf('The "%s" method was deprecated in doctrine/mongodb-odm 1.2 and will be removed in 2.0. Use setReadPreference on the query instead.', __METHOD__),
                 E_USER_DEPRECATED
             );
         }

lib/Doctrine/ODM/MongoDB/DocumentManager.php

@@ -799,7 +799,7 @@ private function getDiscriminatorData(array $referenceMapping, ClassMetadata $cl
      */
     public function createDBRef($document, array $referenceMapping = null)
     {
-        @trigger_error('The ' . __METHOD__ . ' method has been deprecated and will be removed in ODM 2.0. Use createReference() instead.', E_USER_DEPRECATED);
+        @trigger_error(sprintf('The "%s" method has been deprecated and will be removed in doctrine/mongodb-odm 2.0. Use createReference() instead.', __METHOD__), E_USER_DEPRECATED);
 
         if (!isset($referenceMapping['storeAs'])) {
             $referenceMapping['storeAs'] = ClassMetadata::REFERENCE_STORE_AS_DB_REF;

lib/Doctrine/ODM/MongoDB/DocumentNotFoundException.php

@@ -33,7 +33,7 @@ class DocumentNotFoundException extends MongoDBException
     public function __construct($message = "", $code = 0, Throwable $previous = null)
     {
         if (self::class !== static::class) {
-            @trigger_error(sprintf('The class "%s" extends "%s" which will be final in MongoDB ODM 2.0.', static::class, self::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('The class "%s" extends "%s" which will be final in doctrine/mongodb-odm 2.0.', static::class, self::class), E_USER_DEPRECATED);
         }
         parent::__construct($message, $code, $previous);
     }