Tweaked previous merge

Author: stof

DependencyInjection/Compiler/RegisterMappingsPass.php

@@ -1,5 +1,14 @@
 <?php
 
+/*
+ * This file is part of the FOSUserBundle package.
+ *
+ * (c) FriendsOfSymfony <http://friendsofsymfony.github.com/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace FOS\UserBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;

Document/Group.php

@@ -20,8 +20,7 @@ abstract class Group extends BaseGroup
 {
     public function __construct($name, $roles = array())
     {
-        // you should extend the class in the Model namespace directly
-        trigger_error(E_USER_DEPRECATED);
+        trigger_error(E_USER_DEPRECATED, sprintf('%s is deprecated. Extend FOS\UserBundle\Model\Group directly.', __CLASS__));
         parent::__construct($name, $roles);
     }
 }

Document/User.php

@@ -20,8 +20,7 @@ abstract class User extends AbstractUser
 {
     public function __construct()
     {
-        // you should extend the class in the Model namespace directly
-        trigger_error(E_USER_DEPRECATED);
+        trigger_error(E_USER_DEPRECATED, sprintf('%s is deprecated. Extend FOS\UserBundle\Model\User directly.', __CLASS__));
         parent::__construct();
     }
 }

Entity/Group.php

@@ -20,8 +20,7 @@ class Group extends BaseGroup
 {
     public function __construct($name, $roles = array())
     {
-        // you should extend the class in the Model namespace directly
-        trigger_error(E_USER_DEPRECATED);
+        trigger_error(E_USER_DEPRECATED, sprintf('%s is deprecated. Extend FOS\UserBundle\Model\Group directly.', __CLASS__));
         parent::__construct($name, $roles);
     }
 }

Entity/User.php

@@ -20,8 +20,7 @@ abstract class User extends AbstractUser
 {
     public function __construct()
     {
-        // you should extend the class in the Model namespace directly
-        trigger_error(E_USER_DEPRECATED);
+        trigger_error(E_USER_DEPRECATED, sprintf('%s is deprecated. Extend FOS\UserBundle\Model\User directly.', __CLASS__));
         parent::__construct();
     }
 }