Created GroupBundle

diff --git a/app/AppKernel.php b/app/AppKernel.php
index c50783a6d6901fce9a25d12e6cd9b479daf935af..b6babf1d481be563e2e354955d8a5625785fbe74 100644 (file)
--- 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 f1d93aaadca1b4aabc5d34d0582cbefa0e6d9df2..883626fda3eec59766c3b504168387f2abe16703 100644 (file)
--- 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 5229ac73287f5f00ac85a3a16893718cb39e468c..ea7fb086361d42af982148290eb628a89eaa74dd 100644 (file)
--- 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 996f173a892f08db3285b606f3a86c505181bbdb..fcda6ae6d97ff8f21f07483f9a196da270cc057e 100644 (file)
--- 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 aa1cd1a970b1d8ea23a964757cf859795315f498..54427e2318bf1dc5ef816c64913cacfc4cf729cc 100644 (file)
--- 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 57e6c0298150a77fb170836eed848bc25841bad4..16c4f3a04e9bebc338cfdce3eaa430b59f787583 100644 (file)
--- 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 4e26f38c86e8647885bb991c1b70608d621d33a8..8dff4c6d746e8c2024d383156bcf89d8afa5853f 100644 (file)
--- 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 be57e9034af7efe8b8c5a6d6d3bc0e87c98a9a4e..1cf70233b7f0fd957a54d74cf08b66d5542b1611 100644 (file)
--- 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 00c559ede0c5602bbb6adc26c4c0fd7ecd9dc80f..d3af4fd551a87f015a2f842e4500c991aff600ec 100644 (file)
--- 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 f16504eda89bc849adbf230e8f60c10d1838c782..3952eae8054af7f01f5641ce27e6ef398c00bdd0 100644 (file)
--- 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 90a140cd4f9386738ace39726c3b5bd741bad621..74f76c7266ed8ea3bcb603994fb9349bcf50f168 100644 (file)
--- 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
similarity index 88%
rename from src/Wallabag/UserBundle/Entity/Group.php
rename to src/Wallabag/GroupBundle/Entity/Group.php
index 9145959d7e020bc95b13b52be906e47226f7fbbe..57dc16d104c9720863f4ddda19db625dee8f58bb 100644 (file)
--- 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 (file)
index 0000000..93b6650
--- /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 781f7b03f4c05dccd35261352d35cf48940330c6..7da0d1d5ec05bb3becb78ac0322093ae5fe8fd32 100644 (file)
--- 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 15002632cfaabaf5c9b353d55281e0aa2b86ba6a..9d5abcaf60b0beaa217be7378dea9d294aafe33c 100644 (file)
--- 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 (file)
index 0000000..f278827
--- /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());
+    }
+}