diff --git a/TEST b/TEST old mode 100644 new mode 100755 diff --git a/app/Resources/views/logged/angular/pause-selling.html.twig b/app/Resources/views/logged/angular/pause-selling.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/logged/angular/totals.html.twig b/app/Resources/views/logged/angular/totals.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/seriefestival/edit.html.twig b/app/Resources/views/seriefestival/edit.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/seriefestival/index.html.twig b/app/Resources/views/seriefestival/index.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/seriefestival/new.html.twig b/app/Resources/views/seriefestival/new.html.twig old mode 100644 new mode 100755 diff --git a/app/Resources/views/seriefestival/show.html.twig b/app/Resources/views/seriefestival/show.html.twig old mode 100644 new mode 100755 diff --git a/app/config/config.yml b/app/config/config.yml index 38fedb8e..e698fcdd 100755 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -1,84 +1,85 @@ imports: - - { resource: parameters.yml } - - { resource: security.yml } - - { resource: services.yml } + - { resource: parameters.yml } + - { resource: security.yml } + - { resource: services.yml } # 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: fr + locale: fr framework: - #esi: ~ - translator: { fallbacks: ['%locale%'] } - secret: '%secret%' - router: - resource: '%kernel.project_dir%/app/config/routing.yml' - strict_requirements: ~ - form: ~ - csrf_protection: ~ - validation: { enable_annotations: true } - #serializer: { enable_annotations: true } - default_locale: '%locale%' - trusted_hosts: ~ - session: - # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id - handler_id: session.handler.native_file - save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%' - fragments: ~ - http_method_override: true - assets: ~ - php_errors: - log: true - templating: - engines: ['twig'] + #esi: ~ + translator: { fallbacks: ['%locale%'] } + secret: '%secret%' + router: + resource: '%kernel.project_dir%/app/config/routing.yml' + strict_requirements: ~ + form: ~ + csrf_protection: ~ + validation: { enable_annotations: true } + #serializer: { enable_annotations: true } + default_locale: '%locale%' + trusted_hosts: ~ + session: + # https://symfony.com/doc/current/reference/configuration/framework.html#handler-id + handler_id: session.handler.native_file + save_path: '%kernel.project_dir%/var/sessions/%kernel.environment%' + fragments: ~ + http_method_override: true + assets: ~ + php_errors: + log: true + templating: + engines: ['twig'] # Twig Configuration twig: - debug: '%kernel.debug%' - strict_variables: '%kernel.debug%' + debug: '%kernel.debug%' + strict_variables: '%kernel.debug%' # Doctrine Configuration doctrine: - dbal: - driver: pdo_mysql - host: '%database_host%' - port: '%database_port%' - dbname: '%database_name%' - user: '%database_user%' - password: '%database_password%' - charset: UTF8 - mapping_types: - enum: string - # if using pdo_sqlite as your database driver: - # 1. add the path in parameters.yml - # e.g. database_path: '%kernel.project_dir%/var/data/data.sqlite' - # 2. Uncomment database_path in parameters.yml.dist - # 3. Uncomment next line: - #path: '%database_path%' + dbal: + driver: pdo_mysql + server_version: '%server_version%' + host: '%database_host%' + port: '%database_port%' + dbname: '%database_name%' + user: '%database_user%' + password: '%database_password%' + charset: UTF8 + mapping_types: + enum: string + # if using pdo_sqlite as your database driver: + # 1. add the path in parameters.yml + # e.g. database_path: '%kernel.project_dir%/var/data/data.sqlite' + # 2. Uncomment database_path in parameters.yml.dist + # 3. Uncomment next line: + #path: '%database_path%' - orm: - auto_generate_proxy_classes: '%kernel.debug%' - naming_strategy: doctrine.orm.naming_strategy.underscore - auto_mapping: true + orm: + auto_generate_proxy_classes: '%kernel.debug%' + naming_strategy: doctrine.orm.naming_strategy.underscore + auto_mapping: true # Swiftmailer Configuration swiftmailer: - transport: '%mailer_transport%' - host: '%mailer_host%' - username: '%mailer_user%' - password: '%mailer_password%' -# spool: { type: memory } - encryption: '%mailer_encryption%' - port: '%mailer_port%' + transport: '%mailer_transport%' + host: '%mailer_host%' + username: '%mailer_user%' + password: '%mailer_password%' + # spool: { type: memory } + encryption: '%mailer_encryption%' + port: '%mailer_port%' #fos user bundle fos_user: - db_driver: orm # other valid values are 'mongodb' and 'couchdb' - firewall_name: main - user_class: AppBundle\Entity\User - registration: - confirmation: - enabled: true - from_email: - address: "%mailer_user%" - sender_name: "%mailer_user%" + db_driver: orm # other valid values are 'mongodb' and 'couchdb' + firewall_name: main + user_class: AppBundle\Entity\User + registration: + confirmation: + enabled: true + from_email: + address: "%mailer_user%" + sender_name: "%mailer_user%" diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index ccf9c97e..10ac6c54 100755 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -29,3 +29,5 @@ parameters: twitter_secret: change_this disqus_id: change_this disqus_secret: change_this + + server_version: '5.7' diff --git a/app/config/security.yml b/app/config/security.yml index 58c6e8dd..47c11bb8 100755 --- a/app/config/security.yml +++ b/app/config/security.yml @@ -1,39 +1,41 @@ # To get started with security, check out the documentation:# To get started with security, check out the documentation: # https://symfony.com/doc/current/security.html security: - encoders: - FOS\UserBundle\Model\UserInterface: bcrypt - # https://symfony.com/doc/current/security.html#b-configuring-how-users-are-loaded - providers: - fos_userbundle: - id: fos_user.user_provider.username - firewalls: - dev: - pattern: ^/(_(profiler|wdt)|css|images|js)/ - security: false - # https://symfony.com/doc/current/security/form_login_setup.html - # activate different ways to authenticate - # https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate - http_basic: ~ - main: - pattern: ^/ - anonymous: ~ - logout: true - logout_on_user_change: true - form_login: - provider: fos_userbundle - csrf_token_generator: security.csrf.token_manager - default_target_path: dashboard - login_path: fos_user_security_login - check_path: /login_check + encoders: + FOS\UserBundle\Model\UserInterface: bcrypt + # https://symfony.com/doc/current/security.html#b-configuring-how-users-are-loaded + providers: + fos_userbundle: + id: fos_user.user_provider.username + firewalls: + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ + security: false + # https://symfony.com/doc/current/security/form_login_setup.html + # activate different ways to authenticate + # https://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate + http_basic: ~ + main: + pattern: ^/ + anonymous: ~ + logout: true + logout_on_user_change: true + form_login: + provider: fos_userbundle + csrf_token_generator: security.csrf.token_manager + default_target_path: dashboard + login_path: fos_user_security_login + check_path: /login_check - role_hierarchy: - ROLE_ADMIN: ROLE_USER - ROLE_SUPER_ADMIN: ROLE_ADMIN + role_hierarchy: + ROLE_ADMIN: ROLE_USER + ROLE_SUPER_ADMIN: ROLE_ADMIN + + access_control: + - { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/dashboard$, role: IS_AUTHENTICATED_REMEMBERED } + - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/u, role: IS_AUTHENTICATED_ANONYMOUSLY } + - { path: ^/admin/, role: ROLE_ADMIN } - access_control: - - { path: ^/login$, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/dashboard$, role: IS_AUTHENTICATED_REMEMBERED } - - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } - - { path: ^/admin/, role: ROLE_ADMIN } diff --git a/assets/js/parts/previsionnel.js b/assets/js/parts/previsionnel.js old mode 100644 new mode 100755 diff --git a/composer-temp.phar b/composer-temp.phar new file mode 100644 index 00000000..0de03a52 Binary files /dev/null and b/composer-temp.phar differ diff --git a/docs/installation.md b/docs/installation.md old mode 100644 new mode 100755 diff --git a/docs/upgrade.md b/docs/upgrade.md old mode 100644 new mode 100755 diff --git a/src/AppBundle/Controller/SerieFestivalController.php b/src/AppBundle/Controller/SerieFestivalController.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Form/SerieFestivalType.php b/src/AppBundle/Form/SerieFestivalType.php old mode 100644 new mode 100755 diff --git a/src/AppBundle/Tests/Controller/SerieFestivalControllerTest.php b/src/AppBundle/Tests/Controller/SerieFestivalControllerTest.php old mode 100644 new mode 100755