diff --git a/config/packages/sonata_admin.yaml b/config/packages/sonata_admin.yaml index ab9944b531..2ae57f3a29 100644 --- a/config/packages/sonata_admin.yaml +++ b/config/packages/sonata_admin.yaml @@ -177,4 +177,4 @@ sonata_admin: - bundles/sonataformatter/markitup/skins/sonata/style.css - bundles/sonataformatter/markitup/sets/markdown/style.css - bundles/sonataformatter/markitup/sets/html/style.css - - bundles/sonataformatter/markitup/sets/textile/style.css \ No newline at end of file + - bundles/sonataformatter/markitup/sets/textile/style.css diff --git a/config/routes/hwi_oauth_routing.yaml b/config/routes/hwi_oauth_routing.yaml index ffab9d9f68..e19f8230e2 100644 --- a/config/routes/hwi_oauth_routing.yaml +++ b/config/routes/hwi_oauth_routing.yaml @@ -1,11 +1,11 @@ hwi_oauth_redirect: resource: "@HWIOAuthBundle/Resources/config/routing/redirect.xml" - prefix: /connect + prefix: /connect hwi_oauth_connect: resource: "@HWIOAuthBundle/Resources/config/routing/connect.xml" - prefix: /connect + prefix: /connect hwi_oauth_login: resource: "@HWIOAuthBundle/Resources/config/routing/login.xml" - prefix: /login + prefix: /login diff --git a/src/CoreBundle/Entity/AccessUrlRelUser.php b/src/CoreBundle/Entity/AccessUrlRelUser.php index 6574d50877..60495aacdc 100644 --- a/src/CoreBundle/Entity/AccessUrlRelUser.php +++ b/src/CoreBundle/Entity/AccessUrlRelUser.php @@ -8,7 +8,14 @@ use Doctrine\ORM\Mapping as ORM; /** * AccessUrlRelUser. * - * @ORM\Table(name="access_url_rel_user", indexes={@ORM\Index(name="idx_access_url_rel_user_user", columns={"user_id"}), @ORM\Index(name="idx_access_url_rel_user_access_url", columns={"access_url_id"}), @ORM\Index(name="idx_access_url_rel_user_access_url_user", columns={"user_id", "access_url_id"})}) + * @ORM\Table( + * name="access_url_rel_user", + * indexes={ + * @ORM\Index(name="idx_access_url_rel_user_user", columns={"user_id"}), + * @ORM\Index(name="idx_access_url_rel_user_access_url", columns={"access_url_id"}), + * @ORM\Index(name="idx_access_url_rel_user_access_url_user", columns={"user_id", "access_url_id"}) + * } + * ) * @ORM\Entity */ class AccessUrlRelUser diff --git a/src/CoreBundle/Entity/UsergroupRelUser.php b/src/CoreBundle/Entity/UsergroupRelUser.php index c1d4b11eb9..38a9f5a3f4 100644 --- a/src/CoreBundle/Entity/UsergroupRelUser.php +++ b/src/CoreBundle/Entity/UsergroupRelUser.php @@ -23,7 +23,7 @@ class UsergroupRelUser /** * @var int * - * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false) + * @ORM\Column(name="id", type="integer", nullable=false, unique=false) * @ORM\Id * @ORM\GeneratedValue */ @@ -115,7 +115,7 @@ class UsergroupRelUser * * @param int $relationType * - * @return GroupRelUser + * @return $this */ public function setRelationType($relationType) { diff --git a/src/CoreBundle/Form/CurriculumItemType.php b/src/CoreBundle/Form/CurriculumItemType.php index da1b5fd885..a66d9a62ba 100644 --- a/src/CoreBundle/Form/CurriculumItemType.php +++ b/src/CoreBundle/Form/CurriculumItemType.php @@ -3,11 +3,14 @@ namespace Chamilo\CoreBundle\Form; -use Entity; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; +/** + * Class CurriculumItemType. + * @package Chamilo\CoreBundle\Form + */ class CurriculumItemType extends AbstractType { public function buildForm(FormBuilderInterface $builder, array $options) diff --git a/src/CoreBundle/Form/JuryType.php b/src/CoreBundle/Form/JuryType.php index 46bc666e8d..a7a6d0d74e 100644 --- a/src/CoreBundle/Form/JuryType.php +++ b/src/CoreBundle/Form/JuryType.php @@ -3,8 +3,7 @@ namespace Chamilo\CoreBundle\Form; -use DOctrine\ORM\EntityRepository; -use Entity; +use Doctrine\ORM\EntityRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; diff --git a/src/MediaBundle/Entity/GalleryHasMedia.php b/src/MediaBundle/Entity/GalleryHasMedia.php index ada86a60f5..849cfa9d9e 100644 --- a/src/MediaBundle/Entity/GalleryHasMedia.php +++ b/src/MediaBundle/Entity/GalleryHasMedia.php @@ -1,25 +1,14 @@ project. - * - * (c) - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ +/* For licensing terms, see /license.txt */ namespace Chamilo\MediaBundle\Entity; use Sonata\MediaBundle\Entity\BaseGalleryHasMedia as BaseGalleryHasMedia; /** - * This file has been generated by the Sonata EasyExtends bundle ( http://sonata-project.org/bundles/easy-extends ). - * - * References : - * working with object : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/working-with-objects/en + * Class GalleryHasMedia. * - * @author + * @package Chamilo\MediaBundle\Entity */ class GalleryHasMedia extends BaseGalleryHasMedia { @@ -37,4 +26,4 @@ class GalleryHasMedia extends BaseGalleryHasMedia { return $this->id; } -} \ No newline at end of file +}