Update symfony changes

config/bundles.php

@@ -43,4 +43,24 @@ return [
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['all' => true],
     Mopa\Bundle\BootstrapBundle\MopaBootstrapBundle::class => ['all' => true],
+    Chamilo\CoreBundle\ChamiloCoreBundle::class => ['all' => true],
+    Chamilo\ThemeBundle\ChamiloThemeBundle::class => ['all' => true],
+    Chamilo\SkillBundle\ChamiloSkillBundle::class => ['all' => true],
+    Chamilo\CourseBundle\ChamiloCourseBundle::class => ['all' => true],
+    Chamilo\AdminBundle\ChamiloAdminBundle::class => ['all' => true],
+    Chamilo\FaqBundle\ChamiloFaqBundle::class => ['all' => true],
+    Chamilo\ContactBundle\ChamiloContactBundle::class => ['all' => true],
+    Chamilo\TicketBundle\ChamiloTicketBundle::class => ['all' => true],
+    Chamilo\PageBundle\ChamiloPageBundle::class => ['all' => true],
+    Chamilo\UserBundle\ChamiloUserBundle::class => ['all' => true],
+    Chamilo\ClassificationBundle\ChamiloClassificationBundle::class => ['all' => true],
+    Chamilo\MediaBundle\ChamiloMediaBundle::class => ['all' => true],
+    Chamilo\NotificationBundle\ChamiloNotificationBundle::class => ['all' => true],
+    Chamilo\SettingsBundle\ChamiloSettingsBundle::class => ['all' => true],
+    Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle::class => ['all' => true],
+    HWI\Bundle\OAuthBundle\HWIOAuthBundle::class => ['all' => true],
+    winzou\Bundle\StateMachineBundle\winzouStateMachineBundle::class => ['all' => true],
+    Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle::class => ['all' => true],
+    Sylius\Bundle\ResourceBundle\SyliusResourceBundle::class => ['all' => true],
+    Sylius\Bundle\SettingsBundle\SyliusSettingsBundle::class => ['all' => true],
 ];

config/routes.yaml

@@ -1,3 +1,58 @@
 #index:
 #    path: /
-#    controller: App\Controller\DefaultController::index
+#    defaults: { _controller: 'App\Controller\DefaultController::index' }
+
+# Depends on sensio/framework-extra-bundle, doctrine/annotations, and doctrine/cache
+#   install with composer req sensio/framework-extra-bundle annot
+#controllers:
+#    resource: ../src/Controller/
+#    type: annotation
+
+logout:
+    path: /administration/logout
+
+sonata_user_admin_security_logout:
+    path: /administration/logout
+
+_admin:
+    resource: routes/sonata_admin.yaml
+    prefix: /administration
+
+#index:
+#    path: /
+
+#admin_dashboard:
+#    pattern: /administration/
+#    defaults:
+#        _controller: FrameworkBundle:Redirect:redirect
+#        route: sonata_admin_dashboard
+#        permanent: true # this for 301
+
+#admin_without_locale:
+#    pattern: /administration
+#    defaults:
+#        _controller: FrameworkBundle:Redirect:redirect
+#        route: sonata_admin_dashboard
+#        permanent: true # this for 301
+
+#admin_dashboard_without_locale:
+#    pattern: /administration/dashboard
+#    defaults:
+#        _controller: FrameworkBundle:Redirect:redirect
+#        route: sonata_admin_dashboard
+#        permanent: true
+
+
+
+#_api:
+#    resource: routing_api.yml
+#    prefix:   /api
+
+#liip_theme:
+#    resource: "@LiipThemeBundle/Resources/config/routing.xml"
+#    prefix: /theme
+
+#app_settings:
+#    resource: |
+#        alias: app.settings
+#    type: sylius.resource_api

config/services.yaml

@@ -1,7 +1,11 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
-    locale: 'en'
+    password_encryption: '%env(APP_ENCRYPT_METHOD)%'
+    secret: '%env(APP_SECRET)%'
+    locale: '%env(APP_LOCALE)%'
+    url_append: '%env(APP_URL_APPEND)%'
+    installed: '%env(APP_INSTALLED)%'
     twig:
         form:
             resources:
@@ -11,9 +15,9 @@ parameters:
     mailer_host: 127.0.0.1
     mailer_user: admin@example.com
     mailer_password: null
-    url_append: ''
     course_info_is_not_editable: false
     sonata_media.cdn.host: /uploads/media
+    sonata_page.varnish.command: 'if [ ! -r "/etc/varnish/secret" ]; then echo "VALID ERROR :/"; else varnishadm -S /etc/varnish/secret -T 127.0.0.1:6082 {{ COMMAND }} "{{ EXPRESSION }}"; fi;'
 
 services:
     # default configuration for services in *this* file
@@ -38,7 +42,3 @@ services:
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
-    twig:
-      form:
-          resources:
-              - 'GeneratorBundle::fields.html.twig'

src/CourseBundle/Resources/config/services.yml

@@ -69,10 +69,10 @@ services:
         factory: ["@doctrine", getRepository]
         arguments: [ Chamilo\CourseBundle\Entity\CCourseSetting ]
 
-    chamilo_settings.repository.parameter:
-        class: Chamilo\CoreBundle\Entity\Repository\SettingsCurrentRepository
-        factory: ["@doctrine", getRepository]
-        arguments: [ Chamilo\CoreBundle\Entity\SettingsCurrent ]
+#    chamilo_settings.repository.parameter:
+#        class: Chamilo\CoreBundle\Entity\Repository\SettingsCurrentRepository
+#        factory: ["@doctrine", getRepository]
+#        arguments: [ Chamilo\CoreBundle\Entity\SettingsCurrent ]
 
     chamilo_course.registry.settings_schema:
         class: Sylius\Component\Registry\ServiceRegistry

src/FaqBundle/Resources/config/routing.yml

@@ -1,12 +1,12 @@
 faq_index:
-    pattern:  /faq
+    path: /faq
     defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null }
 
 faq:
-    pattern:  /faq/{categorySlug}/{questionSlug}
+    path: /faq/{categorySlug}/{questionSlug}
     defaults: { _controller: ChamiloFaqBundle:Faq:index, categorySlug: null, questionSlug: null }
 
 # Shows the entire FAQ at once, without collapsing any categories or questions. Useful if your FAQ is not that big.
 faq_without_collapse:
-    pattern:  /faq-without-collapse/{categorySlug}
+    path: /faq-without-collapse/{categorySlug}
     defaults: { _controller: ChamiloFaqBundle:Faq:indexWithoutCollapse, categorySlug: null }

src/PageBundle/Resources/config/doctrine/User.orm.xml

@@ -12,7 +12,7 @@
             association mapping  : http://www.doctrine-project.org/projects/orm/2.0/docs/reference/association-mapping/en
     -->
     <entity
-            name="Chamilo\PageBundle\Entity\User"
+            name="Chamilo\UserBundle\Entity\User"
             table="user"
     >