|
+ +----------------------------------------------------------------------+
+ */
+
+#ifndef PHP_TWIG_H
+#define PHP_TWIG_H
+
+#define PHP_TWIG_VERSION "1.22.2"
+
+#include "php.h"
+
+extern zend_module_entry twig_module_entry;
+#define phpext_twig_ptr &twig_module_entry
+#ifndef PHP_WIN32
+zend_module_entry *get_module(void);
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+PHP_FUNCTION(twig_template_get_attributes);
+PHP_RSHUTDOWN_FUNCTION(twig);
+
+#endif
diff --git a/core/vendor/twig/twig/ext/twig/twig.c b/vendor/twig/twig/ext/twig/twig.c
similarity index 100%
rename from core/vendor/twig/twig/ext/twig/twig.c
rename to vendor/twig/twig/ext/twig/twig.c
diff --git a/core/vendor/twig/twig/lib/Twig/Autoloader.php b/vendor/twig/twig/lib/Twig/Autoloader.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Autoloader.php
rename to vendor/twig/twig/lib/Twig/Autoloader.php
diff --git a/core/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php b/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
rename to vendor/twig/twig/lib/Twig/BaseNodeVisitor.php
diff --git a/vendor/twig/twig/lib/Twig/Cache/Filesystem.php b/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
new file mode 100644
index 0000000..2e1c0a0
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
@@ -0,0 +1,92 @@
+
+ */
+class Twig_Cache_Filesystem implements Twig_CacheInterface
+{
+ const FORCE_BYTECODE_INVALIDATION = 1;
+
+ private $directory;
+ private $options;
+
+ /**
+ * @param $directory string The root cache directory
+ * @param $options int A set of options
+ */
+ public function __construct($directory, $options = 0)
+ {
+ $this->directory = $directory;
+ $this->options = $options;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function generateKey($name, $className)
+ {
+ $hash = hash('sha256', $className);
+
+ return $this->directory.'/'.$hash[0].'/'.$hash[1].'/'.$hash.'.php';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load($key)
+ {
+ @include_once $key;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function write($key, $content)
+ {
+ $dir = dirname($key);
+ if (!is_dir($dir)) {
+ if (false === @mkdir($dir, 0777, true) && !is_dir($dir)) {
+ throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $dir));
+ }
+ } elseif (!is_writable($dir)) {
+ throw new RuntimeException(sprintf('Unable to write in the cache directory (%s).', $dir));
+ }
+
+ $tmpFile = tempnam($dir, basename($key));
+ if (false !== @file_put_contents($tmpFile, $content) && @rename($tmpFile, $key)) {
+ @chmod($key, 0666 & ~umask());
+
+ if (self::FORCE_BYTECODE_INVALIDATION == ($this->options & self::FORCE_BYTECODE_INVALIDATION)) {
+ // Compile cached file into bytecode cache
+ if (function_exists('opcache_invalidate')) {
+ opcache_invalidate($key, true);
+ } elseif (function_exists('apc_compile_file')) {
+ apc_compile_file($key);
+ }
+ }
+
+ return;
+ }
+
+ throw new RuntimeException(sprintf('Failed to write cache file "%s".', $key));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTimestamp($key)
+ {
+ return (int) @filemtime($key);
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/Cache/Null.php b/vendor/twig/twig/lib/Twig/Cache/Null.php
new file mode 100644
index 0000000..fde8c80
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Cache/Null.php
@@ -0,0 +1,48 @@
+
+ */
+class Twig_Cache_Null implements Twig_CacheInterface
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function generateKey($name, $className)
+ {
+ return '';
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function write($key, $content)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function load($key)
+ {
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTimestamp($key)
+ {
+ return 0;
+ }
+}
diff --git a/vendor/twig/twig/lib/Twig/CacheInterface.php b/vendor/twig/twig/lib/Twig/CacheInterface.php
new file mode 100644
index 0000000..9b17e0f
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/CacheInterface.php
@@ -0,0 +1,56 @@
+
+ */
+interface Twig_CacheInterface
+{
+ /**
+ * Generates a cache key for the given template class name.
+ *
+ * @param string $name The template name
+ * @param string $className The template class name
+ *
+ * @return string
+ */
+ public function generateKey($name, $className);
+
+ /**
+ * Writes the compiled template to cache.
+ *
+ * @param string $key The cache key
+ * @param string $content The template representation as a PHP class
+ */
+ public function write($key, $content);
+
+ /**
+ * Loads a template from the cache.
+ *
+ * @param string $key The cache key
+ */
+ public function load($key);
+
+ /**
+ * Returns the modification timestamp of a key.
+ *
+ * @param string $key The cache key
+ *
+ * @return int
+ */
+ public function getTimestamp($key);
+}
diff --git a/core/vendor/twig/twig/lib/Twig/Compiler.php b/vendor/twig/twig/lib/Twig/Compiler.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Compiler.php
rename to vendor/twig/twig/lib/Twig/Compiler.php
diff --git a/core/vendor/twig/twig/lib/Twig/CompilerInterface.php b/vendor/twig/twig/lib/Twig/CompilerInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/CompilerInterface.php
rename to vendor/twig/twig/lib/Twig/CompilerInterface.php
diff --git a/vendor/twig/twig/lib/Twig/Environment.php b/vendor/twig/twig/lib/Twig/Environment.php
new file mode 100644
index 0000000..0c32550
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Environment.php
@@ -0,0 +1,1344 @@
+
+ */
+class Twig_Environment
+{
+ const VERSION = '1.22.2';
+
+ protected $charset;
+ protected $loader;
+ protected $debug;
+ protected $autoReload;
+ protected $cache;
+ protected $lexer;
+ protected $parser;
+ protected $compiler;
+ protected $baseTemplateClass;
+ protected $extensions;
+ protected $parsers;
+ protected $visitors;
+ protected $filters;
+ protected $tests;
+ protected $functions;
+ protected $globals;
+ protected $runtimeInitialized = false;
+ protected $extensionInitialized = false;
+ protected $loadedTemplates;
+ protected $strictVariables;
+ protected $unaryOperators;
+ protected $binaryOperators;
+ protected $templateClassPrefix = '__TwigTemplate_';
+ protected $functionCallbacks = array();
+ protected $filterCallbacks = array();
+ protected $staging;
+
+ private $originalCache;
+ private $bcWriteCacheFile = false;
+ private $bcGetCacheFilename = false;
+
+ /**
+ * Constructor.
+ *
+ * Available options:
+ *
+ * * debug: When set to true, it automatically set "auto_reload" to true as
+ * well (default to false).
+ *
+ * * charset: The charset used by the templates (default to UTF-8).
+ *
+ * * base_template_class: The base template class to use for generated
+ * templates (default to Twig_Template).
+ *
+ * * cache: An absolute path where to store the compiled templates,
+ * a Twig_Cache_Interface implementation,
+ * or false to disable compilation cache (default).
+ *
+ * * auto_reload: Whether to reload the template if the original source changed.
+ * If you don't provide the auto_reload option, it will be
+ * determined automatically based on the debug value.
+ *
+ * * strict_variables: Whether to ignore invalid variables in templates
+ * (default to false).
+ *
+ * * autoescape: Whether to enable auto-escaping (default to html):
+ * * false: disable auto-escaping
+ * * true: equivalent to html
+ * * html, js: set the autoescaping to one of the supported strategies
+ * * filename: set the autoescaping strategy based on the template filename extension
+ * * PHP callback: a PHP callback that returns an escaping strategy based on the template "filename"
+ *
+ * * optimizations: A flag that indicates which optimizations to apply
+ * (default to -1 which means that all optimizations are enabled;
+ * set it to 0 to disable).
+ *
+ * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance
+ * @param array $options An array of options
+ */
+ public function __construct(Twig_LoaderInterface $loader = null, $options = array())
+ {
+ if (null !== $loader) {
+ $this->setLoader($loader);
+ } else {
+ @trigger_error('Not passing a Twig_LoaderInterface as the first constructor argument of Twig_Environment is deprecated.', E_USER_DEPRECATED);
+ }
+
+ $options = array_merge(array(
+ 'debug' => false,
+ 'charset' => 'UTF-8',
+ 'base_template_class' => 'Twig_Template',
+ 'strict_variables' => false,
+ 'autoescape' => 'html',
+ 'cache' => false,
+ 'auto_reload' => null,
+ 'optimizations' => -1,
+ ), $options);
+
+ $this->debug = (bool) $options['debug'];
+ $this->charset = strtoupper($options['charset']);
+ $this->baseTemplateClass = $options['base_template_class'];
+ $this->autoReload = null === $options['auto_reload'] ? $this->debug : (bool) $options['auto_reload'];
+ $this->strictVariables = (bool) $options['strict_variables'];
+ $this->setCache($options['cache']);
+
+ $this->addExtension(new Twig_Extension_Core());
+ $this->addExtension(new Twig_Extension_Escaper($options['autoescape']));
+ $this->addExtension(new Twig_Extension_Optimizer($options['optimizations']));
+ $this->staging = new Twig_Extension_Staging();
+
+ // For BC
+ if (is_string($this->originalCache)) {
+ $r = new ReflectionMethod($this, 'writeCacheFile');
+ if ($r->getDeclaringClass()->getName() !== __CLASS__) {
+ @trigger_error('The Twig_Environment::writeCacheFile method is deprecated and will be removed in Twig 2.0.', E_USER_DEPRECATED);
+
+ $this->bcWriteCacheFile = true;
+ }
+
+ $r = new ReflectionMethod($this, 'getCacheFilename');
+ if ($r->getDeclaringClass()->getName() !== __CLASS__) {
+ @trigger_error('The Twig_Environment::getCacheFilename method is deprecated and will be removed in Twig 2.0.', E_USER_DEPRECATED);
+
+ $this->bcGetCacheFilename = true;
+ }
+ }
+ }
+
+ /**
+ * Gets the base template class for compiled templates.
+ *
+ * @return string The base template class name
+ */
+ public function getBaseTemplateClass()
+ {
+ return $this->baseTemplateClass;
+ }
+
+ /**
+ * Sets the base template class for compiled templates.
+ *
+ * @param string $class The base template class name
+ */
+ public function setBaseTemplateClass($class)
+ {
+ $this->baseTemplateClass = $class;
+ }
+
+ /**
+ * Enables debugging mode.
+ */
+ public function enableDebug()
+ {
+ $this->debug = true;
+ }
+
+ /**
+ * Disables debugging mode.
+ */
+ public function disableDebug()
+ {
+ $this->debug = false;
+ }
+
+ /**
+ * Checks if debug mode is enabled.
+ *
+ * @return bool true if debug mode is enabled, false otherwise
+ */
+ public function isDebug()
+ {
+ return $this->debug;
+ }
+
+ /**
+ * Enables the auto_reload option.
+ */
+ public function enableAutoReload()
+ {
+ $this->autoReload = true;
+ }
+
+ /**
+ * Disables the auto_reload option.
+ */
+ public function disableAutoReload()
+ {
+ $this->autoReload = false;
+ }
+
+ /**
+ * Checks if the auto_reload option is enabled.
+ *
+ * @return bool true if auto_reload is enabled, false otherwise
+ */
+ public function isAutoReload()
+ {
+ return $this->autoReload;
+ }
+
+ /**
+ * Enables the strict_variables option.
+ */
+ public function enableStrictVariables()
+ {
+ $this->strictVariables = true;
+ }
+
+ /**
+ * Disables the strict_variables option.
+ */
+ public function disableStrictVariables()
+ {
+ $this->strictVariables = false;
+ }
+
+ /**
+ * Checks if the strict_variables option is enabled.
+ *
+ * @return bool true if strict_variables is enabled, false otherwise
+ */
+ public function isStrictVariables()
+ {
+ return $this->strictVariables;
+ }
+
+ /**
+ * Gets the current cache implementation.
+ *
+ * @param bool $original Whether to return the original cache option or the real cache instance
+ *
+ * @return Twig_CacheInterface|string|false A Twig_CacheInterface implementation,
+ * an absolute path to the compiled templates,
+ * or false to disable cache
+ */
+ public function getCache($original = true)
+ {
+ return $original ? $this->originalCache : $this->cache;
+ }
+
+ /**
+ * Sets the current cache implementation.
+ *
+ * @param Twig_CacheInterface|string|false $cache A Twig_CacheInterface implementation,
+ * an absolute path to the compiled templates,
+ * or false to disable cache
+ */
+ public function setCache($cache)
+ {
+ if (is_string($cache)) {
+ $this->originalCache = $cache;
+ $this->cache = new Twig_Cache_Filesystem($cache);
+ } elseif (false === $cache) {
+ $this->originalCache = $cache;
+ $this->cache = new Twig_Cache_Null();
+ } elseif ($cache instanceof Twig_CacheInterface) {
+ $this->originalCache = $this->cache = $cache;
+ } else {
+ throw new LogicException(sprintf('Cache can only be a string, false, or a Twig_CacheInterface implementation.'));
+ }
+ }
+
+ /**
+ * Gets the cache filename for a given template.
+ *
+ * @param string $name The template name
+ *
+ * @return string|false The cache file name or false when caching is disabled
+ *
+ * @deprecated since 1.22 (to be removed in 2.0)
+ */
+ public function getCacheFilename($name)
+ {
+ @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
+
+ $key = $this->cache->generateKey($name, $this->getTemplateClass($name));
+
+ return !$key ? false : $key;
+ }
+
+ /**
+ * Gets the template class associated with the given string.
+ *
+ * @param string $name The name for which to calculate the template class name
+ * @param int $index The index if it is an embedded template
+ *
+ * @return string The template class name
+ */
+ public function getTemplateClass($name, $index = null)
+ {
+ $key = $this->getLoader()->getCacheKey($name).'__'.implode('__', array_keys($this->extensions));
+
+ return $this->templateClassPrefix.hash('sha256', $key).(null === $index ? '' : '_'.$index);
+ }
+
+ /**
+ * Gets the template class prefix.
+ *
+ * @return string The template class prefix
+ *
+ * @deprecated since 1.22 (to be removed in 2.0)
+ */
+ public function getTemplateClassPrefix()
+ {
+ @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
+
+ return $this->templateClassPrefix;
+ }
+
+ /**
+ * Renders a template.
+ *
+ * @param string $name The template name
+ * @param array $context An array of parameters to pass to the template
+ *
+ * @return string The rendered template
+ *
+ * @throws Twig_Error_Loader When the template cannot be found
+ * @throws Twig_Error_Syntax When an error occurred during compilation
+ * @throws Twig_Error_Runtime When an error occurred during rendering
+ */
+ public function render($name, array $context = array())
+ {
+ return $this->loadTemplate($name)->render($context);
+ }
+
+ /**
+ * Displays a template.
+ *
+ * @param string $name The template name
+ * @param array $context An array of parameters to pass to the template
+ *
+ * @throws Twig_Error_Loader When the template cannot be found
+ * @throws Twig_Error_Syntax When an error occurred during compilation
+ * @throws Twig_Error_Runtime When an error occurred during rendering
+ */
+ public function display($name, array $context = array())
+ {
+ $this->loadTemplate($name)->display($context);
+ }
+
+ /**
+ * Loads a template by name.
+ *
+ * @param string $name The template name
+ * @param int $index The index if it is an embedded template
+ *
+ * @return Twig_TemplateInterface A template instance representing the given template name
+ *
+ * @throws Twig_Error_Loader When the template cannot be found
+ * @throws Twig_Error_Syntax When an error occurred during compilation
+ */
+ public function loadTemplate($name, $index = null)
+ {
+ $cls = $this->getTemplateClass($name, $index);
+
+ if (isset($this->loadedTemplates[$cls])) {
+ return $this->loadedTemplates[$cls];
+ }
+
+ if (!class_exists($cls, false)) {
+ if ($this->bcGetCacheFilename) {
+ $key = $this->getCacheFilename($name);
+ } else {
+ $key = $this->cache->generateKey($name, $cls);
+ }
+
+ if (!$this->isAutoReload() || $this->isTemplateFresh($name, $this->cache->getTimestamp($key))) {
+ $this->cache->load($key);
+ }
+
+ if (!class_exists($cls, false)) {
+ $content = $this->compileSource($this->getLoader()->getSource($name), $name);
+ if ($this->bcWriteCacheFile) {
+ $this->writeCacheFile($key, $content);
+ } else {
+ $this->cache->write($key, $content);
+ }
+
+ eval('?>'.$content);
+ }
+ }
+
+ if (!$this->runtimeInitialized) {
+ $this->initRuntime();
+ }
+
+ return $this->loadedTemplates[$cls] = new $cls($this);
+ }
+
+ /**
+ * Creates a template from source.
+ *
+ * This method should not be used as a generic way to load templates.
+ *
+ * @param string $template The template name
+ *
+ * @return Twig_Template A template instance representing the given template name
+ *
+ * @throws Twig_Error_Loader When the template cannot be found
+ * @throws Twig_Error_Syntax When an error occurred during compilation
+ */
+ public function createTemplate($template)
+ {
+ $name = sprintf('__string_template__%s', hash('sha256', uniqid(mt_rand(), true), false));
+
+ $loader = new Twig_Loader_Chain(array(
+ new Twig_Loader_Array(array($name => $template)),
+ $current = $this->getLoader(),
+ ));
+
+ $this->setLoader($loader);
+ try {
+ $template = $this->loadTemplate($name);
+ } catch (Exception $e) {
+ $this->setLoader($current);
+
+ throw $e;
+ }
+ $this->setLoader($current);
+
+ return $template;
+ }
+
+ /**
+ * Returns true if the template is still fresh.
+ *
+ * Besides checking the loader for freshness information,
+ * this method also checks if the enabled extensions have
+ * not changed.
+ *
+ * @param string $name The template name
+ * @param int $time The last modification time of the cached template
+ *
+ * @return bool true if the template is fresh, false otherwise
+ */
+ public function isTemplateFresh($name, $time)
+ {
+ foreach ($this->extensions as $extension) {
+ $r = new ReflectionObject($extension);
+ if (filemtime($r->getFileName()) > $time) {
+ return false;
+ }
+ }
+
+ return $this->getLoader()->isFresh($name, $time);
+ }
+
+ /**
+ * Tries to load a template consecutively from an array.
+ *
+ * Similar to loadTemplate() but it also accepts Twig_TemplateInterface instances and an array
+ * of templates where each is tried to be loaded.
+ *
+ * @param string|Twig_Template|array $names A template or an array of templates to try consecutively
+ *
+ * @return Twig_Template
+ *
+ * @throws Twig_Error_Loader When none of the templates can be found
+ * @throws Twig_Error_Syntax When an error occurred during compilation
+ */
+ public function resolveTemplate($names)
+ {
+ if (!is_array($names)) {
+ $names = array($names);
+ }
+
+ foreach ($names as $name) {
+ if ($name instanceof Twig_Template) {
+ return $name;
+ }
+
+ try {
+ return $this->loadTemplate($name);
+ } catch (Twig_Error_Loader $e) {
+ }
+ }
+
+ if (1 === count($names)) {
+ throw $e;
+ }
+
+ throw new Twig_Error_Loader(sprintf('Unable to find one of the following templates: "%s".', implode('", "', $names)));
+ }
+
+ /**
+ * Clears the internal template cache.
+ *
+ * @deprecated since 1.18.3 (to be removed in 2.0)
+ */
+ public function clearTemplateCache()
+ {
+ @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
+
+ $this->loadedTemplates = array();
+ }
+
+ /**
+ * Clears the template cache files on the filesystem.
+ *
+ * @deprecated since 1.22 (to be removed in 2.0)
+ */
+ public function clearCacheFiles()
+ {
+ @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
+
+ if (is_string($this->originalCache)) {
+ foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($this->originalCache), RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
+ if ($file->isFile()) {
+ @unlink($file->getPathname());
+ }
+ }
+ }
+ }
+
+ /**
+ * Gets the Lexer instance.
+ *
+ * @return Twig_LexerInterface A Twig_LexerInterface instance
+ */
+ public function getLexer()
+ {
+ if (null === $this->lexer) {
+ $this->lexer = new Twig_Lexer($this);
+ }
+
+ return $this->lexer;
+ }
+
+ /**
+ * Sets the Lexer instance.
+ *
+ * @param Twig_LexerInterface $lexer A Twig_LexerInterface instance
+ */
+ public function setLexer(Twig_LexerInterface $lexer)
+ {
+ $this->lexer = $lexer;
+ }
+
+ /**
+ * Tokenizes a source code.
+ *
+ * @param string $source The template source code
+ * @param string $name The template name
+ *
+ * @return Twig_TokenStream A Twig_TokenStream instance
+ *
+ * @throws Twig_Error_Syntax When the code is syntactically wrong
+ */
+ public function tokenize($source, $name = null)
+ {
+ return $this->getLexer()->tokenize($source, $name);
+ }
+
+ /**
+ * Gets the Parser instance.
+ *
+ * @return Twig_ParserInterface A Twig_ParserInterface instance
+ */
+ public function getParser()
+ {
+ if (null === $this->parser) {
+ $this->parser = new Twig_Parser($this);
+ }
+
+ return $this->parser;
+ }
+
+ /**
+ * Sets the Parser instance.
+ *
+ * @param Twig_ParserInterface $parser A Twig_ParserInterface instance
+ */
+ public function setParser(Twig_ParserInterface $parser)
+ {
+ $this->parser = $parser;
+ }
+
+ /**
+ * Converts a token stream to a node tree.
+ *
+ * @param Twig_TokenStream $stream A token stream instance
+ *
+ * @return Twig_Node_Module A node tree
+ *
+ * @throws Twig_Error_Syntax When the token stream is syntactically or semantically wrong
+ */
+ public function parse(Twig_TokenStream $stream)
+ {
+ return $this->getParser()->parse($stream);
+ }
+
+ /**
+ * Gets the Compiler instance.
+ *
+ * @return Twig_CompilerInterface A Twig_CompilerInterface instance
+ */
+ public function getCompiler()
+ {
+ if (null === $this->compiler) {
+ $this->compiler = new Twig_Compiler($this);
+ }
+
+ return $this->compiler;
+ }
+
+ /**
+ * Sets the Compiler instance.
+ *
+ * @param Twig_CompilerInterface $compiler A Twig_CompilerInterface instance
+ */
+ public function setCompiler(Twig_CompilerInterface $compiler)
+ {
+ $this->compiler = $compiler;
+ }
+
+ /**
+ * Compiles a node and returns the PHP code.
+ *
+ * @param Twig_NodeInterface $node A Twig_NodeInterface instance
+ *
+ * @return string The compiled PHP source code
+ */
+ public function compile(Twig_NodeInterface $node)
+ {
+ return $this->getCompiler()->compile($node)->getSource();
+ }
+
+ /**
+ * Compiles a template source code.
+ *
+ * @param string $source The template source code
+ * @param string $name The template name
+ *
+ * @return string The compiled PHP source code
+ *
+ * @throws Twig_Error_Syntax When there was an error during tokenizing, parsing or compiling
+ */
+ public function compileSource($source, $name = null)
+ {
+ try {
+ $compiled = $this->compile($this->parse($this->tokenize($source, $name)), $source);
+
+ if (isset($source[0])) {
+ $compiled .= '/* '.str_replace(array('*/', "\r\n", "\r", "\n"), array('*//* ', "\n", "\n", "*/\n/* "), $source)."*/\n";
+ }
+
+ return $compiled;
+ } catch (Twig_Error $e) {
+ $e->setTemplateFile($name);
+ throw $e;
+ } catch (Exception $e) {
+ throw new Twig_Error_Syntax(sprintf('An exception has been thrown during the compilation of a template ("%s").', $e->getMessage()), -1, $name, $e);
+ }
+ }
+
+ /**
+ * Sets the Loader instance.
+ *
+ * @param Twig_LoaderInterface $loader A Twig_LoaderInterface instance
+ */
+ public function setLoader(Twig_LoaderInterface $loader)
+ {
+ $this->loader = $loader;
+ }
+
+ /**
+ * Gets the Loader instance.
+ *
+ * @return Twig_LoaderInterface A Twig_LoaderInterface instance
+ */
+ public function getLoader()
+ {
+ if (null === $this->loader) {
+ throw new LogicException('You must set a loader first.');
+ }
+
+ return $this->loader;
+ }
+
+ /**
+ * Sets the default template charset.
+ *
+ * @param string $charset The default charset
+ */
+ public function setCharset($charset)
+ {
+ $this->charset = strtoupper($charset);
+ }
+
+ /**
+ * Gets the default template charset.
+ *
+ * @return string The default charset
+ */
+ public function getCharset()
+ {
+ return $this->charset;
+ }
+
+ /**
+ * Initializes the runtime environment.
+ */
+ public function initRuntime()
+ {
+ $this->runtimeInitialized = true;
+
+ foreach ($this->getExtensions() as $extension) {
+ $extension->initRuntime($this);
+ }
+ }
+
+ /**
+ * Returns true if the given extension is registered.
+ *
+ * @param string $name The extension name
+ *
+ * @return bool Whether the extension is registered or not
+ */
+ public function hasExtension($name)
+ {
+ return isset($this->extensions[$name]);
+ }
+
+ /**
+ * Gets an extension by name.
+ *
+ * @param string $name The extension name
+ *
+ * @return Twig_ExtensionInterface A Twig_ExtensionInterface instance
+ */
+ public function getExtension($name)
+ {
+ if (!isset($this->extensions[$name])) {
+ throw new Twig_Error_Runtime(sprintf('The "%s" extension is not enabled.', $name));
+ }
+
+ return $this->extensions[$name];
+ }
+
+ /**
+ * Registers an extension.
+ *
+ * @param Twig_ExtensionInterface $extension A Twig_ExtensionInterface instance
+ */
+ public function addExtension(Twig_ExtensionInterface $extension)
+ {
+ if ($this->extensionInitialized) {
+ throw new LogicException(sprintf('Unable to register extension "%s" as extensions have already been initialized.', $extension->getName()));
+ }
+
+ $this->extensions[$extension->getName()] = $extension;
+ }
+
+ /**
+ * Removes an extension by name.
+ *
+ * This method is deprecated and you should not use it.
+ *
+ * @param string $name The extension name
+ *
+ * @deprecated since 1.12 (to be removed in 2.0)
+ */
+ public function removeExtension($name)
+ {
+ @trigger_error(sprintf('The %s method is deprecated and will be removed in Twig 2.0.', __METHOD__), E_USER_DEPRECATED);
+
+ if ($this->extensionInitialized) {
+ throw new LogicException(sprintf('Unable to remove extension "%s" as extensions have already been initialized.', $name));
+ }
+
+ unset($this->extensions[$name]);
+ }
+
+ /**
+ * Registers an array of extensions.
+ *
+ * @param array $extensions An array of extensions
+ */
+ public function setExtensions(array $extensions)
+ {
+ foreach ($extensions as $extension) {
+ $this->addExtension($extension);
+ }
+ }
+
+ /**
+ * Returns all registered extensions.
+ *
+ * @return array An array of extensions
+ */
+ public function getExtensions()
+ {
+ return $this->extensions;
+ }
+
+ /**
+ * Registers a Token Parser.
+ *
+ * @param Twig_TokenParserInterface $parser A Twig_TokenParserInterface instance
+ */
+ public function addTokenParser(Twig_TokenParserInterface $parser)
+ {
+ if ($this->extensionInitialized) {
+ throw new LogicException('Unable to add a token parser as extensions have already been initialized.');
+ }
+
+ $this->staging->addTokenParser($parser);
+ }
+
+ /**
+ * Gets the registered Token Parsers.
+ *
+ * @return Twig_TokenParserBrokerInterface A broker containing token parsers
+ */
+ public function getTokenParsers()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->parsers;
+ }
+
+ /**
+ * Gets registered tags.
+ *
+ * Be warned that this method cannot return tags defined by Twig_TokenParserBrokerInterface classes.
+ *
+ * @return Twig_TokenParserInterface[] An array of Twig_TokenParserInterface instances
+ */
+ public function getTags()
+ {
+ $tags = array();
+ foreach ($this->getTokenParsers()->getParsers() as $parser) {
+ if ($parser instanceof Twig_TokenParserInterface) {
+ $tags[$parser->getTag()] = $parser;
+ }
+ }
+
+ return $tags;
+ }
+
+ /**
+ * Registers a Node Visitor.
+ *
+ * @param Twig_NodeVisitorInterface $visitor A Twig_NodeVisitorInterface instance
+ */
+ public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
+ {
+ if ($this->extensionInitialized) {
+ throw new LogicException('Unable to add a node visitor as extensions have already been initialized.');
+ }
+
+ $this->staging->addNodeVisitor($visitor);
+ }
+
+ /**
+ * Gets the registered Node Visitors.
+ *
+ * @return Twig_NodeVisitorInterface[] An array of Twig_NodeVisitorInterface instances
+ */
+ public function getNodeVisitors()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->visitors;
+ }
+
+ /**
+ * Registers a Filter.
+ *
+ * @param string|Twig_SimpleFilter $name The filter name or a Twig_SimpleFilter instance
+ * @param Twig_FilterInterface|Twig_SimpleFilter $filter A Twig_FilterInterface instance or a Twig_SimpleFilter instance
+ */
+ public function addFilter($name, $filter = null)
+ {
+ if (!$name instanceof Twig_SimpleFilter && !($filter instanceof Twig_SimpleFilter || $filter instanceof Twig_FilterInterface)) {
+ throw new LogicException('A filter must be an instance of Twig_FilterInterface or Twig_SimpleFilter');
+ }
+
+ if ($name instanceof Twig_SimpleFilter) {
+ $filter = $name;
+ $name = $filter->getName();
+ } else {
+ @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated. Pass an instance of "Twig_SimpleFilter" instead when defining filter "%s".', __METHOD__, $name), E_USER_DEPRECATED);
+ }
+
+ if ($this->extensionInitialized) {
+ throw new LogicException(sprintf('Unable to add filter "%s" as extensions have already been initialized.', $name));
+ }
+
+ $this->staging->addFilter($name, $filter);
+ }
+
+ /**
+ * Get a filter by name.
+ *
+ * Subclasses may override this method and load filters differently;
+ * so no list of filters is available.
+ *
+ * @param string $name The filter name
+ *
+ * @return Twig_Filter|false A Twig_Filter instance or false if the filter does not exist
+ */
+ public function getFilter($name)
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ if (isset($this->filters[$name])) {
+ return $this->filters[$name];
+ }
+
+ foreach ($this->filters as $pattern => $filter) {
+ $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
+
+ if ($count) {
+ if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
+ array_shift($matches);
+ $filter->setArguments($matches);
+
+ return $filter;
+ }
+ }
+ }
+
+ foreach ($this->filterCallbacks as $callback) {
+ if (false !== $filter = call_user_func($callback, $name)) {
+ return $filter;
+ }
+ }
+
+ return false;
+ }
+
+ public function registerUndefinedFilterCallback($callable)
+ {
+ $this->filterCallbacks[] = $callable;
+ }
+
+ /**
+ * Gets the registered Filters.
+ *
+ * Be warned that this method cannot return filters defined with registerUndefinedFunctionCallback.
+ *
+ * @return Twig_FilterInterface[] An array of Twig_FilterInterface instances
+ *
+ * @see registerUndefinedFilterCallback
+ */
+ public function getFilters()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->filters;
+ }
+
+ /**
+ * Registers a Test.
+ *
+ * @param string|Twig_SimpleTest $name The test name or a Twig_SimpleTest instance
+ * @param Twig_TestInterface|Twig_SimpleTest $test A Twig_TestInterface instance or a Twig_SimpleTest instance
+ */
+ public function addTest($name, $test = null)
+ {
+ if (!$name instanceof Twig_SimpleTest && !($test instanceof Twig_SimpleTest || $test instanceof Twig_TestInterface)) {
+ throw new LogicException('A test must be an instance of Twig_TestInterface or Twig_SimpleTest');
+ }
+
+ if ($name instanceof Twig_SimpleTest) {
+ $test = $name;
+ $name = $test->getName();
+ } else {
+ @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated. Pass an instance of "Twig_SimpleTest" instead when defining test "%s".', __METHOD__, $name), E_USER_DEPRECATED);
+ }
+
+ if ($this->extensionInitialized) {
+ throw new LogicException(sprintf('Unable to add test "%s" as extensions have already been initialized.', $name));
+ }
+
+ $this->staging->addTest($name, $test);
+ }
+
+ /**
+ * Gets the registered Tests.
+ *
+ * @return Twig_TestInterface[] An array of Twig_TestInterface instances
+ */
+ public function getTests()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->tests;
+ }
+
+ /**
+ * Gets a test by name.
+ *
+ * @param string $name The test name
+ *
+ * @return Twig_Test|false A Twig_Test instance or false if the test does not exist
+ */
+ public function getTest($name)
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ if (isset($this->tests[$name])) {
+ return $this->tests[$name];
+ }
+
+ return false;
+ }
+
+ /**
+ * Registers a Function.
+ *
+ * @param string|Twig_SimpleFunction $name The function name or a Twig_SimpleFunction instance
+ * @param Twig_FunctionInterface|Twig_SimpleFunction $function A Twig_FunctionInterface instance or a Twig_SimpleFunction instance
+ */
+ public function addFunction($name, $function = null)
+ {
+ if (!$name instanceof Twig_SimpleFunction && !($function instanceof Twig_SimpleFunction || $function instanceof Twig_FunctionInterface)) {
+ throw new LogicException('A function must be an instance of Twig_FunctionInterface or Twig_SimpleFunction');
+ }
+
+ if ($name instanceof Twig_SimpleFunction) {
+ $function = $name;
+ $name = $function->getName();
+ } else {
+ @trigger_error(sprintf('Passing a name as a first argument to the %s method is deprecated. Pass an instance of "Twig_SimpleFunction" instead when defining function "%s".', __METHOD__, $name), E_USER_DEPRECATED);
+ }
+
+ if ($this->extensionInitialized) {
+ throw new LogicException(sprintf('Unable to add function "%s" as extensions have already been initialized.', $name));
+ }
+
+ $this->staging->addFunction($name, $function);
+ }
+
+ /**
+ * Get a function by name.
+ *
+ * Subclasses may override this method and load functions differently;
+ * so no list of functions is available.
+ *
+ * @param string $name function name
+ *
+ * @return Twig_Function|false A Twig_Function instance or false if the function does not exist
+ */
+ public function getFunction($name)
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ if (isset($this->functions[$name])) {
+ return $this->functions[$name];
+ }
+
+ foreach ($this->functions as $pattern => $function) {
+ $pattern = str_replace('\\*', '(.*?)', preg_quote($pattern, '#'), $count);
+
+ if ($count) {
+ if (preg_match('#^'.$pattern.'$#', $name, $matches)) {
+ array_shift($matches);
+ $function->setArguments($matches);
+
+ return $function;
+ }
+ }
+ }
+
+ foreach ($this->functionCallbacks as $callback) {
+ if (false !== $function = call_user_func($callback, $name)) {
+ return $function;
+ }
+ }
+
+ return false;
+ }
+
+ public function registerUndefinedFunctionCallback($callable)
+ {
+ $this->functionCallbacks[] = $callable;
+ }
+
+ /**
+ * Gets registered functions.
+ *
+ * Be warned that this method cannot return functions defined with registerUndefinedFunctionCallback.
+ *
+ * @return Twig_FunctionInterface[] An array of Twig_FunctionInterface instances
+ *
+ * @see registerUndefinedFunctionCallback
+ */
+ public function getFunctions()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->functions;
+ }
+
+ /**
+ * Registers a Global.
+ *
+ * New globals can be added before compiling or rendering a template;
+ * but after, you can only update existing globals.
+ *
+ * @param string $name The global name
+ * @param mixed $value The global value
+ */
+ public function addGlobal($name, $value)
+ {
+ if ($this->extensionInitialized || $this->runtimeInitialized) {
+ if (null === $this->globals) {
+ $this->globals = $this->initGlobals();
+ }
+
+ if (!array_key_exists($name, $this->globals)) {
+ // The deprecation notice must be turned into the following exception in Twig 2.0
+ @trigger_error(sprintf('Registering global variable "%s" at runtime or when the extensions have already been initialized is deprecated.', $name), E_USER_DEPRECATED);
+ //throw new LogicException(sprintf('Unable to add global "%s" as the runtime or the extensions have already been initialized.', $name));
+ }
+ }
+
+ if ($this->extensionInitialized || $this->runtimeInitialized) {
+ // update the value
+ $this->globals[$name] = $value;
+ } else {
+ $this->staging->addGlobal($name, $value);
+ }
+ }
+
+ /**
+ * Gets the registered Globals.
+ *
+ * @return array An array of globals
+ */
+ public function getGlobals()
+ {
+ if (!$this->runtimeInitialized && !$this->extensionInitialized) {
+ return $this->initGlobals();
+ }
+
+ if (null === $this->globals) {
+ $this->globals = $this->initGlobals();
+ }
+
+ return $this->globals;
+ }
+
+ /**
+ * Merges a context with the defined globals.
+ *
+ * @param array $context An array representing the context
+ *
+ * @return array The context merged with the globals
+ */
+ public function mergeGlobals(array $context)
+ {
+ // we don't use array_merge as the context being generally
+ // bigger than globals, this code is faster.
+ foreach ($this->getGlobals() as $key => $value) {
+ if (!array_key_exists($key, $context)) {
+ $context[$key] = $value;
+ }
+ }
+
+ return $context;
+ }
+
+ /**
+ * Gets the registered unary Operators.
+ *
+ * @return array An array of unary operators
+ */
+ public function getUnaryOperators()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->unaryOperators;
+ }
+
+ /**
+ * Gets the registered binary Operators.
+ *
+ * @return array An array of binary operators
+ */
+ public function getBinaryOperators()
+ {
+ if (!$this->extensionInitialized) {
+ $this->initExtensions();
+ }
+
+ return $this->binaryOperators;
+ }
+
+ public function computeAlternatives($name, $items)
+ {
+ $alternatives = array();
+ foreach ($items as $item) {
+ $lev = levenshtein($name, $item);
+ if ($lev <= strlen($name) / 3 || false !== strpos($item, $name)) {
+ $alternatives[$item] = $lev;
+ }
+ }
+ asort($alternatives);
+
+ return array_keys($alternatives);
+ }
+
+ protected function initGlobals()
+ {
+ $globals = array();
+ foreach ($this->extensions as $extension) {
+ $extGlob = $extension->getGlobals();
+ if (!is_array($extGlob)) {
+ throw new UnexpectedValueException(sprintf('"%s::getGlobals()" must return an array of globals.', get_class($extension)));
+ }
+
+ $globals[] = $extGlob;
+ }
+
+ $globals[] = $this->staging->getGlobals();
+
+ return call_user_func_array('array_merge', $globals);
+ }
+
+ protected function initExtensions()
+ {
+ if ($this->extensionInitialized) {
+ return;
+ }
+
+ $this->extensionInitialized = true;
+ $this->parsers = new Twig_TokenParserBroker(array(), array(), false);
+ $this->filters = array();
+ $this->functions = array();
+ $this->tests = array();
+ $this->visitors = array();
+ $this->unaryOperators = array();
+ $this->binaryOperators = array();
+
+ foreach ($this->extensions as $extension) {
+ $this->initExtension($extension);
+ }
+ $this->initExtension($this->staging);
+ }
+
+ protected function initExtension(Twig_ExtensionInterface $extension)
+ {
+ // filters
+ foreach ($extension->getFilters() as $name => $filter) {
+ if ($filter instanceof Twig_SimpleFilter) {
+ $name = $filter->getName();
+ } else {
+ @trigger_error(sprintf('Using an instance of "%s" for filter "%s" is deprecated. Use Twig_SimpleFilter instead.', get_class($filter), $name), E_USER_DEPRECATED);
+ }
+
+ $this->filters[$name] = $filter;
+ }
+
+ // functions
+ foreach ($extension->getFunctions() as $name => $function) {
+ if ($function instanceof Twig_SimpleFunction) {
+ $name = $function->getName();
+ } else {
+ @trigger_error(sprintf('Using an instance of "%s" for function "%s" is deprecated. Use Twig_SimpleFunction instead.', get_class($function), $name), E_USER_DEPRECATED);
+ }
+
+ $this->functions[$name] = $function;
+ }
+
+ // tests
+ foreach ($extension->getTests() as $name => $test) {
+ if ($test instanceof Twig_SimpleTest) {
+ $name = $test->getName();
+ } else {
+ @trigger_error(sprintf('Using an instance of "%s" for test "%s" is deprecated. Use Twig_SimpleTest instead.', get_class($test), $name), E_USER_DEPRECATED);
+ }
+
+ $this->tests[$name] = $test;
+ }
+
+ // token parsers
+ foreach ($extension->getTokenParsers() as $parser) {
+ if ($parser instanceof Twig_TokenParserInterface) {
+ $this->parsers->addTokenParser($parser);
+ } elseif ($parser instanceof Twig_TokenParserBrokerInterface) {
+ @trigger_error('Registering a Twig_TokenParserBrokerInterface instance is deprecated.', E_USER_DEPRECATED);
+
+ $this->parsers->addTokenParserBroker($parser);
+ } else {
+ throw new LogicException('getTokenParsers() must return an array of Twig_TokenParserInterface or Twig_TokenParserBrokerInterface instances');
+ }
+ }
+
+ // node visitors
+ foreach ($extension->getNodeVisitors() as $visitor) {
+ $this->visitors[] = $visitor;
+ }
+
+ // operators
+ if ($operators = $extension->getOperators()) {
+ if (2 !== count($operators)) {
+ throw new InvalidArgumentException(sprintf('"%s::getOperators()" does not return a valid operators array.', get_class($extension)));
+ }
+
+ $this->unaryOperators = array_merge($this->unaryOperators, $operators[0]);
+ $this->binaryOperators = array_merge($this->binaryOperators, $operators[1]);
+ }
+ }
+
+ /**
+ * @deprecated since 1.22 (to be removed in 2.0)
+ */
+ protected function writeCacheFile($file, $content)
+ {
+ $this->cache->write($file, $content);
+ }
+}
diff --git a/core/vendor/twig/twig/lib/Twig/Error.php b/vendor/twig/twig/lib/Twig/Error.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Error.php
rename to vendor/twig/twig/lib/Twig/Error.php
diff --git a/core/vendor/twig/twig/lib/Twig/Error/Loader.php b/vendor/twig/twig/lib/Twig/Error/Loader.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Error/Loader.php
rename to vendor/twig/twig/lib/Twig/Error/Loader.php
diff --git a/core/vendor/twig/twig/lib/Twig/Error/Runtime.php b/vendor/twig/twig/lib/Twig/Error/Runtime.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Error/Runtime.php
rename to vendor/twig/twig/lib/Twig/Error/Runtime.php
diff --git a/core/vendor/twig/twig/lib/Twig/Error/Syntax.php b/vendor/twig/twig/lib/Twig/Error/Syntax.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Error/Syntax.php
rename to vendor/twig/twig/lib/Twig/Error/Syntax.php
diff --git a/core/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php b/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
rename to vendor/twig/twig/lib/Twig/ExistsLoaderInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/ExpressionParser.php b/vendor/twig/twig/lib/Twig/ExpressionParser.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/ExpressionParser.php
rename to vendor/twig/twig/lib/Twig/ExpressionParser.php
diff --git a/core/vendor/twig/twig/lib/Twig/Extension.php b/vendor/twig/twig/lib/Twig/Extension.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension.php
rename to vendor/twig/twig/lib/Twig/Extension.php
diff --git a/vendor/twig/twig/lib/Twig/Extension/Core.php b/vendor/twig/twig/lib/Twig/Extension/Core.php
new file mode 100644
index 0000000..f9ec2a4
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Extension/Core.php
@@ -0,0 +1,1574 @@
+escapers[$strategy] = $callable;
+ }
+
+ /**
+ * Gets all defined escapers.
+ *
+ * @return array An array of escapers
+ */
+ public function getEscapers()
+ {
+ return $this->escapers;
+ }
+
+ /**
+ * Sets the default format to be used by the date filter.
+ *
+ * @param string $format The default date format string
+ * @param string $dateIntervalFormat The default date interval format string
+ */
+ public function setDateFormat($format = null, $dateIntervalFormat = null)
+ {
+ if (null !== $format) {
+ $this->dateFormats[0] = $format;
+ }
+
+ if (null !== $dateIntervalFormat) {
+ $this->dateFormats[1] = $dateIntervalFormat;
+ }
+ }
+
+ /**
+ * Gets the default format to be used by the date filter.
+ *
+ * @return array The default date format string and the default date interval format string
+ */
+ public function getDateFormat()
+ {
+ return $this->dateFormats;
+ }
+
+ /**
+ * Sets the default timezone to be used by the date filter.
+ *
+ * @param DateTimeZone|string $timezone The default timezone string or a DateTimeZone object
+ */
+ public function setTimezone($timezone)
+ {
+ $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);
+ }
+
+ /**
+ * Gets the default timezone to be used by the date filter.
+ *
+ * @return DateTimeZone The default timezone currently in use
+ */
+ public function getTimezone()
+ {
+ if (null === $this->timezone) {
+ $this->timezone = new DateTimeZone(date_default_timezone_get());
+ }
+
+ return $this->timezone;
+ }
+
+ /**
+ * Sets the default format to be used by the number_format filter.
+ *
+ * @param int $decimal The number of decimal places to use.
+ * @param string $decimalPoint The character(s) to use for the decimal point.
+ * @param string $thousandSep The character(s) to use for the thousands separator.
+ */
+ public function setNumberFormat($decimal, $decimalPoint, $thousandSep)
+ {
+ $this->numberFormat = array($decimal, $decimalPoint, $thousandSep);
+ }
+
+ /**
+ * Get the default format used by the number_format filter.
+ *
+ * @return array The arguments for number_format()
+ */
+ public function getNumberFormat()
+ {
+ return $this->numberFormat;
+ }
+
+ /**
+ * Returns the token parser instance to add to the existing list.
+ *
+ * @return Twig_TokenParser[] An array of Twig_TokenParser instances
+ */
+ public function getTokenParsers()
+ {
+ return array(
+ new Twig_TokenParser_For(),
+ new Twig_TokenParser_If(),
+ new Twig_TokenParser_Extends(),
+ new Twig_TokenParser_Include(),
+ new Twig_TokenParser_Block(),
+ new Twig_TokenParser_Use(),
+ new Twig_TokenParser_Filter(),
+ new Twig_TokenParser_Macro(),
+ new Twig_TokenParser_Import(),
+ new Twig_TokenParser_From(),
+ new Twig_TokenParser_Set(),
+ new Twig_TokenParser_Spaceless(),
+ new Twig_TokenParser_Flush(),
+ new Twig_TokenParser_Do(),
+ new Twig_TokenParser_Embed(),
+ );
+ }
+
+ /**
+ * Returns a list of filters to add to the existing list.
+ *
+ * @return array An array of filters
+ */
+ public function getFilters()
+ {
+ $filters = array(
+ // formatting filters
+ new Twig_SimpleFilter('date', 'twig_date_format_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('date_modify', 'twig_date_modify_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('format', 'sprintf'),
+ new Twig_SimpleFilter('replace', 'twig_replace_filter'),
+ new Twig_SimpleFilter('number_format', 'twig_number_format_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('abs', 'abs'),
+ new Twig_SimpleFilter('round', 'twig_round'),
+
+ // encoding
+ new Twig_SimpleFilter('url_encode', 'twig_urlencode_filter'),
+ new Twig_SimpleFilter('json_encode', 'twig_jsonencode_filter'),
+ new Twig_SimpleFilter('convert_encoding', 'twig_convert_encoding'),
+
+ // string filters
+ new Twig_SimpleFilter('title', 'twig_title_string_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('capitalize', 'twig_capitalize_string_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('upper', 'strtoupper'),
+ new Twig_SimpleFilter('lower', 'strtolower'),
+ new Twig_SimpleFilter('striptags', 'strip_tags'),
+ new Twig_SimpleFilter('trim', 'trim'),
+ new Twig_SimpleFilter('nl2br', 'nl2br', array('pre_escape' => 'html', 'is_safe' => array('html'))),
+
+ // array helpers
+ new Twig_SimpleFilter('join', 'twig_join_filter'),
+ new Twig_SimpleFilter('split', 'twig_split_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('sort', 'twig_sort_filter'),
+ new Twig_SimpleFilter('merge', 'twig_array_merge'),
+ new Twig_SimpleFilter('batch', 'twig_array_batch'),
+
+ // string/array filters
+ new Twig_SimpleFilter('reverse', 'twig_reverse_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('length', 'twig_length_filter', array('needs_environment' => true)),
+ new Twig_SimpleFilter('slice', 'twig_slice', array('needs_environment' => true)),
+ new Twig_SimpleFilter('first', 'twig_first', array('needs_environment' => true)),
+ new Twig_SimpleFilter('last', 'twig_last', array('needs_environment' => true)),
+
+ // iteration and runtime
+ new Twig_SimpleFilter('default', '_twig_default_filter', array('node_class' => 'Twig_Node_Expression_Filter_Default')),
+ new Twig_SimpleFilter('keys', 'twig_get_array_keys_filter'),
+
+ // escaping
+ new Twig_SimpleFilter('escape', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
+ new Twig_SimpleFilter('e', 'twig_escape_filter', array('needs_environment' => true, 'is_safe_callback' => 'twig_escape_filter_is_safe')),
+ );
+
+ if (function_exists('mb_get_info')) {
+ $filters[] = new Twig_SimpleFilter('upper', 'twig_upper_filter', array('needs_environment' => true));
+ $filters[] = new Twig_SimpleFilter('lower', 'twig_lower_filter', array('needs_environment' => true));
+ }
+
+ return $filters;
+ }
+
+ /**
+ * Returns a list of global functions to add to the existing list.
+ *
+ * @return array An array of global functions
+ */
+ public function getFunctions()
+ {
+ return array(
+ new Twig_SimpleFunction('max', 'max'),
+ new Twig_SimpleFunction('min', 'min'),
+ new Twig_SimpleFunction('range', 'range'),
+ new Twig_SimpleFunction('constant', 'twig_constant'),
+ new Twig_SimpleFunction('cycle', 'twig_cycle'),
+ new Twig_SimpleFunction('random', 'twig_random', array('needs_environment' => true)),
+ new Twig_SimpleFunction('date', 'twig_date_converter', array('needs_environment' => true)),
+ new Twig_SimpleFunction('include', 'twig_include', array('needs_environment' => true, 'needs_context' => true, 'is_safe' => array('all'))),
+ new Twig_SimpleFunction('source', 'twig_source', array('needs_environment' => true, 'is_safe' => array('all'))),
+ );
+ }
+
+ /**
+ * Returns a list of tests to add to the existing list.
+ *
+ * @return array An array of tests
+ */
+ public function getTests()
+ {
+ return array(
+ new Twig_SimpleTest('even', null, array('node_class' => 'Twig_Node_Expression_Test_Even')),
+ new Twig_SimpleTest('odd', null, array('node_class' => 'Twig_Node_Expression_Test_Odd')),
+ new Twig_SimpleTest('defined', null, array('node_class' => 'Twig_Node_Expression_Test_Defined')),
+ new Twig_SimpleTest('sameas', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas', 'deprecated' => true, 'alternative' => 'same as')),
+ new Twig_SimpleTest('same as', null, array('node_class' => 'Twig_Node_Expression_Test_Sameas')),
+ new Twig_SimpleTest('none', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
+ new Twig_SimpleTest('null', null, array('node_class' => 'Twig_Node_Expression_Test_Null')),
+ new Twig_SimpleTest('divisibleby', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby', 'deprecated' => true, 'alternative' => 'divisible by')),
+ new Twig_SimpleTest('divisible by', null, array('node_class' => 'Twig_Node_Expression_Test_Divisibleby')),
+ new Twig_SimpleTest('constant', null, array('node_class' => 'Twig_Node_Expression_Test_Constant')),
+ new Twig_SimpleTest('empty', 'twig_test_empty'),
+ new Twig_SimpleTest('iterable', 'twig_test_iterable'),
+ );
+ }
+
+ /**
+ * Returns a list of operators to add to the existing list.
+ *
+ * @return array An array of operators
+ */
+ public function getOperators()
+ {
+ return array(
+ array(
+ 'not' => array('precedence' => 50, 'class' => 'Twig_Node_Expression_Unary_Not'),
+ '-' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Neg'),
+ '+' => array('precedence' => 500, 'class' => 'Twig_Node_Expression_Unary_Pos'),
+ ),
+ array(
+ 'or' => array('precedence' => 10, 'class' => 'Twig_Node_Expression_Binary_Or', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'and' => array('precedence' => 15, 'class' => 'Twig_Node_Expression_Binary_And', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'b-or' => array('precedence' => 16, 'class' => 'Twig_Node_Expression_Binary_BitwiseOr', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'b-xor' => array('precedence' => 17, 'class' => 'Twig_Node_Expression_Binary_BitwiseXor', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'b-and' => array('precedence' => 18, 'class' => 'Twig_Node_Expression_Binary_BitwiseAnd', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '==' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Equal', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '!=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '<' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Less', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '>' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Greater', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '>=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_GreaterEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '<=' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_LessEqual', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'not in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_NotIn', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'in' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_In', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'matches' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_Matches', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'starts with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_StartsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'ends with' => array('precedence' => 20, 'class' => 'Twig_Node_Expression_Binary_EndsWith', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '..' => array('precedence' => 25, 'class' => 'Twig_Node_Expression_Binary_Range', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '+' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Add', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '-' => array('precedence' => 30, 'class' => 'Twig_Node_Expression_Binary_Sub', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '~' => array('precedence' => 40, 'class' => 'Twig_Node_Expression_Binary_Concat', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '*' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mul', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '/' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Div', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '//' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_FloorDiv', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '%' => array('precedence' => 60, 'class' => 'Twig_Node_Expression_Binary_Mod', 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'is' => array('precedence' => 100, 'callable' => array($this, 'parseTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ 'is not' => array('precedence' => 100, 'callable' => array($this, 'parseNotTestExpression'), 'associativity' => Twig_ExpressionParser::OPERATOR_LEFT),
+ '**' => array('precedence' => 200, 'class' => 'Twig_Node_Expression_Binary_Power', 'associativity' => Twig_ExpressionParser::OPERATOR_RIGHT),
+ ),
+ );
+ }
+
+ public function parseNotTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
+ {
+ return new Twig_Node_Expression_Unary_Not($this->parseTestExpression($parser, $node), $parser->getCurrentToken()->getLine());
+ }
+
+ public function parseTestExpression(Twig_Parser $parser, Twig_NodeInterface $node)
+ {
+ $stream = $parser->getStream();
+ list($name, $test) = $this->getTest($parser, $node->getLine());
+
+ if ($test instanceof Twig_SimpleTest && $test->isDeprecated()) {
+ $message = sprintf('Twig Test "%s" is deprecated', $name);
+ if ($test->getAlternative()) {
+ $message .= sprintf('. Use "%s" instead', $test->getAlternative());
+ }
+ $message .= sprintf(' in %s at line %d.', $stream->getFilename(), $stream->getCurrent()->getLine());
+
+ @trigger_error($message, E_USER_DEPRECATED);
+ }
+
+ $class = $this->getTestNodeClass($parser, $test);
+ $arguments = null;
+ if ($stream->test(Twig_Token::PUNCTUATION_TYPE, '(')) {
+ $arguments = $parser->getExpressionParser()->parseArguments(true);
+ }
+
+ return new $class($node, $name, $arguments, $parser->getCurrentToken()->getLine());
+ }
+
+ protected function getTest(Twig_Parser $parser, $line)
+ {
+ $stream = $parser->getStream();
+ $name = $stream->expect(Twig_Token::NAME_TYPE)->getValue();
+ $env = $parser->getEnvironment();
+
+ if ($test = $env->getTest($name)) {
+ return array($name, $test);
+ }
+
+ if ($stream->test(Twig_Token::NAME_TYPE)) {
+ // try 2-words tests
+ $name = $name.' '.$parser->getCurrentToken()->getValue();
+
+ if ($test = $env->getTest($name)) {
+ $parser->getStream()->next();
+
+ return array($name, $test);
+ }
+ }
+
+ $message = sprintf('The test "%s" does not exist', $name);
+ if ($alternatives = $env->computeAlternatives($name, array_keys($env->getTests()))) {
+ $message = sprintf('%s. Did you mean "%s"', $message, implode('", "', $alternatives));
+ }
+
+ throw new Twig_Error_Syntax($message, $line, $parser->getFilename());
+ }
+
+ protected function getTestNodeClass(Twig_Parser $parser, $test)
+ {
+ if ($test instanceof Twig_SimpleTest) {
+ return $test->getNodeClass();
+ }
+
+ return $test instanceof Twig_Test_Node ? $test->getClass() : 'Twig_Node_Expression_Test';
+ }
+
+ /**
+ * Returns the name of the extension.
+ *
+ * @return string The extension name
+ */
+ public function getName()
+ {
+ return 'core';
+ }
+}
+
+/**
+ * Cycles over a value.
+ *
+ * @param ArrayAccess|array $values An array or an ArrayAccess instance
+ * @param int $position The cycle position
+ *
+ * @return string The next value in the cycle
+ */
+function twig_cycle($values, $position)
+{
+ if (!is_array($values) && !$values instanceof ArrayAccess) {
+ return $values;
+ }
+
+ return $values[$position % count($values)];
+}
+
+/**
+ * Returns a random value depending on the supplied parameter type:
+ * - a random item from a Traversable or array
+ * - a random character from a string
+ * - a random integer between 0 and the integer parameter.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param Traversable|array|int|string $values The values to pick a random item from
+ *
+ * @throws Twig_Error_Runtime When $values is an empty array (does not apply to an empty string which is returned as is).
+ *
+ * @return mixed A random value from the given sequence
+ */
+function twig_random(Twig_Environment $env, $values = null)
+{
+ if (null === $values) {
+ return mt_rand();
+ }
+
+ if (is_int($values) || is_float($values)) {
+ return $values < 0 ? mt_rand($values, 0) : mt_rand(0, $values);
+ }
+
+ if ($values instanceof Traversable) {
+ $values = iterator_to_array($values);
+ } elseif (is_string($values)) {
+ if ('' === $values) {
+ return '';
+ }
+ if (null !== $charset = $env->getCharset()) {
+ if ('UTF-8' != $charset) {
+ $values = twig_convert_encoding($values, 'UTF-8', $charset);
+ }
+
+ // unicode version of str_split()
+ // split at all positions, but not after the start and not before the end
+ $values = preg_split('/(? $value) {
+ $values[$i] = twig_convert_encoding($value, $charset, 'UTF-8');
+ }
+ }
+ } else {
+ return $values[mt_rand(0, strlen($values) - 1)];
+ }
+ }
+
+ if (!is_array($values)) {
+ return $values;
+ }
+
+ if (0 === count($values)) {
+ throw new Twig_Error_Runtime('The random function cannot pick from an empty array.');
+ }
+
+ return $values[array_rand($values, 1)];
+}
+
+/**
+ * Converts a date to the given format.
+ *
+ *
+ * {{ post.published_at|date("m/d/Y") }}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param DateTime|DateTimeInterface|DateInterval|string $date A date
+ * @param string|null $format The target format, null to use the default
+ * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
+ *
+ * @return string The formatted date
+ */
+function twig_date_format_filter(Twig_Environment $env, $date, $format = null, $timezone = null)
+{
+ if (null === $format) {
+ $formats = $env->getExtension('core')->getDateFormat();
+ $format = $date instanceof DateInterval ? $formats[1] : $formats[0];
+ }
+
+ if ($date instanceof DateInterval) {
+ return $date->format($format);
+ }
+
+ return twig_date_converter($env, $date, $timezone)->format($format);
+}
+
+/**
+ * Returns a new date object modified.
+ *
+ *
+ * {{ post.published_at|date_modify("-1day")|date("m/d/Y") }}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param DateTime|string $date A date
+ * @param string $modifier A modifier string
+ *
+ * @return DateTime A new date object
+ */
+function twig_date_modify_filter(Twig_Environment $env, $date, $modifier)
+{
+ $date = twig_date_converter($env, $date, false);
+ $resultDate = $date->modify($modifier);
+
+ // This is a hack to ensure PHP 5.2 support and support for DateTimeImmutable
+ // DateTime::modify does not return the modified DateTime object < 5.3.0
+ // and DateTimeImmutable does not modify $date.
+ return null === $resultDate ? $date : $resultDate;
+}
+
+/**
+ * Converts an input to a DateTime instance.
+ *
+ *
+ * {% if date(user.created_at) < date('+2days') %}
+ * {# do something #}
+ * {% endif %}
+ *
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param DateTime|DateTimeInterface|string|null $date A date
+ * @param DateTimeZone|string|null|false $timezone The target timezone, null to use the default, false to leave unchanged
+ *
+ * @return DateTime A DateTime instance
+ */
+function twig_date_converter(Twig_Environment $env, $date = null, $timezone = null)
+{
+ // determine the timezone
+ if (false !== $timezone) {
+ if (null === $timezone) {
+ $timezone = $env->getExtension('core')->getTimezone();
+ } elseif (!$timezone instanceof DateTimeZone) {
+ $timezone = new DateTimeZone($timezone);
+ }
+ }
+
+ // immutable dates
+ if ($date instanceof DateTimeImmutable) {
+ return false !== $timezone ? $date->setTimezone($timezone) : $date;
+ }
+
+ if ($date instanceof DateTime || $date instanceof DateTimeInterface) {
+ $date = clone $date;
+ if (false !== $timezone) {
+ $date->setTimezone($timezone);
+ }
+
+ return $date;
+ }
+
+ if (null === $date || 'now' === $date) {
+ return new DateTime($date, false !== $timezone ? $timezone : $env->getExtension('core')->getTimezone());
+ }
+
+ $asString = (string) $date;
+ if (ctype_digit($asString) || (!empty($asString) && '-' === $asString[0] && ctype_digit(substr($asString, 1)))) {
+ $date = new DateTime('@'.$date);
+ } else {
+ $date = new DateTime($date, $env->getExtension('core')->getTimezone());
+ }
+
+ if (false !== $timezone) {
+ $date->setTimezone($timezone);
+ }
+
+ return $date;
+}
+
+/**
+ * Replaces strings within a string.
+ *
+ * @param string $str String to replace in
+ * @param array|Traversable $from Replace values
+ * @param string|null $to Replace to, deprecated (@see http://php.net/manual/en/function.strtr.php)
+ *
+ * @return string
+ */
+function twig_replace_filter($str, $from, $to = null)
+{
+ if ($from instanceof Traversable) {
+ $from = iterator_to_array($from);
+ } elseif (is_string($from) && is_string($to)) {
+ @trigger_error('Using "replace" with character by character replacement is deprecated and will be removed in Twig 2.0', E_USER_DEPRECATED);
+
+ return strtr($str, $from, $to);
+ } elseif (!is_array($from)) {
+ throw new Twig_Error_Runtime(sprintf('The "replace" filter expects an array or "Traversable" as replace values, got "%s".',is_object($from) ? get_class($from) : gettype($from)));
+ }
+
+ return strtr($str, $from);
+}
+
+/**
+ * Rounds a number.
+ *
+ * @param int|float $value The value to round
+ * @param int|float $precision The rounding precision
+ * @param string $method The method to use for rounding
+ *
+ * @return int|float The rounded number
+ */
+function twig_round($value, $precision = 0, $method = 'common')
+{
+ if ('common' == $method) {
+ return round($value, $precision);
+ }
+
+ if ('ceil' != $method && 'floor' != $method) {
+ throw new Twig_Error_Runtime('The round filter only supports the "common", "ceil", and "floor" methods.');
+ }
+
+ return $method($value * pow(10, $precision)) / pow(10, $precision);
+}
+
+/**
+ * Number format filter.
+ *
+ * All of the formatting options can be left null, in that case the defaults will
+ * be used. Supplying any of the parameters will override the defaults set in the
+ * environment object.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $number A float/int/string of the number to format
+ * @param int $decimal The number of decimal points to display.
+ * @param string $decimalPoint The character(s) to use for the decimal point.
+ * @param string $thousandSep The character(s) to use for the thousands separator.
+ *
+ * @return string The formatted number
+ */
+function twig_number_format_filter(Twig_Environment $env, $number, $decimal = null, $decimalPoint = null, $thousandSep = null)
+{
+ $defaults = $env->getExtension('core')->getNumberFormat();
+ if (null === $decimal) {
+ $decimal = $defaults[0];
+ }
+
+ if (null === $decimalPoint) {
+ $decimalPoint = $defaults[1];
+ }
+
+ if (null === $thousandSep) {
+ $thousandSep = $defaults[2];
+ }
+
+ return number_format((float) $number, $decimal, $decimalPoint, $thousandSep);
+}
+
+/**
+ * URL encodes (RFC 3986) a string as a path segment or an array as a query string.
+ *
+ * @param string|array $url A URL or an array of query parameters
+ *
+ * @return string The URL encoded value
+ */
+function twig_urlencode_filter($url)
+{
+ if (is_array($url)) {
+ if (defined('PHP_QUERY_RFC3986')) {
+ return http_build_query($url, '', '&', PHP_QUERY_RFC3986);
+ }
+
+ return http_build_query($url, '', '&');
+ }
+
+ return rawurlencode($url);
+}
+
+if (PHP_VERSION_ID < 50300) {
+ /**
+ * JSON encodes a variable.
+ *
+ * @param mixed $value The value to encode.
+ * @param int $options Not used on PHP 5.2.x
+ *
+ * @return mixed The JSON encoded value
+ */
+ function twig_jsonencode_filter($value, $options = 0)
+ {
+ if ($value instanceof Twig_Markup) {
+ $value = (string) $value;
+ } elseif (is_array($value)) {
+ array_walk_recursive($value, '_twig_markup2string');
+ }
+
+ return json_encode($value);
+ }
+} else {
+ /**
+ * JSON encodes a variable.
+ *
+ * @param mixed $value The value to encode.
+ * @param int $options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT
+ *
+ * @return mixed The JSON encoded value
+ */
+ function twig_jsonencode_filter($value, $options = 0)
+ {
+ if ($value instanceof Twig_Markup) {
+ $value = (string) $value;
+ } elseif (is_array($value)) {
+ array_walk_recursive($value, '_twig_markup2string');
+ }
+
+ return json_encode($value, $options);
+ }
+}
+
+function _twig_markup2string(&$value)
+{
+ if ($value instanceof Twig_Markup) {
+ $value = (string) $value;
+ }
+}
+
+/**
+ * Merges an array with another one.
+ *
+ *
+ * {% set items = { 'apple': 'fruit', 'orange': 'fruit' } %}
+ *
+ * {% set items = items|merge({ 'peugeot': 'car' }) %}
+ *
+ * {# items now contains { 'apple': 'fruit', 'orange': 'fruit', 'peugeot': 'car' } #}
+ *
+ *
+ * @param array|Traversable $arr1 An array
+ * @param array|Traversable $arr2 An array
+ *
+ * @return array The merged array
+ */
+function twig_array_merge($arr1, $arr2)
+{
+ if ($arr1 instanceof Traversable) {
+ $arr1 = iterator_to_array($arr1);
+ } elseif (!is_array($arr1)) {
+ throw new Twig_Error_Runtime(sprintf('The merge filter only works with arrays or "Traversable", got "%s" as first argument.', gettype($arr1)));
+ }
+
+ if ($arr2 instanceof Traversable) {
+ $arr2 = iterator_to_array($arr2);
+ } elseif (!is_array($arr2)) {
+ throw new Twig_Error_Runtime(sprintf('The merge filter only works with arrays or "Traversable", got "%s" as second argument.', gettype($arr2)));
+ }
+
+ return array_merge($arr1, $arr2);
+}
+
+/**
+ * Slices a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $item A variable
+ * @param int $start Start of the slice
+ * @param int $length Size of the slice
+ * @param bool $preserveKeys Whether to preserve key or not (when the input is an array)
+ *
+ * @return mixed The sliced variable
+ */
+function twig_slice(Twig_Environment $env, $item, $start, $length = null, $preserveKeys = false)
+{
+ if ($item instanceof Traversable) {
+ if ($item instanceof IteratorAggregate) {
+ $item = $item->getIterator();
+ }
+
+ if ($start >= 0 && $length >= 0 && $item instanceof Iterator) {
+ try {
+ return iterator_to_array(new LimitIterator($item, $start, $length === null ? -1 : $length), $preserveKeys);
+ } catch (OutOfBoundsException $exception) {
+ return array();
+ }
+ }
+
+ $item = iterator_to_array($item, $preserveKeys);
+ }
+
+ if (is_array($item)) {
+ return array_slice($item, $start, $length, $preserveKeys);
+ }
+
+ $item = (string) $item;
+
+ if (function_exists('mb_get_info') && null !== $charset = $env->getCharset()) {
+ return (string) mb_substr($item, $start, null === $length ? mb_strlen($item, $charset) - $start : $length, $charset);
+ }
+
+ return (string) (null === $length ? substr($item, $start) : substr($item, $start, $length));
+}
+
+/**
+ * Returns the first element of the item.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $item A variable
+ *
+ * @return mixed The first element of the item
+ */
+function twig_first(Twig_Environment $env, $item)
+{
+ $elements = twig_slice($env, $item, 0, 1, false);
+
+ return is_string($elements) ? $elements : current($elements);
+}
+
+/**
+ * Returns the last element of the item.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $item A variable
+ *
+ * @return mixed The last element of the item
+ */
+function twig_last(Twig_Environment $env, $item)
+{
+ $elements = twig_slice($env, $item, -1, 1, false);
+
+ return is_string($elements) ? $elements : current($elements);
+}
+
+/**
+ * Joins the values to a string.
+ *
+ * The separator between elements is an empty string per default, you can define it with the optional parameter.
+ *
+ *
+ * {{ [1, 2, 3]|join('|') }}
+ * {# returns 1|2|3 #}
+ *
+ * {{ [1, 2, 3]|join }}
+ * {# returns 123 #}
+ *
+ *
+ * @param array $value An array
+ * @param string $glue The separator
+ *
+ * @return string The concatenated string
+ */
+function twig_join_filter($value, $glue = '')
+{
+ if ($value instanceof Traversable) {
+ $value = iterator_to_array($value, false);
+ }
+
+ return implode($glue, (array) $value);
+}
+
+/**
+ * Splits the string into an array.
+ *
+ *
+ * {{ "one,two,three"|split(',') }}
+ * {# returns [one, two, three] #}
+ *
+ * {{ "one,two,three,four,five"|split(',', 3) }}
+ * {# returns [one, two, "three,four,five"] #}
+ *
+ * {{ "123"|split('') }}
+ * {# returns [1, 2, 3] #}
+ *
+ * {{ "aabbcc"|split('', 2) }}
+ * {# returns [aa, bb, cc] #}
+ *
+ *
+ * @param string $value A string
+ * @param string $delimiter The delimiter
+ * @param int $limit The limit
+ *
+ * @return array The split string as an array
+ */
+function twig_split_filter(Twig_Environment $env, $value, $delimiter, $limit = null)
+{
+ if (!empty($delimiter)) {
+ return null === $limit ? explode($delimiter, $value) : explode($delimiter, $value, $limit);
+ }
+
+ if (!function_exists('mb_get_info') || null === $charset = $env->getCharset()) {
+ return str_split($value, null === $limit ? 1 : $limit);
+ }
+
+ if ($limit <= 1) {
+ return preg_split('/(?
+ * {% for key in array|keys %}
+ * {# ... #}
+ * {% endfor %}
+ *
+ *
+ * @param array $array An array
+ *
+ * @return array The keys
+ */
+function twig_get_array_keys_filter($array)
+{
+ if ($array instanceof Traversable) {
+ return array_keys(iterator_to_array($array));
+ }
+
+ if (!is_array($array)) {
+ return array();
+ }
+
+ return array_keys($array);
+}
+
+/**
+ * Reverses a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param array|Traversable|string $item An array, a Traversable instance, or a string
+ * @param bool $preserveKeys Whether to preserve key or not
+ *
+ * @return mixed The reversed input
+ */
+function twig_reverse_filter(Twig_Environment $env, $item, $preserveKeys = false)
+{
+ if ($item instanceof Traversable) {
+ return array_reverse(iterator_to_array($item), $preserveKeys);
+ }
+
+ if (is_array($item)) {
+ return array_reverse($item, $preserveKeys);
+ }
+
+ if (null !== $charset = $env->getCharset()) {
+ $string = (string) $item;
+
+ if ('UTF-8' != $charset) {
+ $item = twig_convert_encoding($string, 'UTF-8', $charset);
+ }
+
+ preg_match_all('/./us', $item, $matches);
+
+ $string = implode('', array_reverse($matches[0]));
+
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ }
+
+ return $string;
+ }
+
+ return strrev((string) $item);
+}
+
+/**
+ * Sorts an array.
+ *
+ * @param array|Traversable $array
+ *
+ * @return array
+ */
+function twig_sort_filter($array)
+{
+ if ($array instanceof Traversable) {
+ $array = iterator_to_array($array);
+ } elseif (!is_array($array)) {
+ throw new Twig_Error_Runtime(sprintf('The sort filter only works with arrays or "Traversable", got "%s".', gettype($array)));
+ }
+
+ asort($array);
+
+ return $array;
+}
+
+/**
+ * @internal
+ */
+function twig_in_filter($value, $compare)
+{
+ if (is_array($compare)) {
+ return in_array($value, $compare, is_object($value) || is_resource($value));
+ } elseif (is_string($compare) && (is_string($value) || is_int($value) || is_float($value))) {
+ return '' === $value || false !== strpos($compare, (string) $value);
+ } elseif ($compare instanceof Traversable) {
+ return in_array($value, iterator_to_array($compare, false), is_object($value) || is_resource($value));
+ }
+
+ return false;
+}
+
+/**
+ * Escapes a string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string The value to be escaped
+ * @param string $strategy The escaping strategy
+ * @param string $charset The charset
+ * @param bool $autoescape Whether the function is called by the auto-escaping feature (true) or by the developer (false)
+ *
+ * @return string
+ */
+function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html', $charset = null, $autoescape = false)
+{
+ if ($autoescape && $string instanceof Twig_Markup) {
+ return $string;
+ }
+
+ if (!is_string($string)) {
+ if (is_object($string) && method_exists($string, '__toString')) {
+ $string = (string) $string;
+ } else {
+ return $string;
+ }
+ }
+
+ if (null === $charset) {
+ $charset = $env->getCharset();
+ }
+
+ switch ($strategy) {
+ case 'html':
+ // see http://php.net/htmlspecialchars
+
+ // Using a static variable to avoid initializing the array
+ // each time the function is called. Moving the declaration on the
+ // top of the function slow downs other escaping strategies.
+ static $htmlspecialcharsCharsets;
+
+ if (null === $htmlspecialcharsCharsets) {
+ if (defined('HHVM_VERSION')) {
+ $htmlspecialcharsCharsets = array('utf-8' => true, 'UTF-8' => true);
+ } else {
+ $htmlspecialcharsCharsets = array(
+ 'ISO-8859-1' => true, 'ISO8859-1' => true,
+ 'ISO-8859-15' => true, 'ISO8859-15' => true,
+ 'utf-8' => true, 'UTF-8' => true,
+ 'CP866' => true, 'IBM866' => true, '866' => true,
+ 'CP1251' => true, 'WINDOWS-1251' => true, 'WIN-1251' => true,
+ '1251' => true,
+ 'CP1252' => true, 'WINDOWS-1252' => true, '1252' => true,
+ 'KOI8-R' => true, 'KOI8-RU' => true, 'KOI8R' => true,
+ 'BIG5' => true, '950' => true,
+ 'GB2312' => true, '936' => true,
+ 'BIG5-HKSCS' => true,
+ 'SHIFT_JIS' => true, 'SJIS' => true, '932' => true,
+ 'EUC-JP' => true, 'EUCJP' => true,
+ 'ISO8859-5' => true, 'ISO-8859-5' => true, 'MACROMAN' => true,
+ );
+ }
+ }
+
+ if (isset($htmlspecialcharsCharsets[$charset])) {
+ return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
+ }
+
+ if (isset($htmlspecialcharsCharsets[strtoupper($charset)])) {
+ // cache the lowercase variant for future iterations
+ $htmlspecialcharsCharsets[$charset] = true;
+
+ return htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, $charset);
+ }
+
+ $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ $string = htmlspecialchars($string, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
+
+ return twig_convert_encoding($string, $charset, 'UTF-8');
+
+ case 'js':
+ // escape all non-alphanumeric characters
+ // into their \xHH or \uHHHH representations
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ }
+
+ if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
+ throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
+ }
+
+ $string = preg_replace_callback('#[^a-zA-Z0-9,\._]#Su', '_twig_escape_js_callback', $string);
+
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ }
+
+ return $string;
+
+ case 'css':
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ }
+
+ if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
+ throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
+ }
+
+ $string = preg_replace_callback('#[^a-zA-Z0-9]#Su', '_twig_escape_css_callback', $string);
+
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ }
+
+ return $string;
+
+ case 'html_attr':
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, 'UTF-8', $charset);
+ }
+
+ if (0 == strlen($string) ? false : (1 == preg_match('/^./su', $string) ? false : true)) {
+ throw new Twig_Error_Runtime('The string to escape is not a valid UTF-8 string.');
+ }
+
+ $string = preg_replace_callback('#[^a-zA-Z0-9,\.\-_]#Su', '_twig_escape_html_attr_callback', $string);
+
+ if ('UTF-8' != $charset) {
+ $string = twig_convert_encoding($string, $charset, 'UTF-8');
+ }
+
+ return $string;
+
+ case 'url':
+ if (PHP_VERSION_ID < 50300) {
+ return str_replace('%7E', '~', rawurlencode($string));
+ }
+
+ return rawurlencode($string);
+
+ default:
+ static $escapers;
+
+ if (null === $escapers) {
+ $escapers = $env->getExtension('core')->getEscapers();
+ }
+
+ if (isset($escapers[$strategy])) {
+ return call_user_func($escapers[$strategy], $env, $string, $charset);
+ }
+
+ $validStrategies = implode(', ', array_merge(array('html', 'js', 'url', 'css', 'html_attr'), array_keys($escapers)));
+
+ throw new Twig_Error_Runtime(sprintf('Invalid escaping strategy "%s" (valid ones: %s).', $strategy, $validStrategies));
+ }
+}
+
+/**
+ * @internal
+ */
+function twig_escape_filter_is_safe(Twig_Node $filterArgs)
+{
+ foreach ($filterArgs as $arg) {
+ if ($arg instanceof Twig_Node_Expression_Constant) {
+ return array($arg->getAttribute('value'));
+ }
+
+ return array();
+ }
+
+ return array('html');
+}
+
+if (function_exists('mb_convert_encoding')) {
+ function twig_convert_encoding($string, $to, $from)
+ {
+ return mb_convert_encoding($string, $to, $from);
+ }
+} elseif (function_exists('iconv')) {
+ function twig_convert_encoding($string, $to, $from)
+ {
+ return iconv($from, $to, $string);
+ }
+} else {
+ function twig_convert_encoding($string, $to, $from)
+ {
+ throw new Twig_Error_Runtime('No suitable convert encoding function (use UTF-8 as your encoding or install the iconv or mbstring extension).');
+ }
+}
+
+function _twig_escape_js_callback($matches)
+{
+ $char = $matches[0];
+
+ // \xHH
+ if (!isset($char[1])) {
+ return '\\x'.strtoupper(substr('00'.bin2hex($char), -2));
+ }
+
+ // \uHHHH
+ $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
+
+ return '\\u'.strtoupper(substr('0000'.bin2hex($char), -4));
+}
+
+function _twig_escape_css_callback($matches)
+{
+ $char = $matches[0];
+
+ // \xHH
+ if (!isset($char[1])) {
+ $hex = ltrim(strtoupper(bin2hex($char)), '0');
+ if (0 === strlen($hex)) {
+ $hex = '0';
+ }
+
+ return '\\'.$hex.' ';
+ }
+
+ // \uHHHH
+ $char = twig_convert_encoding($char, 'UTF-16BE', 'UTF-8');
+
+ return '\\'.ltrim(strtoupper(bin2hex($char)), '0').' ';
+}
+
+/**
+ * This function is adapted from code coming from Zend Framework.
+ *
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license http://framework.zend.com/license/new-bsd New BSD License
+ */
+function _twig_escape_html_attr_callback($matches)
+{
+ /*
+ * While HTML supports far more named entities, the lowest common denominator
+ * has become HTML5's XML Serialisation which is restricted to the those named
+ * entities that XML supports. Using HTML entities would result in this error:
+ * XML Parsing Error: undefined entity
+ */
+ static $entityMap = array(
+ 34 => 'quot', /* quotation mark */
+ 38 => 'amp', /* ampersand */
+ 60 => 'lt', /* less-than sign */
+ 62 => 'gt', /* greater-than sign */
+ );
+
+ $chr = $matches[0];
+ $ord = ord($chr);
+
+ /*
+ * The following replaces characters undefined in HTML with the
+ * hex entity for the Unicode replacement character.
+ */
+ if (($ord <= 0x1f && $chr != "\t" && $chr != "\n" && $chr != "\r") || ($ord >= 0x7f && $ord <= 0x9f)) {
+ return '�';
+ }
+
+ /*
+ * Check if the current character to escape has a name entity we should
+ * replace it with while grabbing the hex value of the character.
+ */
+ if (strlen($chr) == 1) {
+ $hex = strtoupper(substr('00'.bin2hex($chr), -2));
+ } else {
+ $chr = twig_convert_encoding($chr, 'UTF-16BE', 'UTF-8');
+ $hex = strtoupper(substr('0000'.bin2hex($chr), -4));
+ }
+
+ $int = hexdec($hex);
+ if (array_key_exists($int, $entityMap)) {
+ return sprintf('&%s;', $entityMap[$int]);
+ }
+
+ /*
+ * Per OWASP recommendations, we'll use hex entities for any other
+ * characters where a named entity does not exist.
+ */
+ return sprintf('&#x%s;', $hex);
+}
+
+// add multibyte extensions if possible
+if (function_exists('mb_get_info')) {
+ /**
+ * Returns the length of a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $thing A variable
+ *
+ * @return int The length of the value
+ */
+ function twig_length_filter(Twig_Environment $env, $thing)
+ {
+ return is_scalar($thing) ? mb_strlen($thing, $env->getCharset()) : count($thing);
+ }
+
+ /**
+ * Converts a string to uppercase.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The uppercased string
+ */
+ function twig_upper_filter(Twig_Environment $env, $string)
+ {
+ if (null !== ($charset = $env->getCharset())) {
+ return mb_strtoupper($string, $charset);
+ }
+
+ return strtoupper($string);
+ }
+
+ /**
+ * Converts a string to lowercase.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The lowercased string
+ */
+ function twig_lower_filter(Twig_Environment $env, $string)
+ {
+ if (null !== ($charset = $env->getCharset())) {
+ return mb_strtolower($string, $charset);
+ }
+
+ return strtolower($string);
+ }
+
+ /**
+ * Returns a titlecased string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The titlecased string
+ */
+ function twig_title_string_filter(Twig_Environment $env, $string)
+ {
+ if (null !== ($charset = $env->getCharset())) {
+ return mb_convert_case($string, MB_CASE_TITLE, $charset);
+ }
+
+ return ucwords(strtolower($string));
+ }
+
+ /**
+ * Returns a capitalized string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The capitalized string
+ */
+ function twig_capitalize_string_filter(Twig_Environment $env, $string)
+ {
+ if (null !== $charset = $env->getCharset()) {
+ return mb_strtoupper(mb_substr($string, 0, 1, $charset), $charset).mb_strtolower(mb_substr($string, 1, mb_strlen($string, $charset), $charset), $charset);
+ }
+
+ return ucfirst(strtolower($string));
+ }
+}
+// and byte fallback
+else {
+ /**
+ * Returns the length of a variable.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param mixed $thing A variable
+ *
+ * @return int The length of the value
+ */
+ function twig_length_filter(Twig_Environment $env, $thing)
+ {
+ return is_scalar($thing) ? strlen($thing) : count($thing);
+ }
+
+ /**
+ * Returns a titlecased string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The titlecased string
+ */
+ function twig_title_string_filter(Twig_Environment $env, $string)
+ {
+ return ucwords(strtolower($string));
+ }
+
+ /**
+ * Returns a capitalized string.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ * @param string $string A string
+ *
+ * @return string The capitalized string
+ */
+ function twig_capitalize_string_filter(Twig_Environment $env, $string)
+ {
+ return ucfirst(strtolower($string));
+ }
+}
+
+/**
+ * @internal
+ */
+function twig_ensure_traversable($seq)
+{
+ if ($seq instanceof Traversable || is_array($seq)) {
+ return $seq;
+ }
+
+ return array();
+}
+
+/**
+ * Checks if a variable is empty.
+ *
+ *
+ * {# evaluates to true if the foo variable is null, false, or the empty string #}
+ * {% if foo is empty %}
+ * {# ... #}
+ * {% endif %}
+ *
+ *
+ * @param mixed $value A variable
+ *
+ * @return bool true if the value is empty, false otherwise
+ */
+function twig_test_empty($value)
+{
+ if ($value instanceof Countable) {
+ return 0 == count($value);
+ }
+
+ return '' === $value || false === $value || null === $value || array() === $value;
+}
+
+/**
+ * Checks if a variable is traversable.
+ *
+ *
+ * {# evaluates to true if the foo variable is an array or a traversable object #}
+ * {% if foo is traversable %}
+ * {# ... #}
+ * {% endif %}
+ *
+ *
+ * @param mixed $value A variable
+ *
+ * @return bool true if the value is traversable
+ */
+function twig_test_iterable($value)
+{
+ return $value instanceof Traversable || is_array($value);
+}
+
+/**
+ * Renders a template.
+ *
+ * @param Twig_Environment $env
+ * @param array $context
+ * @param string|array $template The template to render or an array of templates to try consecutively
+ * @param array $variables The variables to pass to the template
+ * @param bool $withContext
+ * @param bool $ignoreMissing Whether to ignore missing templates or not
+ * @param bool $sandboxed Whether to sandbox the template or not
+ *
+ * @return string The rendered template
+ */
+function twig_include(Twig_Environment $env, $context, $template, $variables = array(), $withContext = true, $ignoreMissing = false, $sandboxed = false)
+{
+ $alreadySandboxed = false;
+ $sandbox = null;
+ if ($withContext) {
+ $variables = array_merge($context, $variables);
+ }
+
+ if ($isSandboxed = $sandboxed && $env->hasExtension('sandbox')) {
+ $sandbox = $env->getExtension('sandbox');
+ if (!$alreadySandboxed = $sandbox->isSandboxed()) {
+ $sandbox->enableSandbox();
+ }
+ }
+
+ $result = null;
+ try {
+ $result = $env->resolveTemplate($template)->render($variables);
+ } catch (Twig_Error_Loader $e) {
+ if (!$ignoreMissing) {
+ if ($isSandboxed && !$alreadySandboxed) {
+ $sandbox->disableSandbox();
+ }
+
+ throw $e;
+ }
+ }
+
+ if ($isSandboxed && !$alreadySandboxed) {
+ $sandbox->disableSandbox();
+ }
+
+ return $result;
+}
+
+/**
+ * Returns a template content without rendering it.
+ *
+ * @param string $name The template name
+ * @param bool $ignoreMissing Whether to ignore missing templates or not
+ *
+ * @return string The template source
+ */
+function twig_source(Twig_Environment $env, $name, $ignoreMissing = false)
+{
+ try {
+ return $env->getLoader()->getSource($name);
+ } catch (Twig_Error_Loader $e) {
+ if (!$ignoreMissing) {
+ throw $e;
+ }
+ }
+}
+
+/**
+ * Provides the ability to get constants from instances as well as class/global constants.
+ *
+ * @param string $constant The name of the constant
+ * @param null|object $object The object to get the constant from
+ *
+ * @return string
+ */
+function twig_constant($constant, $object = null)
+{
+ if (null !== $object) {
+ $constant = get_class($object).'::'.$constant;
+ }
+
+ return constant($constant);
+}
+
+/**
+ * Batches item.
+ *
+ * @param array $items An array of items
+ * @param int $size The size of the batch
+ * @param mixed $fill A value used to fill missing items
+ *
+ * @return array
+ */
+function twig_array_batch($items, $size, $fill = null)
+{
+ if ($items instanceof Traversable) {
+ $items = iterator_to_array($items, false);
+ }
+
+ $size = ceil($size);
+
+ $result = array_chunk($items, $size, true);
+
+ if (null !== $fill && !empty($result)) {
+ $last = count($result) - 1;
+ if ($fillCount = $size - count($result[$last])) {
+ $result[$last] = array_merge(
+ $result[$last],
+ array_fill(0, $fillCount, $fill)
+ );
+ }
+ }
+
+ return $result;
+}
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Debug.php b/vendor/twig/twig/lib/Twig/Extension/Debug.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension/Debug.php
rename to vendor/twig/twig/lib/Twig/Extension/Debug.php
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Escaper.php b/vendor/twig/twig/lib/Twig/Extension/Escaper.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension/Escaper.php
rename to vendor/twig/twig/lib/Twig/Extension/Escaper.php
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Optimizer.php b/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension/Optimizer.php
rename to vendor/twig/twig/lib/Twig/Extension/Optimizer.php
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Profiler.php b/vendor/twig/twig/lib/Twig/Extension/Profiler.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension/Profiler.php
rename to vendor/twig/twig/lib/Twig/Extension/Profiler.php
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Sandbox.php b/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension/Sandbox.php
rename to vendor/twig/twig/lib/Twig/Extension/Sandbox.php
diff --git a/vendor/twig/twig/lib/Twig/Extension/Staging.php b/vendor/twig/twig/lib/Twig/Extension/Staging.php
new file mode 100644
index 0000000..583e6a9
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Extension/Staging.php
@@ -0,0 +1,115 @@
+
+ *
+ * @internal
+ */
+class Twig_Extension_Staging extends Twig_Extension
+{
+ protected $functions = array();
+ protected $filters = array();
+ protected $visitors = array();
+ protected $tokenParsers = array();
+ protected $globals = array();
+ protected $tests = array();
+
+ public function addFunction($name, $function)
+ {
+ $this->functions[$name] = $function;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFunctions()
+ {
+ return $this->functions;
+ }
+
+ public function addFilter($name, $filter)
+ {
+ $this->filters[$name] = $filter;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getFilters()
+ {
+ return $this->filters;
+ }
+
+ public function addNodeVisitor(Twig_NodeVisitorInterface $visitor)
+ {
+ $this->visitors[] = $visitor;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getNodeVisitors()
+ {
+ return $this->visitors;
+ }
+
+ public function addTokenParser(Twig_TokenParserInterface $parser)
+ {
+ $this->tokenParsers[] = $parser;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTokenParsers()
+ {
+ return $this->tokenParsers;
+ }
+
+ public function addGlobal($name, $value)
+ {
+ $this->globals[$name] = $value;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getGlobals()
+ {
+ return $this->globals;
+ }
+
+ public function addTest($name, $test)
+ {
+ $this->tests[$name] = $test;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getTests()
+ {
+ return $this->tests;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getName()
+ {
+ return 'staging';
+ }
+}
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/StringLoader.php b/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Extension/StringLoader.php
rename to vendor/twig/twig/lib/Twig/Extension/StringLoader.php
diff --git a/core/vendor/twig/twig/lib/Twig/ExtensionInterface.php b/vendor/twig/twig/lib/Twig/ExtensionInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/ExtensionInterface.php
rename to vendor/twig/twig/lib/Twig/ExtensionInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php b/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
rename to vendor/twig/twig/lib/Twig/FileExtensionEscapingStrategy.php
diff --git a/core/vendor/twig/twig/lib/Twig/Filter.php b/vendor/twig/twig/lib/Twig/Filter.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Filter.php
rename to vendor/twig/twig/lib/Twig/Filter.php
diff --git a/core/vendor/twig/twig/lib/Twig/Filter/Function.php b/vendor/twig/twig/lib/Twig/Filter/Function.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Filter/Function.php
rename to vendor/twig/twig/lib/Twig/Filter/Function.php
diff --git a/core/vendor/twig/twig/lib/Twig/Filter/Method.php b/vendor/twig/twig/lib/Twig/Filter/Method.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Filter/Method.php
rename to vendor/twig/twig/lib/Twig/Filter/Method.php
diff --git a/core/vendor/twig/twig/lib/Twig/Filter/Node.php b/vendor/twig/twig/lib/Twig/Filter/Node.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Filter/Node.php
rename to vendor/twig/twig/lib/Twig/Filter/Node.php
diff --git a/core/vendor/twig/twig/lib/Twig/FilterCallableInterface.php b/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/FilterCallableInterface.php
rename to vendor/twig/twig/lib/Twig/FilterCallableInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/FilterInterface.php b/vendor/twig/twig/lib/Twig/FilterInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/FilterInterface.php
rename to vendor/twig/twig/lib/Twig/FilterInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Function.php b/vendor/twig/twig/lib/Twig/Function.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Function.php
rename to vendor/twig/twig/lib/Twig/Function.php
diff --git a/core/vendor/twig/twig/lib/Twig/Function/Function.php b/vendor/twig/twig/lib/Twig/Function/Function.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Function/Function.php
rename to vendor/twig/twig/lib/Twig/Function/Function.php
diff --git a/core/vendor/twig/twig/lib/Twig/Function/Method.php b/vendor/twig/twig/lib/Twig/Function/Method.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Function/Method.php
rename to vendor/twig/twig/lib/Twig/Function/Method.php
diff --git a/core/vendor/twig/twig/lib/Twig/Function/Node.php b/vendor/twig/twig/lib/Twig/Function/Node.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Function/Node.php
rename to vendor/twig/twig/lib/Twig/Function/Node.php
diff --git a/core/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php b/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
rename to vendor/twig/twig/lib/Twig/FunctionCallableInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/FunctionInterface.php b/vendor/twig/twig/lib/Twig/FunctionInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/FunctionInterface.php
rename to vendor/twig/twig/lib/Twig/FunctionInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Lexer.php b/vendor/twig/twig/lib/Twig/Lexer.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Lexer.php
rename to vendor/twig/twig/lib/Twig/Lexer.php
diff --git a/core/vendor/twig/twig/lib/Twig/LexerInterface.php b/vendor/twig/twig/lib/Twig/LexerInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/LexerInterface.php
rename to vendor/twig/twig/lib/Twig/LexerInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Loader/Array.php b/vendor/twig/twig/lib/Twig/Loader/Array.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Loader/Array.php
rename to vendor/twig/twig/lib/Twig/Loader/Array.php
diff --git a/core/vendor/twig/twig/lib/Twig/Loader/Chain.php b/vendor/twig/twig/lib/Twig/Loader/Chain.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Loader/Chain.php
rename to vendor/twig/twig/lib/Twig/Loader/Chain.php
diff --git a/core/vendor/twig/twig/lib/Twig/Loader/Filesystem.php b/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Loader/Filesystem.php
rename to vendor/twig/twig/lib/Twig/Loader/Filesystem.php
diff --git a/vendor/twig/twig/lib/Twig/Loader/String.php b/vendor/twig/twig/lib/Twig/Loader/String.php
new file mode 100644
index 0000000..00f507a
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Loader/String.php
@@ -0,0 +1,63 @@
+
+ */
+class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function getSource($name)
+ {
+ return $name;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function exists($name)
+ {
+ return true;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function getCacheKey($name)
+ {
+ return $name;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function isFresh($name, $time)
+ {
+ return true;
+ }
+}
diff --git a/core/vendor/twig/twig/lib/Twig/LoaderInterface.php b/vendor/twig/twig/lib/Twig/LoaderInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/LoaderInterface.php
rename to vendor/twig/twig/lib/Twig/LoaderInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Markup.php b/vendor/twig/twig/lib/Twig/Markup.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Markup.php
rename to vendor/twig/twig/lib/Twig/Markup.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node.php b/vendor/twig/twig/lib/Twig/Node.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node.php
rename to vendor/twig/twig/lib/Twig/Node.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/AutoEscape.php b/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/AutoEscape.php
rename to vendor/twig/twig/lib/Twig/Node/AutoEscape.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Block.php b/vendor/twig/twig/lib/Twig/Node/Block.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Block.php
rename to vendor/twig/twig/lib/Twig/Node/Block.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/BlockReference.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/BlockReference.php
rename to vendor/twig/twig/lib/Twig/Node/BlockReference.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Body.php b/vendor/twig/twig/lib/Twig/Node/Body.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Body.php
rename to vendor/twig/twig/lib/Twig/Node/Body.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php b/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
rename to vendor/twig/twig/lib/Twig/Node/CheckSecurity.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Do.php b/vendor/twig/twig/lib/Twig/Node/Do.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Do.php
rename to vendor/twig/twig/lib/Twig/Node/Do.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Embed.php b/vendor/twig/twig/lib/Twig/Node/Embed.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Embed.php
rename to vendor/twig/twig/lib/Twig/Node/Embed.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression.php b/vendor/twig/twig/lib/Twig/Node/Expression.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression.php
rename to vendor/twig/twig/lib/Twig/Node/Expression.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Array.php b/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Array.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Array.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php b/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/AssignName.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Add.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/And.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseOr.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/BitwiseXor.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Concat.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Div.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/EndsWith.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Equal.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/FloorDiv.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Greater.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/GreaterEqual.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/In.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Less.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/LessEqual.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Matches.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mod.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Mul.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotEqual.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/NotIn.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Or.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Power.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Range.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/StartsWith.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php b/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Binary/Sub.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/BlockReference.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Call.php b/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Call.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Call.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php b/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Conditional.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Constant.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php b/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/ExtensionReference.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Filter.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php b/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Filter/Default.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Function.php b/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Function.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Function.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php b/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/GetAttr.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php b/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/MethodCall.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Name.php b/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Name.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Name.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php b/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Parent.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php b/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/TempName.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Constant.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Defined.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Divisibleby.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Even.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Null.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Odd.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php b/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Test/Sameas.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary/Neg.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary/Not.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php b/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
rename to vendor/twig/twig/lib/Twig/Node/Expression/Unary/Pos.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Flush.php b/vendor/twig/twig/lib/Twig/Node/Flush.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Flush.php
rename to vendor/twig/twig/lib/Twig/Node/Flush.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/For.php b/vendor/twig/twig/lib/Twig/Node/For.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/For.php
rename to vendor/twig/twig/lib/Twig/Node/For.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/ForLoop.php b/vendor/twig/twig/lib/Twig/Node/ForLoop.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/ForLoop.php
rename to vendor/twig/twig/lib/Twig/Node/ForLoop.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/If.php b/vendor/twig/twig/lib/Twig/Node/If.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/If.php
rename to vendor/twig/twig/lib/Twig/Node/If.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Import.php b/vendor/twig/twig/lib/Twig/Node/Import.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Import.php
rename to vendor/twig/twig/lib/Twig/Node/Import.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Include.php b/vendor/twig/twig/lib/Twig/Node/Include.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Include.php
rename to vendor/twig/twig/lib/Twig/Node/Include.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Macro.php b/vendor/twig/twig/lib/Twig/Node/Macro.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Macro.php
rename to vendor/twig/twig/lib/Twig/Node/Macro.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Module.php b/vendor/twig/twig/lib/Twig/Node/Module.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Module.php
rename to vendor/twig/twig/lib/Twig/Node/Module.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Print.php b/vendor/twig/twig/lib/Twig/Node/Print.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Print.php
rename to vendor/twig/twig/lib/Twig/Node/Print.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Sandbox.php b/vendor/twig/twig/lib/Twig/Node/Sandbox.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Sandbox.php
rename to vendor/twig/twig/lib/Twig/Node/Sandbox.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php b/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
rename to vendor/twig/twig/lib/Twig/Node/SandboxedPrint.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Set.php b/vendor/twig/twig/lib/Twig/Node/Set.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Set.php
rename to vendor/twig/twig/lib/Twig/Node/Set.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/SetTemp.php b/vendor/twig/twig/lib/Twig/Node/SetTemp.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/SetTemp.php
rename to vendor/twig/twig/lib/Twig/Node/SetTemp.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Spaceless.php b/vendor/twig/twig/lib/Twig/Node/Spaceless.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Spaceless.php
rename to vendor/twig/twig/lib/Twig/Node/Spaceless.php
diff --git a/core/vendor/twig/twig/lib/Twig/Node/Text.php b/vendor/twig/twig/lib/Twig/Node/Text.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Node/Text.php
rename to vendor/twig/twig/lib/Twig/Node/Text.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeInterface.php b/vendor/twig/twig/lib/Twig/NodeInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeInterface.php
rename to vendor/twig/twig/lib/Twig/NodeInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeOutputInterface.php b/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeOutputInterface.php
rename to vendor/twig/twig/lib/Twig/NodeOutputInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeTraverser.php b/vendor/twig/twig/lib/Twig/NodeTraverser.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeTraverser.php
rename to vendor/twig/twig/lib/Twig/NodeTraverser.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/Escaper.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/Optimizer.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php b/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/SafeAnalysis.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php b/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
rename to vendor/twig/twig/lib/Twig/NodeVisitor/Sandbox.php
diff --git a/core/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php b/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
rename to vendor/twig/twig/lib/Twig/NodeVisitorInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Parser.php b/vendor/twig/twig/lib/Twig/Parser.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Parser.php
rename to vendor/twig/twig/lib/Twig/Parser.php
diff --git a/core/vendor/twig/twig/lib/Twig/ParserInterface.php b/vendor/twig/twig/lib/Twig/ParserInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/ParserInterface.php
rename to vendor/twig/twig/lib/Twig/ParserInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
rename to vendor/twig/twig/lib/Twig/Profiler/Dumper/Blackfire.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
rename to vendor/twig/twig/lib/Twig/Profiler/Dumper/Html.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php b/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
rename to vendor/twig/twig/lib/Twig/Profiler/Dumper/Text.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php b/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
rename to vendor/twig/twig/lib/Twig/Profiler/Node/EnterProfile.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php b/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
rename to vendor/twig/twig/lib/Twig/Profiler/Node/LeaveProfile.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php b/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
rename to vendor/twig/twig/lib/Twig/Profiler/NodeVisitor/Profiler.php
diff --git a/core/vendor/twig/twig/lib/Twig/Profiler/Profile.php b/vendor/twig/twig/lib/Twig/Profiler/Profile.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Profiler/Profile.php
rename to vendor/twig/twig/lib/Twig/Profiler/Profile.php
diff --git a/core/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityError.php
diff --git a/core/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
diff --git a/core/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
diff --git a/core/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
diff --git a/core/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicy.php
diff --git a/core/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php b/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
rename to vendor/twig/twig/lib/Twig/Sandbox/SecurityPolicyInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/SimpleFilter.php b/vendor/twig/twig/lib/Twig/SimpleFilter.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/SimpleFilter.php
rename to vendor/twig/twig/lib/Twig/SimpleFilter.php
diff --git a/core/vendor/twig/twig/lib/Twig/SimpleFunction.php b/vendor/twig/twig/lib/Twig/SimpleFunction.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/SimpleFunction.php
rename to vendor/twig/twig/lib/Twig/SimpleFunction.php
diff --git a/core/vendor/twig/twig/lib/Twig/SimpleTest.php b/vendor/twig/twig/lib/Twig/SimpleTest.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/SimpleTest.php
rename to vendor/twig/twig/lib/Twig/SimpleTest.php
diff --git a/vendor/twig/twig/lib/Twig/Template.php b/vendor/twig/twig/lib/Twig/Template.php
new file mode 100644
index 0000000..a816022
--- /dev/null
+++ b/vendor/twig/twig/lib/Twig/Template.php
@@ -0,0 +1,614 @@
+
+ */
+abstract class Twig_Template implements Twig_TemplateInterface
+{
+ protected static $cache = array();
+
+ protected $parent;
+ protected $parents = array();
+ protected $env;
+ protected $blocks = array();
+ protected $traits = array();
+
+ /**
+ * Constructor.
+ *
+ * @param Twig_Environment $env A Twig_Environment instance
+ */
+ public function __construct(Twig_Environment $env)
+ {
+ $this->env = $env;
+ }
+
+ /**
+ * Returns the template name.
+ *
+ * @return string The template name
+ */
+ abstract public function getTemplateName();
+
+ /**
+ * @deprecated since 1.20 (to be removed in 2.0)
+ */
+ public function getEnvironment()
+ {
+ @trigger_error('The '.__METHOD__.' method is deprecated since version 1.20 and will be removed in 2.0.', E_USER_DEPRECATED);
+
+ return $this->env;
+ }
+
+ /**
+ * Returns the parent template.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @param array $context
+ *
+ * @return Twig_TemplateInterface|false The parent template or false if there is no parent
+ *
+ * @internal
+ */
+ public function getParent(array $context)
+ {
+ if (null !== $this->parent) {
+ return $this->parent;
+ }
+
+ try {
+ $parent = $this->doGetParent($context);
+
+ if (false === $parent) {
+ return false;
+ }
+
+ if ($parent instanceof self) {
+ return $this->parents[$parent->getTemplateName()] = $parent;
+ }
+
+ if (!isset($this->parents[$parent])) {
+ $this->parents[$parent] = $this->loadTemplate($parent);
+ }
+ } catch (Twig_Error_Loader $e) {
+ $e->setTemplateFile(null);
+ $e->guess();
+
+ throw $e;
+ }
+
+ return $this->parents[$parent];
+ }
+
+ protected function doGetParent(array $context)
+ {
+ return false;
+ }
+
+ public function isTraitable()
+ {
+ return true;
+ }
+
+ /**
+ * Displays a parent block.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @param string $name The block name to display from the parent
+ * @param array $context The context
+ * @param array $blocks The current set of blocks
+ *
+ * @internal
+ */
+ public function displayParentBlock($name, array $context, array $blocks = array())
+ {
+ $name = (string) $name;
+
+ if (isset($this->traits[$name])) {
+ $this->traits[$name][0]->displayBlock($name, $context, $blocks, false);
+ } elseif (false !== $parent = $this->getParent($context)) {
+ $parent->displayBlock($name, $context, $blocks, false);
+ } else {
+ throw new Twig_Error_Runtime(sprintf('The template has no parent and no traits defining the "%s" block', $name), -1, $this->getTemplateName());
+ }
+ }
+
+ /**
+ * Displays a block.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @param string $name The block name to display
+ * @param array $context The context
+ * @param array $blocks The current set of blocks
+ * @param bool $useBlocks Whether to use the current set of blocks
+ *
+ * @internal
+ */
+ public function displayBlock($name, array $context, array $blocks = array(), $useBlocks = true)
+ {
+ $name = (string) $name;
+
+ if ($useBlocks && isset($blocks[$name])) {
+ $template = $blocks[$name][0];
+ $block = $blocks[$name][1];
+ } elseif (isset($this->blocks[$name])) {
+ $template = $this->blocks[$name][0];
+ $block = $this->blocks[$name][1];
+ } else {
+ $template = null;
+ $block = null;
+ }
+
+ if (null !== $template) {
+ // avoid RCEs when sandbox is enabled
+ if (!$template instanceof self) {
+ throw new LogicException('A block must be a method on a Twig_Template instance.');
+ }
+
+ try {
+ $template->$block($context, $blocks);
+ } catch (Twig_Error $e) {
+ if (!$e->getTemplateFile()) {
+ $e->setTemplateFile($template->getTemplateName());
+ }
+
+ // this is mostly useful for Twig_Error_Loader exceptions
+ // see Twig_Error_Loader
+ if (false === $e->getTemplateLine()) {
+ $e->setTemplateLine(-1);
+ $e->guess();
+ }
+
+ throw $e;
+ } catch (Exception $e) {
+ throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $template->getTemplateName(), $e);
+ }
+ } elseif (false !== $parent = $this->getParent($context)) {
+ $parent->displayBlock($name, $context, array_merge($this->blocks, $blocks), false);
+ }
+ }
+
+ /**
+ * Renders a parent block.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @param string $name The block name to render from the parent
+ * @param array $context The context
+ * @param array $blocks The current set of blocks
+ *
+ * @return string The rendered block
+ *
+ * @internal
+ */
+ public function renderParentBlock($name, array $context, array $blocks = array())
+ {
+ ob_start();
+ $this->displayParentBlock($name, $context, $blocks);
+
+ return ob_get_clean();
+ }
+
+ /**
+ * Renders a block.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @param string $name The block name to render
+ * @param array $context The context
+ * @param array $blocks The current set of blocks
+ * @param bool $useBlocks Whether to use the current set of blocks
+ *
+ * @return string The rendered block
+ *
+ * @internal
+ */
+ public function renderBlock($name, array $context, array $blocks = array(), $useBlocks = true)
+ {
+ ob_start();
+ $this->displayBlock($name, $context, $blocks, $useBlocks);
+
+ return ob_get_clean();
+ }
+
+ /**
+ * Returns whether a block exists or not.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * This method does only return blocks defined in the current template
+ * or defined in "used" traits.
+ *
+ * It does not return blocks from parent templates as the parent
+ * template name can be dynamic, which is only known based on the
+ * current context.
+ *
+ * @param string $name The block name
+ *
+ * @return bool true if the block exists, false otherwise
+ *
+ * @internal
+ */
+ public function hasBlock($name)
+ {
+ return isset($this->blocks[(string) $name]);
+ }
+
+ /**
+ * Returns all block names.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @return array An array of block names
+ *
+ * @see hasBlock
+ *
+ * @internal
+ */
+ public function getBlockNames()
+ {
+ return array_keys($this->blocks);
+ }
+
+ protected function loadTemplate($template, $templateName = null, $line = null, $index = null)
+ {
+ try {
+ if (is_array($template)) {
+ return $this->env->resolveTemplate($template);
+ }
+
+ if ($template instanceof self) {
+ return $template;
+ }
+
+ return $this->env->loadTemplate($template, $index);
+ } catch (Twig_Error $e) {
+ if (!$e->getTemplateFile()) {
+ $e->setTemplateFile($templateName ? $templateName : $this->getTemplateName());
+ }
+
+ if ($e->getTemplateLine()) {
+ throw $e;
+ }
+
+ if (!$line) {
+ $e->guess();
+ } else {
+ $e->setTemplateLine($line);
+ }
+
+ throw $e;
+ }
+ }
+
+ /**
+ * Returns all blocks.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * @return array An array of blocks
+ *
+ * @see hasBlock
+ *
+ * @internal
+ */
+ public function getBlocks()
+ {
+ return $this->blocks;
+ }
+
+ /**
+ * Returns the template source code.
+ *
+ * @return string|null The template source code or null if it is not available
+ */
+ public function getSource()
+ {
+ $reflector = new ReflectionClass($this);
+ $file = $reflector->getFileName();
+
+ if (!file_exists($file)) {
+ return;
+ }
+
+ $source = file($file, FILE_IGNORE_NEW_LINES);
+ array_splice($source, 0, $reflector->getEndLine());
+
+ $i = 0;
+ while (isset($source[$i]) && '/* */' === substr_replace($source[$i], '', 3, -2)) {
+ $source[$i] = str_replace('*//* ', '*/', substr($source[$i], 3, -2));
+ ++$i;
+ }
+ array_splice($source, $i);
+
+ return implode("\n", $source);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function display(array $context, array $blocks = array())
+ {
+ $this->displayWithErrorHandling($this->env->mergeGlobals($context), array_merge($this->blocks, $blocks));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function render(array $context)
+ {
+ $level = ob_get_level();
+ ob_start();
+ try {
+ $this->display($context);
+ } catch (Exception $e) {
+ while (ob_get_level() > $level) {
+ ob_end_clean();
+ }
+
+ throw $e;
+ }
+
+ return ob_get_clean();
+ }
+
+ protected function displayWithErrorHandling(array $context, array $blocks = array())
+ {
+ try {
+ $this->doDisplay($context, $blocks);
+ } catch (Twig_Error $e) {
+ if (!$e->getTemplateFile()) {
+ $e->setTemplateFile($this->getTemplateName());
+ }
+
+ // this is mostly useful for Twig_Error_Loader exceptions
+ // see Twig_Error_Loader
+ if (false === $e->getTemplateLine()) {
+ $e->setTemplateLine(-1);
+ $e->guess();
+ }
+
+ throw $e;
+ } catch (Exception $e) {
+ throw new Twig_Error_Runtime(sprintf('An exception has been thrown during the rendering of a template ("%s").', $e->getMessage()), -1, $this->getTemplateName(), $e);
+ }
+ }
+
+ /**
+ * Auto-generated method to display the template with the given context.
+ *
+ * @param array $context An array of parameters to pass to the template
+ * @param array $blocks An array of blocks to pass to the template
+ */
+ abstract protected function doDisplay(array $context, array $blocks = array());
+
+ /**
+ * Returns a variable from the context.
+ *
+ * This method is for internal use only and should never be called
+ * directly.
+ *
+ * This method should not be overridden in a sub-class as this is an
+ * implementation detail that has been introduced to optimize variable
+ * access for versions of PHP before 5.4. This is not a way to override
+ * the way to get a variable value.
+ *
+ * @param array $context The context
+ * @param string $item The variable to return from the context
+ * @param bool $ignoreStrictCheck Whether to ignore the strict variable check or not
+ *
+ * @return mixed The content of the context variable
+ *
+ * @throws Twig_Error_Runtime if the variable does not exist and Twig is running in strict mode
+ *
+ * @internal
+ */
+ final protected function getContext($context, $item, $ignoreStrictCheck = false)
+ {
+ if (!array_key_exists($item, $context)) {
+ if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
+ return;
+ }
+
+ throw new Twig_Error_Runtime(sprintf('Variable "%s" does not exist', $item), -1, $this->getTemplateName());
+ }
+
+ return $context[$item];
+ }
+
+ /**
+ * Returns the attribute value for a given array/object.
+ *
+ * @param mixed $object The object or array from where to get the item
+ * @param mixed $item The item to get from the array or object
+ * @param array $arguments An array of arguments to pass if the item is an object method
+ * @param string $type The type of attribute (@see Twig_Template constants)
+ * @param bool $isDefinedTest Whether this is only a defined check
+ * @param bool $ignoreStrictCheck Whether to ignore the strict attribute check or not
+ *
+ * @return mixed The attribute value, or a Boolean when $isDefinedTest is true, or null when the attribute is not set and $ignoreStrictCheck is true
+ *
+ * @throws Twig_Error_Runtime if the attribute does not exist and Twig is running in strict mode and $isDefinedTest is false
+ */
+ protected function getAttribute($object, $item, array $arguments = array(), $type = self::ANY_CALL, $isDefinedTest = false, $ignoreStrictCheck = false)
+ {
+ // array
+ if (self::METHOD_CALL !== $type) {
+ $arrayItem = is_bool($item) || is_float($item) ? (int) $item : $item;
+
+ if ((is_array($object) && array_key_exists($arrayItem, $object))
+ || ($object instanceof ArrayAccess && isset($object[$arrayItem]))
+ ) {
+ if ($isDefinedTest) {
+ return true;
+ }
+
+ return $object[$arrayItem];
+ }
+
+ if (self::ARRAY_CALL === $type || !is_object($object)) {
+ if ($isDefinedTest) {
+ return false;
+ }
+
+ if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
+ return;
+ }
+
+ if ($object instanceof ArrayAccess) {
+ $message = sprintf('Key "%s" in object with ArrayAccess of class "%s" does not exist', $arrayItem, get_class($object));
+ } elseif (is_object($object)) {
+ $message = sprintf('Impossible to access a key "%s" on an object of class "%s" that does not implement ArrayAccess interface', $item, get_class($object));
+ } elseif (is_array($object)) {
+ if (empty($object)) {
+ $message = sprintf('Key "%s" does not exist as the array is empty', $arrayItem);
+ } else {
+ $message = sprintf('Key "%s" for array with keys "%s" does not exist', $arrayItem, implode(', ', array_keys($object)));
+ }
+ } elseif (self::ARRAY_CALL === $type) {
+ if (null === $object) {
+ $message = sprintf('Impossible to access a key ("%s") on a null variable', $item);
+ } else {
+ $message = sprintf('Impossible to access a key ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
+ }
+ } elseif (null === $object) {
+ $message = sprintf('Impossible to access an attribute ("%s") on a null variable', $item);
+ } else {
+ $message = sprintf('Impossible to access an attribute ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
+ }
+
+ throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
+ }
+ }
+
+ if (!is_object($object)) {
+ if ($isDefinedTest) {
+ return false;
+ }
+
+ if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
+ return;
+ }
+
+ if (null === $object) {
+ $message = sprintf('Impossible to invoke a method ("%s") on a null variable', $item);
+ } else {
+ $message = sprintf('Impossible to invoke a method ("%s") on a %s variable ("%s")', $item, gettype($object), $object);
+ }
+
+ throw new Twig_Error_Runtime($message, -1, $this->getTemplateName());
+ }
+
+ // object property
+ if (self::METHOD_CALL !== $type && !$object instanceof self) { // Twig_Template does not have public properties, and we don't want to allow access to internal ones
+ if (isset($object->$item) || array_key_exists((string) $item, $object)) {
+ if ($isDefinedTest) {
+ return true;
+ }
+
+ if ($this->env->hasExtension('sandbox')) {
+ $this->env->getExtension('sandbox')->checkPropertyAllowed($object, $item);
+ }
+
+ return $object->$item;
+ }
+ }
+
+ $class = get_class($object);
+
+ // object method
+ if (!isset(self::$cache[$class]['methods'])) {
+ // get_class_methods returns all methods accessible in the scope, but we only want public ones to be accessible in templates
+ if ($object instanceof self) {
+ $ref = new ReflectionClass($class);
+ $methods = array();
+
+ foreach ($ref->getMethods(ReflectionMethod::IS_PUBLIC) as $refMethod) {
+ $methodName = strtolower($refMethod->name);
+
+ // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
+ if ('getenvironment' !== $methodName) {
+ $methods[$methodName] = true;
+ }
+ }
+
+ self::$cache[$class]['methods'] = $methods;
+ } else {
+ self::$cache[$class]['methods'] = array_change_key_case(array_flip(get_class_methods($object)));
+ }
+ }
+
+ $call = false;
+ $lcItem = strtolower($item);
+ if (isset(self::$cache[$class]['methods'][$lcItem])) {
+ $method = (string) $item;
+ } elseif (isset(self::$cache[$class]['methods']['get'.$lcItem])) {
+ $method = 'get'.$item;
+ } elseif (isset(self::$cache[$class]['methods']['is'.$lcItem])) {
+ $method = 'is'.$item;
+ } elseif (isset(self::$cache[$class]['methods']['__call'])) {
+ $method = (string) $item;
+ $call = true;
+ } else {
+ if ($isDefinedTest) {
+ return false;
+ }
+
+ if ($ignoreStrictCheck || !$this->env->isStrictVariables()) {
+ return;
+ }
+
+ throw new Twig_Error_Runtime(sprintf('Method "%s" for object "%s" does not exist', $item, get_class($object)), -1, $this->getTemplateName());
+ }
+
+ if ($isDefinedTest) {
+ return true;
+ }
+
+ if ($this->env->hasExtension('sandbox')) {
+ $this->env->getExtension('sandbox')->checkMethodAllowed($object, $method);
+ }
+
+ // Some objects throw exceptions when they have __call, and the method we try
+ // to call is not supported. If ignoreStrictCheck is true, we should return null.
+ try {
+ $ret = call_user_func_array(array($object, $method), $arguments);
+ } catch (BadMethodCallException $e) {
+ if ($call && ($ignoreStrictCheck || !$this->env->isStrictVariables())) {
+ return;
+ }
+ throw $e;
+ }
+
+ // useful when calling a template method from a template
+ // this is not supported but unfortunately heavily used in the Symfony profiler
+ if ($object instanceof Twig_TemplateInterface) {
+ return $ret === '' ? '' : new Twig_Markup($ret, $this->env->getCharset());
+ }
+
+ return $ret;
+ }
+}
diff --git a/core/vendor/twig/twig/lib/Twig/TemplateInterface.php b/vendor/twig/twig/lib/Twig/TemplateInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TemplateInterface.php
rename to vendor/twig/twig/lib/Twig/TemplateInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Test.php b/vendor/twig/twig/lib/Twig/Test.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Test.php
rename to vendor/twig/twig/lib/Twig/Test.php
diff --git a/core/vendor/twig/twig/lib/Twig/Test/Function.php b/vendor/twig/twig/lib/Twig/Test/Function.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Test/Function.php
rename to vendor/twig/twig/lib/Twig/Test/Function.php
diff --git a/core/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php b/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
rename to vendor/twig/twig/lib/Twig/Test/IntegrationTestCase.php
diff --git a/core/vendor/twig/twig/lib/Twig/Test/Method.php b/vendor/twig/twig/lib/Twig/Test/Method.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Test/Method.php
rename to vendor/twig/twig/lib/Twig/Test/Method.php
diff --git a/core/vendor/twig/twig/lib/Twig/Test/Node.php b/vendor/twig/twig/lib/Twig/Test/Node.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Test/Node.php
rename to vendor/twig/twig/lib/Twig/Test/Node.php
diff --git a/core/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php b/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
rename to vendor/twig/twig/lib/Twig/Test/NodeTestCase.php
diff --git a/core/vendor/twig/twig/lib/Twig/TestCallableInterface.php b/vendor/twig/twig/lib/Twig/TestCallableInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TestCallableInterface.php
rename to vendor/twig/twig/lib/Twig/TestCallableInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/TestInterface.php b/vendor/twig/twig/lib/Twig/TestInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TestInterface.php
rename to vendor/twig/twig/lib/Twig/TestInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/Token.php b/vendor/twig/twig/lib/Twig/Token.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Token.php
rename to vendor/twig/twig/lib/Twig/Token.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser.php b/vendor/twig/twig/lib/Twig/TokenParser.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser.php
rename to vendor/twig/twig/lib/Twig/TokenParser.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php b/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
rename to vendor/twig/twig/lib/Twig/TokenParser/AutoEscape.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Block.php b/vendor/twig/twig/lib/Twig/TokenParser/Block.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Block.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Block.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Do.php b/vendor/twig/twig/lib/Twig/TokenParser/Do.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Do.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Do.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Embed.php b/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Embed.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Embed.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Extends.php b/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Extends.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Extends.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Filter.php b/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Filter.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Filter.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Flush.php b/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Flush.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Flush.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/For.php b/vendor/twig/twig/lib/Twig/TokenParser/For.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/For.php
rename to vendor/twig/twig/lib/Twig/TokenParser/For.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/From.php b/vendor/twig/twig/lib/Twig/TokenParser/From.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/From.php
rename to vendor/twig/twig/lib/Twig/TokenParser/From.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/If.php b/vendor/twig/twig/lib/Twig/TokenParser/If.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/If.php
rename to vendor/twig/twig/lib/Twig/TokenParser/If.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Import.php b/vendor/twig/twig/lib/Twig/TokenParser/Import.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Import.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Import.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Include.php b/vendor/twig/twig/lib/Twig/TokenParser/Include.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Include.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Include.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Macro.php b/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Macro.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Macro.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php b/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Sandbox.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Set.php b/vendor/twig/twig/lib/Twig/TokenParser/Set.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Set.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Set.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php b/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Spaceless.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParser/Use.php b/vendor/twig/twig/lib/Twig/TokenParser/Use.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParser/Use.php
rename to vendor/twig/twig/lib/Twig/TokenParser/Use.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParserBroker.php b/vendor/twig/twig/lib/Twig/TokenParserBroker.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParserBroker.php
rename to vendor/twig/twig/lib/Twig/TokenParserBroker.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php b/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
rename to vendor/twig/twig/lib/Twig/TokenParserBrokerInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenParserInterface.php b/vendor/twig/twig/lib/Twig/TokenParserInterface.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenParserInterface.php
rename to vendor/twig/twig/lib/Twig/TokenParserInterface.php
diff --git a/core/vendor/twig/twig/lib/Twig/TokenStream.php b/vendor/twig/twig/lib/Twig/TokenStream.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/TokenStream.php
rename to vendor/twig/twig/lib/Twig/TokenStream.php
diff --git a/core/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php b/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
rename to vendor/twig/twig/lib/Twig/Util/DeprecationCollector.php
diff --git a/core/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php b/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
similarity index 100%
rename from core/vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
rename to vendor/twig/twig/lib/Twig/Util/TemplateDirIterator.php
diff --git a/core/vendor/twig/twig/phpunit.xml.dist b/vendor/twig/twig/phpunit.xml.dist
similarity index 100%
rename from core/vendor/twig/twig/phpunit.xml.dist
rename to vendor/twig/twig/phpunit.xml.dist
diff --git a/core/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php b/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
rename to vendor/twig/twig/test/Twig/Tests/AutoloaderTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/CompilerTest.php b/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/CompilerTest.php
rename to vendor/twig/twig/test/Twig/Tests/CompilerTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php b/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
rename to vendor/twig/twig/test/Twig/Tests/EnvironmentTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/ErrorTest.php b/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/ErrorTest.php
rename to vendor/twig/twig/test/Twig/Tests/ErrorTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php b/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
rename to vendor/twig/twig/test/Twig/Tests/ExpressionParserTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php b/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
rename to vendor/twig/twig/test/Twig/Tests/Extension/CoreTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php b/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
rename to vendor/twig/twig/test/Twig/Tests/Extension/SandboxTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php b/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
rename to vendor/twig/twig/test/Twig/Tests/FileCachingTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php b/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
rename to vendor/twig/twig/test/Twig/Tests/FileExtensionEscapingStrategyTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/autoescape/filename.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/autoescape/filename.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/autoescape/filename.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/autoescape/filename.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html b/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/errors/base.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html b/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/errors/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_array_with_undefined_variable_again.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_undefined_variable.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_function_with_unknown_argument.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/multiline_tag_with_undefined_variable.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/syntax_error_in_reused_template.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/syntax_error_in_reused_template.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/syntax_error_in_reused_template.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/syntax_error_in_reused_template.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/unclosed_tag.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_parent.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_parent.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_parent.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_parent.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_template_in_child_template.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/exceptions/undefined_trait.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/array_call.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/binary.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/bitwise.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/comparison.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/divisibleby.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/dotdot.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ends_with.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/grouping.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/literals.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/magic_call.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/matches.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/method_call.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/negative_numbers.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/negative_numbers.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/negative_numbers.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/negative_numbers.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/operators_as_variables.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/postfix.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/sameas.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/starts_with.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/strings.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_noelse.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/ternary_operator_nothen.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/two_word_operators_as_variables.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_macro_arguments.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/expressions/unary_precedence.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/abs.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_float.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_empty_fill.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_exact_elements.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_fill.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_keys.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_keys.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_keys.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_keys.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/batch_with_zero_elements.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/convert_encoding.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_default_format_interval.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_immutable.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_interval.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_modify.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/date_namedargs.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/default.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/dynamic_filter.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_html_attr.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/escape_non_supported_charset.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/first.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/force_escape.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/format.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/join.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/json_encode.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/last.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/length_utf8.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/merge.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/nl2br.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/number_format_default.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/replace_invalid_arg.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/reverse.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/round.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/slice.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/sort.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/special_chars.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/split_utf8.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/trim.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/filters/urlencode_deprecated.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/attribute.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/block.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/constant.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/cycle.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/date_namedargs.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dump_array.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/dynamic_function.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/assignment.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/autoescaping.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/expression.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/ignore_missing.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/missing_nested.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/sandbox_disabling_ignore_missing.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/template_instance.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/templates_as_array.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_context.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/include/with_variables.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/max.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/min.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/range.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/recursive_block_with_inheritance.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/source.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/special_chars.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/functions/template_from_string.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/default_values.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/nested_calls.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/reserved_variables.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/simple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs_argument.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs_argument.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs_argument.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/varargs_argument.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/macros/with_filters.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/regression/combined_debug_info.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/regression/empty_token.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/regression/issue_1143.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/regression/multi_word_tests.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/regression/simple_xml_element.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/regression/strings_like_numbers.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/blocks.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/double_escaping.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/functions.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/literal.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/nested.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/objects.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/raw.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.legacy.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/strategy.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/type.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_filters_arguments.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_pre_escape_filters.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/autoescape/with_preserves_safety_filters.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/block_unique_name.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/block/special_chars.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/error_line.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/multiple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/nested.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/embed/with_extends.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/json_encode.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/multiple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/nested.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_for_tag.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/filter/with_if_tag.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/condition.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/context.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/else.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/inner_variables.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/keys_and_values.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_context_local.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/loop_not_defined_cond.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/nested_else.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/objects_countable.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/recursive.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/for/values.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/from.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/if/expression.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/expression.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/ignore_missing.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/missing_nested.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/only.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/template_instance.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/templates_as_array.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/include/with_variables.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/block_expr2.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/conditional.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/dynamic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/empty.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_empty_name.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/extends_as_array_with_null_name.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/multiple_dynamic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_blocks_parent_only.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/nested_inheritance.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_change.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_in_a_block.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_isolation.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_nested.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/parent_without_extends_but_traits.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/template_instance.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/inheritance/use.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/endmacro_name.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/external.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/from_with_reserved_name.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/global.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/import_with_reserved_nam.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/reserved_name.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/self_import.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/special_chars.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/macro/super_globals.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/basic.legacy.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/mixed_usage_with_raw.legacy.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/raw/whitespace_control.legacy.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid1.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/not_valid2.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/sandbox/simple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture-empty.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/capture.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/set/expression.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/spaceless/simple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/special_chars.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/trim_block.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/aliases.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/deep_empty.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/inheritance2.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/multiple_aliases.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block2.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/use/parent_block3.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/basic.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/mixed_usage_with_raw.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tags/verbatim/whitespace_control.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/array.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/constant.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/defined.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/empty.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/even.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/in_with_objects.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/iterable.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test b/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test
rename to vendor/twig/twig/test/Twig/Tests/Fixtures/tests/odd.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php b/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/IntegrationTest.php
rename to vendor/twig/twig/test/Twig/Tests/IntegrationTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/LegacyFixtures/test.legacy.test b/vendor/twig/twig/test/Twig/Tests/LegacyFixtures/test.legacy.test
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/LegacyFixtures/test.legacy.test
rename to vendor/twig/twig/test/Twig/Tests/LegacyFixtures/test.legacy.test
diff --git a/core/vendor/twig/twig/test/Twig/Tests/LegacyIntegrationTest.php b/vendor/twig/twig/test/Twig/Tests/LegacyIntegrationTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/LegacyIntegrationTest.php
rename to vendor/twig/twig/test/Twig/Tests/LegacyIntegrationTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/LexerTest.php b/vendor/twig/twig/test/Twig/Tests/LexerTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/LexerTest.php
rename to vendor/twig/twig/test/Twig/Tests/LexerTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php b/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
rename to vendor/twig/twig/test/Twig/Tests/Loader/ArrayTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php b/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
rename to vendor/twig/twig/test/Twig/Tests/Loader/ChainTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php b/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
rename to vendor/twig/twig/test/Twig/Tests/Loader/FilesystemTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_empty_parent.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_nonexistent_parent.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_null_parent.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/array_inheritance_valid_parent.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/parent.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/parent.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/parent.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/parent.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/spare_parent.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/spare_parent.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/spare_parent.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/inheritance/spare_parent.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_bis/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_final/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_quater/named_absolute.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_quater/named_absolute.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_quater/named_absolute.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_quater/named_absolute.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/named_ter/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_bis/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_final/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/normal_ter/index.html
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme1/blocks.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig b/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig
rename to vendor/twig/twig/test/Twig/Tests/Loader/Fixtures/themes/theme2/blocks.html.twig
diff --git a/core/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php b/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
rename to vendor/twig/twig/test/Twig/Tests/NativeExtensionTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php b/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/AutoEscapeTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php b/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/BlockReferenceTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php b/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/BlockTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php b/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/DoTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/DoTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/ArrayTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/AssignNameTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AddTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/AndTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ConcatTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/DivTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/FloorDivTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/ModTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/MulTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/OrTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Binary/SubTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/CallTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/ConditionalTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/ConstantTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/FilterTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/FunctionTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/GetAttrTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/NameTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FilterInclude.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/FunctionInclude.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/PHP53/TestInclude.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/ParentTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/TestTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NegTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/NotTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php b/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/Expression/Unary/PosTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php b/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/ForTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/ForTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php b/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/IfTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/IfTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php b/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/ImportTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php b/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php b/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/MacroTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php b/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/ModuleTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php b/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/PrintTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php b/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/SandboxTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php b/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/SandboxedPrintTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php b/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/SetTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/SetTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php b/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/SpacelessTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php b/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Node/TextTest.php
rename to vendor/twig/twig/test/Twig/Tests/Node/TextTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php b/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
rename to vendor/twig/twig/test/Twig/Tests/NodeVisitor/OptimizerTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/ParserTest.php b/vendor/twig/twig/test/Twig/Tests/ParserTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/ParserTest.php
rename to vendor/twig/twig/test/Twig/Tests/ParserTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php b/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
rename to vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/AbstractTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/BlackfireTest.php b/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/BlackfireTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/BlackfireTest.php
rename to vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/BlackfireTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/HtmlTest.php b/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/HtmlTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/HtmlTest.php
rename to vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/HtmlTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/TextTest.php b/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/TextTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/TextTest.php
rename to vendor/twig/twig/test/Twig/Tests/Profiler/Dumper/TextTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php b/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
rename to vendor/twig/twig/test/Twig/Tests/Profiler/ProfileTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/TemplateTest.php b/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/TemplateTest.php
rename to vendor/twig/twig/test/Twig/Tests/TemplateTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php b/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
rename to vendor/twig/twig/test/Twig/Tests/TokenStreamTest.php
diff --git a/core/vendor/twig/twig/test/Twig/Tests/escapingTest.php b/vendor/twig/twig/test/Twig/Tests/escapingTest.php
similarity index 100%
rename from core/vendor/twig/twig/test/Twig/Tests/escapingTest.php
rename to vendor/twig/twig/test/Twig/Tests/escapingTest.php
diff --git a/core/vendor/twig/twig/test/bootstrap.php b/vendor/twig/twig/test/bootstrap.php
similarity index 100%
rename from core/vendor/twig/twig/test/bootstrap.php
rename to vendor/twig/twig/test/bootstrap.php
diff --git a/vendor/wikimedia/composer-merge-plugin/LICENSE b/vendor/wikimedia/composer-merge-plugin/LICENSE
new file mode 100644
index 0000000..3c9804a
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015 Bryan Davis, Wikimedia Foundation, and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vendor/wikimedia/composer-merge-plugin/README.md b/vendor/wikimedia/composer-merge-plugin/README.md
new file mode 100644
index 0000000..7f54bee
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/README.md
@@ -0,0 +1,131 @@
+[](https://packagist.org/packages/wikimedia/composer-merge-plugin) [](https://github.com/wikimedia/composer-merge-plugin/blob/master/LICENSE)
+[](https://travis-ci.org/wikimedia/composer-merge-plugin)
+[](https://scrutinizer-ci.com/g/wikimedia/composer-merge-plugin/?branch=master)
+
+Composer Merge Plugin
+=====================
+
+Merge one or more additional composer.json files at [Composer] runtime.
+
+Composer Merge Plugin is intended to allow easier dependency management for
+applications which ship a composer.json file and expect some deployments to
+install additional Composer managed libraries. It does this by allowing the
+application's top level `composer.json` file to provide a list of optional
+additional configuration files. When Composer is run it will parse these files
+and merge their configuration into the base configuration. This combined
+configuration will allow downloading additional libraries and generating the
+autoloader. It was specifically created to help with installation of
+[MediaWiki] which has core Composer managed library requirements and optional
+libraries and extensions which may also be managed via Composer.
+
+
+Installation
+------------
+```
+$ composer require wikimedia/composer-merge-plugin
+```
+
+
+Usage
+-----
+
+```
+{
+ "require": {
+ "wikimedia/composer-merge-plugin": "dev-master"
+ },
+ "extra": {
+ "merge-plugin": {
+ "include": [
+ "composer.local.json",
+ "extensions/*/composer.json"
+ ],
+ "recurse": false,
+ "replace": false,
+ "merge-extra": false
+ }
+ }
+}
+```
+
+The `include` key can specify either a single value or an array of values.
+Each value is treated as a `glob()` pattern identifying additional
+composer.json style configuration files to merge into the configuration for
+the current Composer execution. By default the merge plugin is recursive, if
+an included file also has a "merge-plugin" section it will also be processed.
+This functionality can be disabled by setting `"recurse": false` inside the
+"merge-plugin" section.
+
+These sections of the found configuration files will be merged into the root
+package configuration as though they were directly included in the top-level
+composer.json file:
+
+* [autoload](https://getcomposer.org/doc/04-schema.md#autoload)
+* [autoload-dev](https://getcomposer.org/doc/04-schema.md#autoload-dev)
+* [conflict](https://getcomposer.org/doc/04-schema.md#conflict)
+* [provide](https://getcomposer.org/doc/04-schema.md#provide)
+* [replace](https://getcomposer.org/doc/04-schema.md#replace)
+* [repositories](https://getcomposer.org/doc/04-schema.md#repositories)
+* [require](https://getcomposer.org/doc/04-schema.md#require)
+* [require-dev](https://getcomposer.org/doc/04-schema.md#require-dev)
+* [suggest](https://getcomposer.org/doc/04-schema.md#suggest)
+
+A `"merge-extra": true` setting enables the merging of the "extra" section of
+included files as well. The normal merge mode for the extra section is to
+accept the first version of any key found (e.g. a key in the master config
+wins over the version found in an imported config). If `replace` mode is
+active (see below) then this behavior changes and the last found key will win
+(the key in the master config is replaced by the key in the imported config).
+Note that the `merge-plugin` key itself is excluded from this merge process.
+Your mileage with merging the extra section will vary depending on the plugins
+being used and the order in which they are processed by Composer.
+
+By default, Composer's normal conflict resolution engine is used to determine
+which version of a package should be installed if multiple files specify the
+same package. A `"replace": true` setting can be provided inside the
+"merge-plugin" section to change to a "last version specified wins" conflict
+resolution strategy. In this mode, duplicate package declarations in merged
+files will overwrite the declarations made in earlier files. Files are loaded
+in the order specified in the `include` section with globbed files being
+loaded in alphabetical order.
+
+
+Running tests
+-------------
+```
+$ composer install
+$ composer test
+```
+
+
+Contributing
+------------
+Bug, feature requests and other issues should be reported to the [GitHub
+project]. We accept code and documentation contributions via Pull Requests on
+GitHub as well.
+
+- [PSR-2 Coding Standard][] is used by the project. The included test
+ configuration uses [PHP Code Sniffer][] to validate the conventions.
+- Tests are encouraged. Our test coverage isn't perfect but we'd like it to
+ get better rather than worse, so please try to include tests with your
+ changes.
+- Keep the documentation up to date. Make sure `README.md` and other
+ relevant documentation is kept up to date with your changes.
+- One pull request per feature. Try to keep your changes focused on solving
+ a single problem. This will make it easier for us to review the change and
+ easier for you to make sure you have updated the necessary tests and
+ documentation.
+
+
+License
+-------
+Composer Merge plugin is licensed under the MIT license. See the `LICENSE`
+file for more details.
+
+
+---
+[Composer]: https://getcomposer.org/
+[MediaWiki]: https://www.mediawiki.org/wiki/MediaWiki
+[GitHub project]: https://github.com/wikimedia/composer-merge-plugin
+[PSR-2 Coding Standard]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
+[PHP Code Sniffer]: http://pear.php.net/package/PHP_CodeSniffer
diff --git a/vendor/wikimedia/composer-merge-plugin/composer.json b/vendor/wikimedia/composer-merge-plugin/composer.json
new file mode 100644
index 0000000..02d7d56
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/composer.json
@@ -0,0 +1,47 @@
+{
+ "name": "wikimedia/composer-merge-plugin",
+ "description": "Composer plugin to merge multiple composer.json files",
+ "type": "composer-plugin",
+ "license": "MIT",
+ "authors": [
+ {
+ "name": "Bryan Davis",
+ "email": "bd808@wikimedia.org"
+ }
+ ],
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "require": {
+ "composer-plugin-api": "^1.0",
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "composer/composer": "1.0.*@dev",
+ "jakub-onderka/php-parallel-lint": "~0.8",
+ "phpspec/prophecy-phpunit": "~1.0",
+ "phpunit/phpunit": "~4.0",
+ "squizlabs/php_codesniffer": "~2.1.0"
+ },
+ "autoload": {
+ "psr-4": {
+ "Wikimedia\\Composer\\": "src/"
+ }
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ },
+ "class": "Wikimedia\\Composer\\MergePlugin"
+ },
+ "config": {
+ "optimize-autoloader": true
+ },
+ "scripts": {
+ "test": [
+ "composer validate --no-interaction",
+ "parallel-lint src tests",
+ "phpunit --log-junit=reports/unitreport.xml --coverage-text --coverage-html=reports/coverage --coverage-clover=reports/coverage.xml",
+ "phpcs --encoding=utf-8 --standard=PSR2 --report-checkstyle=reports/checkstyle-phpcs.xml --report-full --extensions=php src/* tests/phpunit/*"
+ ]
+ }
+}
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Logger.php b/vendor/wikimedia/composer-merge-plugin/src/Logger.php
new file mode 100644
index 0000000..b0c695c
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/src/Logger.php
@@ -0,0 +1,66 @@
+
+ */
+class Logger
+{
+ /**
+ * @var string $name
+ */
+ protected $name;
+
+ /**
+ * @var IOInterface $inputOutput
+ */
+ protected $inputOutput;
+
+ /**
+ * @param string $name
+ * @param IOInterface $io
+ */
+ public function __construct($name, IOInterface $io)
+ {
+ $this->name = $name;
+ $this->inputOutput = $io;
+ }
+
+ /**
+ * Log a debug message
+ *
+ * Messages will be output at the "verbose" logging level (eg `-v` needed
+ * on the Composer command).
+ *
+ * @param string $message
+ */
+ public function debug($message)
+ {
+ if ($this->inputOutput->isVerbose()) {
+ $message = " [{$this->name}] {$message}";
+
+ if (method_exists($this->inputOutput, 'writeError')) {
+ $this->inputOutput->writeError($message);
+ } else {
+ // @codeCoverageIgnoreStart
+ // Backwards compatiblity for Composer before cb336a5
+ $this->inputOutput->write($message);
+ // @codeCoverageIgnoreEnd
+ }
+ }
+ }
+}
+// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
new file mode 100644
index 0000000..476fdc9
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/src/Merge/ExtraPackage.php
@@ -0,0 +1,437 @@
+
+ */
+class ExtraPackage
+{
+
+ /**
+ * @var Composer $composer
+ */
+ protected $composer;
+
+ /**
+ * @var Logger $logger
+ */
+ protected $logger;
+
+ /**
+ * @var string $path
+ */
+ protected $path;
+
+ /**
+ * @var array $json
+ */
+ protected $json;
+
+ /**
+ * @var CompletePackage $package
+ */
+ protected $package;
+
+ /**
+ * @param string $path Path to composer.json file
+ * @param Composer $composer
+ * @param Logger $logger
+ */
+ public function __construct($path, Composer $composer, Logger $logger)
+ {
+ $this->path = $path;
+ $this->composer = $composer;
+ $this->logger = $logger;
+ $this->json = $this->readPackageJson($path);
+ $this->package = $this->loadPackage($this->json);
+ }
+
+ /**
+ * Get list of additional packages to include if precessing recursively.
+ *
+ * @return array
+ */
+ public function getIncludes()
+ {
+ return isset($this->json['extra']['merge-plugin']['include']) ?
+ $this->json['extra']['merge-plugin']['include'] : array();
+ }
+
+ /**
+ * Read the contents of a composer.json style file into an array.
+ *
+ * The package contents are fixed up to be usable to create a Package
+ * object by providing dummy "name" and "version" values if they have not
+ * been provided in the file. This is consistent with the default root
+ * package loading behavior of Composer.
+ *
+ * @param string $path
+ * @return array
+ */
+ protected function readPackageJson($path)
+ {
+ $file = new JsonFile($path);
+ $json = $file->read();
+ if (!isset($json['name'])) {
+ $json['name'] = 'merge-plugin/' .
+ strtr($path, DIRECTORY_SEPARATOR, '-');
+ }
+ if (!isset($json['version'])) {
+ $json['version'] = '1.0.0';
+ }
+ return $json;
+ }
+
+ /**
+ * @return CompletePackage
+ */
+ protected function loadPackage($json)
+ {
+ $loader = new ArrayLoader();
+ $package = $loader->load($json);
+ // @codeCoverageIgnoreStart
+ if (!$package instanceof CompletePackage) {
+ throw new UnexpectedValueException(
+ 'Expected instance of CompletePackage, got ' .
+ get_class($package)
+ );
+ }
+ // @codeCoverageIgnoreEnd
+ return $package;
+ }
+
+ /**
+ * Merge this package into a RootPackage
+ *
+ * @param RootPackage $root
+ * @param PluginState $state
+ */
+ public function mergeInto(RootPackage $root, PluginState $state)
+ {
+ $this->addRepositories($root);
+
+ $this->mergeRequires($root, $state);
+ $this->mergeDevRequires($root, $state);
+
+ $this->mergeConflicts($root);
+ $this->mergeReplaces($root);
+ $this->mergeProvides($root);
+ $this->mergeSuggests($root);
+
+ $this->mergeAutoload($root);
+ $this->mergeDevAutoload($root);
+
+ $this->mergeExtra($root, $state);
+ }
+
+ /**
+ * Add a collection of repositories described by the given configuration
+ * to the given package and the global repository manager.
+ *
+ * @param RootPackage $root
+ */
+ protected function addRepositories(RootPackage $root)
+ {
+ if (!isset($this->json['repositories'])) {
+ return;
+ }
+ $repoManager = $this->composer->getRepositoryManager();
+ $newRepos = array();
+
+ foreach ($this->json['repositories'] as $repoJson) {
+ if (!isset($repoJson['type'])) {
+ continue;
+ }
+ $this->logger->debug("Adding {$repoJson['type']} repository");
+ $repo = $repoManager->createRepository(
+ $repoJson['type'],
+ $repoJson
+ );
+ $repoManager->addRepository($repo);
+ $newRepos[] = $repo;
+ }
+
+ $root->setRepositories(array_merge(
+ $newRepos,
+ $root->getRepositories()
+ ));
+ }
+
+ /**
+ * Merge require into a RootPackage
+ *
+ * @param RootPackage $root
+ * @param PluginState $state
+ */
+ protected function mergeRequires(RootPackage $root, PluginState $state)
+ {
+ $requires = $this->package->getRequires();
+ if (empty($requires)) {
+ return;
+ }
+
+ $this->mergeStabilityFlags($root, $requires);
+
+ $dups = array();
+ $root->setRequires($this->mergeLinks(
+ $root->getRequires(),
+ $requires,
+ $state->replaceDuplicateLinks(),
+ $dups
+ ));
+ $state->addDuplicateLinks('require', $dups);
+ }
+
+ /**
+ * Merge require-dev into RootPackage
+ *
+ * @param RootPackage $root
+ * @param PluginState $state
+ */
+ protected function mergeDevRequires(RootPackage $root, PluginState $state)
+ {
+ $requires = $this->package->getDevRequires();
+ if (empty($requires)) {
+ return;
+ }
+
+ $this->mergeStabilityFlags($root, $requires);
+
+ $dups = array();
+ $root->setDevRequires($this->mergeLinks(
+ $root->getDevRequires(),
+ $requires,
+ $state->replaceDuplicateLinks(),
+ $dups
+ ));
+ $state->addDuplicateLinks('require-dev', $dups);
+ }
+
+ /**
+ * Merge two collections of package links and collect duplicates for
+ * subsequent processing.
+ *
+ * @param array $origin Primary collection
+ * @param array $merge Additional collection
+ * @param bool $replace Replace exising links?
+ * @param array &dups Duplicate storage
+ * @return array Merged collection
+ */
+ protected function mergeLinks(
+ array $origin,
+ array $merge,
+ $replace,
+ array &$dups
+ ) {
+ foreach ($merge as $name => $link) {
+ if (!isset($origin[$name]) || $replace) {
+ $this->logger->debug("Merging {$name}");
+ $origin[$name] = $link;
+ } else {
+ // Defer to solver.
+ $this->logger->debug(
+ "Deferring duplicate {$name}"
+ );
+ $dups[] = $link;
+ }
+ }
+ return $origin;
+ }
+
+ /**
+ * Merge autoload into a RootPackage
+ *
+ * @param RootPackage $root
+ */
+ protected function mergeAutoload(RootPackage $root)
+ {
+ $autoload = $this->package->getAutoload();
+ if (empty($autoload)) {
+ return;
+ }
+
+ $root->setAutoload(array_merge_recursive(
+ $root->getAutoload(),
+ $this->fixRelativePaths($autoload)
+ ));
+ }
+
+ /**
+ * Merge autoload-dev into a RootPackage
+ *
+ * @param RootPackage $root
+ */
+ protected function mergeDevAutoload(RootPackage $root)
+ {
+ $autoload = $this->package->getDevAutoload();
+ if (empty($autoload)) {
+ return;
+ }
+
+ $root->setDevAutoload(array_merge_recursive(
+ $root->getDevAutoload(),
+ $this->fixRelativePaths($autoload)
+ ));
+ }
+
+ /**
+ * Fix a collection of paths that are relative to this package to be
+ * relative to the base package.
+ *
+ * @param array $paths
+ * @return array
+ */
+ protected function fixRelativePaths(array $paths)
+ {
+ $base = dirname($this->path);
+ $base = ($base === '.') ? '' : "{$base}/";
+
+ array_walk_recursive(
+ $paths,
+ function (&$path) use ($base) {
+ $path = "{$base}{$path}";
+ }
+ );
+ return $paths;
+ }
+
+ /**
+ * Extract and merge stability flags from the given collection of
+ * requires and merge them into a RootPackage
+ *
+ * @param RootPackage $root
+ * @param array $requires
+ */
+ protected function mergeStabilityFlags(
+ RootPackage $root,
+ array $requires
+ ) {
+ $flags = $root->getStabilityFlags();
+ foreach ($requires as $name => $link) {
+ $name = strtolower($name);
+ $version = $link->getPrettyConstraint();
+ $stability = VersionParser::parseStability($version);
+ $flags[$name] = BasePackage::$stabilities[$stability];
+ }
+ $root->setStabilityFlags($flags);
+ }
+
+ /**
+ * Merge conflicting packages into a RootPackage
+ *
+ * @param RootPackage $root
+ */
+ protected function mergeConflicts(RootPackage $root)
+ {
+ $conflicts = $this->package->getConflicts();
+ if (!empty($conflicts)) {
+ $root->setconflicts(array_merge(
+ $root->getConflicts(),
+ $conflicts
+ ));
+ }
+ }
+
+ /**
+ * Merge replaced packages into a RootPackage
+ *
+ * @param RootPackage $root
+ */
+ protected function mergeReplaces(RootPackage $root)
+ {
+ $replaces = $this->package->getReplaces();
+ if (!empty($replaces)) {
+ $root->setReplaces(array_merge(
+ $root->getReplaces(),
+ $replaces
+ ));
+ }
+ }
+
+ /**
+ * Merge provided virtual packages into a RootPackage
+ *
+ * @param RootPackage $root
+ */
+ protected function mergeProvides(RootPackage $root)
+ {
+ $provides = $this->package->getProvides();
+ if (!empty($provides)) {
+ $root->setProvides(array_merge(
+ $root->getProvides(),
+ $provides
+ ));
+ }
+ }
+
+ /**
+ * Merge suggested packages into a RootPackage
+ *
+ * @param RootPackage $root
+ */
+ protected function mergeSuggests(RootPackage $root)
+ {
+ $suggests = $this->package->getSuggests();
+ if (!empty($suggests)) {
+ $root->setSuggests(array_merge(
+ $root->getSuggests(),
+ $suggests
+ ));
+ }
+ }
+
+ /**
+ * Merge extra config into a RootPackage
+ *
+ * @param RootPackage $root
+ * @param PluginState $state
+ */
+ public function mergeExtra(RootPackage $root, PluginState $state)
+ {
+ $extra = $this->package->getExtra();
+ unset($extra['merge-plugin']);
+ if (!$state->shouldMergeExtra() || empty($extra)) {
+ return;
+ }
+
+ $rootExtra = $root->getExtra();
+
+ if ($state->replaceDuplicateLinks()) {
+ $root->setExtra(array_merge($rootExtra, $extra));
+
+ } else {
+ foreach ($extra as $key => $value) {
+ if (isset($rootExtra[$key])) {
+ $this->logger->debug(
+ "Ignoring duplicate {$key} in ".
+ "{$this->path} extra config."
+ );
+ }
+ }
+ $root->setExtra(array_merge($extra, $rootExtra));
+ }
+ }
+}
+// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php b/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php
new file mode 100644
index 0000000..061a64d
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/src/Merge/PluginState.php
@@ -0,0 +1,326 @@
+
+ */
+class PluginState
+{
+ /**
+ * @var Composer $composer
+ */
+ protected $composer;
+
+ /**
+ * @var array $includes
+ */
+ protected $includes = array();
+
+ /**
+ * @var array $duplicateLinks
+ */
+ protected $duplicateLinks = array();
+
+ /**
+ * @var bool $devMode
+ */
+ protected $devMode = false;
+
+ /**
+ * @var bool $recurse
+ */
+ protected $recurse = true;
+
+ /**
+ * @var bool $replace
+ */
+ protected $replace = false;
+
+ /**
+ * Whether to merge the extra section.
+ *
+ * By default, the extra section is not merged and there will be many
+ * cases where the merge of the extra section is performed too late
+ * to be of use to other plugins. When enabled, merging uses one of
+ * two strategies - either 'first wins' or 'last wins'. When enabled,
+ * 'first wins' is the default behaviour. If Replace mode is activated
+ * then 'last wins' is used.
+ *
+ * @var bool $mergeExtra
+ */
+ protected $mergeExtra = false;
+
+ /**
+ * @var bool $firstInstall
+ */
+ protected $firstInstall = false;
+
+ /**
+ * @var bool $locked
+ */
+ protected $locked = false;
+
+ /**
+ * @var bool $dumpAutoloader
+ */
+ protected $dumpAutoloader = false;
+
+ /**
+ * @var bool $optimizeAutoloader
+ */
+ protected $optimizeAutoloader = false;
+
+ /**
+ * @param Composer $composer
+ */
+ public function __construct(Composer $composer)
+ {
+ $this->composer = $composer;
+ }
+
+ /**
+ * Load plugin settings
+ */
+ public function loadSettings()
+ {
+ $extra = $this->getRootPackage()->getExtra();
+ $config = array_merge(
+ array(
+ 'include' => array(),
+ 'recurse' => true,
+ 'replace' => false,
+ 'merge-extra' => false,
+ ),
+ isset($extra['merge-plugin']) ? $extra['merge-plugin'] : array()
+ );
+
+ $this->includes = (is_array($config['include'])) ?
+ $config['include'] : array($config['include']);
+ $this->recurse = (bool)$config['recurse'];
+ $this->replace = (bool)$config['replace'];
+ $this->mergeExtra = (bool)$config['merge-extra'];
+ }
+
+ /**
+ * Get the root package
+ *
+ * @return RootPackage
+ */
+ public function getRootPackage()
+ {
+ $root = $this->composer->getPackage();
+ if ($root instanceof AliasPackage) {
+ $root = $root->getAliasOf();
+ }
+ // @codeCoverageIgnoreStart
+ if (!$root instanceof RootPackage) {
+ throw new UnexpectedValueException(
+ 'Expected instance of RootPackage, got ' .
+ get_class($root)
+ );
+ }
+ // @codeCoverageIgnoreEnd
+ return $root;
+ }
+
+ /**
+ * Get list of filenames and/or glob patterns to include
+ *
+ * @return array
+ */
+ public function getIncludes()
+ {
+ return $this->includes;
+ }
+
+ /**
+ * Set the first install flag
+ *
+ * @param bool $flag
+ */
+ public function setFirstInstall($flag)
+ {
+ $this->firstInstall = (bool)$flag;
+ }
+
+ /**
+ * Is this the first time that the plugin has been installed?
+ *
+ * @return bool
+ */
+ public function isFirstInstall()
+ {
+ return $this->firstInstall;
+ }
+
+ /**
+ * Set the locked flag
+ *
+ * @param bool $flag
+ */
+ public function setLocked($flag)
+ {
+ $this->locked = (bool)$flag;
+ }
+
+ /**
+ * Was a lockfile present when the plugin was installed?
+ *
+ * @return bool
+ */
+ public function isLocked()
+ {
+ return $this->locked;
+ }
+
+ /**
+ * Should an update be forced?
+ *
+ * @return true If packages are not locked
+ */
+ public function forceUpdate()
+ {
+ return !$this->locked;
+ }
+
+ /**
+ * Set the devMode flag
+ *
+ * @param bool $flag
+ */
+ public function setDevMode($flag)
+ {
+ $this->devMode = (bool)$flag;
+ }
+
+ /**
+ * Should devMode settings be processed?
+ *
+ * @return bool
+ */
+ public function isDevMode()
+ {
+ return $this->devMode;
+ }
+
+ /**
+ * Set the dumpAutoloader flag
+ *
+ * @param bool $flag
+ */
+ public function setDumpAutoloader($flag)
+ {
+ $this->dumpAutoloader = (bool)$flag;
+ }
+
+ /**
+ * Is the autoloader file supposed to be written out?
+ *
+ * @return bool
+ */
+ public function shouldDumpAutoloader()
+ {
+ return $this->dumpAutoloader;
+ }
+
+ /**
+ * Set the optimizeAutoloader flag
+ *
+ * @param bool $flag
+ */
+ public function setOptimizeAutoloader($flag)
+ {
+ $this->optimizeAutoloader = (bool)$flag;
+ }
+
+ /**
+ * Should the autoloader be optimized?
+ *
+ * @return bool
+ */
+ public function shouldOptimizeAutoloader()
+ {
+ return $this->optimizeAutoloader;
+ }
+
+ /**
+ * Add duplicate packages
+ *
+ * @param string $type Package type
+ * @param array $packages
+ */
+ public function addDuplicateLinks($type, array $packages)
+ {
+ if (!isset($this->duplicateLinks[$type])) {
+ $this->duplicateLinks[$type] = array();
+ }
+ $this->duplicateLinks[$type] =
+ array_merge($this->duplicateLinks[$type], $packages);
+ }
+
+ /**
+ * Get duplicate packages
+ *
+ * @param string $type Package type
+ * @return array
+ */
+ public function getDuplicateLinks($type)
+ {
+ return isset($this->duplicateLinks[$type]) ?
+ $this->duplicateLinks[$type] : array();
+ }
+
+ /**
+ * Should includes be recursively processed?
+ *
+ * @return bool
+ */
+ public function recurseIncludes()
+ {
+ return $this->recurse;
+ }
+
+ /**
+ * Should duplicate links be replaced in a 'last definition wins' order?
+ *
+ * @return bool
+ */
+ public function replaceDuplicateLinks()
+ {
+ return $this->replace;
+ }
+
+ /**
+ * Should the extra section be merged?
+ *
+ * By default, the extra section is not merged and there will be many
+ * cases where the merge of the extra section is performed too late
+ * to be of use to other plugins. When enabled, merging uses one of
+ * two strategies - either 'first wins' or 'last wins'. When enabled,
+ * 'first wins' is the default behaviour. If Replace mode is activated
+ * then 'last wins' is used.
+ *
+ * @return bool
+ */
+ public function shouldMergeExtra()
+ {
+ return $this->mergeExtra;
+ }
+}
+// vim:sw=4:ts=4:sts=4:et:
diff --git a/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php b/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php
new file mode 100644
index 0000000..112d410
--- /dev/null
+++ b/vendor/wikimedia/composer-merge-plugin/src/MergePlugin.php
@@ -0,0 +1,296 @@
+
+ */
+class MergePlugin implements PluginInterface, EventSubscriberInterface
+{
+
+ /**
+ * Offical package name
+ */
+ const PACKAGE_NAME = 'wikimedia/composer-merge-plugin';
+
+ /**
+ * @var Composer $composer
+ */
+ protected $composer;
+
+ /**
+ * @var PluginState $state
+ */
+ protected $state;
+
+ /**
+ * @var Logger $logger
+ */
+ protected $logger;
+
+ /**
+ * Files that have already been processed
+ *
+ * @var string[] $loadedFiles
+ */
+ protected $loadedFiles = array();
+
+ /**
+ * {@inheritdoc}
+ */
+ public function activate(Composer $composer, IOInterface $io)
+ {
+ $this->composer = $composer;
+ $this->state = new PluginState($this->composer);
+ $this->logger = new Logger('merge-plugin', $io);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public static function getSubscribedEvents()
+ {
+ return array(
+ InstallerEvents::PRE_DEPENDENCIES_SOLVING => 'onDependencySolve',
+ PackageEvents::POST_PACKAGE_INSTALL => 'onPostPackageInstall',
+ ScriptEvents::POST_INSTALL_CMD => 'onPostInstallOrUpdate',
+ ScriptEvents::POST_UPDATE_CMD => 'onPostInstallOrUpdate',
+ ScriptEvents::PRE_AUTOLOAD_DUMP => 'onInstallUpdateOrDump',
+ ScriptEvents::PRE_INSTALL_CMD => 'onInstallUpdateOrDump',
+ ScriptEvents::PRE_UPDATE_CMD => 'onInstallUpdateOrDump',
+ );
+ }
+
+ /**
+ * Handle an event callback for an install, update or dump command by
+ * checking for "merge-plugin" in the "extra" data and merging package
+ * contents if found.
+ *
+ * @param Event $event
+ */
+ public function onInstallUpdateOrDump(Event $event)
+ {
+ $this->state->loadSettings();
+ $this->state->setDevMode($event->isDevMode());
+ $this->mergeIncludes($this->state->getIncludes());
+
+ if ($event->getName() === ScriptEvents::PRE_AUTOLOAD_DUMP) {
+ $this->state->setDumpAutoloader(true);
+ $flags = $event->getFlags();
+ if (isset($flags['optimize'])) {
+ $this->state->setOptimizeAutoloader($flags['optimize']);
+ }
+ }
+ }
+
+ /**
+ * Find configuration files matching the configured glob patterns and
+ * merge their contents with the master package.
+ *
+ * @param array $includes List of files/glob patterns
+ */
+ protected function mergeIncludes(array $includes)
+ {
+ $root = $this->state->getRootPackage();
+ foreach (array_reduce(
+ array_map('glob', $includes),
+ 'array_merge',
+ array()
+ ) as $path) {
+ $this->mergeFile($root, $path);
+ }
+ }
+
+ /**
+ * Read a JSON file and merge its contents
+ *
+ * @param RootPackage $root
+ * @param string $path
+ */
+ protected function mergeFile(RootPackage $root, $path)
+ {
+ if (isset($this->loadedFiles[$path])) {
+ $this->logger->debug(
+ "Skipping duplicate $path..."
+ );
+ return;
+ } else {
+ $this->loadedFiles[$path] = true;
+ }
+ $this->logger->debug("Loading {$path}...");
+
+ $package = new ExtraPackage($path, $this->composer, $this->logger);
+ $package->mergeInto($root, $this->state);
+
+ if ($this->state->recurseIncludes()) {
+ $this->mergeIncludes($package->getIncludes());
+ }
+ }
+
+ /**
+ * Handle an event callback for pre-dependency solving phase of an install
+ * or update by adding any duplicate package dependencies found during
+ * initial merge processing to the request that will be processed by the
+ * dependency solver.
+ *
+ * @param InstallerEvent $event
+ */
+ public function onDependencySolve(InstallerEvent $event)
+ {
+ $request = $event->getRequest();
+ foreach ($this->state->getDuplicateLinks('require') as $link) {
+ $this->logger->debug(
+ "Adding dependency {$link}"
+ );
+ $request->install($link->getTarget(), $link->getConstraint());
+ }
+ if ($this->state->isDevMode()) {
+ foreach ($this->state->getDuplicateLinks('require-dev') as $link) {
+ $this->logger->debug(
+ "Adding dev dependency {$link}"
+ );
+ $request->install($link->getTarget(), $link->getConstraint());
+ }
+ }
+ }
+
+ /**
+ * Handle an event callback following installation of a new package by
+ * checking to see if the package that was installed was our plugin.
+ *
+ * @param PackageEvent $event
+ */
+ public function onPostPackageInstall(PackageEvent $event)
+ {
+ $op = $event->getOperation();
+ if ($op instanceof InstallOperation) {
+ $package = $op->getPackage()->getName();
+ if ($package === self::PACKAGE_NAME) {
+ $this->logger->debug('composer-merge-plugin installed');
+ $this->state->setFirstInstall(true);
+ $this->state->setLocked(
+ $event->getComposer()->getLocker()->isLocked()
+ );
+ }
+ }
+ }
+
+ /**
+ * Handle an event callback following an install or update command. If our
+ * plugin was installed during the run then trigger an update command to
+ * process any merge-patterns in the current config.
+ *
+ * @param Event $event
+ */
+ public function onPostInstallOrUpdate(Event $event)
+ {
+ // @codeCoverageIgnoreStart
+ if ($this->state->isFirstInstall()) {
+ $this->state->setFirstInstall(false);
+ $this->logger->debug(
+ '' .
+ 'Running additional update to apply merge settings' .
+ ''
+ );
+
+ $config = $this->composer->getConfig();
+
+ $preferSource = $config->get('preferred-install') == 'source';
+ $preferDist = $config->get('preferred-install') == 'dist';
+
+ $installer = Installer::create(
+ $event->getIO(),
+ // Create a new Composer instance to ensure full processing of
+ // the merged files.
+ Factory::create($event->getIO(), null, false)
+ );
+
+ $installer->setPreferSource($preferSource);
+ $installer->setPreferDist($preferDist);
+ $installer->setDevMode($event->isDevMode());
+ $installer->setDumpAutoloader($this->state->shouldDumpAutoloader());
+ $installer->setOptimizeAutoloader(
+ $this->state->shouldOptimizeAutoloader()
+ );
+
+ if ($this->state->forceUpdate()) {
+ // Force update mode so that new packages are processed rather
+ // than just telling the user that composer.json and
+ // composer.lock don't match.
+ $installer->setUpdate(true);
+ }
+
+ $installer->run();
+ }
+ // @codeCoverageIgnoreEnd
+ }
+}
+// vim:sw=4:ts=4:sts=4:et:
diff --git a/core/vendor/zendframework/zend-diactoros/.coveralls.yml b/vendor/zendframework/zend-diactoros/.coveralls.yml
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/.coveralls.yml
rename to vendor/zendframework/zend-diactoros/.coveralls.yml
diff --git a/core/vendor/zendframework/zend-diactoros/CHANGELOG.md b/vendor/zendframework/zend-diactoros/CHANGELOG.md
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/CHANGELOG.md
rename to vendor/zendframework/zend-diactoros/CHANGELOG.md
diff --git a/core/vendor/zendframework/zend-diactoros/CONTRIBUTING.md b/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/CONTRIBUTING.md
rename to vendor/zendframework/zend-diactoros/CONTRIBUTING.md
diff --git a/core/vendor/zendframework/zend-diactoros/LICENSE.md b/vendor/zendframework/zend-diactoros/LICENSE.md
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/LICENSE.md
rename to vendor/zendframework/zend-diactoros/LICENSE.md
diff --git a/core/vendor/zendframework/zend-diactoros/README.md b/vendor/zendframework/zend-diactoros/README.md
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/README.md
rename to vendor/zendframework/zend-diactoros/README.md
diff --git a/core/vendor/zendframework/zend-diactoros/composer.json b/vendor/zendframework/zend-diactoros/composer.json
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/composer.json
rename to vendor/zendframework/zend-diactoros/composer.json
diff --git a/core/vendor/zendframework/zend-diactoros/phpcs.xml b/vendor/zendframework/zend-diactoros/phpcs.xml
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/phpcs.xml
rename to vendor/zendframework/zend-diactoros/phpcs.xml
diff --git a/core/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php b/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
rename to vendor/zendframework/zend-diactoros/src/AbstractSerializer.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php b/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
rename to vendor/zendframework/zend-diactoros/src/Exception/DeprecatedMethodException.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-diactoros/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php b/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
rename to vendor/zendframework/zend-diactoros/src/HeaderSecurity.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/MessageTrait.php b/vendor/zendframework/zend-diactoros/src/MessageTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/MessageTrait.php
rename to vendor/zendframework/zend-diactoros/src/MessageTrait.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/PhpInputStream.php b/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/PhpInputStream.php
rename to vendor/zendframework/zend-diactoros/src/PhpInputStream.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/RelativeStream.php b/vendor/zendframework/zend-diactoros/src/RelativeStream.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/RelativeStream.php
rename to vendor/zendframework/zend-diactoros/src/RelativeStream.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Request.php b/vendor/zendframework/zend-diactoros/src/Request.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Request.php
rename to vendor/zendframework/zend-diactoros/src/Request.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Request/Serializer.php b/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Request/Serializer.php
rename to vendor/zendframework/zend-diactoros/src/Request/Serializer.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/RequestTrait.php b/vendor/zendframework/zend-diactoros/src/RequestTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/RequestTrait.php
rename to vendor/zendframework/zend-diactoros/src/RequestTrait.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response.php b/vendor/zendframework/zend-diactoros/src/Response.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response.php
rename to vendor/zendframework/zend-diactoros/src/Response.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php b/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
rename to vendor/zendframework/zend-diactoros/src/Response/EmitterInterface.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php b/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
rename to vendor/zendframework/zend-diactoros/src/Response/EmptyResponse.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php b/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
rename to vendor/zendframework/zend-diactoros/src/Response/HtmlResponse.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php b/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
rename to vendor/zendframework/zend-diactoros/src/Response/InjectContentTypeTrait.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php b/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
rename to vendor/zendframework/zend-diactoros/src/Response/JsonResponse.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php b/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
rename to vendor/zendframework/zend-diactoros/src/Response/RedirectResponse.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php b/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
rename to vendor/zendframework/zend-diactoros/src/Response/SapiEmitter.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Response/Serializer.php b/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Response/Serializer.php
rename to vendor/zendframework/zend-diactoros/src/Response/Serializer.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Server.php b/vendor/zendframework/zend-diactoros/src/Server.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Server.php
rename to vendor/zendframework/zend-diactoros/src/Server.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/ServerRequest.php b/vendor/zendframework/zend-diactoros/src/ServerRequest.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/ServerRequest.php
rename to vendor/zendframework/zend-diactoros/src/ServerRequest.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php b/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
rename to vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Stream.php b/vendor/zendframework/zend-diactoros/src/Stream.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Stream.php
rename to vendor/zendframework/zend-diactoros/src/Stream.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/UploadedFile.php b/vendor/zendframework/zend-diactoros/src/UploadedFile.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/UploadedFile.php
rename to vendor/zendframework/zend-diactoros/src/UploadedFile.php
diff --git a/core/vendor/zendframework/zend-diactoros/src/Uri.php b/vendor/zendframework/zend-diactoros/src/Uri.php
similarity index 100%
rename from core/vendor/zendframework/zend-diactoros/src/Uri.php
rename to vendor/zendframework/zend-diactoros/src/Uri.php
diff --git a/core/vendor/zendframework/zend-escaper/CONTRIBUTING.md b/vendor/zendframework/zend-escaper/CONTRIBUTING.md
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/CONTRIBUTING.md
rename to vendor/zendframework/zend-escaper/CONTRIBUTING.md
diff --git a/core/vendor/zendframework/zend-stdlib/LICENSE.md b/vendor/zendframework/zend-escaper/LICENSE.md
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/LICENSE.md
rename to vendor/zendframework/zend-escaper/LICENSE.md
diff --git a/core/vendor/zendframework/zend-escaper/README.md b/vendor/zendframework/zend-escaper/README.md
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/README.md
rename to vendor/zendframework/zend-escaper/README.md
diff --git a/core/vendor/zendframework/zend-escaper/composer.json b/vendor/zendframework/zend-escaper/composer.json
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/composer.json
rename to vendor/zendframework/zend-escaper/composer.json
diff --git a/core/vendor/zendframework/zend-escaper/src/Escaper.php b/vendor/zendframework/zend-escaper/src/Escaper.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/src/Escaper.php
rename to vendor/zendframework/zend-escaper/src/Escaper.php
diff --git a/core/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-escaper/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
rename to vendor/zendframework/zend-escaper/src/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php b/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
rename to vendor/zendframework/zend-escaper/src/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/CHANGELOG.md b/vendor/zendframework/zend-feed/CHANGELOG.md
similarity index 100%
rename from core/vendor/zendframework/zend-feed/CHANGELOG.md
rename to vendor/zendframework/zend-feed/CHANGELOG.md
diff --git a/core/vendor/zendframework/zend-feed/CONTRIBUTING.md b/vendor/zendframework/zend-feed/CONTRIBUTING.md
similarity index 100%
rename from core/vendor/zendframework/zend-feed/CONTRIBUTING.md
rename to vendor/zendframework/zend-feed/CONTRIBUTING.md
diff --git a/core/vendor/zendframework/zend-feed/LICENSE.md b/vendor/zendframework/zend-feed/LICENSE.md
similarity index 100%
rename from core/vendor/zendframework/zend-feed/LICENSE.md
rename to vendor/zendframework/zend-feed/LICENSE.md
diff --git a/core/vendor/zendframework/zend-feed/README.md b/vendor/zendframework/zend-feed/README.md
similarity index 100%
rename from core/vendor/zendframework/zend-feed/README.md
rename to vendor/zendframework/zend-feed/README.md
diff --git a/core/vendor/zendframework/zend-feed/composer.json b/vendor/zendframework/zend-feed/composer.json
similarity index 100%
rename from core/vendor/zendframework/zend-feed/composer.json
rename to vendor/zendframework/zend-feed/composer.json
diff --git a/core/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
rename to vendor/zendframework/zend-feed/src/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-feed/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
rename to vendor/zendframework/zend-feed/src/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
rename to vendor/zendframework/zend-feed/src/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/AbstractCallback.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/CallbackInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/HttpResponse.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Model/AbstractModel.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Model/Subscription.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Model/SubscriptionPersistenceInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/PubSubHubbub.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Publisher.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Subscriber/Callback.php
diff --git a/core/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php b/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
rename to vendor/zendframework/zend-feed/src/PubSubHubbub/Version.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php b/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
rename to vendor/zendframework/zend-feed/src/Reader/AbstractEntry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
rename to vendor/zendframework/zend-feed/src/Reader/AbstractFeed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Collection.php b/vendor/zendframework/zend-feed/src/Reader/Collection.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Collection.php
rename to vendor/zendframework/zend-feed/src/Reader/Collection.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php b/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
rename to vendor/zendframework/zend-feed/src/Reader/Collection/AbstractCollection.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
rename to vendor/zendframework/zend-feed/src/Reader/Collection/Author.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
rename to vendor/zendframework/zend-feed/src/Reader/Collection/Category.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php b/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
rename to vendor/zendframework/zend-feed/src/Reader/Collection/Collection.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php b/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
rename to vendor/zendframework/zend-feed/src/Reader/Entry/AbstractEntry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
rename to vendor/zendframework/zend-feed/src/Reader/Entry/Atom.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php b/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/Entry/EntryInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php b/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
rename to vendor/zendframework/zend-feed/src/Reader/Entry/Rss.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
rename to vendor/zendframework/zend-feed/src/Reader/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
rename to vendor/zendframework/zend-feed/src/Reader/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
rename to vendor/zendframework/zend-feed/src/Reader/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/AbstractEntry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/AbstractFeed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Atom/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Content/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/CreativeCommons/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/DublinCore/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Podcast/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Slash/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Syndication/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/Thread/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php b/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
rename to vendor/zendframework/zend-feed/src/Reader/Extension/WellFormedWeb/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php b/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
rename to vendor/zendframework/zend-feed/src/Reader/ExtensionManager.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php b/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/ExtensionManagerInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php b/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
rename to vendor/zendframework/zend-feed/src/Reader/ExtensionPluginManager.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
rename to vendor/zendframework/zend-feed/src/Reader/Feed/AbstractFeed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php b/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
rename to vendor/zendframework/zend-feed/src/Reader/Feed/Atom.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php b/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
rename to vendor/zendframework/zend-feed/src/Reader/Feed/Atom/Source.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php b/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/Feed/FeedInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php b/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
rename to vendor/zendframework/zend-feed/src/Reader/Feed/Rss.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/FeedSet.php b/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/FeedSet.php
rename to vendor/zendframework/zend-feed/src/Reader/FeedSet.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php b/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/Http/ClientInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php b/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/Http/ResponseInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/Reader.php b/vendor/zendframework/zend-feed/src/Reader/Reader.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/Reader.php
rename to vendor/zendframework/zend-feed/src/Reader/Reader.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php b/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
rename to vendor/zendframework/zend-feed/src/Reader/ReaderImportInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php b/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
rename to vendor/zendframework/zend-feed/src/Reader/StandaloneExtensionManager.php
diff --git a/core/vendor/zendframework/zend-feed/src/Uri.php b/vendor/zendframework/zend-feed/src/Uri.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Uri.php
rename to vendor/zendframework/zend-feed/src/Uri.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php b/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
rename to vendor/zendframework/zend-feed/src/Writer/AbstractFeed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Deleted.php b/vendor/zendframework/zend-feed/src/Writer/Deleted.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Deleted.php
rename to vendor/zendframework/zend-feed/src/Writer/Deleted.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
rename to vendor/zendframework/zend-feed/src/Writer/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php b/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-feed/src/Writer/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
rename to vendor/zendframework/zend-feed/src/Writer/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php b/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
rename to vendor/zendframework/zend-feed/src/Writer/Exception/RuntimeException.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php b/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/AbstractRenderer.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/Atom/Renderer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/Content/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/DublinCore/Renderer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/ITunes/Renderer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php b/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/RendererInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/Slash/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/Threading/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php b/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
rename to vendor/zendframework/zend-feed/src/Writer/Extension/WellFormedWeb/Renderer/Entry.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
rename to vendor/zendframework/zend-feed/src/Writer/ExtensionManager.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
rename to vendor/zendframework/zend-feed/src/Writer/ExtensionManagerInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php b/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
rename to vendor/zendframework/zend-feed/src/Writer/ExtensionPluginManager.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Feed.php b/vendor/zendframework/zend-feed/src/Writer/Feed.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Feed.php
rename to vendor/zendframework/zend-feed/src/Writer/Feed.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php b/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
rename to vendor/zendframework/zend-feed/src/Writer/FeedFactory.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/AbstractRenderer.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Atom/Deleted.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/AtomDeleted.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Entry/Rss.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AbstractAtom.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/AbstractAtom.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Atom/Source.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/AtomSource.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/Feed/Rss.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php b/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
rename to vendor/zendframework/zend-feed/src/Writer/Renderer/RendererInterface.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Source.php b/vendor/zendframework/zend-feed/src/Writer/Source.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Source.php
rename to vendor/zendframework/zend-feed/src/Writer/Source.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Version.php b/vendor/zendframework/zend-feed/src/Writer/Version.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Version.php
rename to vendor/zendframework/zend-feed/src/Writer/Version.php
diff --git a/core/vendor/zendframework/zend-feed/src/Writer/Writer.php b/vendor/zendframework/zend-feed/src/Writer/Writer.php
similarity index 100%
rename from core/vendor/zendframework/zend-feed/src/Writer/Writer.php
rename to vendor/zendframework/zend-feed/src/Writer/Writer.php
diff --git a/vendor/zendframework/zend-hydrator/CHANGELOG.md b/vendor/zendframework/zend-hydrator/CHANGELOG.md
new file mode 100644
index 0000000..6911686
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/CHANGELOG.md
@@ -0,0 +1,39 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 1.0.0 - 2015-09-17
+
+Initial release. This ports all hydrator classes and functionality from
+[zend-stdlib](https://github.com/zendframework/zend-stdlib) to a standalone
+repository. All final keywords are removed, to allow a deprecation cycle in the
+zend-stdlib component.
+
+Please note: the following classes will be marked as `final` for a version 2.0.0
+release to immediately follow 1.0.0:
+
+- `Zend\Hydrator\NamingStrategy\IdentityNamingStrategy`
+- `Zend\Hydrator\NamingStrategy\ArrayMapNamingStrategy`
+- `Zend\Hydrator\NamingStrategy\CompositeNamingStrategy`
+- `Zend\Hydrator\Strategy\ExplodeStrategy`
+- `Zend\Hydrator\Strategy\StrategyChain`
+- `Zend\Hydrator\Strategy\DateTimeFormatterStrategy`
+- `Zend\Hydrator\Strategy\BooleanStrategy`
+
+As such, you should not extend them.
+
+### Added
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
diff --git a/vendor/zendframework/zend-hydrator/CONTRIBUTING.md b/vendor/zendframework/zend-hydrator/CONTRIBUTING.md
new file mode 100644
index 0000000..ddfff50
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/CONTRIBUTING.md
@@ -0,0 +1,229 @@
+# CONTRIBUTING
+
+## RESOURCES
+
+If you wish to contribute to Zend Framework, please be sure to
+read/subscribe to the following resources:
+
+ - [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards)
+ - [Contributor's Guide](http://framework.zend.com/participate/contributor-guide)
+ - ZF Contributor's mailing list:
+ Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html
+ Subscribe: zf-contributors-subscribe@lists.zend.com
+ - ZF Contributor's IRC channel:
+ #zftalk.dev on Freenode.net
+
+If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-hydrator/issues/new).
+
+## Reporting Potential Security Issues
+
+If you have encountered a potential security vulnerability, please **DO NOT** report it on the public
+issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead.
+We will work with you to verify the vulnerability and patch it as soon as possible.
+
+When reporting issues, please provide the following information:
+
+- Component(s) affected
+- A description indicating how to reproduce the issue
+- A summary of the security vulnerability and impact
+
+We request that you contact us via the email address above and give the project
+contributors a chance to resolve the vulnerability and issue a new release prior
+to any public exposure; this helps protect users and provides them with a chance
+to upgrade and/or update in order to protect their applications.
+
+For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc).
+
+## RUNNING TESTS
+
+> ### Note: testing versions prior to 2.4
+>
+> This component originates with Zend Framework 2. During the lifetime of ZF2,
+> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
+> changes were necessary. However, due to the migration, tests may not run on
+> versions < 2.4. As such, you may need to change the PHPUnit dependency if
+> attempting a fix on such a version.
+
+To run tests:
+
+- Clone the repository:
+
+ ```console
+ $ git clone git@github.com:zendframework/zend-hydrator.git
+ $ cd
+ ```
+
+- Install dependencies via composer:
+
+ ```console
+ $ curl -sS https://getcomposer.org/installer | php --
+ $ ./composer.phar install
+ ```
+
+ If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
+
+- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
+
+ ```console
+ $ ./vendor/bin/phpunit
+ ```
+
+You can turn on conditional tests with the phpunit.xml file.
+To do so:
+
+ - Copy `phpunit.xml.dist` file to `phpunit.xml`
+ - Edit `phpunit.xml` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
+
+## Running Coding Standards Checks
+
+This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
+standards checks, and provides configuration for our selected checks.
+`phpcs` is installed by default via Composer.
+
+To run checks only:
+
+```console
+$ ./vendor/bin/phpcs
+```
+
+`phpcs` also provides a tool that can automatically fix many CS issues,
+`phpcbf`:
+
+```console
+$ ./vendor/bin/phpcbf
+```
+
+If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
+they pass, and make sure you add and commit the changes after verification.
+
+## Recommended Workflow for Contributions
+
+Your first step is to establish a public repository from which we can
+pull your work into the master repository. We recommend using
+[GitHub](https://github.com), as that is where the component is already hosted.
+
+1. Setup a [GitHub account](http://github.com/), if you haven't yet
+2. Fork the repository (http://github.com/zendframework/zend-hydrator)
+3. Clone the canonical repository locally and enter it.
+
+ ```console
+ $ git clone git://github.com:zendframework/zend-hydrator.git
+ $ cd zend-hydrator
+ ```
+
+4. Add a remote to your fork; substitute your GitHub username in the command
+ below.
+
+ ```console
+ $ git remote add {username} git@github.com:{username}/zend-hydrator.git
+ $ git fetch {username}
+ ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical ZF repository. Assuming you have setup your local repository
+per the instructions above, you can do the following:
+
+
+```console
+$ git checkout master
+$ git fetch origin
+$ git rebase origin/master
+# OPTIONALLY, to keep your remote up-to-date -
+$ git push {username} master:master
+```
+
+If you're tracking other branches -- for example, the "develop" branch, where
+new feature development occurs -- you'll want to do the same operations for that
+branch; simply substitute "develop" for "master".
+
+### Working on a patch
+
+We recommend you do each new feature or bugfix in a new branch. This simplifies
+the task of code review as well as the task of merging your changes into the
+canonical repository.
+
+A typical workflow will then consist of the following:
+
+1. Create a new local branch based off either your master or develop branch.
+2. Switch to your new local branch. (This step can be combined with the
+ previous step with the use of `git checkout -b`.)
+3. Do some work, commit, repeat as necessary.
+4. Push the local branch to your remote repository.
+5. Send a pull request.
+
+The mechanics of this process are actually quite trivial. Below, we will
+create a branch for fixing an issue in the tracker.
+
+```console
+$ git checkout -b hotfix/9295
+Switched to a new branch 'hotfix/9295'
+```
+
+... do some work ...
+
+
+```console
+$ git commit
+```
+
+... write your log message ...
+
+
+```console
+$ git push {username} hotfix/9295:hotfix/9295
+Counting objects: 38, done.
+Delta compression using up to 2 threads.
+Compression objects: 100% (18/18), done.
+Writing objects: 100% (20/20), 8.19KiB, done.
+Total 20 (delta 12), reused 0 (delta 0)
+To ssh://git@github.com/{username}/zend-hydrator.git
+ b5583aa..4f51698 HEAD -> master
+```
+
+To send a pull request, you have two options.
+
+If using GitHub, you can do the pull request from there. Navigate to
+your repository, select the branch you just created, and then select the
+"Pull Request" button in the upper right. Select the user/organization
+"zendframework" as the recipient.
+
+If using your own repository - or even if using GitHub - you can use `git
+format-patch` to create a patchset for us to apply; in fact, this is
+**recommended** for security-related patches. If you use `format-patch`, please
+send the patches as attachments to:
+
+- zf-devteam@zend.com for patches without security implications
+- zf-security@zend.com for security patches
+
+#### What branch to issue the pull request against?
+
+Which branch should you issue a pull request against?
+
+- For fixes against the stable release, issue the pull request against the
+ "master" branch.
+- For new features, or fixes that introduce new elements to the public API (such
+ as new public methods or properties), issue the pull request against the
+ "develop" branch.
+
+### Branch Cleanup
+
+As you might imagine, if you are a frequent contributor, you'll start to
+get a ton of branches both locally and on your remote.
+
+Once you know that your changes have been accepted to the master
+repository, we suggest doing some cleanup of these branches.
+
+- Local branch cleanup
+
+ ```console
+ $ git branch -d
+ ```
+
+- Remote branch removal
+
+ ```console
+ $ git push {username} :
+ ```
diff --git a/core/vendor/zendframework/zend-escaper/LICENSE.md b/vendor/zendframework/zend-hydrator/LICENSE.md
similarity index 100%
rename from core/vendor/zendframework/zend-escaper/LICENSE.md
rename to vendor/zendframework/zend-hydrator/LICENSE.md
diff --git a/vendor/zendframework/zend-hydrator/README.md b/vendor/zendframework/zend-hydrator/README.md
new file mode 100644
index 0000000..7608334
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/README.md
@@ -0,0 +1,11 @@
+# zend-hydrator
+
+[](https://secure.travis-ci.org/zendframework/zend-hydrator)
+[](https://coveralls.io/r/zendframework/zend-hydrator?branch=master)
+
+`Zend\Hydrator` provides utilities for mapping arrays to objects, and vice
+versa, including facilities for filtering which data is mapped as well as
+providing mechanisms for mapping nested structures.
+
+- File issues at https://github.com/zendframework/zend-hydrator/issues
+- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
diff --git a/vendor/zendframework/zend-hydrator/composer.json b/vendor/zendframework/zend-hydrator/composer.json
new file mode 100644
index 0000000..21b4afe
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/composer.json
@@ -0,0 +1,47 @@
+{
+ "name": "zendframework/zend-hydrator",
+ "description": " ",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "zf2",
+ "hydrator"
+ ],
+ "homepage": "https://github.com/zendframework/zend-hydrator",
+ "autoload": {
+ "psr-4": {
+ "Zend\\Hydrator\\": "src/"
+ }
+ },
+ "require": {
+ "php": ">=5.5",
+ "zendframework/zend-stdlib": "^2.5.1"
+ },
+ "require-dev": {
+ "zendframework/zend-eventmanager": "^2.5.1",
+ "zendframework/zend-inputfilter": "^2.5.1",
+ "zendframework/zend-serializer": "^2.5.1",
+ "zendframework/zend-servicemanager": "^2.5.1",
+ "zendframework/zend-filter": "^2.5.1",
+ "phpunit/PHPUnit": "~4.0",
+ "squizlabs/php_codesniffer": "^2.0@dev"
+ },
+ "suggest": {
+ "zendframework/zend-eventmanager": "^2.5.1, to support aggregate hydrator usage",
+ "zendframework/zend-serializer": "^2.5.1, to use the SerializableStrategy",
+ "zendframework/zend-servicemanager": "^2.5.1, to support hydrator plugin manager usage",
+ "zendframework/zend-filter": "^2.5.1, to support naming strategy hydrator usage"
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0-dev",
+ "dev-develop": "1.1-dev"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "ZendTest\\Hydrator\\": "test/"
+ }
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/phpcs.xml b/vendor/zendframework/zend-hydrator/phpcs.xml
new file mode 100644
index 0000000..e994eae
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/phpcs.xml
@@ -0,0 +1,21 @@
+
+
+ Zend Framework coding standard
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ test
+
diff --git a/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php b/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php
new file mode 100644
index 0000000..6f3f0a9
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/AbstractHydrator.php
@@ -0,0 +1,283 @@
+strategies = new ArrayObject();
+ $this->filterComposite = new Filter\FilterComposite();
+ }
+
+ /**
+ * Gets the strategy with the given name.
+ *
+ * @param string $name The name of the strategy to get.
+ *
+ * @throws Exception\InvalidArgumentException
+ * @return Strategy\StrategyInterface
+ */
+ public function getStrategy($name)
+ {
+ if (isset($this->strategies[$name])) {
+ return $this->strategies[$name];
+ }
+
+ if (!isset($this->strategies['*'])) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s: no strategy by name of "%s", and no wildcard strategy present',
+ __METHOD__,
+ $name
+ ));
+ }
+
+ return $this->strategies['*'];
+ }
+
+ /**
+ * Checks if the strategy with the given name exists.
+ *
+ * @param string $name The name of the strategy to check for.
+ * @return bool
+ */
+ public function hasStrategy($name)
+ {
+ return array_key_exists($name, $this->strategies)
+ || array_key_exists('*', $this->strategies);
+ }
+
+ /**
+ * Adds the given strategy under the given name.
+ *
+ * @param string $name The name of the strategy to register.
+ * @param Strategy\StrategyInterface $strategy The strategy to register.
+ * @return HydratorInterface
+ */
+ public function addStrategy($name, Strategy\StrategyInterface $strategy)
+ {
+ $this->strategies[$name] = $strategy;
+ return $this;
+ }
+
+ /**
+ * Removes the strategy with the given name.
+ *
+ * @param string $name The name of the strategy to remove.
+ * @return HydratorInterface
+ */
+ public function removeStrategy($name)
+ {
+ unset($this->strategies[$name]);
+ return $this;
+ }
+
+ /**
+ * Converts a value for extraction. If no strategy exists the plain value is returned.
+ *
+ * @param string $name The name of the strategy to use.
+ * @param mixed $value The value that should be converted.
+ * @param mixed $object The object is optionally provided as context.
+ * @return mixed
+ */
+ public function extractValue($name, $value, $object = null)
+ {
+ if ($this->hasStrategy($name)) {
+ $strategy = $this->getStrategy($name);
+ $value = $strategy->extract($value, $object);
+ }
+ return $value;
+ }
+
+ /**
+ * Converts a value for hydration. If no strategy exists the plain value is returned.
+ *
+ * @param string $name The name of the strategy to use.
+ * @param mixed $value The value that should be converted.
+ * @param array $data The whole data is optionally provided as context.
+ * @return mixed
+ */
+ public function hydrateValue($name, $value, $data = null)
+ {
+ if ($this->hasStrategy($name)) {
+ $strategy = $this->getStrategy($name);
+ $value = $strategy->hydrate($value, $data);
+ }
+ return $value;
+ }
+
+ /**
+ * Convert a name for extraction. If no naming strategy exists, the plain value is returned.
+ *
+ * @param string $name The name to convert.
+ * @param null $object The object is optionally provided as context.
+ * @return mixed
+ */
+ public function extractName($name, $object = null)
+ {
+ if ($this->hasNamingStrategy()) {
+ $name = $this->getNamingStrategy()->extract($name, $object);
+ }
+ return $name;
+ }
+
+ /**
+ * Converts a value for hydration. If no naming strategy exists, the plain value is returned.
+ *
+ * @param string $name The name to convert.
+ * @param array $data The whole data is optionally provided as context.
+ * @return mixed
+ */
+ public function hydrateName($name, $data = null)
+ {
+ if ($this->hasNamingStrategy()) {
+ $name = $this->getNamingStrategy()->hydrate($name, $data);
+ }
+ return $name;
+ }
+
+ /**
+ * Get the filter instance
+ *
+ * @return Filter\FilterComposite
+ */
+ public function getFilter()
+ {
+ return $this->filterComposite;
+ }
+
+ /**
+ * Add a new filter to take care of what needs to be hydrated.
+ * To exclude e.g. the method getServiceLocator:
+ *
+ *
+ * $composite->addFilter("servicelocator",
+ * function ($property) {
+ * list($class, $method) = explode('::', $property);
+ * if ($method === 'getServiceLocator') {
+ * return false;
+ * }
+ * return true;
+ * }, FilterComposite::CONDITION_AND
+ * );
+ *
+ *
+ * @param string $name Index in the composite
+ * @param callable|Filter\FilterInterface $filter
+ * @param int $condition
+ * @return Filter\FilterComposite
+ */
+ public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR)
+ {
+ return $this->filterComposite->addFilter($name, $filter, $condition);
+ }
+
+ /**
+ * Check whether a specific filter exists at key $name or not
+ *
+ * @param string $name Index in the composite
+ * @return bool
+ */
+ public function hasFilter($name)
+ {
+ return $this->filterComposite->hasFilter($name);
+ }
+
+ /**
+ * Remove a filter from the composition.
+ * To not extract "has" methods, you simply need to unregister it
+ *
+ *
+ * $filterComposite->removeFilter('has');
+ *
+ *
+ * @param $name
+ * @return Filter\FilterComposite
+ */
+ public function removeFilter($name)
+ {
+ return $this->filterComposite->removeFilter($name);
+ }
+
+ /**
+ * Adds the given naming strategy
+ *
+ * @param NamingStrategy\NamingStrategyInterface $strategy The naming to register.
+ * @return self
+ */
+ public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy)
+ {
+ $this->namingStrategy = $strategy;
+
+ return $this;
+ }
+
+ /**
+ * Gets the naming strategy.
+ *
+ * @return NamingStrategy\NamingStrategyInterface
+ */
+ public function getNamingStrategy()
+ {
+ return $this->namingStrategy;
+ }
+
+ /**
+ * Checks if a naming strategy exists.
+ *
+ * @return bool
+ */
+ public function hasNamingStrategy()
+ {
+ return isset($this->namingStrategy);
+ }
+
+ /**
+ * Removes the naming strategy
+ *
+ * @return self
+ */
+ public function removeNamingStrategy()
+ {
+ $this->namingStrategy = null;
+
+ return $this;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php b/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php
new file mode 100644
index 0000000..fa384ad
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Aggregate/AggregateHydrator.php
@@ -0,0 +1,85 @@
+getEventManager()->attachAggregate(new HydratorListener($hydrator), $priority);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function extract($object)
+ {
+ $event = new ExtractEvent($this, $object);
+
+ $this->getEventManager()->trigger($event);
+
+ return $event->getExtractedData();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function hydrate(array $data, $object)
+ {
+ $event = new HydrateEvent($this, $object, $data);
+
+ $this->getEventManager()->trigger($event);
+
+ return $event->getHydratedObject();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function setEventManager(EventManagerInterface $eventManager)
+ {
+ $eventManager->setIdentifiers([__CLASS__, get_class($this)]);
+
+ $this->eventManager = $eventManager;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function getEventManager()
+ {
+ if (null === $this->eventManager) {
+ $this->setEventManager(new EventManager());
+ }
+
+ return $this->eventManager;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php b/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php
new file mode 100644
index 0000000..1395917
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Aggregate/ExtractEvent.php
@@ -0,0 +1,98 @@
+target = $target;
+ $this->extractionObject = $extractionObject;
+ }
+
+ /**
+ * Retrieves the object from which data is extracted
+ *
+ * @return object
+ */
+ public function getExtractionObject()
+ {
+ return $this->extractionObject;
+ }
+
+ /**
+ * @param object $extractionObject
+ *
+ * @return void
+ */
+ public function setExtractionObject($extractionObject)
+ {
+ $this->extractionObject = $extractionObject;
+ }
+
+ /**
+ * Retrieves the data that has been extracted
+ *
+ * @return array
+ */
+ public function getExtractedData()
+ {
+ return $this->extractedData;
+ }
+
+ /**
+ * @param array $extractedData
+ *
+ * @return void
+ */
+ public function setExtractedData(array $extractedData)
+ {
+ $this->extractedData = $extractedData;
+ }
+
+ /**
+ * Merge provided data with the extracted data
+ *
+ * @param array $additionalData
+ *
+ * @return void
+ */
+ public function mergeExtractedData(array $additionalData)
+ {
+ $this->extractedData = array_merge($this->extractedData, $additionalData);
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php b/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php
new file mode 100644
index 0000000..7865964
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Aggregate/HydrateEvent.php
@@ -0,0 +1,84 @@
+target = $target;
+ $this->hydratedObject = $hydratedObject;
+ $this->hydrationData = $hydrationData;
+ }
+
+ /**
+ * Retrieves the object that is being hydrated
+ *
+ * @return object
+ */
+ public function getHydratedObject()
+ {
+ return $this->hydratedObject;
+ }
+
+ /**
+ * @param object $hydratedObject
+ */
+ public function setHydratedObject($hydratedObject)
+ {
+ $this->hydratedObject = $hydratedObject;
+ }
+
+ /**
+ * Retrieves the data that is being used for hydration
+ *
+ * @return array
+ */
+ public function getHydrationData()
+ {
+ return $this->hydrationData;
+ }
+
+ /**
+ * @param array $hydrationData
+ */
+ public function setHydrationData(array $hydrationData)
+ {
+ $this->hydrationData = $hydrationData;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php b/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php
new file mode 100644
index 0000000..c8260a4
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Aggregate/HydratorListener.php
@@ -0,0 +1,72 @@
+hydrator = $hydrator;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function attach(EventManagerInterface $events, $priority = 1)
+ {
+ $this->listeners[] = $events->attach(HydrateEvent::EVENT_HYDRATE, [$this, 'onHydrate'], $priority);
+ $this->listeners[] = $events->attach(ExtractEvent::EVENT_EXTRACT, [$this, 'onExtract'], $priority);
+ }
+
+ /**
+ * Callback to be used when {@see HydrateEvent::EVENT_HYDRATE} is triggered
+ *
+ * @param HydrateEvent $event
+ * @return object
+ * @internal
+ */
+ public function onHydrate(HydrateEvent $event)
+ {
+ $object = $this->hydrator->hydrate($event->getHydrationData(), $event->getHydratedObject());
+ $event->setHydratedObject($object);
+ return $object;
+ }
+
+ /**
+ * Callback to be used when {@see ExtractEvent::EVENT_EXTRACT} is triggered
+ *
+ * @param ExtractEvent $event
+ * @return array
+ * @internal
+ */
+ public function onExtract(ExtractEvent $event)
+ {
+ $data = $this->hydrator->extract($event->getExtractionObject());
+ $event->mergeExtractedData($data);
+ return $data;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/ArraySerializable.php b/vendor/zendframework/zend-hydrator/src/ArraySerializable.php
new file mode 100644
index 0000000..24edee5
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/ArraySerializable.php
@@ -0,0 +1,81 @@
+getArrayCopy();
+ $filter = $this->getFilter();
+
+ foreach ($data as $name => $value) {
+ if (!$filter->filter($name)) {
+ unset($data[$name]);
+ continue;
+ }
+ $extractedName = $this->extractName($name, $object);
+ // replace the original key with extracted, if differ
+ if ($extractedName !== $name) {
+ unset($data[$name]);
+ $name = $extractedName;
+ }
+ $data[$name] = $this->extractValue($name, $value, $object);
+ }
+
+ return $data;
+ }
+
+ /**
+ * Hydrate an object
+ *
+ * Hydrates an object by passing $data to either its exchangeArray() or
+ * populate() method.
+ *
+ * @param array $data
+ * @param object $object
+ * @return object
+ * @throws Exception\BadMethodCallException for an $object not implementing exchangeArray() or populate()
+ */
+ public function hydrate(array $data, $object)
+ {
+ $replacement = [];
+ foreach ($data as $key => $value) {
+ $name = $this->hydrateName($key, $data);
+ $replacement[$name] = $this->hydrateValue($name, $value, $data);
+ }
+
+ if (is_callable([$object, 'exchangeArray'])) {
+ $object->exchangeArray($replacement);
+ } elseif (is_callable([$object, 'populate'])) {
+ $object->populate($replacement);
+ } else {
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided object to implement exchangeArray() or populate()', __METHOD__)
+ );
+ }
+ return $object;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/ClassMethods.php b/vendor/zendframework/zend-hydrator/src/ClassMethods.php
new file mode 100644
index 0000000..80cce84
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/ClassMethods.php
@@ -0,0 +1,268 @@
+setUnderscoreSeparatedKeys($underscoreSeparatedKeys);
+
+ $this->callableMethodFilter = new Filter\OptionalParametersFilter();
+
+ $this->filterComposite->addFilter('is', new Filter\IsFilter());
+ $this->filterComposite->addFilter('has', new Filter\HasFilter());
+ $this->filterComposite->addFilter('get', new Filter\GetFilter());
+ $this->filterComposite->addFilter(
+ 'parameter',
+ new Filter\OptionalParametersFilter(),
+ Filter\FilterComposite::CONDITION_AND
+ );
+ }
+
+ /**
+ * @param array|Traversable $options
+ * @return ClassMethods
+ * @throws Exception\InvalidArgumentException
+ */
+ public function setOptions($options)
+ {
+ if ($options instanceof Traversable) {
+ $options = ArrayUtils::iteratorToArray($options);
+ } elseif (!is_array($options)) {
+ throw new Exception\InvalidArgumentException(
+ 'The options parameter must be an array or a Traversable'
+ );
+ }
+ if (isset($options['underscoreSeparatedKeys'])) {
+ $this->setUnderscoreSeparatedKeys($options['underscoreSeparatedKeys']);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param bool $underscoreSeparatedKeys
+ * @return ClassMethods
+ */
+ public function setUnderscoreSeparatedKeys($underscoreSeparatedKeys)
+ {
+ $this->underscoreSeparatedKeys = (bool) $underscoreSeparatedKeys;
+
+ if ($this->underscoreSeparatedKeys) {
+ $this->setNamingStrategy(new NamingStrategy\UnderscoreNamingStrategy);
+ } elseif ($this->getNamingStrategy() instanceof NamingStrategy\UnderscoreNamingStrategy) {
+ $this->removeNamingStrategy();
+ }
+
+ return $this;
+ }
+
+ /**
+ * @return bool
+ */
+ public function getUnderscoreSeparatedKeys()
+ {
+ return $this->underscoreSeparatedKeys;
+ }
+
+ /**
+ * Extract values from an object with class methods
+ *
+ * Extracts the getter/setter of the given $object.
+ *
+ * @param object $object
+ * @return array
+ * @throws Exception\BadMethodCallException for a non-object $object
+ */
+ public function extract($object)
+ {
+ if (!is_object($object)) {
+ throw new Exception\BadMethodCallException(sprintf(
+ '%s expects the provided $object to be a PHP object)',
+ __METHOD__
+ ));
+ }
+
+ $objectClass = get_class($object);
+
+ // reset the hydrator's hydrator's cache for this object, as the filter may be per-instance
+ if ($object instanceof Filter\FilterProviderInterface) {
+ $this->extractionMethodsCache[$objectClass] = null;
+ }
+
+ // pass 1 - finding out which properties can be extracted, with which methods (populate hydration cache)
+ if (! isset($this->extractionMethodsCache[$objectClass])) {
+ $this->extractionMethodsCache[$objectClass] = [];
+ $filter = $this->filterComposite;
+ $methods = get_class_methods($object);
+
+ if ($object instanceof Filter\FilterProviderInterface) {
+ $filter = new Filter\FilterComposite(
+ [$object->getFilter()],
+ [new Filter\MethodMatchFilter('getFilter')]
+ );
+ }
+
+ foreach ($methods as $method) {
+ $methodFqn = $objectClass . '::' . $method;
+
+ if (! ($filter->filter($methodFqn) && $this->callableMethodFilter->filter($methodFqn))) {
+ continue;
+ }
+
+ $attribute = $method;
+
+ if (strpos($method, 'get') === 0) {
+ $attribute = substr($method, 3);
+ if (!property_exists($object, $attribute)) {
+ $attribute = lcfirst($attribute);
+ }
+ }
+
+ $this->extractionMethodsCache[$objectClass][$method] = $attribute;
+ }
+ }
+
+ $values = [];
+
+ // pass 2 - actually extract data
+ foreach ($this->extractionMethodsCache[$objectClass] as $methodName => $attributeName) {
+ $realAttributeName = $this->extractName($attributeName, $object);
+ $values[$realAttributeName] = $this->extractValue($realAttributeName, $object->$methodName(), $object);
+ }
+
+ return $values;
+ }
+
+ /**
+ * Hydrate an object by populating getter/setter methods
+ *
+ * Hydrates an object by getter/setter methods of the object.
+ *
+ * @param array $data
+ * @param object $object
+ * @return object
+ * @throws Exception\BadMethodCallException for a non-object $object
+ */
+ public function hydrate(array $data, $object)
+ {
+ if (!is_object($object)) {
+ throw new Exception\BadMethodCallException(sprintf(
+ '%s expects the provided $object to be a PHP object)',
+ __METHOD__
+ ));
+ }
+
+ $objectClass = get_class($object);
+
+ foreach ($data as $property => $value) {
+ $propertyFqn = $objectClass . '::$' . $property;
+
+ if (! isset($this->hydrationMethodsCache[$propertyFqn])) {
+ $setterName = 'set' . ucfirst($this->hydrateName($property, $data));
+
+ $this->hydrationMethodsCache[$propertyFqn] = is_callable([$object, $setterName])
+ ? $setterName
+ : false;
+ }
+
+ if ($this->hydrationMethodsCache[$propertyFqn]) {
+ $object->{$this->hydrationMethodsCache[$propertyFqn]}($this->hydrateValue($property, $value, $data));
+ }
+ }
+
+ return $object;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR)
+ {
+ $this->resetCaches();
+
+ return parent::addFilter($name, $filter, $condition);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function removeFilter($name)
+ {
+ $this->resetCaches();
+
+ return parent::removeFilter($name);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function setNamingStrategy(NamingStrategy\NamingStrategyInterface $strategy)
+ {
+ $this->resetCaches();
+
+ return parent::setNamingStrategy($strategy);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function removeNamingStrategy()
+ {
+ $this->resetCaches();
+
+ return parent::removeNamingStrategy();
+ }
+
+ /**
+ * Reset all local hydration/extraction caches
+ */
+ private function resetCaches()
+ {
+ $this->hydrationMethodsCache = $this->extractionMethodsCache = [];
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php b/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php
new file mode 100644
index 0000000..a6f3f94
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/DelegatingHydrator.php
@@ -0,0 +1,57 @@
+hydrators = $hydrators;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function hydrate(array $data, $object)
+ {
+ return $this->getHydrator($object)->hydrate($data, $object);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function extract($object)
+ {
+ return $this->getHydrator($object)->extract($object);
+ }
+
+ /**
+ * Gets hydrator of an object
+ *
+ * @param object $object
+ * @return HydratorInterface
+ */
+ protected function getHydrator($object)
+ {
+ return $this->hydrators->get(get_class($object));
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php b/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php
new file mode 100644
index 0000000..89f2841
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/DelegatingHydratorFactory.php
@@ -0,0 +1,29 @@
+orFilter = new ArrayObject($orFilter);
+ $this->andFilter = new ArrayObject($andFilter);
+ }
+
+ /**
+ * Add a filter to the composite. Has to be indexed with $name in
+ * order to identify a specific filter.
+ *
+ * This example will exclude all methods from the hydration, that starts with 'getService'
+ *
+ * $composite->addFilter('exclude',
+ * function ($method) {
+ * if (preg_match('/^getService/', $method) {
+ * return false;
+ * }
+ * return true;
+ * }, FilterComposite::CONDITION_AND
+ * );
+ *
+ *
+ * @param string $name
+ * @param callable|FilterInterface $filter
+ * @param int $condition Can be either
+ * FilterComposite::CONDITION_OR or FilterComposite::CONDITION_AND
+ * @throws InvalidArgumentException
+ * @return FilterComposite
+ */
+ public function addFilter($name, $filter, $condition = self::CONDITION_OR)
+ {
+ if (!is_callable($filter) && !($filter instanceof FilterInterface)) {
+ throw new InvalidArgumentException(
+ 'The value of ' . $name . ' should be either a callable or ' .
+ 'an instance of Zend\Stdlib\Hydrator\Filter\FilterInterface'
+ );
+ }
+
+ if ($condition === self::CONDITION_OR) {
+ $this->orFilter[$name] = $filter;
+ } elseif ($condition === self::CONDITION_AND) {
+ $this->andFilter[$name] = $filter;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Remove a filter from the composition
+ *
+ * @param $name string Identifier for the filter
+ * @return FilterComposite
+ */
+ public function removeFilter($name)
+ {
+ if (isset($this->orFilter[$name])) {
+ unset($this->orFilter[$name]);
+ }
+
+ if (isset($this->andFilter[$name])) {
+ unset($this->andFilter[$name]);
+ }
+
+ return $this;
+ }
+
+ /**
+ * Check if $name has a filter registered
+ *
+ * @param $name string Identifier for the filter
+ * @return bool
+ */
+ public function hasFilter($name)
+ {
+ return isset($this->orFilter[$name]) || isset($this->andFilter[$name]);
+ }
+
+ /**
+ * Filter the composite based on the AND and OR condition
+ * Will return true if one from the "or conditions" and all from
+ * the "and condition" returns true. Otherwise false
+ *
+ * @param $property string Parameter will be e.g. Parent\Namespace\Class::method
+ * @return bool
+ */
+ public function filter($property)
+ {
+ $andCount = count($this->andFilter);
+ $orCount = count($this->orFilter);
+ // return true if no filters are registered
+ if ($orCount === 0 && $andCount === 0) {
+ return true;
+ } elseif ($orCount === 0 && $andCount !== 0) {
+ $returnValue = true;
+ } else {
+ $returnValue = false;
+ }
+
+ // Check if 1 from the or filters return true
+ foreach ($this->orFilter as $filter) {
+ if (is_callable($filter)) {
+ if ($filter($property) === true) {
+ $returnValue = true;
+ break;
+ }
+ continue;
+ } else {
+ if ($filter->filter($property) === true) {
+ $returnValue = true;
+ break;
+ }
+ }
+ }
+
+ // Check if all of the and condition return true
+ foreach ($this->andFilter as $filter) {
+ if (is_callable($filter)) {
+ if ($filter($property) === false) {
+ return false;
+ }
+ continue;
+ } else {
+ if ($filter->filter($property) === false) {
+ return false;
+ }
+ }
+ }
+
+ return $returnValue;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php b/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php
new file mode 100644
index 0000000..fb49918
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Filter/FilterInterface.php
@@ -0,0 +1,22 @@
+method = $method;
+ $this->exclude = $exclude;
+ }
+
+ public function filter($property)
+ {
+ $pos = strpos($property, '::');
+ if ($pos !== false) {
+ $pos += 2;
+ } else {
+ $pos = 0;
+ }
+ if (substr($property, $pos) === $this->method) {
+ return !$this->exclude;
+ }
+ return $this->exclude;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php
new file mode 100644
index 0000000..abd8ee6
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Filter/NumberOfParameterFilter.php
@@ -0,0 +1,49 @@
+numberOfParameters = (int) $numberOfParameters;
+ }
+
+ /**
+ * @param string $property the name of the property
+ * @return bool
+ * @throws InvalidArgumentException
+ */
+ public function filter($property)
+ {
+ try {
+ $reflectionMethod = new ReflectionMethod($property);
+ } catch (ReflectionException $exception) {
+ throw new InvalidArgumentException(
+ "Method $property doesn't exist"
+ );
+ }
+
+ return $reflectionMethod->getNumberOfParameters() === $this->numberOfParameters;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php b/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php
new file mode 100644
index 0000000..25775d7
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Filter/OptionalParametersFilter.php
@@ -0,0 +1,55 @@
+getParameters(),
+ function (ReflectionParameter $parameter) {
+ return ! $parameter->isOptional();
+ }
+ );
+
+ return static::$propertiesCache[$property] = empty($mandatoryParameters);
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php b/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php
new file mode 100644
index 0000000..f95f8b4
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/FilterEnabledInterface.php
@@ -0,0 +1,59 @@
+
+ * $composite->addFilter(
+ * "servicelocator",
+ * function ($property) {
+ * list($class, $method) = explode('::', $property);
+ * if ($method === 'getServiceLocator') {
+ * return false;
+ * }
+ * return true;
+ * },
+ * FilterComposite::CONDITION_AND
+ * );
+ *
+ *
+ * @param string $name Index in the composite
+ * @param callable|Filter\FilterInterface $filter
+ * @param int $condition
+ * @return Filter\FilterComposite
+ */
+ public function addFilter($name, $filter, $condition = Filter\FilterComposite::CONDITION_OR);
+
+ /**
+ * Check whether a specific filter exists at key $name or not
+ *
+ * @param string $name Index in the composite
+ * @return bool
+ */
+ public function hasFilter($name);
+
+ /**
+ * Remove a filter from the composition.
+ * To not extract "has" methods, you simply need to unregister it
+ *
+ *
+ * $filterComposite->removeFilter('has');
+ *
+ *
+ * @param $name
+ * @return Filter\FilterComposite
+ */
+ public function removeFilter($name);
+}
diff --git a/vendor/zendframework/zend-hydrator/src/HydrationInterface.php b/vendor/zendframework/zend-hydrator/src/HydrationInterface.php
new file mode 100644
index 0000000..ca28983
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/HydrationInterface.php
@@ -0,0 +1,22 @@
+hydrator = $hydrator;
+
+ return $this;
+ }
+
+ /**
+ * Retrieve hydrator
+ *
+ * @param void
+ * @return null|HydratorInterface
+ * @access public
+ */
+ public function getHydrator()
+ {
+ return $this->hydrator;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/HydratorInterface.php b/vendor/zendframework/zend-hydrator/src/HydratorInterface.php
new file mode 100644
index 0000000..a48effa
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/HydratorInterface.php
@@ -0,0 +1,14 @@
+ 'Zend\Hydrator\DelegatingHydrator',
+ ];
+
+ /**
+ * Default set of adapters
+ *
+ * @var array
+ */
+ protected $invokableClasses = [
+ 'arrayserializable' => 'Zend\Hydrator\ArraySerializable',
+ 'classmethods' => 'Zend\Hydrator\ClassMethods',
+ 'objectproperty' => 'Zend\Hydrator\ObjectProperty',
+ 'reflection' => 'Zend\Hydrator\Reflection'
+ ];
+
+ /**
+ * Default factory-based adapters
+ *
+ * @var array
+ */
+ protected $factories = [
+ 'Zend\Hydrator\DelegatingHydrator' => 'Zend\Hydrator\DelegatingHydratorFactory',
+ ];
+
+ /**
+ * {@inheritDoc}
+ */
+ public function validatePlugin($plugin)
+ {
+ if ($plugin instanceof HydratorInterface) {
+ // we're okay
+ return;
+ }
+
+ throw new Exception\RuntimeException(sprintf(
+ 'Plugin of type %s is invalid; must implement Zend\Hydrator\HydratorInterface',
+ (is_object($plugin) ? get_class($plugin) : gettype($plugin))
+ ));
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php b/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php
new file mode 100644
index 0000000..8e14f03
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Iterator/HydratingArrayIterator.php
@@ -0,0 +1,36 @@
+setHydrator($hydrator);
+ $this->setPrototype($prototype);
+ parent::__construct($data);
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setPrototype($prototype)
+ {
+ if (is_object($prototype)) {
+ $this->prototype = $prototype;
+ return;
+ }
+
+ if (!class_exists($prototype)) {
+ throw new InvalidArgumentException(
+ sprintf('Method %s was passed an invalid class name: %s', __METHOD__, $prototype)
+ );
+ }
+
+ $this->prototype = new $prototype;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function setHydrator(HydratorInterface $hydrator)
+ {
+ $this->hydrator = $hydrator;
+ }
+
+ /**
+ * @return object Returns hydrated clone of $prototype
+ */
+ public function current()
+ {
+ $currentValue = parent::current();
+ $object = clone $this->prototype;
+ $this->hydrator->hydrate($currentValue, $object);
+ return $object;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php
new file mode 100644
index 0000000..c6333e2
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/NamingStrategy/ArrayMapNamingStrategy.php
@@ -0,0 +1,51 @@
+extractionMap = $extractionMap;
+ $this->hydrationMap = array_flip($extractionMap);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function hydrate($name)
+ {
+ return isset($this->hydrationMap[$name]) ? $this->hydrationMap[$name] : $name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function extract($name)
+ {
+ return isset($this->extractionMap[$name]) ? $this->extractionMap[$name] : $name;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php
new file mode 100644
index 0000000..c2bae8c
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/NamingStrategy/CompositeNamingStrategy.php
@@ -0,0 +1,64 @@
+namingStrategies = array_map(
+ function (NamingStrategyInterface $strategy) {
+ // this callback is here only to ensure type-safety
+ return $strategy;
+ },
+ $strategies
+ );
+
+ $this->defaultNamingStrategy = $defaultNamingStrategy ?: new IdentityNamingStrategy();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function extract($name)
+ {
+ $strategy = isset($this->namingStrategies[$name])
+ ? $this->namingStrategies[$name]
+ : $this->defaultNamingStrategy;
+
+ return $strategy->extract($name);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function hydrate($name)
+ {
+ $strategy = isset($this->namingStrategies[$name])
+ ? $this->namingStrategies[$name]
+ : $this->defaultNamingStrategy;
+
+ return $strategy->hydrate($name);
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php
new file mode 100644
index 0000000..59e3fed
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/NamingStrategy/IdentityNamingStrategy.php
@@ -0,0 +1,29 @@
+mapping = $mapping;
+ $this->reverse = $reverse ?: $this->flipMapping($mapping);
+ }
+
+ /**
+ * Safelly flip mapping array.
+ *
+ * @param array $array Array to flip
+ * @return array Flipped array
+ * @throws InvalidArgumentException
+ */
+ protected function flipMapping(array $array)
+ {
+ array_walk($array, function ($value) {
+ if (!is_string($value) && !is_int($value)) {
+ throw new InvalidArgumentException('Mapping array can\'t be flipped because of invalid value');
+ }
+ });
+
+ return array_flip($array);
+ }
+
+ /**
+ * Converts the given name so that it can be extracted by the hydrator.
+ *
+ * @param string $name The original name
+ * @return mixed The hydrated name
+ */
+ public function hydrate($name)
+ {
+ if (array_key_exists($name, $this->mapping)) {
+ return $this->mapping[$name];
+ }
+
+ return $name;
+ }
+
+ /**
+ * Converts the given name so that it can be hydrated by the hydrator.
+ *
+ * @param string $name The original name
+ * @return mixed The extracted name
+ */
+ public function extract($name)
+ {
+ if (array_key_exists($name, $this->reverse)) {
+ return $this->reverse[$name];
+ }
+
+ return $name;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php b/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php
new file mode 100644
index 0000000..cb7ca94
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/NamingStrategy/NamingStrategyInterface.php
@@ -0,0 +1,34 @@
+getUnderscoreToStudlyCaseFilter()->filter($name);
+ }
+
+ /**
+ * Remove capitalized letters and prepend underscores.
+ *
+ * @param string $name
+ * @return string
+ */
+ public function extract($name)
+ {
+ return $this->getCamelCaseToUnderscoreFilter()->filter($name);
+ }
+
+ /**
+ * @return FilterChain
+ */
+ protected function getUnderscoreToStudlyCaseFilter()
+ {
+ if (static::$underscoreToStudlyCaseFilter instanceof FilterChain) {
+ return static::$underscoreToStudlyCaseFilter;
+ }
+
+ $filter = new FilterChain();
+
+ $filter->attachByName('WordUnderscoreToStudlyCase');
+
+ return static::$underscoreToStudlyCaseFilter = $filter;
+ }
+
+ /**
+ * @return FilterChain
+ */
+ protected function getCamelCaseToUnderscoreFilter()
+ {
+ if (static::$camelCaseToUnderscoreFilter instanceof FilterChain) {
+ return static::$camelCaseToUnderscoreFilter;
+ }
+
+ $filter = new FilterChain();
+
+ $filter->attachByName('WordCamelCaseToUnderscore');
+ $filter->attachByName('StringToLower');
+
+ return static::$camelCaseToUnderscoreFilter = $filter;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php b/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php
new file mode 100644
index 0000000..c01a527
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/NamingStrategyEnabledInterface.php
@@ -0,0 +1,42 @@
+getFilter();
+
+ foreach ($data as $name => $value) {
+ // Filter keys, removing any we don't want
+ if (! $filter->filter($name)) {
+ unset($data[$name]);
+ continue;
+ }
+
+ // Replace name if extracted differ
+ $extracted = $this->extractName($name, $object);
+
+ if ($extracted !== $name) {
+ unset($data[$name]);
+ $name = $extracted;
+ }
+
+ $data[$name] = $this->extractValue($name, $value, $object);
+ }
+
+ return $data;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * Hydrate an object by populating public properties
+ *
+ * Hydrates an object by setting public properties of the object.
+ *
+ * @throws Exception\BadMethodCallException for a non-object $object
+ */
+ public function hydrate(array $data, $object)
+ {
+ if (!is_object($object)) {
+ throw new Exception\BadMethodCallException(
+ sprintf('%s expects the provided $object to be a PHP object)', __METHOD__)
+ );
+ }
+
+ $properties = & self::$skippedPropertiesCache[get_class($object)];
+
+ if (! isset($properties)) {
+ $reflection = new ReflectionClass($object);
+ $properties = array_fill_keys(
+ array_map(
+ function (ReflectionProperty $property) {
+ return $property->getName();
+ },
+ $reflection->getProperties(
+ ReflectionProperty::IS_PRIVATE
+ + ReflectionProperty::IS_PROTECTED
+ + ReflectionProperty::IS_STATIC
+ )
+ ),
+ true
+ );
+ }
+
+ foreach ($data as $name => $value) {
+ $property = $this->hydrateName($name, $data);
+
+ if (isset($properties[$property])) {
+ continue;
+ }
+
+ $object->$property = $this->hydrateValue($property, $value, $data);
+ }
+
+ return $object;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Reflection.php b/vendor/zendframework/zend-hydrator/src/Reflection.php
new file mode 100644
index 0000000..019748b
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Reflection.php
@@ -0,0 +1,95 @@
+extractName($property->getName(), $object);
+ if (!$this->filterComposite->filter($propertyName)) {
+ continue;
+ }
+
+ $value = $property->getValue($object);
+ $result[$propertyName] = $this->extractValue($propertyName, $value, $object);
+ }
+
+ return $result;
+ }
+
+ /**
+ * Hydrate $object with the provided $data.
+ *
+ * @param array $data
+ * @param object $object
+ * @return object
+ */
+ public function hydrate(array $data, $object)
+ {
+ $reflProperties = self::getReflProperties($object);
+ foreach ($data as $key => $value) {
+ $name = $this->hydrateName($key, $data);
+ if (isset($reflProperties[$name])) {
+ $reflProperties[$name]->setValue($object, $this->hydrateValue($name, $value, $data));
+ }
+ }
+ return $object;
+ }
+
+ /**
+ * Get a reflection properties from in-memory cache and lazy-load if
+ * class has not been loaded.
+ *
+ * @param string|object $input
+ * @throws Exception\InvalidArgumentException
+ * @return ReflectionProperty[]
+ */
+ protected static function getReflProperties($input)
+ {
+ if (is_object($input)) {
+ $input = get_class($input);
+ } elseif (!is_string($input)) {
+ throw new Exception\InvalidArgumentException('Input must be a string or an object.');
+ }
+
+ if (isset(static::$reflProperties[$input])) {
+ return static::$reflProperties[$input];
+ }
+
+ static::$reflProperties[$input] = [];
+ $reflClass = new ReflectionClass($input);
+ $reflProperties = $reflClass->getProperties();
+
+ foreach ($reflProperties as $property) {
+ $property->setAccessible(true);
+ static::$reflProperties[$input][$property->getName()] = $property;
+ }
+
+ return static::$reflProperties[$input];
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php
new file mode 100644
index 0000000..dcb3a42
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/BooleanStrategy.php
@@ -0,0 +1,104 @@
+trueValue = $trueValue;
+ $this->falseValue = $falseValue;
+ }
+
+ /**
+ * Converts the given value so that it can be extracted by the hydrator.
+ *
+ * @param bool $value The original value.
+ * @throws InvalidArgumentException
+ * @return int|string Returns the value that should be extracted.
+ */
+ public function extract($value)
+ {
+ if (!is_bool($value)) {
+ throw new InvalidArgumentException(sprintf(
+ 'Unable to extract. Expected bool. %s was given.',
+ is_object($value) ? get_class($value) : gettype($value)
+ ));
+ }
+
+ return $value === true ? $this->trueValue : $this->falseValue;
+ }
+
+ /**
+ * Converts the given value so that it can be hydrated by the hydrator.
+ *
+ * @param int|string $value The original value.
+ * @throws InvalidArgumentException
+ * @return bool Returns the value that should be hydrated.
+ */
+ public function hydrate($value)
+ {
+ if (!is_string($value) && !is_int($value)) {
+ throw new InvalidArgumentException(sprintf(
+ 'Unable to hydrate. Expected string or int. %s was given.',
+ is_object($value) ? get_class($value) : gettype($value)
+ ));
+ }
+
+ if ($value === $this->trueValue) {
+ return true;
+ }
+
+ if ($value === $this->falseValue) {
+ return false;
+ }
+
+ throw new InvalidArgumentException(sprintf(
+ 'Unexpected value %s can\'t be hydrated. Expect %s or %s as Value.',
+ $value,
+ $this->trueValue,
+ $this->falseValue
+ ));
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php
new file mode 100644
index 0000000..1f6526d
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/ClosureStrategy.php
@@ -0,0 +1,113 @@
+
+ * function ($value) {
+ * return $value;
+ * };
+ *
+ *
+ * @var callable
+ */
+ protected $extractFunc = null;
+
+ /**
+ * Function, used in hydrate method, default:
+ *
+ *
+ * function ($value) {
+ * return $value;
+ * };
+ *
+ *
+ * @var callable
+ */
+ protected $hydrateFunc = null;
+
+ /**
+ * You can describe how your values will extract and hydrate, like this:
+ *
+ *
+ * $hydrator->addStrategy('category', new ClosureStrategy(
+ * function (Category $value) {
+ * return (int) $value->id;
+ * },
+ * function ($value) {
+ * return new Category((int) $value);
+ * }
+ * ));
+ *
+ *
+ * @param callable $extractFunc - anonymous function, that extract values
+ * from object
+ * @param callable $hydrateFunc - anonymous function, that hydrate values
+ * into object
+ */
+ public function __construct($extractFunc = null, $hydrateFunc = null)
+ {
+ if (isset($extractFunc)) {
+ if (!is_callable($extractFunc)) {
+ throw new \Exception('$extractFunc must be callable');
+ }
+
+ $this->extractFunc = $extractFunc;
+ } else {
+ $this->extractFunc = function ($value) {
+ return $value;
+ };
+ }
+
+ if (isset($hydrateFunc)) {
+ if (!is_callable($hydrateFunc)) {
+ throw new \Exception('$hydrateFunc must be callable');
+ }
+
+ $this->hydrateFunc = $hydrateFunc;
+ } else {
+ $this->hydrateFunc = function ($value) {
+ return $value;
+ };
+ }
+ }
+
+ /**
+ * Converts the given value so that it can be extracted by the hydrator.
+ *
+ * @param mixed $value The original value.
+ * @param array $object The object is optionally provided as context.
+ * @return mixed Returns the value that should be extracted.
+ */
+ public function extract($value, $object = null)
+ {
+ $func = $this->extractFunc;
+
+ return $func($value, $object);
+ }
+
+ /**
+ * Converts the given value so that it can be hydrated by the hydrator.
+ *
+ * @param mixed $value The original value.
+ * @param array $data The whole data is optionally provided as context.
+ * @return mixed Returns the value that should be hydrated.
+ */
+ public function hydrate($value, $data = null)
+ {
+ $func = $this->hydrateFunc;
+
+ return $func($value, $data);
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php
new file mode 100644
index 0000000..62dda71
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/DateTimeFormatterStrategy.php
@@ -0,0 +1,80 @@
+format = (string) $format;
+ $this->timezone = $timezone;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * Converts to date time string
+ *
+ * @param mixed|DateTime $value
+ *
+ * @return mixed|string
+ */
+ public function extract($value)
+ {
+ if ($value instanceof DateTime) {
+ return $value->format($this->format);
+ }
+
+ return $value;
+ }
+
+ /**
+ * Converts date time string to DateTime instance for injecting to object
+ *
+ * {@inheritDoc}
+ *
+ * @param mixed|string $value
+ *
+ * @return mixed|DateTime
+ */
+ public function hydrate($value)
+ {
+ if ($value === '' || $value === null) {
+ return;
+ }
+
+ if ($this->timezone) {
+ $hydrated = DateTime::createFromFormat($this->format, $value, $this->timezone);
+ } else {
+ $hydrated = DateTime::createFromFormat($this->format, $value);
+ }
+
+ return $hydrated ?: $value;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php
new file mode 100644
index 0000000..6fb8f45
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/DefaultStrategy.php
@@ -0,0 +1,35 @@
+setValueDelimiter($delimiter);
+
+ $this->explodeLimit = ($explodeLimit === null) ? null : (int) $explodeLimit;
+ }
+
+ /**
+ * Sets the delimiter string that the values will be split upon
+ *
+ * @param string $delimiter
+ * @return self
+ */
+ private function setValueDelimiter($delimiter)
+ {
+ if (!is_string($delimiter)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects Delimiter to be string, %s provided instead',
+ __METHOD__,
+ is_object($delimiter) ? get_class($delimiter) : gettype($delimiter)
+ ));
+ }
+
+ if (empty($delimiter)) {
+ throw new Exception\InvalidArgumentException('Delimiter cannot be empty.');
+ }
+
+ $this->valueDelimiter = $delimiter;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * Split a string by delimiter
+ *
+ * @param string|null $value
+ *
+ * @return string[]
+ *
+ * @throws Exception\InvalidArgumentException
+ */
+ public function hydrate($value)
+ {
+ if (null === $value) {
+ return [];
+ }
+
+ if (!(is_string($value) || is_numeric($value))) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects argument 1 to be string, %s provided instead',
+ __METHOD__,
+ is_object($value) ? get_class($value) : gettype($value)
+ ));
+ }
+
+ if ($this->explodeLimit !== null) {
+ return explode($this->valueDelimiter, $value, $this->explodeLimit);
+ }
+
+ return explode($this->valueDelimiter, $value);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * Join array elements with delimiter
+ *
+ * @param string[] $value The original value.
+ *
+ * @return string|null
+ */
+ public function extract($value)
+ {
+ if (!is_array($value)) {
+ throw new Exception\InvalidArgumentException(sprintf(
+ '%s expects argument 1 to be array, %s provided instead',
+ __METHOD__,
+ is_object($value) ? get_class($value) : gettype($value)
+ ));
+ }
+
+ return empty($value) ? null : implode($this->valueDelimiter, $value);
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php b/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php
new file mode 100644
index 0000000..bc49e7b
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/SerializableStrategy.php
@@ -0,0 +1,123 @@
+setSerializer($serializer);
+ if ($serializerOptions) {
+ $this->setSerializerOptions($serializerOptions);
+ }
+ }
+
+ /**
+ * Serialize the given value so that it can be extracted by the hydrator.
+ *
+ * @param mixed $value The original value.
+ * @return mixed Returns the value that should be extracted.
+ */
+ public function extract($value)
+ {
+ $serializer = $this->getSerializer();
+ return $serializer->serialize($value);
+ }
+
+ /**
+ * Unserialize the given value so that it can be hydrated by the hydrator.
+ *
+ * @param mixed $value The original value.
+ * @return mixed Returns the value that should be hydrated.
+ */
+ public function hydrate($value)
+ {
+ $serializer = $this->getSerializer();
+ return $serializer->unserialize($value);
+ }
+
+ /**
+ * Set serializer
+ *
+ * @param string|SerializerAdapter $serializer
+ * @return SerializableStrategy
+ */
+ public function setSerializer($serializer)
+ {
+ if (!is_string($serializer) && !$serializer instanceof SerializerAdapter) {
+ throw new InvalidArgumentException(sprintf(
+ '%s expects either a string serializer name or Zend\Serializer\Adapter\AdapterInterface instance; '
+ . 'received "%s"',
+ __METHOD__,
+ (is_object($serializer) ? get_class($serializer) : gettype($serializer))
+ ));
+ }
+ $this->serializer = $serializer;
+ return $this;
+ }
+
+ /**
+ * Get serializer
+ *
+ * @return SerializerAdapter
+ */
+ public function getSerializer()
+ {
+ if (is_string($this->serializer)) {
+ $options = $this->getSerializerOptions();
+ $this->setSerializer(SerializerFactory::factory($this->serializer, $options));
+ } elseif (null === $this->serializer) {
+ $this->setSerializer(SerializerFactory::getDefaultAdapter());
+ }
+
+ return $this->serializer;
+ }
+
+ /**
+ * Set configuration options for instantiating a serializer adapter
+ *
+ * @param mixed $serializerOptions
+ * @return SerializableStrategy
+ */
+ public function setSerializerOptions($serializerOptions)
+ {
+ $this->serializerOptions = $serializerOptions;
+ return $this;
+ }
+
+ /**
+ * Get configuration options for instantiating a serializer adapter
+ *
+ * @return mixed
+ */
+ public function getSerializerOptions()
+ {
+ return $this->serializerOptions;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php b/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php
new file mode 100644
index 0000000..49d514d
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/StrategyChain.php
@@ -0,0 +1,73 @@
+extractionStrategies = array_map(
+ function (StrategyInterface $strategy) {
+ // this callback is here only to ensure type-safety
+ return $strategy;
+ },
+ $extractionStrategies
+ );
+
+ $this->hydrationStrategies = array_reverse($extractionStrategies);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function extract($value)
+ {
+ foreach ($this->extractionStrategies as $strategy) {
+ $value = $strategy->extract($value);
+ }
+
+ return $value;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public function hydrate($value)
+ {
+ foreach ($this->hydrationStrategies as $strategy) {
+ $value = $strategy->hydrate($value);
+ }
+
+ return $value;
+ }
+}
diff --git a/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php b/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php
new file mode 100644
index 0000000..a705593
--- /dev/null
+++ b/vendor/zendframework/zend-hydrator/src/Strategy/StrategyInterface.php
@@ -0,0 +1,34 @@
+ ### Note: testing versions prior to 2.4
+>
+> This component originates with Zend Framework 2. During the lifetime of ZF2,
+> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no
+> changes were necessary. However, due to the migration, tests may not run on
+> versions < 2.4. As such, you may need to change the PHPUnit dependency if
+> attempting a fix on such a version.
+
+To run tests:
+
+- Clone the repository:
+
+ ```console
+ $ git clone git@github.com:zendframework/zend-stdlib.git
+ $ cd
+ ```
+
+- Install dependencies via composer:
+
+ ```console
+ $ curl -sS https://getcomposer.org/installer | php --
+ $ ./composer.phar install
+ ```
+
+ If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
+
+- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
+
+ ```console
+ $ ./vendor/bin/phpunit
+ ```
+
+You can turn on conditional tests with the phpunit.xml file.
+To do so:
+
+ - Copy `phpunit.xml.dist` file to `phpunit.xml`
+ - Edit `phpunit.xml` to enable any specific functionality you
+ want to test, as well as to provide test values to utilize.
+
+## Running Coding Standards Checks
+
+This component uses [php-cs-fixer](http://cs.sensiolabs.org/) for coding
+standards checks, and provides configuration for our selected checks.
+`php-cs-fixer` is installed by default via Composer.
+
+To run checks only:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --dry-run --config-file=.php_cs
+```
+
+To have `php-cs-fixer` attempt to fix problems for you, omit the `--dry-run`
+flag:
+
+```console
+$ ./vendor/bin/php-cs-fixer fix . -v --diff --config-file=.php_cs
+```
+
+If you allow php-cs-fixer to fix CS issues, please re-run the tests to ensure
+they pass, and make sure you add and commit the changes after verification.
+
+## Benchmarks
+
+We provide benchmark tests for zend-stdlib under the directory [benchmark/](benchmark/),
+using. [athletic](https://github.com/polyfractal/athletic). You can execute
+the benchmarks running the following command:
+
+```bash
+$ ./vendor/bin/athletic -p benchmark
+```
+
+## Recommended Workflow for Contributions
+
+Your first step is to establish a public repository from which we can
+pull your work into the master repository. We recommend using
+[GitHub](https://github.com), as that is where the component is already hosted.
+
+1. Setup a [GitHub account](http://github.com/), if you haven't yet
+2. Fork the repository (http://github.com/zendframework/zend-stdlib)
+3. Clone the canonical repository locally and enter it.
+
+ ```console
+ $ git clone git://github.com:zendframework/zend-stdlib.git
+ $ cd zend-stdlib
+ ```
+
+4. Add a remote to your fork; substitute your GitHub username in the command
+ below.
+
+ ```console
+ $ git remote add {username} git@github.com:{username}/zend-stdlib.git
+ $ git fetch {username}
+ ```
+
+### Keeping Up-to-Date
+
+Periodically, you should update your fork or personal repository to
+match the canonical ZF repository. Assuming you have setup your local repository
+per the instructions above, you can do the following:
+
+
+```console
+$ git checkout master
+$ git fetch origin
+$ git rebase origin/master
+# OPTIONALLY, to keep your remote up-to-date -
+$ git push {username} master:master
+```
+
+If you're tracking other branches -- for example, the "develop" branch, where
+new feature development occurs -- you'll want to do the same operations for that
+branch; simply substitute "develop" for "master".
+
+### Working on a patch
+
+We recommend you do each new feature or bugfix in a new branch. This simplifies
+the task of code review as well as the task of merging your changes into the
+canonical repository.
+
+A typical workflow will then consist of the following:
+
+1. Create a new local branch based off either your master or develop branch.
+2. Switch to your new local branch. (This step can be combined with the
+ previous step with the use of `git checkout -b`.)
+3. Do some work, commit, repeat as necessary.
+4. Push the local branch to your remote repository.
+5. Send a pull request.
+
+The mechanics of this process are actually quite trivial. Below, we will
+create a branch for fixing an issue in the tracker.
+
+```console
+$ git checkout -b hotfix/9295
+Switched to a new branch 'hotfix/9295'
+```
+
+... do some work ...
+
+
+```console
+$ git commit
+```
+
+... write your log message ...
+
+
+```console
+$ git push {username} hotfix/9295:hotfix/9295
+Counting objects: 38, done.
+Delta compression using up to 2 threads.
+Compression objects: 100% (18/18), done.
+Writing objects: 100% (20/20), 8.19KiB, done.
+Total 20 (delta 12), reused 0 (delta 0)
+To ssh://git@github.com/{username}/zend-stdlib.git
+ b5583aa..4f51698 HEAD -> master
+```
+
+To send a pull request, you have two options.
+
+If using GitHub, you can do the pull request from there. Navigate to
+your repository, select the branch you just created, and then select the
+"Pull Request" button in the upper right. Select the user/organization
+"zendframework" as the recipient.
+
+If using your own repository - or even if using GitHub - you can use `git
+format-patch` to create a patchset for us to apply; in fact, this is
+**recommended** for security-related patches. If you use `format-patch`, please
+send the patches as attachments to:
+
+- zf-devteam@zend.com for patches without security implications
+- zf-security@zend.com for security patches
+
+#### What branch to issue the pull request against?
+
+Which branch should you issue a pull request against?
+
+- For fixes against the stable release, issue the pull request against the
+ "master" branch.
+- For new features, or fixes that introduce new elements to the public API (such
+ as new public methods or properties), issue the pull request against the
+ "develop" branch.
+
+### Branch Cleanup
+
+As you might imagine, if you are a frequent contributor, you'll start to
+get a ton of branches both locally and on your remote.
+
+Once you know that your changes have been accepted to the master
+repository, we suggest doing some cleanup of these branches.
+
+- Local branch cleanup
+
+ ```console
+ $ git branch -d
+ ```
+
+- Remote branch removal
+
+ ```console
+ $ git push {username} :
+ ```
diff --git a/vendor/zendframework/zend-stdlib/LICENSE.md b/vendor/zendframework/zend-stdlib/LICENSE.md
new file mode 100644
index 0000000..dbb1b49
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/LICENSE.md
@@ -0,0 +1,28 @@
+Copyright (c) 2005-2015, Zend Technologies USA, Inc.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+- Neither the name of Zend Technologies USA, Inc. nor the names of its
+ contributors may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/zendframework/zend-stdlib/README.md b/vendor/zendframework/zend-stdlib/README.md
new file mode 100644
index 0000000..d87d00c
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/README.md
@@ -0,0 +1,19 @@
+# zend-stdlib
+
+[](https://secure.travis-ci.org/zendframework/zend-stdlib)
+[](https://coveralls.io/r/zendframework/zend-stdlib?branch=master)
+
+`Zend\Stdlib` is a set of components that implements general purpose utility
+class for different scopes like:
+
+- array utilities functions;
+- hydrators;
+- json serializable interfaces;
+- general messaging systems;
+- string wrappers;
+- etc.
+
+---
+
+- File issues at https://github.com/zendframework/zend-stdlib/issues
+- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-stdlib
diff --git a/vendor/zendframework/zend-stdlib/benchmark/ExtractPriorityQueue.php b/vendor/zendframework/zend-stdlib/benchmark/ExtractPriorityQueue.php
new file mode 100644
index 0000000..8fa7527
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/benchmark/ExtractPriorityQueue.php
@@ -0,0 +1,56 @@
+splPriorityQueue = new SplPriorityQueue();
+ $this->fastPriorityQueue = new FastPriorityQueue();
+ $this->priorityQueue = new PriorityQueue();
+
+ for ($i = 0; $i < 5000; $i += 1) {
+ $priority = rand(1, 100);
+ $this->splPriorityQueue->insert('foo', $priority);
+ $this->fastPriorityQueue->insert('foo', $priority);
+ $this->priorityQueue->insert('foo', $priority);
+ }
+ }
+
+ /**
+ * @iterations 5000
+ */
+ public function extractSplPriorityQueue()
+ {
+ $this->splPriorityQueue->extract();
+ }
+
+ /**
+ * @iterations 5000
+ */
+ public function extractPriorityQueue()
+ {
+ $this->priorityQueue->extract();
+ }
+
+ /**
+ * @iterations 5000
+ */
+ public function extractFastPriorityQueue()
+ {
+ $this->fastPriorityQueue->extract();
+ }
+}
diff --git a/vendor/zendframework/zend-stdlib/benchmark/InsertPriorityQueue.php b/vendor/zendframework/zend-stdlib/benchmark/InsertPriorityQueue.php
new file mode 100644
index 0000000..561c535
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/benchmark/InsertPriorityQueue.php
@@ -0,0 +1,49 @@
+splPriorityQueue = new SplPriorityQueue();
+ $this->fastPriorityQueue = new FastPriorityQueue();
+ $this->priorityQueue = new PriorityQueue();
+ }
+
+ /**
+ * @iterations 5000
+ */
+ public function insertSplPriorityQueue()
+ {
+ $this->splPriorityQueue->insert('foo', rand(1, 100));
+ }
+
+ /**
+ * @iterations 5000
+ */
+ public function insertPriorityQueue()
+ {
+ $this->priorityQueue->insert('foo', rand(1, 100));
+ }
+
+ /**
+ * @iterations 5000
+ */
+ public function insertFastPriorityQueue()
+ {
+ $this->fastPriorityQueue->insert('foo', rand(1, 100));
+ }
+}
diff --git a/vendor/zendframework/zend-stdlib/benchmark/RemovePriorityQueue.php b/vendor/zendframework/zend-stdlib/benchmark/RemovePriorityQueue.php
new file mode 100644
index 0000000..1cfd35b
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/benchmark/RemovePriorityQueue.php
@@ -0,0 +1,45 @@
+fastPriorityQueue = new FastPriorityQueue();
+ $this->priorityQueue = new PriorityQueue();
+
+ for ($i = 0; $i < 1000; $i += 1) {
+ $priority = rand(1, 100);
+ $this->fastPriorityQueue->insert('foo', $priority);
+ $this->priorityQueue->insert('foo', $priority);
+ }
+ }
+
+ /**
+ * @iterations 1000
+ */
+ public function removePriorityQueue()
+ {
+ $this->priorityQueue->remove('foo');
+ }
+
+ /**
+ * @iterations 1000
+ */
+ public function removeFastPriorityQueue()
+ {
+ $this->fastPriorityQueue->remove('foo');
+ }
+}
diff --git a/vendor/zendframework/zend-stdlib/composer.json b/vendor/zendframework/zend-stdlib/composer.json
new file mode 100644
index 0000000..4a5ecd5
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/composer.json
@@ -0,0 +1,50 @@
+{
+ "name": "zendframework/zend-stdlib",
+ "description": " ",
+ "license": "BSD-3-Clause",
+ "keywords": [
+ "zf2",
+ "stdlib"
+ ],
+ "homepage": "https://github.com/zendframework/zend-stdlib",
+ "autoload": {
+ "psr-4": {
+ "Zend\\Stdlib\\": "src/"
+ }
+ },
+ "require": {
+ "php": ">=5.5",
+ "zendframework/zend-hydrator": "~1.0"
+ },
+ "require-dev": {
+ "zendframework/zend-config": "~2.5",
+ "zendframework/zend-eventmanager": "~2.5",
+ "zendframework/zend-inputfilter": "~2.5",
+ "zendframework/zend-serializer": "~2.5",
+ "zendframework/zend-servicemanager": "~2.5",
+ "zendframework/zend-filter": "~2.5",
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/PHPUnit": "~4.0",
+ "athletic/athletic": "~0.1"
+ },
+ "suggest": {
+ "zendframework/zend-eventmanager": "To support aggregate hydrator usage",
+ "zendframework/zend-serializer": "Zend\\Serializer component",
+ "zendframework/zend-servicemanager": "To support hydrator plugin manager usage",
+ "zendframework/zend-filter": "To support naming strategy hydrator usage"
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.7-dev",
+ "dev-develop": "2.8-dev"
+ }
+ },
+ "autoload-dev": {
+ "psr-4": {
+ "ZendTest\\Stdlib\\": "test/",
+ "ZendBench\\Stdlib\\": "benchmark/"
+ }
+ }
+}
diff --git a/core/vendor/zendframework/zend-stdlib/src/AbstractOptions.php b/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/AbstractOptions.php
rename to vendor/zendframework/zend-stdlib/src/AbstractOptions.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArrayObject.php b/vendor/zendframework/zend-stdlib/src/ArrayObject.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArrayObject.php
rename to vendor/zendframework/zend-stdlib/src/ArrayObject.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php b/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
rename to vendor/zendframework/zend-stdlib/src/ArraySerializableInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArrayStack.php b/vendor/zendframework/zend-stdlib/src/ArrayStack.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArrayStack.php
rename to vendor/zendframework/zend-stdlib/src/ArrayStack.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArrayUtils.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArrayUtils.php
rename to vendor/zendframework/zend-stdlib/src/ArrayUtils.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
rename to vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeRemoveKey.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
rename to vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKey.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php b/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
rename to vendor/zendframework/zend-stdlib/src/ArrayUtils/MergeReplaceKeyInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/CallbackHandler.php b/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/CallbackHandler.php
rename to vendor/zendframework/zend-stdlib/src/CallbackHandler.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/DateTime.php b/vendor/zendframework/zend-stdlib/src/DateTime.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/DateTime.php
rename to vendor/zendframework/zend-stdlib/src/DateTime.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php b/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
rename to vendor/zendframework/zend-stdlib/src/DispatchableInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/ErrorHandler.php b/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/ErrorHandler.php
rename to vendor/zendframework/zend-stdlib/src/ErrorHandler.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php b/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/BadMethodCallException.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php b/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/DomainException.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php b/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
rename to vendor/zendframework/zend-stdlib/src/Exception/ExceptionInterface.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php b/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/ExtensionNotLoadedException.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php b/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/InvalidArgumentException.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php b/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/InvalidCallbackException.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php b/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/LogicException.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php b/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
rename to vendor/zendframework/zend-stdlib/src/Exception/RuntimeException.php
diff --git a/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php b/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
new file mode 100644
index 0000000..6c84720
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/src/Extractor/ExtractionInterface.php
@@ -0,0 +1,19 @@
+values[$priority][] = $value;
+ if (! isset($this->priorities[$priority])) {
+ $this->priorities[$priority] = $priority;
+ $this->maxPriority = max($priority, $this->maxPriority);
+ }
+ ++$this->count;
+ }
+
+ /**
+ * Extract an element in the queue according to the priority and the
+ * order of insertion
+ *
+ * @return mixed
+ */
+ public function extract()
+ {
+ if (! $this->valid()) {
+ return false;
+ }
+ $value = $this->current();
+ $this->nextAndRemove();
+ return $value;
+ }
+
+ /**
+ * Remove an item from the queue
+ *
+ * This is different than {@link extract()}; its purpose is to dequeue an
+ * item.
+ *
+ * Note: this removes the first item matching the provided item found. If
+ * the same item has been added multiple times, it will not remove other
+ * instances.
+ *
+ * @param mixed $datum
+ * @return bool False if the item was not found, true otherwise.
+ */
+ public function remove($datum)
+ {
+ $this->rewind();
+ while ($this->valid()) {
+ if (current($this->values[$this->maxPriority]) === $datum) {
+ unset($this->values[$this->maxPriority][$this->subIndex]);
+ --$this->count;
+ return true;
+ }
+ $this->next();
+ }
+ return false;
+ }
+
+ /**
+ * Get the total number of elements in the queue
+ *
+ * @return integer
+ */
+ public function count()
+ {
+ return $this->count;
+ }
+
+ /**
+ * Get the current element in the queue
+ *
+ * @return mixed
+ */
+ public function current()
+ {
+ switch ($this->extractFlag) {
+ case self::EXTR_DATA:
+ return current($this->values[$this->maxPriority]);
+ case self::EXTR_PRIORITY:
+ return $this->maxPriority;
+ case self::EXTR_BOTH:
+ return [
+ 'data' => current($this->values[$this->maxPriority]),
+ 'priority' => $this->maxPriority
+ ];
+ }
+ }
+
+ /**
+ * Get the index of the current element in the queue
+ *
+ * @return integer
+ */
+ public function key()
+ {
+ return $this->index;
+ }
+
+ /**
+ * Set the iterator pointer to the next element in the queue
+ * removing the previous element
+ */
+ protected function nextAndRemove()
+ {
+ if (false === next($this->values[$this->maxPriority])) {
+ unset($this->priorities[$this->maxPriority]);
+ unset($this->values[$this->maxPriority]);
+ $this->maxPriority = empty($this->priorities) ? 0 : max($this->priorities);
+ $this->subIndex = -1;
+ }
+ ++$this->index;
+ ++$this->subIndex;
+ --$this->count;
+ }
+
+ /**
+ * Set the iterator pointer to the next element in the queue
+ * without removing the previous element
+ */
+ public function next()
+ {
+ if (false === next($this->values[$this->maxPriority])) {
+ unset($this->subPriorities[$this->maxPriority]);
+ reset($this->values[$this->maxPriority]);
+ $this->maxPriority = empty($this->subPriorities) ? 0 : max($this->subPriorities);
+ $this->subIndex = -1;
+ }
+ ++$this->index;
+ ++$this->subIndex;
+ }
+
+ /**
+ * Check if the current iterator is valid
+ *
+ * @return boolean
+ */
+ public function valid()
+ {
+ return isset($this->values[$this->maxPriority]);
+ }
+
+ /**
+ * Rewind the current iterator
+ */
+ public function rewind()
+ {
+ $this->subPriorities = $this->priorities;
+ $this->maxPriority = empty($this->priorities) ? 0 : max($this->priorities);
+ $this->index = 0;
+ $this->subIndex = 0;
+ }
+
+ /**
+ * Serialize to an array
+ *
+ * Array will be priority => data pairs
+ *
+ * @return array
+ */
+ public function toArray()
+ {
+ $array = [];
+ foreach (clone $this as $item) {
+ $array[] = $item;
+ }
+ return $array;
+ }
+
+ /**
+ * Serialize
+ *
+ * @return string
+ */
+ public function serialize()
+ {
+ $clone = clone $this;
+ $clone->setExtractFlags(self::EXTR_BOTH);
+
+ $data = [];
+ foreach ($clone as $item) {
+ $data[] = $item;
+ }
+
+ return serialize($data);
+ }
+
+ /**
+ * Deserialize
+ *
+ * @param string $data
+ * @return void
+ */
+ public function unserialize($data)
+ {
+ foreach (unserialize($data) as $item) {
+ $this->insert($item['data'], $item['priority']);
+ }
+ }
+
+ /**
+ * Set the extract flag
+ *
+ * @param integer $flag
+ */
+ public function setExtractFlags($flag)
+ {
+ switch ($flag) {
+ case self::EXTR_DATA:
+ case self::EXTR_PRIORITY:
+ case self::EXTR_BOTH:
+ $this->extractFlag = $flag;
+ break;
+ default:
+ throw new Exception\InvalidArgumentException("The extract flag specified is not valid");
+ }
+ }
+
+ /**
+ * Check if the queue is empty
+ *
+ * @return boolean
+ */
+ public function isEmpty()
+ {
+ return empty($this->values);
+ }
+
+ /**
+ * Does the queue contain the given datum?
+ *
+ * @param mixed $datum
+ * @return bool
+ */
+ public function contains($datum)
+ {
+ foreach ($this->values as $values) {
+ if (in_array($datum, $values)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Does the queue have an item with the given priority?
+ *
+ * @param int $priority
+ * @return bool
+ */
+ public function hasPriority($priority)
+ {
+ return isset($this->values[$priority]);
+ }
+}
diff --git a/core/vendor/zendframework/zend-stdlib/src/Glob.php b/vendor/zendframework/zend-stdlib/src/Glob.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Glob.php
rename to vendor/zendframework/zend-stdlib/src/Glob.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
rename to vendor/zendframework/zend-stdlib/src/Guard/AllGuardsTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
rename to vendor/zendframework/zend-stdlib/src/Guard/ArrayOrTraversableGuardTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
rename to vendor/zendframework/zend-stdlib/src/Guard/EmptyGuardTrait.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php b/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
rename to vendor/zendframework/zend-stdlib/src/Guard/GuardUtils.php
diff --git a/core/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php b/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
similarity index 100%
rename from core/vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
rename to vendor/zendframework/zend-stdlib/src/Guard/NullGuardTrait.php
diff --git a/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php b/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
new file mode 100644
index 0000000..a4cf08a
--- /dev/null
+++ b/vendor/zendframework/zend-stdlib/src/Hydrator/AbstractHydrator.php
@@ -0,0 +1,19 @@
+