Browse Source

Merge branch 'unstable' into feature/test

bastien 13 years ago
parent
commit
0f6f04be30

+ 1 - 1
src/Muzich/CoreBundle/Entity/UsersElementsFavorites.php View File

34
    * Cet attribut contient l'objet Element lié
34
    * Cet attribut contient l'objet Element lié
35
    * 
35
    * 
36
    * @ORM\ManyToOne(targetEntity="Element", inversedBy="users")
36
    * @ORM\ManyToOne(targetEntity="Element", inversedBy="users")
37
-   * @ORM\JoinColumn(name="tag_id", referencedColumnName="id")
37
+   * @ORM\JoinColumn(name="element_id", referencedColumnName="id")
38
    */
38
    */
39
   protected $element;
39
   protected $element;
40
   
40
   

+ 2 - 0
src/Muzich/CoreBundle/lib/UnitTest.php View File

6
 
6
 
7
 class UnitTest extends \PHPUnit_Framework_TestCase
7
 class UnitTest extends \PHPUnit_Framework_TestCase
8
 {
8
 {
9
+    protected $_container;
10
+  
9
   public function __construct()
11
   public function __construct()
10
   {
12
   {
11
     $kernel = new \AppKernel("test", true);
13
     $kernel = new \AppKernel("test", true);