add deprecated errors to constructors, fix Upgrade.md

Author: dbu

Document/Group.php

@@ -14,8 +14,14 @@
 use FOS\UserBundle\Model\Group as BaseGroup;
 
 /**
- * @deprecated directly extend the model classes
+ * @deprecated directly extend the classes in the Model namespace
  */
 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);
+        parent::__construct($name, $roles);
+    }
 }

Document/User.php

@@ -14,8 +14,14 @@
 use FOS\UserBundle\Model\User as AbstractUser;
 
 /**
- * @deprecated directly extend the model classes
+ * @deprecated directly extend the classes in the Model namespace
  */
 abstract class User extends AbstractUser
 {
+    public function __construct()
+    {
+        // you should extend the class in the Model namespace directly
+        trigger_error(E_USER_DEPRECATED);
+        parent::__construct();
+    }
 }

Entity/Group.php

@@ -14,8 +14,14 @@
 use FOS\UserBundle\Model\Group as BaseGroup;
 
 /**
- * @deprecated directly extend the model classes
+ * @deprecated directly extend the classes in the Model namespace
  */
 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);
+        parent::__construct($name, $roles);
+    }
 }

Entity/User.php

@@ -14,8 +14,14 @@
 use FOS\UserBundle\Model\User as AbstractUser;
 
 /**
- * @deprecated directly extend the model classes
+ * @deprecated directly extend the classes in the Model namespace
  */
 abstract class User extends AbstractUser
 {
+    public function __construct()
+    {
+        // you should extend the class in the Model namespace directly
+        trigger_error(E_USER_DEPRECATED);
+        parent::__construct();
+    }
 }

FOSUserBundle.php

@@ -25,7 +25,6 @@
  */
 class FOSUserBundle extends Bundle
 {
-
     public function build(ContainerBuilder $container)
     {
         parent::build($container);

Upgrade.md

@@ -4,17 +4,16 @@ Upgrade instruction
 This document describes the changes needed when upgrading because of a BC
 break. For the full list of changes, please look at the Changelog file.
 
-## 1.3.1 to 1.3.2
+## 1.3 to 2.0
 
 ### User and Group class
 
-This bundle now registers mappings for the classes in Model directly, instead
-of having empty extending classes. The Entity/User and Document/User and Group
-classes are deprecated, you should update your User and Group classes to extend
-the classes found in Model directly.
-The old classes will stay around for a while and continue to work, but will be
-dropped for version 2.0.
-
+This bundle now (registers mappings)[http://symfony.com/doc/master/cookbook/doctrine/mapping_model_classes.html]
+for the classes in the Model namespace directly, instead
+of having empty extending classes. The User and Group classes in the Entity and
+Document namespaces are deprecated, you should update your User and Group
+classes to extend the classes found in `Model`.
+The old classes will stay until 2.0 is released stable, but throw deprecated warnings.
 
 ## 1.2 to 1.3