Some minor composer fixes

LimeSurvey · Apr 29, 2021 · 6bf49d8 · 6bf49d8
1 parent a8544ad
commit 6bf49d8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/application/config/internal.php b/application/config/internal.php
@@ -55,9 +55,9 @@
         // Twig aliases. We don't want to change the file ETwigViewRenderer, so we can update it without difficulties
         // However, LimeSurvey directory tree is not a standard Yii Application tree.
         // we use 'third_party' instead of 'vendor'
-        // This line just point application.vendor.Twig to application/third_party/Twig
+        // This line just point vendor.Twig to third_party/Twig
         // @see: ETwigViewRenderer::$twigPathAlias
-        'application.vendor.Twig'=>'application.third_party.Twig',
+        'application.vendor.Twig'=>'webroot.third_party.Twig.twig.lib.Twig',
         // 'CaptchaExtendedAction' => realpath(__DIR__ . '/../extensions/captchaExtended/CaptchaExtendedAction.php'),
         // 'CaptchaExtendedValidator' => realpath(__DIR__ . '/../extensions/captchaExtended/CaptchaExtendedValidator.php')
     ),

diff --git a/third_party/Twig/ETwigViewRenderer.php b/third_party/Twig/ETwigViewRenderer.php
@@ -14,7 +14,7 @@ class ETwigViewRenderer extends CApplicationComponent implements IViewRenderer
     /**
      * @var string Path alias to Twig
      */
-    public $twigPathAlias = 'webroot.third_party.Twig.twig.lib.Twig';
+    public $twigPathAlias = 'application.vendor.Twig';
     /**
      * @var string Twig template files extension
      */

diff --git a/third_party/composer/autoload_psr4.php b/third_party/composer/autoload_psr4.php
@@ -6,7 +6,7 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Twig\\' => array($baseDir . '/application/third_party/Twig', $vendorDir . '/twig/twig/src'),
+    'Twig\\' => array( $vendorDir . '/twig/twig/src'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'LimeSurvey\\PluginManager\\' => array($baseDir . '/application/libraries/PluginManager', $baseDir . '/application/libraries/PluginManager/Storage'),
     'LimeSurvey\\Menu\\' => array($baseDir . '/application/libraries/MenuObjects'),

diff --git a/third_party/composer/autoload_static.php b/third_party/composer/autoload_static.php
@@ -30,8 +30,7 @@ class ComposerStaticInitddb1a145e450f862353420acc5153e40
     public static $prefixDirsPsr4 = array (
         'Twig\\' => 
         array (
-            0 => __DIR__ . '/../..' . '/application/third_party/Twig',
-            1 => __DIR__ . '/..' . '/twig/twig/src',
+            0 => __DIR__ . '/..' . '/twig/twig/src',
         ),
         'Symfony\\Polyfill\\Ctype\\' => 
         array (