diff --git a/config/bundles.php b/config/bundles.php index 688992683a..ae91dc46b6 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -19,7 +19,6 @@ return [ Chamilo\SkillBundle\ChamiloSkillBundle::class => ['all' => true], Chamilo\CourseBundle\ChamiloCourseBundle::class => ['all' => true], Chamilo\TicketBundle\ChamiloTicketBundle::class => ['all' => true], - Chamilo\SettingsBundle\ChamiloSettingsBundle::class => ['all' => true], Chamilo\GraphQlBundle\ChamiloGraphQlBundle::class => ['all' => true], Chamilo\LtiBundle\ChamiloLtiBundle::class => ['all' => true], Sylius\Bundle\SettingsBundle\SyliusSettingsBundle::class => ['all' => true], diff --git a/src/CoreBundle/Controller/Admin/SettingsController.php b/src/CoreBundle/Controller/Admin/SettingsController.php index 874c37d01c..23b39a0beb 100644 --- a/src/CoreBundle/Controller/Admin/SettingsController.php +++ b/src/CoreBundle/Controller/Admin/SettingsController.php @@ -4,7 +4,7 @@ namespace Chamilo\CoreBundle\Controller\Admin; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Sylius\Bundle\SettingsBundle\Controller\SettingsController as SyliusSettingsController; use Sylius\Bundle\SettingsBundle\Form\Factory\SettingsFormFactory; diff --git a/src/CoreBundle/Controller/EditorController.php b/src/CoreBundle/Controller/EditorController.php index f0904ee18b..f5475f7f44 100644 --- a/src/CoreBundle/Controller/EditorController.php +++ b/src/CoreBundle/Controller/EditorController.php @@ -17,7 +17,7 @@ use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter; use Chamilo\CoreBundle\Traits\ControllerTrait; use Chamilo\CoreBundle\Traits\CourseControllerTrait; use Chamilo\CoreBundle\Traits\ResourceControllerTrait; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use FM\ElfinderBundle\Connector\ElFinderConnector; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; diff --git a/src/CoreBundle/DependencyInjection/ChamiloCoreExtension.php b/src/CoreBundle/DependencyInjection/ChamiloCoreExtension.php index 15edd9e180..767a44b232 100644 --- a/src/CoreBundle/DependencyInjection/ChamiloCoreExtension.php +++ b/src/CoreBundle/DependencyInjection/ChamiloCoreExtension.php @@ -27,6 +27,12 @@ class ChamiloCoreExtension extends Extension $loader->load('settings.yml'); $loader->load('repositories.yml'); $loader->load('tool_settings.yml'); + + $loader = new Loader\XmlFileLoader( + $container, + new FileLocator(__DIR__.'/../Resources/config') + ); + $loader->load('services.xml'); } /** diff --git a/src/SettingsBundle/DependencyInjection/Configuration.php b/src/CoreBundle/DependencyInjection/Configuration.php similarity index 91% rename from src/SettingsBundle/DependencyInjection/Configuration.php rename to src/CoreBundle/DependencyInjection/Configuration.php index be480f8dcc..88584f14d9 100644 --- a/src/SettingsBundle/DependencyInjection/Configuration.php +++ b/src/CoreBundle/DependencyInjection/Configuration.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SettingsBundle\DependencyInjection; +namespace Chamilo\CoreBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; diff --git a/src/CoreBundle/Entity/CourseRelUser.php b/src/CoreBundle/Entity/CourseRelUser.php index cca7b1038a..d973fc27e8 100644 --- a/src/CoreBundle/Entity/CourseRelUser.php +++ b/src/CoreBundle/Entity/CourseRelUser.php @@ -4,11 +4,17 @@ namespace Chamilo\CoreBundle\Entity; +use ApiPlatform\Core\Annotation\ApiResource; use Doctrine\ORM\Mapping as ORM; use Symfony\Component\Serializer\Annotation\Groups; /** * CourseRelUser. + * @ApiResource( + * shortName="CourseSubscription", + * attributes={"security"="is_granted('ROLE_ADMIN')"}, + * normalizationContext={"groups"={"skill:read"}} + * ) * * @ORM\Table( * name="course_rel_user", @@ -32,8 +38,6 @@ class CourseRelUser protected $id; /** - * Groups({"course_rel_user:read", "course_rel_user:write"}). - * * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\User", inversedBy="courses", cascade={"persist"}) * @ORM\JoinColumn(name="user_id", referencedColumnName="id") */ diff --git a/src/CoreBundle/Entity/Listener/CourseListener.php b/src/CoreBundle/Entity/Listener/CourseListener.php index 0fa3793d01..f92e57b6aa 100644 --- a/src/CoreBundle/Entity/Listener/CourseListener.php +++ b/src/CoreBundle/Entity/Listener/CourseListener.php @@ -10,7 +10,7 @@ use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Repository\CourseRepository; use Chamilo\CoreBundle\ToolChain; use Chamilo\CourseBundle\Repository\CToolRepository; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Doctrine\ORM\Event\LifecycleEventArgs; /** diff --git a/src/CoreBundle/Entity/User.php b/src/CoreBundle/Entity/User.php index 1d666f8d95..b302f28cd5 100644 --- a/src/CoreBundle/Entity/User.php +++ b/src/CoreBundle/Entity/User.php @@ -109,17 +109,31 @@ class User implements UserInterface, EquatableInterface /** * @var string * @Groups({"user:read", "user:write"}) - * @ORM\Column(name="firstname", type="string", length=60, nullable=true, unique=false) + * @ORM\Column(name="firstname", type="string", length=64, nullable=true, unique=false) */ protected $firstname; /** * @var string * @Groups({"user:read", "user:write"}) - * @ORM\Column(name="lastname", type="string", length=60, nullable=true, unique=false) + * @ORM\Column(name="lastname", type="string", length=64, nullable=true, unique=false) */ protected $lastname; + /** + * @var string + * @Groups({"user:read", "user:write"}) + * @ORM\Column(name="website", type="string", length=64, nullable=true) + */ + protected $website; + + /** + * @var string + * @Groups({"user:read", "user:write"}) + * @ORM\Column(name="biography", type="text", nullable=true) + */ + protected $biography; + /** * @var string * @Groups({"user:read", "user:write"}) @@ -224,7 +238,7 @@ class User implements UserInterface, EquatableInterface /** * @var string * - * @ORM\Column(name="phone", type="string", length=30, nullable=true, unique=false) + * @ORM\Column(name="phone", type="string", length=64, nullable=true, unique=false) */ protected $phone; diff --git a/src/CoreBundle/EventListener/LocaleListener.php b/src/CoreBundle/EventListener/LocaleListener.php index 45a2c1135a..5f8a2d5966 100644 --- a/src/CoreBundle/EventListener/LocaleListener.php +++ b/src/CoreBundle/EventListener/LocaleListener.php @@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\EventListener; use Chamilo\CoreBundle\Entity\Course; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\RequestEvent; diff --git a/src/CoreBundle/EventListener/LoginSuccessHandler.php b/src/CoreBundle/EventListener/LoginSuccessHandler.php index 2cb78dad53..fc1dd46f75 100644 --- a/src/CoreBundle/EventListener/LoginSuccessHandler.php +++ b/src/CoreBundle/EventListener/LoginSuccessHandler.php @@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\EventListener; use Chamilo\CoreBundle\Entity\User; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface; diff --git a/src/CoreBundle/Framework/Container.php b/src/CoreBundle/Framework/Container.php index 96ba9b0a6e..6ed50879ff 100644 --- a/src/CoreBundle/Framework/Container.php +++ b/src/CoreBundle/Framework/Container.php @@ -37,7 +37,7 @@ use Chamilo\CourseBundle\Repository\CStudentPublicationAssignmentRepository; use Chamilo\CourseBundle\Repository\CStudentPublicationCommentRepository; use Chamilo\CourseBundle\Repository\CStudentPublicationRepository; use Chamilo\PageBundle\Entity\Page; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Session\Session; diff --git a/src/SettingsBundle/Manager/SettingsManager.php b/src/CoreBundle/Manager/SettingsManager.php similarity index 99% rename from src/SettingsBundle/Manager/SettingsManager.php rename to src/CoreBundle/Manager/SettingsManager.php index 3374f40c9c..e7448e605f 100644 --- a/src/SettingsBundle/Manager/SettingsManager.php +++ b/src/CoreBundle/Manager/SettingsManager.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SettingsBundle\Manager; +namespace Chamilo\CoreBundle\Manager; use Chamilo\CoreBundle\Entity\AccessUrl; use Chamilo\CoreBundle\Entity\Course; @@ -67,7 +67,7 @@ class SettingsManager implements SettingsManagerInterface ServiceRegistryInterface $schemaRegistry, EntityManager $manager, EntityRepository $repository, - $eventDispatcher, + EventDispatcherInterface $eventDispatcher, RequestStack $request ) { $this->schemaRegistry = $schemaRegistry; diff --git a/src/SettingsBundle/Resources/config/services.xml b/src/CoreBundle/Resources/config/services.xml similarity index 68% rename from src/SettingsBundle/Resources/config/services.xml rename to src/CoreBundle/Resources/config/services.xml index 5b98c70a2a..2511da1ffd 100644 --- a/src/SettingsBundle/Resources/config/services.xml +++ b/src/CoreBundle/Resources/config/services.xml @@ -5,11 +5,10 @@ xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> - Chamilo\SettingsBundle\Manager\SettingsManager - Chamilo\CoreBundle\Entity\Manager\SettingsCurrentManager + Chamilo\CoreBundle\Manager\SettingsManager Chamilo\CoreBundle\Entity\SettingsCurrent - Chamilo\SettingsBundle\Twig\SettingsExtension - Chamilo\SettingsBundle\Templating\Helper\SettingsHelper + Chamilo\CoreBundle\Twig\SettingsExtension + Chamilo\CoreBundle\Twig\SettingsHelper @@ -37,14 +36,14 @@ - - - - + + + + - - - - + + + + diff --git a/src/CoreBundle/Resources/config/services.yml b/src/CoreBundle/Resources/config/services.yml index 213f9d2479..8e1890be92 100644 --- a/src/CoreBundle/Resources/config/services.yml +++ b/src/CoreBundle/Resources/config/services.yml @@ -250,6 +250,12 @@ services: class: Chamilo\CoreBundle\EventListener\LogoutSuccessHandler arguments: ['@router', '@security.authorization_checker', '@security.token_storage'] + Chamilo\CoreBundle\Twig\SettingsHelper: + arguments: + - '@chamilo.settings.manager' + tags: + - {name: templating.helper, alias: chamilo_settings} + # Block services # chamilo_core.block.course: # class: Chamilo\CoreBundle\Block\CourseBlockService diff --git a/src/CoreBundle/Settings/CourseSettingsSchema.php b/src/CoreBundle/Settings/CourseSettingsSchema.php index 760e4329aa..4d96b7dee6 100644 --- a/src/CoreBundle/Settings/CourseSettingsSchema.php +++ b/src/CoreBundle/Settings/CourseSettingsSchema.php @@ -9,7 +9,7 @@ use Chamilo\CoreBundle\Form\DataTransformer\ResourceToIdentifierTransformer; use Chamilo\CoreBundle\Form\Type\YesNoType; use Chamilo\CoreBundle\Tool\AbstractTool; use Chamilo\CoreBundle\ToolChain; -use Chamilo\SettingsBundle\Transformer\ArrayToIdentifierTransformer; +use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer; //use Sylius\Bundle\ResourceBundle\Form\DataTransformer\ResourceToIdentifierTransformer; use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder; use Symfony\Bridge\Doctrine\Form\Type\EntityType; diff --git a/src/CoreBundle/Settings/DocumentSettingsSchema.php b/src/CoreBundle/Settings/DocumentSettingsSchema.php index 8506ca6d11..242122bae4 100644 --- a/src/CoreBundle/Settings/DocumentSettingsSchema.php +++ b/src/CoreBundle/Settings/DocumentSettingsSchema.php @@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\Settings; use Chamilo\CoreBundle\Form\Type\YesNoType; -use Chamilo\SettingsBundle\Transformer\ArrayToIdentifierTransformer; +use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer; use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\TextareaType; diff --git a/src/CoreBundle/Settings/PlatformSettingsSchema.php b/src/CoreBundle/Settings/PlatformSettingsSchema.php index 45c0e6eb85..20dda24dcf 100644 --- a/src/CoreBundle/Settings/PlatformSettingsSchema.php +++ b/src/CoreBundle/Settings/PlatformSettingsSchema.php @@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\Settings; use Chamilo\CoreBundle\Form\Type\YesNoType; -use Chamilo\SettingsBundle\Transformer\ArrayToIdentifierTransformer; +use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer; use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\TimezoneType; diff --git a/src/CoreBundle/Settings/ProfileSettingsSchema.php b/src/CoreBundle/Settings/ProfileSettingsSchema.php index a93368d08d..e3089161e2 100644 --- a/src/CoreBundle/Settings/ProfileSettingsSchema.php +++ b/src/CoreBundle/Settings/ProfileSettingsSchema.php @@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\Settings; use Chamilo\CoreBundle\Form\Type\YesNoType; -use Chamilo\SettingsBundle\Transformer\ArrayToIdentifierTransformer; +use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer; use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/src/CoreBundle/Settings/RegistrationSettingsSchema.php b/src/CoreBundle/Settings/RegistrationSettingsSchema.php index 75e2348c55..6130964570 100644 --- a/src/CoreBundle/Settings/RegistrationSettingsSchema.php +++ b/src/CoreBundle/Settings/RegistrationSettingsSchema.php @@ -5,7 +5,7 @@ namespace Chamilo\CoreBundle\Settings; use Chamilo\CoreBundle\Form\Type\YesNoType; -use Chamilo\SettingsBundle\Transformer\ArrayToIdentifierTransformer; +use Chamilo\CoreBundle\Transformer\ArrayToIdentifierTransformer; use Sylius\Bundle\SettingsBundle\Schema\AbstractSettingsBuilder; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/src/CoreBundle/ToolChain.php b/src/CoreBundle/ToolChain.php index f94b08c317..c2fdb20fbe 100644 --- a/src/CoreBundle/ToolChain.php +++ b/src/CoreBundle/ToolChain.php @@ -13,7 +13,7 @@ use Chamilo\CoreBundle\Security\Authorization\Voter\ResourceNodeVoter; use Chamilo\CoreBundle\Tool\AbstractTool; use Chamilo\CourseBundle\Entity\CTool; use Chamilo\CourseBundle\Repository\CToolRepository; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Doctrine\ORM\EntityManagerInterface; use Symfony\Component\PropertyAccess\Exception\InvalidArgumentException; use Symfony\Component\Security\Core\Security; diff --git a/src/SettingsBundle/Transformer/ArrayToIdentifierTransformer.php b/src/CoreBundle/Transformer/ArrayToIdentifierTransformer.php similarity index 92% rename from src/SettingsBundle/Transformer/ArrayToIdentifierTransformer.php rename to src/CoreBundle/Transformer/ArrayToIdentifierTransformer.php index b1a8e738f3..24ececaf54 100644 --- a/src/SettingsBundle/Transformer/ArrayToIdentifierTransformer.php +++ b/src/CoreBundle/Transformer/ArrayToIdentifierTransformer.php @@ -2,7 +2,7 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SettingsBundle\Transformer; +namespace Chamilo\CoreBundle\Transformer; use Symfony\Component\Form\DataTransformerInterface; diff --git a/src/SettingsBundle/Twig/SettingsExtension.php b/src/CoreBundle/Twig/SettingsExtension.php similarity index 92% rename from src/SettingsBundle/Twig/SettingsExtension.php rename to src/CoreBundle/Twig/SettingsExtension.php index 6816de4c28..4c02d0c2fe 100644 --- a/src/SettingsBundle/Twig/SettingsExtension.php +++ b/src/CoreBundle/Twig/SettingsExtension.php @@ -2,9 +2,8 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SettingsBundle\Twig; +namespace Chamilo\CoreBundle\Twig; -use Chamilo\SettingsBundle\Templating\Helper\SettingsHelper; use Twig\Extension\AbstractExtension; use Twig\TwigFilter; use Twig\TwigFunction; @@ -24,7 +23,7 @@ class SettingsExtension extends AbstractExtension /** * @param SettingsHelper $helper */ - public function __construct($helper) + public function __construct(SettingsHelper $helper) { $this->helper = $helper; } diff --git a/src/SettingsBundle/Templating/Helper/SettingsHelper.php b/src/CoreBundle/Twig/SettingsHelper.php similarity index 91% rename from src/SettingsBundle/Templating/Helper/SettingsHelper.php rename to src/CoreBundle/Twig/SettingsHelper.php index e719e16ebc..d428da7f28 100644 --- a/src/SettingsBundle/Templating/Helper/SettingsHelper.php +++ b/src/CoreBundle/Twig/SettingsHelper.php @@ -2,9 +2,9 @@ /* For licensing terms, see /license.txt */ -namespace Chamilo\SettingsBundle\Templating\Helper; +namespace Chamilo\CoreBundle\Twig; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Sylius\Bundle\SettingsBundle\Manager\SettingsManagerInterface; use Sylius\Bundle\SettingsBundle\Templating\Helper\SettingsHelperInterface; use Symfony\Component\Templating\Helper\Helper; diff --git a/src/CourseBundle/Manager/SettingsManager.php b/src/CourseBundle/Manager/SettingsManager.php index ac9935c995..0755d838dc 100644 --- a/src/CourseBundle/Manager/SettingsManager.php +++ b/src/CourseBundle/Manager/SettingsManager.php @@ -7,7 +7,7 @@ namespace Chamilo\CourseBundle\Manager; use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\SettingsCurrent; use Chamilo\CourseBundle\Entity\CCourseSetting; -use Chamilo\SettingsBundle\Manager\SettingsManager as ChamiloSettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager as ChamiloSettingsManager; use Sylius\Bundle\SettingsBundle\Model\Settings; use Sylius\Bundle\SettingsBundle\Model\SettingsInterface; use Sylius\Bundle\SettingsBundle\Schema\SchemaInterface; diff --git a/src/CourseBundle/Resources/config/services.yml b/src/CourseBundle/Resources/config/services.yml index 61e3ba4c76..f2681f6f18 100644 --- a/src/CourseBundle/Resources/config/services.yml +++ b/src/CourseBundle/Resources/config/services.yml @@ -28,31 +28,6 @@ services: chamilo_course.repository.parameter: class: Chamilo\CourseBundle\Repository\CCourseSettingRepository - # chamilo_settings.repository.parameter: - # class: Chamilo\CoreBundle\Repository\SettingsCurrentRepository - # factory: ["@doctrine", getRepository] - # arguments: [ Chamilo\CoreBundle\Entity\SettingsCurrent ] - # chamilo_course.settings.manager: - # class: '%chamilo_course.settings.manager.class%' - # arguments: - # - '@chamilo_course.registry.settings_schema' - # - '@sylius.registry.settings_resolver' - # - '@doctrine.orm.entity_manager' - # - '@chamilo_course.repository.parameter' - # - '@sylius.factory.settings' - # - '@event_dispatcher' - # chamilo_course.settings.manager: - # class: '%chamilo_course.settings.manager.class%' - # public: true - # arguments: - # - '@sylius.registry.settings_schema' - # - '@sylius.registry.settings_resolver' - # - '@doctrine.orm.entity_manager' - # - '@chamilo_course.repository.parameter' - # - '@sylius.factory.settings' - # - '@event_dispatcher' - - Chamilo\CourseBundle\Repository\: resource: ../../Repository exclude: '../../Repository/{CDocumentRepository.php|CQuizRepository.php}' diff --git a/src/GraphQlBundle/Traits/GraphQLTrait.php b/src/GraphQlBundle/Traits/GraphQLTrait.php index a950b92574..9085371271 100644 --- a/src/GraphQlBundle/Traits/GraphQLTrait.php +++ b/src/GraphQlBundle/Traits/GraphQLTrait.php @@ -8,7 +8,7 @@ use Chamilo\CoreBundle\Entity\AccessUrl; use Chamilo\CoreBundle\Entity\Course; use Chamilo\CoreBundle\Entity\Session; use Chamilo\CoreBundle\Entity\User; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; use Doctrine\ORM\EntityManager; use Firebase\JWT\JWT; use Overblog\GraphQLBundle\Error\UserError; diff --git a/src/LtiBundle/Util/Utils.php b/src/LtiBundle/Util/Utils.php index adb88a4d6d..5d8b280b3c 100644 --- a/src/LtiBundle/Util/Utils.php +++ b/src/LtiBundle/Util/Utils.php @@ -6,7 +6,7 @@ namespace Chamilo\LtiBundle\Util; use Chamilo\CoreBundle\Entity\User; use Chamilo\LtiBundle\Entity\ExternalTool; -use Chamilo\SettingsBundle\Manager\SettingsManager; +use Chamilo\CoreBundle\Manager\SettingsManager; /** * Class Utils. diff --git a/src/SettingsBundle/ChamiloSettingsBundle.php b/src/SettingsBundle/ChamiloSettingsBundle.php deleted file mode 100644 index d8aa009e6c..0000000000 --- a/src/SettingsBundle/ChamiloSettingsBundle.php +++ /dev/null @@ -1,14 +0,0 @@ -load('services.xml'); - } -}