Moved twig to third-party dir

composer.json

@@ -25,18 +25,18 @@
 			],
 			"LimeSurvey\\Menu\\": "application/libraries/MenuObjects/",
 			"LimeSurvey\\Helpers\\": "application/helpers",
-            "Twig\\": "application/third_party/Twig"
 		}
 	},
-	"require": {
-	},
-    "config": {
+	"config": {
         "vendor-dir": "third_party",
         "bin-dir": "third_party/bin"
     },
 	"require-dev": {
 		"facebook/webdriver": "^1.4",
         "squizlabs/php_codesniffer": "2.*",
         "phpunit/phpunit": "5.7.*"
+	},
+	"require": {
+		"twig/twig": "1.42.5"
 	}
 }

third_party/Twig/ETwigViewRenderer.php

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

third_party/Twig/twig/.editorconfig

@@ -0,0 +1,18 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+
+[*.php]
+indent_style = space
+indent_size = 4
+
+[*.test]
+indent_style = space
+indent_size = 4
+
+[*.rst]
+indent_style = space
+indent_size = 4

third_party/Twig/twig/.gitattributes

@@ -0,0 +1,2 @@
+/tests export-ignore
+/phpunit.xml.dist export-ignore

third_party/Twig/twig/.gitignore

@@ -0,0 +1,6 @@
+/build
+/composer.lock
+/ext/twig/autom4te.cache/
+/phpunit.xml
+/vendor
+.phpunit.result.cache

third_party/Twig/twig/.travis.yml

@@ -0,0 +1,46 @@
+language: php
+
+dist: trusty
+
+sudo: false
+
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache/files
+
+
+env:
+    global:
+        - TWIG_EXT=no
+        - SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1
+
+before_install:
+    - phpenv config-rm xdebug.ini || return 0
+
+install:
+    - travis_retry composer install
+
+before_script:
+    - if [ "$TWIG_EXT" == "yes" ]; then sh -c "cd ext/twig && phpize && ./configure --enable-twig && make && make install"; fi
+    - if [ "$TWIG_EXT" == "yes" ]; then echo "extension=twig.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
+
+script: ./vendor/bin/simple-phpunit
+
+jobs:
+    fast_finish: true
+    include:
+        - php: 5.5
+        - php: 5.5
+          env: TWIG_EXT=yes
+        - php: 5.6
+        - php: 5.6
+          env: TWIG_EXT=yes
+        - php: 7.0
+        - php: 7.1
+        - php: 7.2
+        - php: 7.3
+        - php: 7.4snapshot
+        - stage: integration tests
+          php: 7.3
+          script: ./drupal_test.sh