diff --git a/core/composer.json b/core/composer.json
index 5befb3c27d11130d32396978018c1e7c8c5fce57..78ef4f7e050a1747c0960cfe4427440275c68aa6 100644
--- a/core/composer.json
+++ b/core/composer.json
@@ -17,7 +17,7 @@
"symfony/validator": "2.7.*",
"symfony/process": "2.7.*",
"symfony/yaml": "2.7.*",
- "twig/twig": "~1.22",
+ "twig/twig": "^1.22.2",
"doctrine/common": "2.5.*",
"doctrine/annotations": "1.2.*",
"guzzlehttp/guzzle": "~6.1",
diff --git a/core/composer.lock b/core/composer.lock
index 5563e7e4087123f0bc7f9b37e573dfb7840ebf6f..d5a9ed9383ac66ec0848dd5330e70668f4f7f9b6 100644
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -4,8 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "e917b58b5b2a847270d4bd49b0bcb22e",
- "content-hash": "bbb9004b899df99873971591682b1e42",
+ "hash": "e6a3c80757f0e2a34ecc1cb9332cdab1",
"packages": [
{
"name": "doctrine/annotations",
@@ -1779,16 +1778,16 @@
},
{
"name": "twig/twig",
- "version": "v1.22.1",
+ "version": "v1.22.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad"
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/b7fc2469fa009897871fb95b68237286fc54a5ad",
- "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
"shasum": ""
},
"require": {
@@ -1836,7 +1835,7 @@
"keywords": [
"templating"
],
- "time": "2015-09-15 06:50:16"
+ "time": "2015-09-22 13:59:32"
},
{
"name": "zendframework/zend-diactoros",
@@ -2169,7 +2168,7 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/7e9a7319cc0e8cf9d4d4c9e06e2020d3a31bd792",
+ "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f",
"reference": "cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
"shasum": ""
},
diff --git a/core/lib/Drupal/Core/Template/TwigEnvironment.php b/core/lib/Drupal/Core/Template/TwigEnvironment.php
index 2deec5f79218c19f69e0a0bc27b9886a9be345be..845f219a8ab9327415b7a48e231722589a4dd313 100644
--- a/core/lib/Drupal/Core/Template/TwigEnvironment.php
+++ b/core/lib/Drupal/Core/Template/TwigEnvironment.php
@@ -67,56 +67,6 @@ public function __construct($root, CacheBackendInterface $cache, $twig_extension
parent::__construct($this->loader, $options);
}
- /**
- * Implements Twig_Environment::loadTemplate().
- *
- * We need to overwrite this function to integrate with drupal_php_storage().
- *
- * This is a straight copy from loadTemplate() changed to use
- * drupal_php_storage().
- *
- * @param string $name
- * The template name or the string which should be rendered as template.
- * @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)) {
- $key = $this->cache->generateKey($name, $cls);
-
- if (!$this->cache->has($key) || ($this->isAutoReload() && !$this->isTemplateFresh($name, $this->cache->getTimestamp($key)))) {
- $this->cache->write($key, $this->compileSource($this->getLoader()->getSource($name), $name));
- }
-
- $this->cache->load($key);
-
- if (!class_exists($cls, FALSE)) {
- $compiled_source = $this->compileSource($this->loader->getSource($name), $name);
- eval('?' . '>' . $compiled_source);
- }
- }
-
- if (!$this->runtimeInitialized) {
- $this->initRuntime();
- }
-
- return $this->loadedTemplates[$cls] = new $cls($this);
- }
-
/**
* Gets the template class associated with the given string.
*
diff --git a/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php b/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
index 258aa360148c55843e60f431b00151f138a30574..4f5e6b1473eff55380777c5f8278199745a08c2a 100644
--- a/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
+++ b/core/lib/Drupal/Core/Template/TwigPhpStorageCache.php
@@ -78,13 +78,6 @@ public function generateKey($name, $className) {
return $this->templateCacheFilenamePrefix . '_' . basename($name) . '_' . $hash;
}
- /**
- * {@inheritdoc}
- */
- public function has($key) {
- return $this->storage()->exists($key);
- }
-
/**
* {@inheritdoc}
*/
diff --git a/core/vendor/composer/installed.json b/core/vendor/composer/installed.json
index 0655b5bd4f11bdb8dfdf8898b488c26dac7f6d1c..aaff5ec495d8c86c86a7c1c07807dfa02a25d140 100644
--- a/core/vendor/composer/installed.json
+++ b/core/vendor/composer/installed.json
@@ -592,7 +592,7 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/7e9a7319cc0e8cf9d4d4c9e06e2020d3a31bd792",
+ "url": "https://api.github.com/repos/minkphp/MinkGoutteDriver/zipball/c8e254f127d6f2242b994afd4339fb62d471df3f",
"reference": "cc5ce119b5a8e06662f634b35967aff0b0c7dfdd",
"shasum": ""
},
@@ -3418,17 +3418,17 @@
},
{
"name": "twig/twig",
- "version": "v1.22.1",
- "version_normalized": "1.22.1.0",
+ "version": "v1.22.2",
+ "version_normalized": "1.22.2.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad"
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/b7fc2469fa009897871fb95b68237286fc54a5ad",
- "reference": "b7fc2469fa009897871fb95b68237286fc54a5ad",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
+ "reference": "79249fc8c9ff62e41e217e0c630e2e00bcadda6a",
"shasum": ""
},
"require": {
@@ -3438,7 +3438,7 @@
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~2.7"
},
- "time": "2015-09-15 06:50:16",
+ "time": "2015-09-22 13:59:32",
"type": "library",
"extra": {
"branch-alias": {
diff --git a/core/vendor/twig/twig/CHANGELOG b/core/vendor/twig/twig/CHANGELOG
index 7e33437018a22eeb353974ee0fc0e13e1de110e8..90905c0d154189d90e423e0964ac757febc48833 100644
--- a/core/vendor/twig/twig/CHANGELOG
+++ b/core/vendor/twig/twig/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.22.2 (2015-09-22)
+
+ * fixed a race condition in template loading
+
* 1.22.1 (2015-09-15)
* fixed regression in template_from_string
diff --git a/core/vendor/twig/twig/ext/twig/php_twig.h b/core/vendor/twig/twig/ext/twig/php_twig.h
index 50f5b45f56e97aff226ff3e1b15d310f3da31a3a..359cd43b250f2583b7c936acc351f48811038649 100644
--- a/core/vendor/twig/twig/ext/twig/php_twig.h
+++ b/core/vendor/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
#ifndef PHP_TWIG_H
#define PHP_TWIG_H
-#define PHP_TWIG_VERSION "1.22.1"
+#define PHP_TWIG_VERSION "1.22.2"
#include "php.h"
diff --git a/core/vendor/twig/twig/lib/Twig/Cache/Filesystem.php b/core/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
index c33fa90d9ce63a4ecf185f9eccc646ed58067cd2..2e1c0a0691d078a36ced592f3e7cc523e6ee897f 100644
--- a/core/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
+++ b/core/vendor/twig/twig/lib/Twig/Cache/Filesystem.php
@@ -19,7 +19,7 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
const FORCE_BYTECODE_INVALIDATION = 1;
private $directory;
- private $invalidateBytecode;
+ private $options;
/**
* @param $directory string The root cache directory
@@ -41,20 +41,12 @@ public function generateKey($name, $className)
return $this->directory.'/'.$hash[0].'/'.$hash[1].'/'.$hash.'.php';
}
- /**
- * {@inheritdoc}
- */
- public function has($key)
- {
- return is_file($key);
- }
-
/**
* {@inheritdoc}
*/
public function load($key)
{
- require_once $key;
+ @include_once $key;
}
/**
@@ -64,11 +56,8 @@ public function write($key, $content)
{
$dir = dirname($key);
if (!is_dir($dir)) {
- if (false === @mkdir($dir, 0777, true)) {
- clearstatcache(false, $dir);
- if (!is_dir($dir)) {
- throw new RuntimeException(sprintf('Unable to create the cache directory (%s).', $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));
@@ -98,6 +87,6 @@ public function write($key, $content)
*/
public function getTimestamp($key)
{
- return filemtime($key);
+ return (int) @filemtime($key);
}
}
diff --git a/core/vendor/twig/twig/lib/Twig/Cache/Null.php b/core/vendor/twig/twig/lib/Twig/Cache/Null.php
index 918e4cef33ead129ddc6fe3866834325ae7e3574..fde8c8082e957a21a3ae0d6fdab0d4523936c02c 100644
--- a/core/vendor/twig/twig/lib/Twig/Cache/Null.php
+++ b/core/vendor/twig/twig/lib/Twig/Cache/Null.php
@@ -24,20 +24,11 @@ public function generateKey($name, $className)
return '';
}
- /**
- * {@inheritdoc}
- */
- public function has($key)
- {
- return false;
- }
-
/**
* {@inheritdoc}
*/
public function write($key, $content)
{
- eval('?>'.$content);
}
/**
@@ -52,7 +43,6 @@ public function load($key)
*/
public function getTimestamp($key)
{
- // never called as has() always returns false
return 0;
}
}
diff --git a/core/vendor/twig/twig/lib/Twig/CacheInterface.php b/core/vendor/twig/twig/lib/Twig/CacheInterface.php
index fedd36625eed2e505ef631f8b1e484b6bb93cb27..9b17e0f427be25a3657f36345a9076afc649e691 100644
--- a/core/vendor/twig/twig/lib/Twig/CacheInterface.php
+++ b/core/vendor/twig/twig/lib/Twig/CacheInterface.php
@@ -30,15 +30,6 @@ interface Twig_CacheInterface
*/
public function generateKey($name, $className);
- /**
- * Checks if the cache key exists.
- *
- * @param string $key The cache key
- *
- * @return bool true if the cache key exists, false otherwise
- */
- public function has($key);
-
/**
* Writes the compiled template to cache.
*
diff --git a/core/vendor/twig/twig/lib/Twig/Environment.php b/core/vendor/twig/twig/lib/Twig/Environment.php
index cd167bd56c58a615d9c656c96e91d78db041600a..0c32550cce26d0619cc59e63322fdd803d4a1c62 100644
--- a/core/vendor/twig/twig/lib/Twig/Environment.php
+++ b/core/vendor/twig/twig/lib/Twig/Environment.php
@@ -16,7 +16,7 @@
*/
class Twig_Environment
{
- const VERSION = '1.22.1';
+ const VERSION = '1.22.2';
protected $charset;
protected $loader;
@@ -375,15 +375,20 @@ public function loadTemplate($name, $index = null)
$key = $this->cache->generateKey($name, $cls);
}
- if (!$this->cache->has($key) || ($this->isAutoReload() && !$this->isTemplateFresh($name, $this->cache->getTimestamp($key)))) {
+ 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, $this->compileSource($this->getLoader()->getSource($name), $name));
+ $this->writeCacheFile($key, $content);
} else {
- $this->cache->write($key, $this->compileSource($this->getLoader()->getSource($name), $name));
+ $this->cache->write($key, $content);
}
- }
- $this->cache->load($key);
+ eval('?>'.$content);
+ }
}
if (!$this->runtimeInitialized) {
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Core.php b/core/vendor/twig/twig/lib/Twig/Extension/Core.php
index 3716f02485b14ca4c1fc3fc059fee1712fad74fd..f9ec2a475b38c079157232f510f70894477f7ad7 100644
--- a/core/vendor/twig/twig/lib/Twig/Extension/Core.php
+++ b/core/vendor/twig/twig/lib/Twig/Extension/Core.php
@@ -885,6 +885,9 @@ function twig_split_filter(Twig_Environment $env, $value, $delimiter, $limit = n
// The '_default' filter is used internally to avoid using the ternary operator
// which costs a lot for big contexts (before PHP 5.4). So, on average,
// a function call is cheaper.
+/**
+ * @internal
+ */
function _twig_default_filter($value, $default = '')
{
if (twig_test_empty($value)) {
@@ -982,7 +985,9 @@ function twig_sort_filter($array)
return $array;
}
-/* used internally */
+/**
+ * @internal
+ */
function twig_in_filter($value, $compare)
{
if (is_array($compare)) {
@@ -1150,7 +1155,9 @@ function twig_escape_filter(Twig_Environment $env, $string, $strategy = 'html',
}
}
-/* used internally */
+/**
+ * @internal
+ */
function twig_escape_filter_is_safe(Twig_Node $filterArgs)
{
foreach ($filterArgs as $arg) {
@@ -1396,7 +1403,9 @@ function twig_capitalize_string_filter(Twig_Environment $env, $string)
}
}
-/* used internally */
+/**
+ * @internal
+ */
function twig_ensure_traversable($seq)
{
if ($seq instanceof Traversable || is_array($seq)) {
diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Staging.php b/core/vendor/twig/twig/lib/Twig/Extension/Staging.php
index 8ab0f4596082e542c006c1adf92d875068d03583..583e6a911a199a83a7ba4f960599bd14e81162a3 100644
--- a/core/vendor/twig/twig/lib/Twig/Extension/Staging.php
+++ b/core/vendor/twig/twig/lib/Twig/Extension/Staging.php
@@ -15,6 +15,8 @@
* This class is used by Twig_Environment as a staging area and must not be used directly.
*
* @author Fabien Potencier <fabien@symfony.com>
+ *
+ * @internal
*/
class Twig_Extension_Staging extends Twig_Extension
{
diff --git a/core/vendor/twig/twig/lib/Twig/Loader/String.php b/core/vendor/twig/twig/lib/Twig/Loader/String.php
index 9bfd856bfef1a443c0c4d72bff29156e0f61f8b4..00f507a4f5771b341712af300fd60a98e1bc8fff 100644
--- a/core/vendor/twig/twig/lib/Twig/Loader/String.php
+++ b/core/vendor/twig/twig/lib/Twig/Loader/String.php
@@ -23,6 +23,8 @@
*
* @deprecated since 1.18.1 (to be removed in 2.0)
*
+ * @internal
+ *
* @author Fabien Potencier <fabien@symfony.com>
*/
class Twig_Loader_String implements Twig_LoaderInterface, Twig_ExistsLoaderInterface
diff --git a/core/vendor/twig/twig/lib/Twig/Template.php b/core/vendor/twig/twig/lib/Twig/Template.php
index 36d41621a1b67217fbc4d1b94ab0197669c073ce..a8160227ed755d5ca0c76fb91276f9f0d402b956 100644
--- a/core/vendor/twig/twig/lib/Twig/Template.php
+++ b/core/vendor/twig/twig/lib/Twig/Template.php
@@ -61,6 +61,8 @@ public function getEnvironment()
* @param array $context
*
* @return Twig_TemplateInterface|false The parent template or false if there is no parent
+ *
+ * @internal
*/
public function getParent(array $context)
{
@@ -111,6 +113,8 @@ public function isTraitable()
* @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())
{
@@ -135,6 +139,8 @@ public function displayParentBlock($name, array $context, array $blocks = array(
* @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)
{
@@ -191,6 +197,8 @@ public function displayBlock($name, array $context, array $blocks = array(), $us
* @param array $blocks The current set of blocks
*
* @return string The rendered block
+ *
+ * @internal
*/
public function renderParentBlock($name, array $context, array $blocks = array())
{
@@ -212,6 +220,8 @@ public function renderParentBlock($name, array $context, array $blocks = array()
* @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)
{
@@ -237,6 +247,8 @@ public function renderBlock($name, array $context, array $blocks = array(), $use
* @param string $name The block name
*
* @return bool true if the block exists, false otherwise
+ *
+ * @internal
*/
public function hasBlock($name)
{
@@ -252,6 +264,8 @@ public function hasBlock($name)
* @return array An array of block names
*
* @see hasBlock
+ *
+ * @internal
*/
public function getBlockNames()
{
@@ -298,6 +312,8 @@ protected function loadTemplate($template, $templateName = null, $line = null, $
* @return array An array of blocks
*
* @see hasBlock
+ *
+ * @internal
*/
public function getBlocks()
{
@@ -407,6 +423,8 @@ abstract protected function doDisplay(array $context, array $blocks = array());
* @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)
{