Remove APP_URL_APPEND not needed since the main folder is inside public

pull/3064/head
Julio Montoya 5 years ago
parent afd83cb705
commit b54686d461
  1. 49
      .codeclimate.yml
  2. 4
      .env
  3. 2
      config/packages/assets.yaml
  4. 2
      config/packages/fos_js_routing.yaml
  5. 7
      config/services.yaml
  6. 8
      src/CoreBundle/Framework/Container.php
  7. 4
      src/CoreBundle/Menu/NavBuilder.php
  8. 8
      src/Kernel.php

@ -65,32 +65,29 @@ exclude_patterns:
- var/cache/
- var/log/
- config/
- app/SymfonyRequirements.php
- app/Migrations/
- app/Resources/
- main/admin/db.php
- main/admin/ldap_synchro.php
- main/chat/emoji_strategy.php
- main/document/Wami.swf
- main/fonts/
- main/inc/ajax/Wami.swf
- main/inc/lib/browser/
- main/inc/lib/internationalization_database/
- main/inc/lib/javascript/
- main/inc/lib/kses-0.2.2/
- main/inc/lib/mimetex/
- main/inc/lib/nanogong/
- main/inc/lib/nusoap/
- main/inc/lib/opengraph/*
- main/inc/lib/ppt2png/
- main/inc/lib/pear/
- main/inc/lib/svg-edit/
- main/inc/lib/swfobject/
- main/inc/lib/wami-recorder/
- main/inc/lib/xajax/
- main/lp/packaging/
- main/template/
- main/lang/
- public/main/admin/db.php
- public/main/admin/ldap_synchro.php
- public/main/chat/emoji_strategy.php
- public/main/document/Wami.swf
- public/main/fonts/
- public/main/inc/ajax/Wami.swf
- public/main/inc/lib/browser/
- public/main/inc/lib/internationalization_database/
- public/main/inc/lib/javascript/
- public/main/inc/lib/kses-0.2.2/
- public/main/inc/lib/mimetex/
- public/main/inc/lib/nanogong/
- public/main/inc/lib/nusoap/
- public/main/inc/lib/opengraph/*
- public/main/inc/lib/ppt2png/
- public/main/inc/lib/pear/
- public/main/inc/lib/svg-edit/
- public/main/inc/lib/swfobject/
- public/main/inc/lib/wami-recorder/
- public/main/inc/lib/xajax/
- public/main/lp/packaging/
- public/main/template/
- public/main/lang/
- public/libs/
- public/img/
- plugin/buycourses/src/Culqi/

@ -32,10 +32,6 @@ APP_ENCRYPT_METHOD='{{APP_ENCRYPT_METHOD}}'
APP_LOCALE='en'
## Example: '/chamilo2'
APP_URL_APPEND='{{APP_URL_APPEND}}'
APP_MULTIPLE_ACCESS_URL=''
###< chamilo ###

@ -1,4 +1,4 @@
framework:
assets:
json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
base_path: '../../../../%env(APP_URL_APPEND)%/public/'
base_path: '../../../../public/'

@ -1,2 +1,2 @@
fos_js_routing:
request_context_base_url: '%env(APP_URL_APPEND)%'
request_context_base_url: '/'

@ -4,7 +4,6 @@ parameters:
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:
@ -16,10 +15,10 @@ parameters:
mailer_user: admin@example.com
mailer_password: null
course_info_is_not_editable: false
sonata_media.cdn.host: '%env(APP_URL_APPEND)%/public/resource'
sonata_media.cdn.host: '/var/upload/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;'
router.request_context.base_url: '%env(APP_URL_APPEND)%'
asset.request_context.base_path: '%env(APP_URL_APPEND)%'
# router.request_context.base_url: '%env(APP_URL_APPEND)%'
# asset.request_context.base_path: '%env(APP_URL_APPEND)%'
glide_config:
source: 'oneup_flysystem.resources_filesystem'

@ -137,14 +137,6 @@ class Container
return str_replace('\\', '/', realpath(__DIR__.'/../../../')).'/';
}
/**
* @return string
*/
public static function getUrlAppend()
{
return self::$container->get('kernel')->getUrlAppend();
}
/**
* @return string
*/

@ -329,11 +329,7 @@ class NavBuilder implements ContainerAwareInterface
// Needed when loading legacy pages (inside main)
$isLegacy = $container->get('request_stack')->getCurrentRequest()->get('load_legacy');
$urlAppend = $container->getParameter('url_append');
$legacyIndex = '';
if ($isLegacy) {
$legacyIndex = $urlAppend.'/public';
}
if ($site) {
$pageManager = $container->get('sonata.page.manager.page');

@ -106,14 +106,6 @@ class Kernel extends BaseKernel
return !empty($this->getContainer()->getParameter('installed'));
}
/**
* @return string
*/
public function getUrlAppend()
{
return $this->getContainer()->getParameter('url_append');
}
protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
{
$container->addResource(new FileResource($this->getProjectDir().'/config/bundles.php'));

Loading…
Cancel
Save