Merge branch '2.3' into 2.7
* 2.3: Fixed correct class name in thrown exception Add gc_mem_caches() call for PHP7 after itoken_get_all() as new memory manager will not release small buckets to OS automatically Removed a duplicated test in CardSchemeValidatorTest Fix perf and mem issue when using token_get_all [SecurityBundle] fix SecureRandom service constructor args Normalize params only when used.
This commit is contained in:
commit
8d7b19fbbe
@ -49,12 +49,8 @@ class DbalLogger implements SQLLogger
|
|||||||
$this->stopwatch->start('doctrine', 'doctrine');
|
$this->stopwatch->start('doctrine', 'doctrine');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_array($params)) {
|
|
||||||
$params = $this->normalizeParams($params);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (null !== $this->logger) {
|
if (null !== $this->logger) {
|
||||||
$this->log($sql, null === $params ? array() : $params);
|
$this->log($sql, null === $params ? array() : $this->normalizeParams($params));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,11 +9,7 @@
|
|||||||
</parameters>
|
</parameters>
|
||||||
|
|
||||||
<services>
|
<services>
|
||||||
<!-- Pseudo-Random Number Generator -->
|
<!-- Pseudorandom Number Generator -->
|
||||||
<service id="security.secure_random" class="%security.secure_random.class%">
|
<service id="security.secure_random" class="Symfony\Component\Security\Core\Util\SecureRandom" />
|
||||||
<tag name="monolog.logger" channel="security" />
|
|
||||||
<argument>%kernel.cache_dir%/secure_random.seed</argument>
|
|
||||||
<argument type="service" id="logger" on-invalid="ignore" />
|
|
||||||
</service>
|
|
||||||
</services>
|
</services>
|
||||||
</container>
|
</container>
|
||||||
|
@ -60,6 +60,11 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
|
|||||||
$files = $this->extractFiles($resource);
|
$files = $this->extractFiles($resource);
|
||||||
foreach ($files as $file) {
|
foreach ($files as $file) {
|
||||||
$this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
|
$this->parseTokens(token_get_all(file_get_contents($file)), $catalog);
|
||||||
|
|
||||||
|
if (PHP_VERSION_ID >= 70000) {
|
||||||
|
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
|
||||||
|
gc_mem_caches();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,7 +85,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
|
|||||||
*/
|
*/
|
||||||
protected function normalizeToken($token)
|
protected function normalizeToken($token)
|
||||||
{
|
{
|
||||||
if (is_array($token)) {
|
if (isset($token[1]) && 'b"' !== $token) {
|
||||||
return $token[1];
|
return $token[1];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -94,7 +99,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
|
|||||||
{
|
{
|
||||||
for (; $tokenIterator->valid(); $tokenIterator->next()) {
|
for (; $tokenIterator->valid(); $tokenIterator->next()) {
|
||||||
$t = $tokenIterator->current();
|
$t = $tokenIterator->current();
|
||||||
if (!is_array($t) || ($t[0] !== T_WHITESPACE)) {
|
if (T_WHITESPACE !== $t[0]) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -111,7 +116,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
|
|||||||
|
|
||||||
for (; $tokenIterator->valid(); $tokenIterator->next()) {
|
for (; $tokenIterator->valid(); $tokenIterator->next()) {
|
||||||
$t = $tokenIterator->current();
|
$t = $tokenIterator->current();
|
||||||
if (!is_array($t)) {
|
if (!isset($t[1])) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.9",
|
"php": ">=5.3.9",
|
||||||
"symfony/security": "~2.7",
|
"symfony/security": "~2.7.9|~2.8",
|
||||||
"symfony/security-acl": "~2.7",
|
"symfony/security-acl": "~2.7",
|
||||||
"symfony/http-kernel": "~2.2"
|
"symfony/http-kernel": "~2.2"
|
||||||
},
|
},
|
||||||
|
@ -149,8 +149,9 @@ class ClassCollectionLoader
|
|||||||
$inNamespace = false;
|
$inNamespace = false;
|
||||||
$tokens = token_get_all($source);
|
$tokens = token_get_all($source);
|
||||||
|
|
||||||
for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
|
for ($i = 0; isset($tokens[$i]); ++$i) {
|
||||||
if (is_string($token)) {
|
$token = $tokens[$i];
|
||||||
|
if (!isset($token[1]) || 'b"' === $token) {
|
||||||
$rawChunk .= $token;
|
$rawChunk .= $token;
|
||||||
} elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
|
} elseif (in_array($token[0], array(T_COMMENT, T_DOC_COMMENT))) {
|
||||||
// strip comments
|
// strip comments
|
||||||
@ -162,12 +163,12 @@ class ClassCollectionLoader
|
|||||||
$rawChunk .= $token[1];
|
$rawChunk .= $token[1];
|
||||||
|
|
||||||
// namespace name and whitespaces
|
// namespace name and whitespaces
|
||||||
while (($t = next($tokens)) && is_array($t) && in_array($t[0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
|
while (isset($tokens[++$i][1]) && in_array($tokens[$i][0], array(T_WHITESPACE, T_NS_SEPARATOR, T_STRING))) {
|
||||||
$rawChunk .= $t[1];
|
$rawChunk .= $tokens[$i][1];
|
||||||
}
|
}
|
||||||
if ('{' === $t) {
|
if ('{' === $tokens[$i]) {
|
||||||
$inNamespace = false;
|
$inNamespace = false;
|
||||||
prev($tokens);
|
--$i;
|
||||||
} else {
|
} else {
|
||||||
$rawChunk = rtrim($rawChunk)."\n{";
|
$rawChunk = rtrim($rawChunk)."\n{";
|
||||||
$inNamespace = true;
|
$inNamespace = true;
|
||||||
@ -175,8 +176,8 @@ class ClassCollectionLoader
|
|||||||
} elseif (T_START_HEREDOC === $token[0]) {
|
} elseif (T_START_HEREDOC === $token[0]) {
|
||||||
$output .= self::compressCode($rawChunk).$token[1];
|
$output .= self::compressCode($rawChunk).$token[1];
|
||||||
do {
|
do {
|
||||||
$token = next($tokens);
|
$token = $tokens[++$i];
|
||||||
$output .= is_string($token) ? $token : $token[1];
|
$output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
|
||||||
} while ($token[0] !== T_END_HEREDOC);
|
} while ($token[0] !== T_END_HEREDOC);
|
||||||
$output .= "\n";
|
$output .= "\n";
|
||||||
$rawChunk = '';
|
$rawChunk = '';
|
||||||
@ -192,7 +193,15 @@ class ClassCollectionLoader
|
|||||||
$rawChunk .= "}\n";
|
$rawChunk .= "}\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
return $output.self::compressCode($rawChunk);
|
$output .= self::compressCode($rawChunk);
|
||||||
|
|
||||||
|
if (PHP_VERSION_ID >= 70000) {
|
||||||
|
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
|
||||||
|
unset($tokens, $rawChunk);
|
||||||
|
gc_mem_caches();
|
||||||
|
}
|
||||||
|
|
||||||
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -72,6 +72,11 @@ class ClassMapGenerator
|
|||||||
|
|
||||||
$classes = self::findClasses($path);
|
$classes = self::findClasses($path);
|
||||||
|
|
||||||
|
if (PHP_VERSION_ID >= 70000) {
|
||||||
|
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
|
||||||
|
gc_mem_caches();
|
||||||
|
}
|
||||||
|
|
||||||
foreach ($classes as $class) {
|
foreach ($classes as $class) {
|
||||||
$map[$class] = $path;
|
$map[$class] = $path;
|
||||||
}
|
}
|
||||||
@ -95,10 +100,10 @@ class ClassMapGenerator
|
|||||||
$classes = array();
|
$classes = array();
|
||||||
|
|
||||||
$namespace = '';
|
$namespace = '';
|
||||||
for ($i = 0, $max = count($tokens); $i < $max; ++$i) {
|
for ($i = 0; isset($tokens[$i]); ++$i) {
|
||||||
$token = $tokens[$i];
|
$token = $tokens[$i];
|
||||||
|
|
||||||
if (is_string($token)) {
|
if (!isset($token[1])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,9 +113,9 @@ class ClassMapGenerator
|
|||||||
case T_NAMESPACE:
|
case T_NAMESPACE:
|
||||||
$namespace = '';
|
$namespace = '';
|
||||||
// If there is a namespace, extract it
|
// If there is a namespace, extract it
|
||||||
while (($t = $tokens[++$i]) && is_array($t)) {
|
while (isset($tokens[++$i][1])) {
|
||||||
if (in_array($t[0], array(T_STRING, T_NS_SEPARATOR))) {
|
if (in_array($tokens[$i][0], array(T_STRING, T_NS_SEPARATOR))) {
|
||||||
$namespace .= $t[1];
|
$namespace .= $tokens[$i][1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$namespace .= '\\';
|
$namespace .= '\\';
|
||||||
@ -121,7 +126,7 @@ class ClassMapGenerator
|
|||||||
// Skip usage of ::class constant
|
// Skip usage of ::class constant
|
||||||
$isClassConstant = false;
|
$isClassConstant = false;
|
||||||
for ($j = $i - 1; $j > 0; --$j) {
|
for ($j = $i - 1; $j > 0; --$j) {
|
||||||
if (is_string($tokens[$j])) {
|
if (!isset($tokens[$j][1])) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -138,10 +143,11 @@ class ClassMapGenerator
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Find the classname
|
// Find the classname
|
||||||
while (($t = $tokens[++$i]) && is_array($t)) {
|
while (isset($tokens[++$i][1])) {
|
||||||
|
$t = $tokens[$i];
|
||||||
if (T_STRING === $t[0]) {
|
if (T_STRING === $t[0]) {
|
||||||
$class .= $t[1];
|
$class .= $t[1];
|
||||||
} elseif ($class !== '' && T_WHITESPACE == $t[0]) {
|
} elseif ('' !== $class && T_WHITESPACE === $t[0]) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -711,14 +711,15 @@ abstract class Kernel implements KernelInterface, TerminableInterface
|
|||||||
$output = '';
|
$output = '';
|
||||||
$tokens = token_get_all($source);
|
$tokens = token_get_all($source);
|
||||||
$ignoreSpace = false;
|
$ignoreSpace = false;
|
||||||
for (reset($tokens); false !== $token = current($tokens); next($tokens)) {
|
for ($i = 0; isset($tokens[$i]); ++$i) {
|
||||||
if (is_string($token)) {
|
$token = $tokens[$i];
|
||||||
|
if (!isset($token[1]) || 'b"' === $token) {
|
||||||
$rawChunk .= $token;
|
$rawChunk .= $token;
|
||||||
} elseif (T_START_HEREDOC === $token[0]) {
|
} elseif (T_START_HEREDOC === $token[0]) {
|
||||||
$output .= $rawChunk.$token[1];
|
$output .= $rawChunk.$token[1];
|
||||||
do {
|
do {
|
||||||
$token = next($tokens);
|
$token = $tokens[++$i];
|
||||||
$output .= $token[1];
|
$output .= isset($token[1]) && 'b"' !== $token ? $token[1] : $token;
|
||||||
} while ($token[0] !== T_END_HEREDOC);
|
} while ($token[0] !== T_END_HEREDOC);
|
||||||
$rawChunk = '';
|
$rawChunk = '';
|
||||||
} elseif (T_WHITESPACE === $token[0]) {
|
} elseif (T_WHITESPACE === $token[0]) {
|
||||||
@ -744,6 +745,12 @@ abstract class Kernel implements KernelInterface, TerminableInterface
|
|||||||
|
|
||||||
$output .= $rawChunk;
|
$output .= $rawChunk;
|
||||||
|
|
||||||
|
if (PHP_VERSION_ID >= 70000) {
|
||||||
|
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
|
||||||
|
unset($tokens, $rawChunk);
|
||||||
|
gc_mem_caches();
|
||||||
|
}
|
||||||
|
|
||||||
return $output;
|
return $output;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -246,7 +246,7 @@ modified';
|
|||||||
$heredoc = <<<HD
|
$heredoc = <<<HD
|
||||||
|
|
||||||
|
|
||||||
Heredoc should not be modified
|
Heredoc should not be modified {$a[1+$b]}
|
||||||
|
|
||||||
|
|
||||||
HD;
|
HD;
|
||||||
@ -282,7 +282,7 @@ modified';
|
|||||||
$heredoc = <<<HD
|
$heredoc = <<<HD
|
||||||
|
|
||||||
|
|
||||||
Heredoc should not be modified
|
Heredoc should not be modified {$a[1+$b]}
|
||||||
|
|
||||||
|
|
||||||
HD;
|
HD;
|
||||||
|
@ -110,7 +110,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
|
|||||||
|
|
||||||
$class = new \ReflectionClass($class);
|
$class = new \ReflectionClass($class);
|
||||||
if ($class->isAbstract()) {
|
if ($class->isAbstract()) {
|
||||||
throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class));
|
throw new \InvalidArgumentException(sprintf('Annotations from class "%s" cannot be read as it is abstract.', $class->getName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
$globals = $this->getGlobals($class);
|
$globals = $this->getGlobals($class);
|
||||||
|
@ -64,6 +64,10 @@ class AnnotationFileLoader extends FileLoader
|
|||||||
$collection->addResource(new FileResource($path));
|
$collection->addResource(new FileResource($path));
|
||||||
$collection->addCollection($this->loader->load($class, $type));
|
$collection->addCollection($this->loader->load($class, $type));
|
||||||
}
|
}
|
||||||
|
if (PHP_VERSION_ID >= 70000) {
|
||||||
|
// PHP 7 memory manager will not release after token_get_all(), see https://bugs.php.net/70098
|
||||||
|
gc_mem_caches();
|
||||||
|
}
|
||||||
|
|
||||||
return $collection;
|
return $collection;
|
||||||
}
|
}
|
||||||
@ -88,10 +92,10 @@ class AnnotationFileLoader extends FileLoader
|
|||||||
$class = false;
|
$class = false;
|
||||||
$namespace = false;
|
$namespace = false;
|
||||||
$tokens = token_get_all(file_get_contents($file));
|
$tokens = token_get_all(file_get_contents($file));
|
||||||
for ($i = 0, $count = count($tokens); $i < $count; ++$i) {
|
for ($i = 0; isset($tokens[$i]); ++$i) {
|
||||||
$token = $tokens[$i];
|
$token = $tokens[$i];
|
||||||
|
|
||||||
if (!is_array($token)) {
|
if (!isset($token[1])) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -100,11 +104,11 @@ class AnnotationFileLoader extends FileLoader
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (true === $namespace && T_STRING === $token[0]) {
|
if (true === $namespace && T_STRING === $token[0]) {
|
||||||
$namespace = '';
|
$namespace = $token[1];
|
||||||
do {
|
while (isset($tokens[++$i][1]) && in_array($tokens[$i][0], array(T_NS_SEPARATOR, T_STRING))) {
|
||||||
$namespace .= $token[1];
|
$namespace .= $tokens[$i][1];
|
||||||
$token = $tokens[++$i];
|
}
|
||||||
} while ($i < $count && is_array($token) && in_array($token[0], array(T_NS_SEPARATOR, T_STRING)));
|
$token = $tokens[$i];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (T_CLASS === $token[0]) {
|
if (T_CLASS === $token[0]) {
|
||||||
|
@ -99,7 +99,6 @@ class CardSchemeValidatorTest extends AbstractConstraintValidatorTest
|
|||||||
array('MAESTRO', '5020507657408074712'),
|
array('MAESTRO', '5020507657408074712'),
|
||||||
array('MAESTRO', '5612559223580173965'),
|
array('MAESTRO', '5612559223580173965'),
|
||||||
array('MAESTRO', '6759744069209'),
|
array('MAESTRO', '6759744069209'),
|
||||||
array('MAESTRO', '6759744069209'),
|
|
||||||
array('MAESTRO', '6594371785970435599'),
|
array('MAESTRO', '6594371785970435599'),
|
||||||
array('MASTERCARD', '5555555555554444'),
|
array('MASTERCARD', '5555555555554444'),
|
||||||
array('MASTERCARD', '5105105105105100'),
|
array('MASTERCARD', '5105105105105100'),
|
||||||
|
Reference in New Issue
Block a user