Merge branch '2.8' into 3.2

* 2.8: Fix minor phpdoc mismatches with the code(detected by phan) [Asset] Starting slash should indicate no basePath wanted [Security] Fix phpdoc logout listener Add iconv extension to suggested dependencies Fix minor typo in the main README.md Allow Upper Case property names in ObjectNormalizer [EventDispatcher] fix: unwrap listeners for correct info

Author: fabpot

README.md

@@ -46,7 +46,7 @@ If you discover a security vulnerability within Symfony, please follow our
 About Us
 --------
 
-Symfony development is sponsored by [SensioLabs][21], lead by the
+Symfony development is sponsored by [SensioLabs][21], led by the
 [Symfony Core Team][22] and supported by [Symfony contributors][19].
 
 [1]: https://symfony.com

src/Symfony/Component/Asset/PathPackage.php

@@ -59,7 +59,8 @@ public function getUrl($path)
 
  $versionedPath = $this->getVersionStrategy()->applyVersion($path);
 
- if ($this->isAbsoluteUrl($versionedPath)) {
+ // if absolute or begins with /, we're done
+ if ($this->isAbsoluteUrl($versionedPath) || ($versionedPath && '/' === $versionedPath[0])) {
  return $versionedPath;
  }
 

src/Symfony/Component/Asset/Tests/PathPackageTest.php

@@ -35,16 +35,16 @@ public function getConfigs()
 
  array('', '', '/foo', '/foo?v1'),
 
- array('/foo', '', '/foo', '/foo/foo?v1'),
- array('/foo', '', 'foo', '/foo/foo?v1'),
- array('foo', '', 'foo', '/foo/foo?v1'),
- array('foo/', '', 'foo', '/foo/foo?v1'),
- array('/foo/', '', 'foo', '/foo/foo?v1'),
-
- array('/foo', 'version-%2$s/%1$s', '/foo', '/foo/version-v1/foo'),
- array('/foo', 'version-%2$s/%1$s', 'foo', '/foo/version-v1/foo'),
- array('/foo', 'version-%2$s/%1$s', 'foo/', '/foo/version-v1/foo/'),
- array('/foo', 'version-%2$s/%1$s', '/foo/', '/foo/version-v1/foo/'),
+ array('/foo', '', '/bar', '/bar?v1'),
+ array('/foo', '', 'bar', '/foo/bar?v1'),
+ array('foo', '', 'bar', '/foo/bar?v1'),
+ array('foo/', '', 'bar', '/foo/bar?v1'),
+ array('/foo/', '', 'bar', '/foo/bar?v1'),
+
+ array('/foo', 'version-%2$s/%1$s', '/bar', '/version-v1/bar'),
+ array('/foo', 'version-%2$s/%1$s', 'bar', '/foo/version-v1/bar'),
+ array('/foo', 'version-%2$s/%1$s', 'bar/', '/foo/version-v1/bar/'),
+ array('/foo', 'version-%2$s/%1$s', '/bar/', '/version-v1/bar/'),
  );
  }
 
@@ -61,17 +61,17 @@ public function testGetUrlWithContext($basePathRequest, $basePath, $format, $pat
  public function getContextConfigs()
  {
  return array(
- array('', '/foo', '', '/foo', '/foo/foo?v1'),
- array('', '/foo', '', 'foo', '/foo/foo?v1'),
- array('', 'foo', '', 'foo', '/foo/foo?v1'),
- array('', 'foo/', '', 'foo', '/foo/foo?v1'),
- array('', '/foo/', '', 'foo', '/foo/foo?v1'),
-
- array('/bar', '/foo', '', '/foo', '/bar/foo/foo?v1'),
- array('/bar', '/foo', '', 'foo', '/bar/foo/foo?v1'),
- array('/bar', 'foo', '', 'foo', '/bar/foo/foo?v1'),
- array('/bar', 'foo/', '', 'foo', '/bar/foo/foo?v1'),
- array('/bar', '/foo/', '', 'foo', '/bar/foo/foo?v1'),
+ array('', '/foo', '', '/baz', '/baz?v1'),
+ array('', '/foo', '', 'baz', '/foo/baz?v1'),
+ array('', 'foo', '', 'baz', '/foo/baz?v1'),
+ array('', 'foo/', '', 'baz', '/foo/baz?v1'),
+ array('', '/foo/', '', 'baz', '/foo/baz?v1'),
+
+ array('/bar', '/foo', '', '/baz', '/baz?v1'),
+ array('/bar', '/foo', '', 'baz', '/bar/foo/baz?v1'),
+ array('/bar', 'foo', '', 'baz', '/bar/foo/baz?v1'),
+ array('/bar', 'foo/', '', 'baz', '/bar/foo/baz?v1'),
+ array('/bar', '/foo/', '', 'baz', '/bar/foo/baz?v1'),
  );
  }
 

src/Symfony/Component/CssSelector/Parser/Reader.php

@@ -97,7 +97,7 @@ public function getOffset($string)
  /**
  * @param string $pattern
  *
- * @return bool
+ * @return array|false
  */
  public function findPattern($pattern)
  {

src/Symfony/Component/CssSelector/XPath/Extension/NodeExtension.php

@@ -72,7 +72,7 @@ public function setFlag($flag, $on)
  */
  public function hasFlag($flag)
  {
- return $this->flags & $flag;
+ return (bool) ($this->flags & $flag);
  }
 
  /**

src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
+use Symfony\Component\EventDispatcher\Debug\WrappedListener;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -104,27 +105,44 @@ public function testAddRemoveSubscriber()
  $this->assertCount(0, $dispatcher->getListeners('foo'));
  }
 
- public function testGetCalledListeners()
+ /**
+ * @dataProvider isWrappedDataProvider
+ *
+ * @param bool $isWrapped
+ */
+ public function testGetCalledListeners($isWrapped)
  {
  $dispatcher = new EventDispatcher();
- $tdispatcher = new TraceableEventDispatcher($dispatcher, new Stopwatch());
- $tdispatcher->addListener('foo', $listener = function () {});
+ $stopWatch = new Stopwatch();
+ $tdispatcher = new TraceableEventDispatcher($dispatcher, $stopWatch);
+
+ $listener = function () {};
+ if ($isWrapped) {
+ $listener = new WrappedListener($listener, 'foo', $stopWatch, $dispatcher);
+ }
+
+ $tdispatcher->addListener('foo', $listener, 5);
 
  $listeners = $tdispatcher->getNotCalledListeners();
  $this->assertArrayHasKey('data', $listeners['foo.closure']);
  unset($listeners['foo.closure']['data']);
  $this->assertEquals(array(), $tdispatcher->getCalledListeners());
- $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 0)), $listeners);
+ $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 5)), $tdispatcher->getNotCalledListeners());
 
  $tdispatcher->dispatch('foo');
 
