From 8fe31ed5c5986cf7f1e78edfee54bfc533d801de Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Thu, 7 May 2020 10:52:05 +0200 Subject: [PATCH] Refactor: move code into CoreBundle --- config/bundles.php | 1 - config/services.yaml | 18 ++++++++++++ public/main/admin/skill.php | 4 +-- public/main/admin/skill_level.php | 12 ++++---- public/main/admin/skill_profile.php | 12 ++++---- public/main/admin/skill_rel_course.php | 4 +-- public/main/badge/assign.php | 2 +- public/main/badge/issued.php | 2 +- public/main/badge/issued_all.php | 2 +- public/main/gradebook/skill_rel_user.php | 7 +++-- public/main/inc/ajax/skill.ajax.php | 12 ++++---- public/main/inc/lib/database.lib.php | 2 -- public/main/inc/lib/skill.lib.php | 29 ++++++++++--------- .../Entity/Level.php | 4 +-- .../Entity/Profile.php | 4 +-- .../Entity/SkillRelCourse.php | 2 +- .../Entity/SkillRelItem.php | 2 +- .../Entity/SkillRelItemRelUser.php | 4 +-- .../Resources/config/services.yml | 15 ---------- src/SkillBundle/ChamiloSkillBundle.php | 14 --------- 20 files changed, 70 insertions(+), 82 deletions(-) rename src/{SkillBundle => CoreBundle}/Entity/Level.php (94%) rename src/{SkillBundle => CoreBundle}/Entity/Profile.php (92%) rename src/{SkillBundle => CoreBundle}/Entity/SkillRelCourse.php (98%) rename src/{SkillBundle => CoreBundle}/Entity/SkillRelItem.php (99%) rename src/{SkillBundle => CoreBundle}/Entity/SkillRelItemRelUser.php (96%) delete mode 100644 src/SkillBundle/ChamiloSkillBundle.php diff --git a/config/bundles.php b/config/bundles.php index dbb0870bf9..96da093216 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -15,7 +15,6 @@ return [ FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true], FOS\RestBundle\FOSRestBundle::class => ['all' => true], Chamilo\CoreBundle\ChamiloCoreBundle::class => ['all' => true], - Chamilo\SkillBundle\ChamiloSkillBundle::class => ['all' => true], Chamilo\CourseBundle\ChamiloCourseBundle::class => ['all' => true], Chamilo\TicketBundle\ChamiloTicketBundle::class => ['all' => true], Chamilo\GraphQlBundle\ChamiloGraphQlBundle::class => ['all' => true], diff --git a/config/services.yaml b/config/services.yaml index 7fa35e7e6b..68ae1a8b90 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -83,6 +83,24 @@ services: public: true + League\Flysystem\MountManager: '@oneup_flysystem.mount_manager' + + # Voters + # Group voter, checks if a user has permissions to do actions + chamilo_course.security.authorization.voter.group_voter: + class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter + arguments: + - '@doctrine.orm.entity_manager' + - '@Chamilo\CoreBundle\Repository\CourseRepository' + - '@Chamilo\CourseBundle\Repository\CGroupInfoRepository' + - '@security.authorization_checker' + - '@service_container' + public: false + tags: + - {name: security.voter} + + + sylius_settings: driver: doctrine/orm diff --git a/public/main/admin/skill.php b/public/main/admin/skill.php index 58f86cc3b9..eef0799b7e 100644 --- a/public/main/admin/skill.php +++ b/public/main/admin/skill.php @@ -10,7 +10,7 @@ $cidReset = true; require_once __DIR__.'/../inc/global.inc.php'; api_protect_admin_script(); $em = Database::getManager(); -$profiles = $em->getRepository('ChamiloSkillBundle:Profile')->findAll(); +$profiles = $em->getRepository('ChamiloCoreBundle:Profile')->findAll(); $list = $em->getRepository('ChamiloCoreBundle:Skill')->findAll(); $listAction = api_get_self(); @@ -62,7 +62,7 @@ switch ($action) { if ($form->validate()) { $values = $form->exportValues(); - $profile = $em->getRepository('ChamiloSkillBundle:Profile')->find($values['profile_id']); + $profile = $em->getRepository('ChamiloCoreBundle:Profile')->find($values['profile_id']); if ($profile) { $item->setProfile($profile); $em->persist($item); diff --git a/public/main/admin/skill_level.php b/public/main/admin/skill_level.php index f53fa99bbb..f872bf7373 100644 --- a/public/main/admin/skill_level.php +++ b/public/main/admin/skill_level.php @@ -1,7 +1,7 @@ getRepository('ChamiloSkillBundle:Profile')->findAll(); -$list = $em->getRepository('ChamiloSkillBundle:Level')->findAll(); +$profiles = $em->getRepository('ChamiloCoreBundle:Profile')->findAll(); +$list = $em->getRepository('ChamiloCoreBundle:Level')->findAll(); $listAction = api_get_self(); @@ -28,7 +28,7 @@ $id = isset($_GET['id']) ? $_GET['id'] : ''; $item = null; if (!empty($id)) { /** @var Level $item */ - $item = $em->getRepository('ChamiloSkillBundle:Level')->find($id); + $item = $em->getRepository('ChamiloCoreBundle:Level')->find($id); if (!$item) { api_not_allowed(); } @@ -62,7 +62,7 @@ switch ($action) { if ($form->validate()) { $values = $form->exportValues(); if (isset($values['profile_id']) && !empty($values['profile_id'])) { - $profile = $em->getRepository('ChamiloSkillBundle:Profile')->find($values['profile_id']); + $profile = $em->getRepository('ChamiloCoreBundle:Profile')->find($values['profile_id']); if ($profile) { $item = new Level(); $item->setName($values['name']); @@ -109,7 +109,7 @@ switch ($action) { $item->setName($values['name']); $item->setShortName($values['short_name']); - $profile = $em->getRepository('ChamiloSkillBundle:Profile')->find($values['profile_id']); + $profile = $em->getRepository('ChamiloCoreBundle:Profile')->find($values['profile_id']); if ($profile) { $item->setProfile($profile); } diff --git a/public/main/admin/skill_profile.php b/public/main/admin/skill_profile.php index 1c32075733..359faec1cb 100644 --- a/public/main/admin/skill_profile.php +++ b/public/main/admin/skill_profile.php @@ -1,8 +1,8 @@ getRepository('ChamiloSkillBundle:Profile')->findAll(); +$list = $em->getRepository('ChamiloCoreBundle:Profile')->findAll(); $listAction = api_get_self(); @@ -25,7 +25,7 @@ $id = isset($_GET['id']) ? $_GET['id'] : ''; $item = null; if (!empty($id)) { - $item = $em->getRepository('ChamiloSkillBundle:Profile')->find($id); + $item = $em->getRepository('ChamiloCoreBundle:Profile')->find($id); if (!$item) { api_not_allowed(); } @@ -52,7 +52,7 @@ $tpl = new Template($action); switch ($action) { case 'move_up': /** @var Level $item */ - $item = $em->getRepository('ChamiloSkillBundle:Level')->find($_GET['level_id']); + $item = $em->getRepository('ChamiloCoreBundle:Level')->find($_GET['level_id']); if ($item) { $position = $item->getPosition(); if (!empty($position)) { @@ -68,7 +68,7 @@ switch ($action) { break; case 'move_down': /** @var Level $item */ - $item = $em->getRepository('ChamiloSkillBundle:Level')->find($_GET['level_id']); + $item = $em->getRepository('ChamiloCoreBundle:Level')->find($_GET['level_id']); if ($item) { $position = $item->getPosition(); $item->setPosition($position + 1); diff --git a/public/main/admin/skill_rel_course.php b/public/main/admin/skill_rel_course.php index ed79005424..b3950b560f 100644 --- a/public/main/admin/skill_rel_course.php +++ b/public/main/admin/skill_rel_course.php @@ -1,7 +1,7 @@ addHeader(get_lang('Add skills').$sessionName); $skillList = []; $em = Database::getManager(); -$items = $em->getRepository('ChamiloSkillBundle:SkillRelCourse')->findBy( +$items = $em->getRepository('ChamiloCoreBundle:SkillRelCourse')->findBy( ['course' => $courseId, 'session' => $sessionId] ); /** @var SkillRelCourse $skillRelCourse */ diff --git a/public/main/badge/assign.php b/public/main/badge/assign.php index 4a3d7eea3d..dd01f118be 100644 --- a/public/main/badge/assign.php +++ b/public/main/badge/assign.php @@ -29,7 +29,7 @@ $entityManager = Database::getManager(); $skillManager = new SkillManager(); $skillRepo = $entityManager->getRepository('ChamiloCoreBundle:Skill'); $skillRelSkill = $entityManager->getRepository('ChamiloCoreBundle:SkillRelSkill'); -$skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level'); +$skillLevelRepo = $entityManager->getRepository('ChamiloCoreBundle:Level'); $skillUserRepo = $entityManager->getRepository('ChamiloCoreBundle:SkillRelUser'); $skillLevels = api_get_configuration_value('skill_levels_names'); diff --git a/public/main/badge/issued.php b/public/main/badge/issued.php index dce091b4c7..28dcd298e8 100644 --- a/public/main/badge/issued.php +++ b/public/main/badge/issued.php @@ -35,7 +35,7 @@ if (!$skillIssue) { } $skillRepo = $entityManager->getRepository('ChamiloCoreBundle:Skill'); -$skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level'); +$skillLevelRepo = $entityManager->getRepository('ChamiloCoreBundle:Level'); $user = $skillIssue->getUser(); $skill = $skillIssue->getSkill(); diff --git a/public/main/badge/issued_all.php b/public/main/badge/issued_all.php index b06e6d9a29..fb0a054ceb 100644 --- a/public/main/badge/issued_all.php +++ b/public/main/badge/issued_all.php @@ -37,7 +37,7 @@ if (!$user || !$skill) { $skillRepo = $em->getRepository('ChamiloCoreBundle:Skill'); $skillUserRepo = $em->getRepository('ChamiloCoreBundle:SkillRelUser'); -$skillLevelRepo = $em->getRepository('ChamiloSkillBundle:Level'); +$skillLevelRepo = $em->getRepository('ChamiloCoreBundle:Level'); $userSkills = $skillUserRepo->findBy([ 'user' => $user, diff --git a/public/main/gradebook/skill_rel_user.php b/public/main/gradebook/skill_rel_user.php index aa1501e6dd..8f45e5acff 100644 --- a/public/main/gradebook/skill_rel_user.php +++ b/public/main/gradebook/skill_rel_user.php @@ -1,7 +1,8 @@ $userId, 'skillRelItem' => $skill, ]; - /** @var \Chamilo\SkillBundle\Entity\SkillRelItemRelUser $skillRelItemRelUser */ - $skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria); + /** @var SkillRelItemRelUser $skillRelItemRelUser */ + $skillRelItemRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelItemRelUser')->findOneBy($criteria); $itemInfo['status'] = $skillRelItemRelUser ? true : false; $itemInfo['url_activity'] = $codePath.$skill->getItemResultList(api_get_cidreq()); if ($skillRelItemRelUser) { diff --git a/public/main/inc/ajax/skill.ajax.php b/public/main/inc/ajax/skill.ajax.php index ff1fddbb4c..d5ef94a577 100644 --- a/public/main/inc/ajax/skill.ajax.php +++ b/public/main/inc/ajax/skill.ajax.php @@ -373,12 +373,12 @@ switch ($action) { exit; } $em = Database::getManager(); - $skills = $em->getRepository('ChamiloSkillBundle:SkillRelCourse')->findBy( + $skills = $em->getRepository('ChamiloCoreBundle:SkillRelCourse')->findBy( ['course' => $courseId, 'session' => $sessionId] ); $returnSkills = []; - /** @var \Chamilo\SkillBundle\Entity\SkillRelCourse $skill */ + /** @var \Chamilo\CoreBundle\Entity\SkillRelCourse $skill */ foreach ($skills as $skill) { $returnSkills[] = [ 'id' => $skill->getSkill()->getId(), @@ -421,8 +421,8 @@ switch ($action) { } $session = $em->getRepository('ChamiloCoreBundle:Session')->find($sessionId); - /** @var \Chamilo\SkillBundle\Entity\SkillRelItem $skillRelItem */ - $skillRelItem = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findOneBy( + /** @var \Chamilo\CoreBundle\Entity\SkillRelItem $skillRelItem */ + $skillRelItem = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findOneBy( ['itemId' => $itemId, 'itemType' => $typeId, 'skill' => $skillId] ); @@ -431,13 +431,13 @@ switch ($action) { 'user' => $userId, 'skillRelItem' => $skillRelItem, ]; - $skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria); + $skillRelItemRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelItemRelUser')->findOneBy($criteria); if ($skillRelItemRelUser) { $em->remove($skillRelItemRelUser); $em->flush(); $skillRelItemRelUser = null; } else { - $skillRelItemRelUser = new Chamilo\SkillBundle\Entity\SkillRelItemRelUser(); + $skillRelItemRelUser = new Chamilo\CoreBundle\Entity\SkillRelItemRelUser(); $skillRelItemRelUser ->setUser($user) ->setSkillRelItem($skillRelItem) diff --git a/public/main/inc/lib/database.lib.php b/public/main/inc/lib/database.lib.php index 819c91d978..026d40218f 100644 --- a/public/main/inc/lib/database.lib.php +++ b/public/main/inc/lib/database.lib.php @@ -35,10 +35,8 @@ class Database $config->setAutoGenerateProxyClasses(true); $config->setEntityNamespaces( [ - 'ChamiloCoreBundle' => 'Chamilo\CoreBundle\Entity', 'ChamiloCoreBundle' => 'Chamilo\CoreBundle\Entity', 'ChamiloCourseBundle' => 'Chamilo\CourseBundle\Entity', - 'ChamiloSkillBundle' => 'Chamilo\SkillBundle\Entity', 'ChamiloTicketBundle' => 'Chamilo\TicketBundle\Entity', 'ChamiloPluginBundle' => 'Chamilo\PluginBundle\Entity', ] diff --git a/public/main/inc/lib/skill.lib.php b/public/main/inc/lib/skill.lib.php index 79aaf34dc3..579c313ec4 100644 --- a/public/main/inc/lib/skill.lib.php +++ b/public/main/inc/lib/skill.lib.php @@ -3,9 +3,10 @@ use Chamilo\CoreBundle\Component\Utils\ChamiloApi; use Chamilo\CoreBundle\Entity\Skill as SkillEntity; +use Chamilo\CoreBundle\Entity\SkillRelItemRelUser; use Chamilo\CoreBundle\Entity\SkillRelUser as SkillRelUserEntity; -use Chamilo\SkillBundle\Entity\SkillRelCourse; -use Chamilo\SkillBundle\Entity\SkillRelItem; +use Chamilo\CoreBundle\Entity\SkillRelCourse; +use Chamilo\CoreBundle\Entity\SkillRelItem; use Chamilo\CoreBundle\Entity\User; use Fhaculty\Graph\Graph; use Fhaculty\Graph\Vertex; @@ -2482,9 +2483,9 @@ class Skill extends Model } /** - * @param \Chamilo\SkillBundle\Entity\SkillRelItem $skillRelItem - * @param \Chamilo\SkillBundle\Entity\SkillRelItemRelUser $skillRelItemRelUser - * @param bool $addHeader + * @param SkillRelItem $skillRelItem + * @param SkillRelItemRelUser $skillRelItemRelUser + * @param bool $addHeader * * @return string */ @@ -2522,7 +2523,7 @@ class Skill extends Model $allowSkillInTools = api_get_configuration_value('allow_skill_rel_items'); if ($allowSkillInTools && !empty($typeId) && !empty($itemId) && !empty($userId)) { $em = Database::getManager(); - $items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy( + $items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy( ['itemId' => $itemId, 'itemType' => $typeId] ); @@ -2539,7 +2540,7 @@ class Skill extends Model 'user' => $userId, 'skillRelItem' => $skillRelItem, ]; - $skillRelItemRelUser = $em->getRepository('ChamiloSkillBundle:SkillRelItemRelUser')->findOneBy($criteria); + $skillRelItemRelUser = $em->getRepository('ChamiloCoreBundle:SkillRelItemRelUser')->findOneBy($criteria); $skills .= self::getUserSkillStatusLabel($skillRelItem, $skillRelItemRelUser); } @@ -2605,7 +2606,7 @@ class Skill extends Model $skillList = []; if (!empty($itemId)) { $em = Database::getManager(); - $items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy( + $items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy( ['itemId' => $itemId, 'itemType' => $typeId] ); /** @var SkillRelItem $skillRelItem */ @@ -2649,7 +2650,7 @@ class Skill extends Model if ($allowSkillInTools) { $em = Database::getManager(); - $skills = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy( + $skills = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy( ['courseId' => $courseId, 'sessionId' => $sessionId] ); } @@ -2742,7 +2743,7 @@ class Skill extends Model $skills = []; if ($allowSkillInTools) { $em = Database::getManager(); - $skills = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy( + $skills = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy( ['itemId' => $itemId, 'itemType' => $typeId] ); } @@ -2785,7 +2786,7 @@ class Skill extends Model $em = Database::getManager(); // Delete old ones - $items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy( + $items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy( ['itemId' => $itemId, 'itemType' => $typeId] ); @@ -2824,7 +2825,7 @@ class Skill extends Model $skills = (array) $form->getSubmitValue('skills'); // Delete old ones - $items = $em->getRepository('ChamiloSkillBundle:SkillRelItem')->findBy( + $items = $em->getRepository('ChamiloCoreBundle:SkillRelItem')->findBy( ['itemId' => $itemId, 'itemType' => $typeId] ); if (!empty($items)) { @@ -2910,7 +2911,7 @@ class Skill extends Model } // Delete old ones - $items = $em->getRepository('ChamiloSkillBundle:SkillRelCourse')->findBy( + $items = $em->getRepository('ChamiloCoreBundle:SkillRelCourse')->findBy( ['course' => $courseId, 'session' => $sessionId] ); @@ -2995,7 +2996,7 @@ class Skill extends Model if (!empty($result)) { return false; } - $skillLevelRepo = $entityManager->getRepository('ChamiloSkillBundle:Level'); + $skillLevelRepo = $entityManager->getRepository('ChamiloCoreBundle:Level'); $skillUser = new SkillRelUserEntity(); $skillUser->setUser($user); diff --git a/src/SkillBundle/Entity/Level.php b/src/CoreBundle/Entity/Level.php similarity index 94% rename from src/SkillBundle/Entity/Level.php rename to src/CoreBundle/Entity/Level.php index da482dad66..3cdeb263c4 100644 --- a/src/SkillBundle/Entity/Level.php +++ b/src/CoreBundle/Entity/Level.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SkillBundle\Entity; +namespace Chamilo\CoreBundle\Entity; use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; @@ -48,7 +48,7 @@ class Level /** * @Gedmo\SortableGroup * - * @ORM\ManyToOne(targetEntity="Chamilo\SkillBundle\Entity\Profile", inversedBy="levels") + * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Profile", inversedBy="levels") * @ORM\JoinColumn(name="profile_id", referencedColumnName="id") */ protected $profile; diff --git a/src/SkillBundle/Entity/Profile.php b/src/CoreBundle/Entity/Profile.php similarity index 92% rename from src/SkillBundle/Entity/Profile.php rename to src/CoreBundle/Entity/Profile.php index b3267411e4..2a09fb67b6 100644 --- a/src/SkillBundle/Entity/Profile.php +++ b/src/CoreBundle/Entity/Profile.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SkillBundle\Entity; +namespace Chamilo\CoreBundle\Entity; use Doctrine\ORM\Mapping as ORM; @@ -36,7 +36,7 @@ class Profile protected $skills; /** - * @ORM\OneToMany(targetEntity="Chamilo\SkillBundle\Entity\Level", mappedBy="profile", cascade={"persist"}) + * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\Level", mappedBy="profile", cascade={"persist"}) * @ORM\OrderBy({"position" = "ASC"}) */ protected $levels; diff --git a/src/SkillBundle/Entity/SkillRelCourse.php b/src/CoreBundle/Entity/SkillRelCourse.php similarity index 98% rename from src/SkillBundle/Entity/SkillRelCourse.php rename to src/CoreBundle/Entity/SkillRelCourse.php index bc8ee54702..4a5fd4f78b 100644 --- a/src/SkillBundle/Entity/SkillRelCourse.php +++ b/src/CoreBundle/Entity/SkillRelCourse.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SkillBundle\Entity; +namespace Chamilo\CoreBundle\Entity; use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Session; diff --git a/src/SkillBundle/Entity/SkillRelItem.php b/src/CoreBundle/Entity/SkillRelItem.php similarity index 99% rename from src/SkillBundle/Entity/SkillRelItem.php rename to src/CoreBundle/Entity/SkillRelItem.php index d69a833bc6..946edfb598 100644 --- a/src/SkillBundle/Entity/SkillRelItem.php +++ b/src/CoreBundle/Entity/SkillRelItem.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SkillBundle\Entity; +namespace Chamilo\CoreBundle\Entity; use Chamilo\CoreBundle\Entity\Skill; use Doctrine\ORM\Mapping as ORM; diff --git a/src/SkillBundle/Entity/SkillRelItemRelUser.php b/src/CoreBundle/Entity/SkillRelItemRelUser.php similarity index 96% rename from src/SkillBundle/Entity/SkillRelItemRelUser.php rename to src/CoreBundle/Entity/SkillRelItemRelUser.php index 46b7c3e53f..ac0969d145 100644 --- a/src/SkillBundle/Entity/SkillRelItemRelUser.php +++ b/src/CoreBundle/Entity/SkillRelItemRelUser.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SkillBundle\Entity; +namespace Chamilo\CoreBundle\Entity; use Chamilo\CoreBundle\Entity\User; use Doctrine\ORM\Mapping as ORM; @@ -30,7 +30,7 @@ class SkillRelItemRelUser /** * @var SkillRelItem * - * @ORM\ManyToOne(targetEntity="Chamilo\SkillBundle\Entity\SkillRelItem", cascade={"persist"}) + * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\SkillRelItem", cascade={"persist"}) * @ORM\JoinColumn(name="skill_rel_item_id", referencedColumnName="id", nullable=false) */ protected $skillRelItem; diff --git a/src/CourseBundle/Resources/config/services.yml b/src/CourseBundle/Resources/config/services.yml index f2681f6f18..4b00858848 100644 --- a/src/CourseBundle/Resources/config/services.yml +++ b/src/CourseBundle/Resources/config/services.yml @@ -3,8 +3,6 @@ services: autowire: true public: true - League\Flysystem\MountManager: '@oneup_flysystem.mount_manager' - chamilo_course.registry.settings_schema: class: Sylius\Component\Registry\ServiceRegistry arguments: @@ -192,16 +190,3 @@ services: - [setRequest, ['@request_stack']] tags: - {name: kernel.event_listener, event: chamilo_course.course.session, method: onSessionAccessEvent} - # Voters - # Group voter, checks if a user has permissions to do actions - chamilo_course.security.authorization.voter.group_voter: - class: Chamilo\CoreBundle\Security\Authorization\Voter\GroupVoter - arguments: - - '@doctrine.orm.entity_manager' - - '@Chamilo\CoreBundle\Repository\CourseRepository' - - '@Chamilo\CourseBundle\Repository\CGroupInfoRepository' - - '@security.authorization_checker' - - '@service_container' - public: false - tags: - - {name: security.voter} diff --git a/src/SkillBundle/ChamiloSkillBundle.php b/src/SkillBundle/ChamiloSkillBundle.php deleted file mode 100644 index f18ff6c57a..0000000000 --- a/src/SkillBundle/ChamiloSkillBundle.php +++ /dev/null @@ -1,14 +0,0 @@ -