Created GroupBundle

16 files changed, 40 insertions, 3 deletions

diff --git a/app/AppKernel.php b/app/AppKernel.php
index c50783a6..b6babf1d 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -40,6 +40,7 @@ class AppKernel extends Kernel
             new Wallabag\ImportBundle\WallabagImportBundle(),
             new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
+            new Wallabag\GroupBundle\WallabagGroupBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
diff --git a/app/config/config.yml b/app/config/config.yml
index f1d93aaa..883626fd 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -179,7 +179,7 @@ fos_user:
     firewall_name: secured_area
     user_class: Wallabag\UserBundle\Entity\User
     group:
-        group_class: Wallabag\UserBundle\Entity\Group
+        group_class: Wallabag\GroupBundle\Entity\Group
     registration:
         confirmation:
             enabled: "%fosuser_confirmation%"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5229ac73..ea7fb086 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Gentag adgangskode'
         plain_password_label: '????'
         email_label: 'Emailadresse'
+        # group: 'Group'
         # enabled_label: 'Enabled'
         # last_login_label: 'Last login'
         # twofactor_label: Two factor authentication
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 996f173a..fcda6ae6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Neues Kennwort wiederholen'
         plain_password_label: '????'
         email_label: 'E-Mail-Adresse'
+        # group: 'Group'
         enabled_label: 'Aktiviert'
         last_login_label: 'Letzter Login'
         twofactor_label: Zwei-Faktor-Authentifizierung
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index aa1cd1a9..54427e23 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Repeat new password'
         plain_password_label: '????'
         email_label: 'Email'
+        group: 'Group'
         enabled_label: 'Enabled'
         last_login_label: 'Last login'
         twofactor_label: Two factor authentication
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 57e6c029..16c4f3a0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
         plain_password_label: '????'
         email_label: 'نشانی ایمیل'
+        # group: 'Group'
         # enabled_label: 'Enabled'
         # last_login_label: 'Last login'
         # twofactor_label: Two factor authentication
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 4e26f38c..8dff4c6d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Ripeti password'
         plain_password_label: '????'
         email_label: 'E-mail'
+        # group: 'Group'
         # enabled_label: 'Enabled'
         # last_login_label: 'Last login'
         # twofactor_label: Two factor authentication
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index be57e903..1cf70233 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
         plain_password_label: 'Senhal en clar'
         email_label: 'Adreça de corrièl'
+        # group: 'Group'
         enabled_label: 'Actiu'
         last_login_label: 'Darrièra connexion'
         twofactor_label: 'Autentificacion doble-factor'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 00c559ed..d3af4fd5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Powtórz nowe hasło'
         plain_password_label: 'Jawne hasło'
         email_label: 'Adres email'
+        # group: 'Group'
         enabled_label: 'Włączony'
         last_login_label: 'Ostatnie logowanie'
         twofactor_label: Autoryzacja dwuetapowa
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index f16504ed..3952eae8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -514,6 +514,7 @@ user:
         repeat_new_password_label: 'Repeat new password'
         plain_password_label: '????'
         email_label: 'E-mail'
+        # group: 'Group'
         # enabled_label: 'Enabled'
         # last_login_label: 'Last login'
         # twofactor_label: Two factor authentication
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 90a140cd..74f76c72 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -512,6 +512,7 @@ user:
         repeat_new_password_label: 'Yeni şifrenin tekrarı'
         plain_password_label: '????'
         email_label: 'E-posta'
+        # group: 'Group'
         # enabled_label: 'Enabled'
         # last_login_label: 'Last login'
         # twofactor_label: Two factor authentication
diff --git a/src/Wallabag/UserBundle/Entity/Group.php b/src/Wallabag/GroupBundle/Entity/Group.php
index 9145959d..57dc16d1 100644
--- a/src/Wallabag/UserBundle/Entity/Group.php
+++ b/src/Wallabag/GroupBundle/Entity/Group.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Entity;
+namespace Wallabag\GroupBundle\Entity;
 
 use FOS\UserBundle\Model\Group as BaseGroup;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Wallabag/GroupBundle/WallabagGroupBundle.php b/src/Wallabag/GroupBundle/WallabagGroupBundle.php
new file mode 100644
index 00000000..93b66508
--- /dev/null
+++ b/src/Wallabag/GroupBundle/WallabagGroupBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Wallabag\GroupBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class WallabagGroupBundle extends Bundle
+{
+}
diff --git a/src/Wallabag/UserBundle/Entity/User.php b/src/Wallabag/UserBundle/Entity/User.php
index 781f7b03..7da0d1d5 100644
--- a/src/Wallabag/UserBundle/Entity/User.php
+++ b/src/Wallabag/UserBundle/Entity/User.php
@@ -98,7 +98,7 @@ class User extends BaseUser implements TwoFactorInterface, TrustedComputerInterf
     private $authCode;
 
     /**
-     * @ORM\ManyToMany(targetEntity="Wallabag\UserBundle\Entity\Group")
+     * @ORM\ManyToMany(targetEntity="Wallabag\GroupBundle\Entity\Group")
      * @ORM\JoinTable(name="user_group",
      *      joinColumns={@ORM\JoinColumn(name="user_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="group_id", referencedColumnName="id")}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
index 15002632..9d5abcaf 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
@@ -30,6 +30,7 @@
                                 {{ form_rest(searchForm) }}
                             </form>
                         </div>
+
                     </div>
 
                     <table class="bordered">
diff --git a/tests/WallabagGroupBundle/Controller/DefaultControllerTest.php b/tests/WallabagGroupBundle/Controller/DefaultControllerTest.php
new file mode 100644
index 00000000..f278827b
--- /dev/null
+++ b/tests/WallabagGroupBundle/Controller/DefaultControllerTest.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Wallabag\GroupBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class DefaultControllerTest extends WebTestCase
+{
+    public function testIndex()
+    {
+        $client = static::createClient();
+
+        $crawler = $client->request('GET', '/');
+
+        $this->assertContains('Hello World', $client->getResponse()->getContent());
+    }
+}