- $listeners = $tdispatcher->getCalledListeners();
- $this->assertArrayHasKey('data', $listeners['foo.closure']);
- unset($listeners['foo.closure']['data']);
- $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'pretty' => 'closure', 'priority' => 0)), $listeners);
+ $this->assertEquals(array('foo.closure' => array('event' => 'foo', 'type' => 'Closure', 'pretty' => 'closure', 'priority' => 5)), $tdispatcher->getCalledListeners());
  $this->assertEquals(array(), $tdispatcher->getNotCalledListeners());
  }
 
+ public function isWrappedDataProvider()
+ {
+ return array(
+ array(false),
+ array(true),
+ );
+ }
+
  public function testGetCalledListenersNested()
  {
  $tdispatcher = null;

src/Symfony/Component/ExpressionLanguage/Lexer.php

@@ -42,7 +42,7 @@ public function tokenize($expression)
  continue;
  }
 
- if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, null, $cursor)) {
+ if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, 0, $cursor)) {
  // numbers
  $number = (float) $match[0]; // floats
  if (preg_match('/^[0-9]+$/', $match[0]) && $number <= PHP_INT_MAX) {
@@ -69,19 +69,19 @@ public function tokenize($expression)
 
  $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
  ++$cursor;
- } elseif (preg_match('/"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As', $expression, $match, null, $cursor)) {
+ } elseif (preg_match('/"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As', $expression, $match, 0, $cursor)) {
  // strings
  $tokens[] = new Token(Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)), $cursor + 1);
  $cursor += strlen($match[0]);
- } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, null, $cursor)) {
+ } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
  // operators
  $tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
  $cursor += strlen($match[0]);
  } elseif (false !== strpos('.,?:', $expression[$cursor])) {
  // punctuation
  $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
  ++$cursor;
- } elseif (preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $expression, $match, null, $cursor)) {
+ } elseif (preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $expression, $match, 0, $cursor)) {
  // names
  $tokens[] = new Token(Token::NAME_TYPE, $match[0], $cursor + 1);
  $cursor += strlen($match[0]);

src/Symfony/Component/ExpressionLanguage/Token.php

@@ -32,7 +32,7 @@ class Token
  /**
  * Constructor.
  *
- * @param int $type The type of the token
+ * @param string $type The type of the token (self::*_TYPE)
  * @param string $value The token value
  * @param int $cursor The cursor position in the source
  */

src/Symfony/Component/HttpFoundation/FileBag.php

@@ -69,7 +69,7 @@ public function add(array $files = array())
  *
  * @param array|UploadedFile $file A (multi-dimensional) array of uploaded file information
  *
- * @return array A (multi-dimensional) array of UploadedFile instances
+ * @return UploadedFile|UploadedFile[] A (multi-dimensional) array of UploadedFile instances
  */
  protected function convertFileInformation($file)
  {

src/Symfony/Component/HttpFoundation/Request.php

@@ -930,7 +930,7 @@ public function getScheme()
  * If your reverse proxy uses a different header name than "X-Forwarded-Port",
  * configure it via "setTrustedHeaderName()" with the "client-port" key.
  *
- * @return string
+ * @return int|string can be a string if fetched from the server bag
  */
  public function getPort()
  {