diff --git a/composer.json b/composer.json index bc9d149fbd..d671c057e4 100755 --- a/composer.json +++ b/composer.json @@ -85,7 +85,6 @@ "ezyang/htmlpurifier": "~4.12", "firebase/php-jwt": "^5.0", "friendsofsymfony/jsrouting-bundle": "~2.0", - "friendsofsymfony/rest-bundle": "dev-master", "graphp/algorithms": "~0.8", "graphp/graphviz": "~0.2", "gregwar/captcha-bundle": "^2.0", @@ -139,7 +138,7 @@ "symfony/polyfill-apcu": "^1.9", "symfony/requirements-checker": "^1.1", "symfony/security-bundle": "^5.0", - "symfony/string": "5.0.*", + "symfony/string": "^5.0", "symfony/templating": "^5.0", "symfony/translation": "^5.0", "symfony/twig-pack": "^1.0", diff --git a/config/bundles.php b/config/bundles.php index 96da093216..6d63a582cd 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -13,7 +13,6 @@ return [ Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true], - FOS\RestBundle\FOSRestBundle::class => ['all' => true], Chamilo\CoreBundle\ChamiloCoreBundle::class => ['all' => true], Chamilo\CourseBundle\ChamiloCourseBundle::class => ['all' => true], Chamilo\TicketBundle\ChamiloTicketBundle::class => ['all' => true], @@ -40,4 +39,5 @@ return [ Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], SymfonyCasts\Bundle\ResetPassword\SymfonyCastsResetPasswordBundle::class => ['all' => true], + Symplify\ParameterNameGuard\ParameterNameGuardBundle::class => ['dev' => true, 'test' => true], ]; diff --git a/config/packages/fos_rest.yaml b/config/packages/fos_rest.yaml deleted file mode 100644 index 720790ec16..0000000000 --- a/config/packages/fos_rest.yaml +++ /dev/null @@ -1,18 +0,0 @@ -#fos_rest: -# routing_loader: -# include_format: false -# param_fetcher_listener: true -# format_listener: -# rules: -# - {path: '^/api2', priorities:['json'], fallback_format: json, prefer_extension: false} -# - {path: '^/', priorities: ['html', '*/*'], fallback_format: ~, prefer_extension: true} -# view: -# view_response_listener: true -# formats: -# json: true - -# body_listener: true -# body_converter: -# enabled: true -# validate: true -# validation_errors_argument: validationErrors diff --git a/config/packages/security.yaml b/config/packages/security.yaml index 76c485afc1..4b4af46c15 100644 --- a/config/packages/security.yaml +++ b/config/packages/security.yaml @@ -75,7 +75,7 @@ security: path: /logout target: / switch_user: false -# json_login: -# check_path: app_login -# username_path: username -# password_path: password + json_login: + check_path: /login + username_path: security.credentials.login + password_path: security.credentials.password \ No newline at end of file diff --git a/config/routes.yaml b/config/routes.yaml index a55cc9a693..ad2420aee7 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -4,9 +4,6 @@ login_check: logout: path: /logout -sonata_user_admin_security_logout: - path: /logout - oneup_uploader: resource: . type: uploader @@ -23,6 +20,19 @@ legacy_plugin: requirements: name: .+ +courses_vue: + path: /courses/{wildcard} + controller: Chamilo\CoreBundle\Controller\IndexController::courses + requirements: + wildcard: .* + +sessions_vue: + path: /sessions/{wildcard} + controller: Chamilo\CoreBundle\Controller\IndexController::courses + requirements: + wildcard: .* + + # web url shortcuts for legacy templates web.ajax: path: main/inc/ajax/ @@ -30,12 +40,6 @@ web.ajax: web.main: path: main/ -# Core controllers -core_admin: - resource: '@ChamiloCoreBundle/Controller/Admin' - type: annotation - prefix: /admin - #liip_theme: # resource: "@LiipThemeBundle/Resources/config/routing.xml" # prefix: /theme