Merge branch '3.4' into 4.0

* 3.4:
  Fix tests
  PropertyInfo\DoctrineExtractor - There is bug when indexBy is meta key
  Fix PercentType error rendering.
  [minor] SCA
  [Cache] Inline some hot function calls

src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php

@@ -95,9 +95,19 @@ class DoctrineExtractor implements PropertyListExtractorInterface, PropertyTypeE
 
                 if (isset($associationMapping['indexBy'])) {
                     $indexProperty = $associationMapping['indexBy'];
+                    /** @var ClassMetadataInfo $subMetadata */
                     $subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
                     $typeOfField = $subMetadata->getTypeOfField($indexProperty);
 
+                    if (null === $typeOfField) {
+                        $associationMapping = $subMetadata->getAssociationMapping($indexProperty);
+
+                        /** @var ClassMetadataInfo $subMetadata */
+                        $indexProperty = $subMetadata->getSingleAssociationReferencedJoinColumnName($indexProperty);
+                        $subMetadata = $this->classMetadataFactory->getMetadataFor($associationMapping['targetEntity']);
+                        $typeOfField = $subMetadata->getTypeOfField($indexProperty);
+                    }
+
                     $collectionKeyType = $this->getPhpType($typeOfField);
                 }
             }

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php

@@ -61,6 +61,7 @@ class DoctrineExtractorTest extends TestCase
                 'foo',
                 'bar',
                 'indexedBar',
+                'indexedFoo',
             ),
             $this->extractor->getProperties('Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineDummy')
         );
@@ -141,6 +142,14 @@ class DoctrineExtractorTest extends TestCase
                 new Type(Type::BUILTIN_TYPE_STRING),
                 new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
             ))),
+            array('indexedFoo', array(new Type(
+                Type::BUILTIN_TYPE_OBJECT,
+                false,
+                'Doctrine\Common\Collections\Collection',
+                true,
+                new Type(Type::BUILTIN_TYPE_STRING),
+                new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\DoctrineRelation')
+            ))),
             array('simpleArray', array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING)))),
             array('customFoo', null),
             array('notMapped', null),

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php

@@ -14,6 +14,7 @@ namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\OneToMany;
 use Doctrine\ORM\Mapping\ManyToMany;
 use Doctrine\ORM\Mapping\ManyToOne;
 
@@ -45,6 +46,11 @@ class DoctrineDummy
      */
     protected $indexedBar;
 
+    /**
+     * @OneToMany(targetEntity="DoctrineRelation", mappedBy="foo", indexBy="foo")
+     */
+    protected $indexedFoo;
+
     /**
      * @Column(type="guid")
      */

src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineRelation.php

@@ -14,6 +14,7 @@ namespace Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\Entity;
 use Doctrine\ORM\Mapping\Id;
+use Doctrine\ORM\Mapping\ManyToOne;
 
 /**
  * @Entity
@@ -32,4 +33,10 @@ class DoctrineRelation
      * @Column(type="guid")
      */
     protected $rguid;
+
+    /**
+     * @Column(type="guid")
+     * @ManyToOne(targetEntity="DoctrineDummy", inversedBy="indexedFoo")
+     */
+    protected $foo;
 }

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig

@@ -106,8 +106,7 @@
 {%- endblock dateinterval_widget %}
 
 {% block percent_widget -%}
-    <div class="input-group{{ not valid ? ' form-control is-invalid' }}">
+    <div class="input-group">
-        {% set valid = true %}
         {{- block('form_widget_simple') -}}
         <div class="input-group-append">
             <span class="input-group-text">%</span>

src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplateFinder.php

@@ -97,11 +97,10 @@ class TemplateFinder implements TemplateFinderInterface
     private function findTemplatesInBundle(BundleInterface $bundle)
     {
         $name = $bundle->getName();
-        $templates = array_merge(
+        $templates = array_unique(array_merge(
             $this->findTemplatesInFolder($bundle->getPath().'/Resources/views'),
             $this->findTemplatesInFolder($this->rootDir.'/'.$name.'/views')
-        );
+        ));
-        $templates = array_unique($templates);
 
         foreach ($templates as $i => $template) {
             $templates[$i] = $template->set('bundle', $name);

src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

@@ -157,7 +157,7 @@ class CodeHelper extends Helper
             $file = trim($file);
             $fileStr = $file;
             if (0 === strpos($fileStr, $this->rootDir)) {
-                $fileStr = str_replace($this->rootDir, '', str_replace('\\', '/', $fileStr));
+                $fileStr = str_replace(array('\\', $this->rootDir), array('/', ''), $fileStr);
                 $fileStr = htmlspecialchars($fileStr, $flags, $this->charset);
                 $fileStr = sprintf('<abbr title="%s">kernel.root_dir</abbr>/%s', htmlspecialchars($this->rootDir, $flags, $this->charset), $fileStr);
             }

src/Symfony/Component/Cache/Adapter/AbstractAdapter.php

@@ -233,7 +233,7 @@ abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface
             if (true === $e || array() === $e) {
                 continue;
             }
-            if (is_array($e) || 1 === count($values)) {
+            if (\is_array($e) || 1 === \count($values)) {
                 foreach (is_array($e) ? $e : array_keys($values) as $id) {
                     $ok = false;
                     $v = $values[$id];

src/Symfony/Component/Cache/Adapter/ChainAdapter.php

@@ -30,13 +30,13 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
 {
     private $adapters = array();
     private $adapterCount;
-    private $saveUp;
+    private $syncItem;
 
     /**
-     * @param CacheItemPoolInterface[] $adapters    The ordered list of adapters used to fetch cached items
+     * @param CacheItemPoolInterface[] $adapters        The ordered list of adapters used to fetch cached items
-     * @param int                      $maxLifetime The max lifetime of items propagated from lower adapters to upper ones
+     * @param int                      $defaultLifetime The default lifetime of items propagated from lower adapters to upper ones
      */
-    public function __construct(array $adapters, int $maxLifetime = 0)
+    public function __construct(array $adapters, int $defaultLifetime = 0)
     {
         if (!$adapters) {
             throw new InvalidArgumentException('At least one adapter must be specified.');
@@ -55,16 +55,20 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
         }
         $this->adapterCount = count($this->adapters);
 
-        $this->saveUp = \Closure::bind(
+        $this->syncItem = \Closure::bind(
-            function ($adapter, $item) use ($maxLifetime) {
+            function ($sourceItem, $item) use ($defaultLifetime) {
-                $origDefaultLifetime = $item->defaultLifetime;
+                $item->value = $sourceItem->value;
+                $item->expiry = $sourceItem->expiry;
+                $item->isHit = $sourceItem->isHit;
 
-                if (0 < $maxLifetime && ($origDefaultLifetime <= 0 || $maxLifetime < $origDefaultLifetime)) {
+                if (0 < $sourceItem->defaultLifetime && $sourceItem->defaultLifetime < $defaultLifetime) {
-                    $item->defaultLifetime = $maxLifetime;
+                    $defaultLifetime = $sourceItem->defaultLifetime;
+                }
+                if (0 < $defaultLifetime && ($item->defaultLifetime <= 0 || $defaultLifetime < $item->defaultLifetime)) {
+                    $item->defaultLifetime = $defaultLifetime;
                 }
 
-                $adapter->save($item);
+                return $item;
-                $item->defaultLifetime = $origDefaultLifetime;
             },
             null,
             CacheItem::class
@@ -76,18 +80,21 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
      */
     public function getItem($key)
     {
-        $saveUp = $this->saveUp;
+        $syncItem = $this->syncItem;
+        $misses = array();
 
         foreach ($this->adapters as $i => $adapter) {
             $item = $adapter->getItem($key);
 
             if ($item->isHit()) {
                 while (0 <= --$i) {
-                    $saveUp($this->adapters[$i], $item);
+                    $this->adapters[$i]->save($syncItem($item, $misses[$i]));
                 }
 
                 return $item;
             }
+
+            $misses[$i] = $item;
         }
 
         return $item;
@@ -104,6 +111,7 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
     private function generateItems($items, $adapterIndex)
     {
         $missing = array();
+        $misses = array();
         $nextAdapterIndex = $adapterIndex + 1;
         $nextAdapter = isset($this->adapters[$nextAdapterIndex]) ? $this->adapters[$nextAdapterIndex] : null;
 
@@ -112,17 +120,18 @@ class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableIn
                 yield $k => $item;
             } else {
                 $missing[] = $k;
+                $misses[$k] = $item;
             }
         }
 
         if ($missing) {
-            $saveUp = $this->saveUp;
+            $syncItem = $this->syncItem;
             $adapter = $this->adapters[$adapterIndex];
             $items = $this->generateItems($nextAdapter->getItems($missing), $nextAdapterIndex);
 
             foreach ($items as $k => $item) {
                 if ($item->isHit()) {
-                    $saveUp($adapter, $item);
+                    $adapter->save($syncItem($item, $misses[$k]));
                 }
 
                 yield $k => $item;

src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php

@@ -82,7 +82,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public function getItem($key)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -97,7 +97,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
 
         if ('N;' === $value) {
             $value = null;
-        } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+        } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
             try {
                 $e = null;
                 $value = unserialize($value);
@@ -121,7 +121,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
     public function getItems(array $keys = array())
     {
         foreach ($keys as $key) {
-            if (!is_string($key)) {
+            if (!\is_string($key)) {
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
         }
@@ -137,7 +137,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public function hasItem($key)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -152,7 +152,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
      */
     public function deleteItem($key)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -171,7 +171,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
         $fallbackKeys = array();
 
         foreach ($keys as $key) {
-            if (!is_string($key)) {
+            if (!\is_string($key)) {
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
 
@@ -235,7 +235,7 @@ class PhpArrayAdapter implements AdapterInterface, PruneableInterface, Resettabl
 
                 if ('N;' === $value) {
                     yield $key => $f($key, null, true);
-                } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
                         yield $key => $f($key, unserialize($value), true);
                     } catch (\Error $e) {

src/Symfony/Component/Cache/Adapter/TagAwareAdapter.php

@@ -107,7 +107,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
     public function invalidateTags(array $tags)
     {
         foreach ($tags as $k => $tag) {
-            if ('' !== $tag && is_string($tag)) {
+            if ('' !== $tag && \is_string($tag)) {
                 $tags[$k] = $tag.static::TAGS_PREFIX;
             }
         }
@@ -161,7 +161,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
         $tagKeys = array();
 
         foreach ($keys as $key) {
-            if ('' !== $key && is_string($key)) {
+            if ('' !== $key && \is_string($key)) {
                 $key = static::TAGS_PREFIX.$key;
                 $tagKeys[$key] = $key;
             }
@@ -202,7 +202,7 @@ class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, R
     public function deleteItems(array $keys)
     {
         foreach ($keys as $key) {
-            if ('' !== $key && is_string($key)) {
+            if ('' !== $key && \is_string($key)) {
                 $keys[] = static::TAGS_PREFIX.$key;
             }
         }

src/Symfony/Component/Cache/CacheItem.php

@@ -89,7 +89,7 @@ final class CacheItem implements CacheItemInterface
             $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
         } elseif ($time instanceof \DateInterval) {
             $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
-        } elseif (is_int($time)) {
+        } elseif (\is_int($time)) {
             $this->expiry = $time + time();
         } else {
             throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($time) ? get_class($time) : gettype($time)));
@@ -109,17 +109,17 @@ final class CacheItem implements CacheItemInterface
      */
     public function tag($tags)
     {
-        if (!is_array($tags)) {
+        if (!\is_array($tags)) {
             $tags = array($tags);
         }
         foreach ($tags as $tag) {
-            if (!is_string($tag)) {
+            if (!\is_string($tag)) {
                 throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given', is_object($tag) ? get_class($tag) : gettype($tag)));
             }
             if (isset($this->tags[$tag])) {
                 continue;
             }
-            if (!isset($tag[0])) {
+            if ('' === $tag) {
                 throw new InvalidArgumentException('Cache tag length must be greater than zero');
             }
             if (false !== strpbrk($tag, '{}()/\@:')) {
@@ -152,10 +152,10 @@ final class CacheItem implements CacheItemInterface
      */
     public static function validateKey($key)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given', is_object($key) ? get_class($key) : gettype($key)));
         }
-        if (!isset($key[0])) {
+        if ('' === $key) {
             throw new InvalidArgumentException('Cache key length must be greater than zero');
         }
         if (false !== strpbrk($key, '{}()/\@:')) {

src/Symfony/Component/Cache/Simple/AbstractCache.php

@@ -75,7 +75,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
+        } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         $ids = array();
@@ -99,13 +99,13 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
+        if (!\is_array($values) && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
         $valuesById = array();
 
         foreach ($values as $key => $value) {
-            if (is_int($key)) {
+            if (\is_int($key)) {
                 $key = (string) $key;
             }
             $valuesById[$this->getId($key)] = $value;
@@ -122,7 +122,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
             return true;
         }
         $keys = array();
-        foreach (is_array($e) ? $e : array_keys($valuesById) as $id) {
+        foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) {
             $keys[] = substr($id, strlen($this->namespace));
         }
         CacheItem::log($this->logger, 'Failed to save values', array('keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null));
@@ -137,7 +137,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
+        } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
 
@@ -152,7 +152,7 @@ abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, Re
         if ($ttl instanceof \DateInterval) {
             $ttl = (int) \DateTime::createFromFormat('U', 0)->add($ttl)->format('U');
         }
-        if (is_int($ttl)) {
+        if (\is_int($ttl)) {
             return 0 < $ttl ? $ttl : false;
         }
 

src/Symfony/Component/Cache/Simple/ArrayCache.php

@@ -57,7 +57,7 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
+        } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         foreach ($keys as $key) {
@@ -72,7 +72,7 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
      */
     public function deleteMultiple($keys)
     {
-        if (!is_array($keys) && !$keys instanceof \Traversable) {
+        if (!\is_array($keys) && !$keys instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         foreach ($keys as $key) {
@@ -97,13 +97,13 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
+        if (!\is_array($values) && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
         $valuesArray = array();
 
         foreach ($values as $key => $value) {
-            is_int($key) || CacheItem::validateKey($key);
+            \is_int($key) || CacheItem::validateKey($key);
             $valuesArray[$key] = $value;
         }
         if (false === $ttl = $this->normalizeTtl($ttl)) {
@@ -139,7 +139,7 @@ class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInte
         if ($ttl instanceof \DateInterval) {
             $ttl = (int) \DateTime::createFromFormat('U', 0)->add($ttl)->format('U');
         }
-        if (is_int($ttl)) {
+        if (\is_int($ttl)) {
             return 0 < $ttl ? $ttl : false;
         }
 

src/Symfony/Component/Cache/Simple/ChainCache.php

@@ -58,7 +58,7 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
      */
     public function get($key, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
 
         foreach ($this->caches as $i => $cache) {
             $value = $cache->get($key, $miss);
@@ -80,7 +80,7 @@ class ChainCache implements CacheInterface, PruneableInterface, ResettableInterf
      */
     public function getMultiple($keys, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
 
         return $this->generateItems($this->caches[0]->getMultiple($keys, $miss), 0, $miss, $default);
     }

src/Symfony/Component/Cache/Simple/PhpArrayCache.php

@@ -61,7 +61,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function get($key, $default = null)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -75,7 +75,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
         if ('N;' === $value) {
             $value = null;
-        } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+        } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
             try {
                 $e = null;
                 $value = unserialize($value);
@@ -97,11 +97,11 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
+        } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         foreach ($keys as $key) {
-            if (!is_string($key)) {
+            if (!\is_string($key)) {
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
         }
@@ -117,7 +117,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function has($key)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -132,7 +132,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function delete($key)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -147,7 +147,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function deleteMultiple($keys)
     {
-        if (!is_array($keys) && !$keys instanceof \Traversable) {
+        if (!\is_array($keys) && !$keys instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
 
@@ -155,7 +155,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
         $fallbackKeys = array();
 
         foreach ($keys as $key) {
-            if (!is_string($key)) {
+            if (!\is_string($key)) {
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
 
@@ -181,7 +181,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function set($key, $value, $ttl = null)
     {
-        if (!is_string($key)) {
+        if (!\is_string($key)) {
             throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
@@ -196,7 +196,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof \Traversable) {
+        if (!\is_array($values) && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
 
@@ -204,7 +204,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
         $fallbackValues = array();
 
         foreach ($values as $key => $value) {
-            if (!is_string($key) && !is_int($key)) {
+            if (!\is_string($key) && !\is_int($key)) {
                 throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
 
@@ -232,7 +232,7 @@ class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInt
 
                 if ('N;' === $value) {
                     yield $key => null;
-                } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
                         yield $key => unserialize($value);
                     } catch (\Error $e) {

src/Symfony/Component/Cache/Simple/Psr6Cache.php

@@ -38,7 +38,7 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
         if ($pool instanceof AbstractAdapter) {
             $this->createCacheItem = \Closure::bind(
                 function ($key, $value, $allowInt = false) {
-                    if ($allowInt && is_int($key)) {
+                    if ($allowInt && \is_int($key)) {
                         $key = (string) $key;
                     } else {
                         CacheItem::validateKey($key);
@@ -121,7 +121,7 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
+        } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
 
@@ -146,7 +146,7 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
      */
     public function setMultiple($values, $ttl = null)
     {
-        $valuesIsArray = is_array($values);
+        $valuesIsArray = \is_array($values);
         if (!$valuesIsArray && !$values instanceof \Traversable) {
             throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
@@ -166,7 +166,7 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
                 $items = $this->pool->getItems($items);
             } else {
                 foreach ($values as $key => $value) {
-                    if (is_int($key)) {
+                    if (\is_int($key)) {
                         $key = (string) $key;
                     }
                     $items[$key] = $this->pool->getItem($key)->set($value);
@@ -199,7 +199,7 @@ class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterfa
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!is_array($keys)) {
+        } elseif (!\is_array($keys)) {
             throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
 

src/Symfony/Component/Cache/Simple/TraceableCache.php

@@ -37,7 +37,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
      */
     public function get($key, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
         $event = $this->start(__FUNCTION__);
         try {
             $value = $this->pool->get($key, $miss);
@@ -109,7 +109,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
                 }
             };
             $values = $values();
-        } elseif (is_array($values)) {
+        } elseif (\is_array($values)) {
             $event->result['keys'] = array_keys($values);
         }
 
@@ -125,7 +125,7 @@ class TraceableCache implements CacheInterface, PruneableInterface, ResettableIn
      */
     public function getMultiple($keys, $default = null)
     {
-        $miss = null !== $default && is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
         $event = $this->start(__FUNCTION__);
         try {
             $result = $this->pool->getMultiple($keys, $miss);

src/Symfony/Component/Cache/Traits/AbstractTrait.php

@@ -241,7 +241,7 @@ trait AbstractTrait
         if (null === $this->maxIdLength) {
             return $this->namespace.$this->namespaceVersion.$key;
         }
-        if (strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
+        if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
             $id = $this->namespace.$this->namespaceVersion.substr_replace(base64_encode(hash('sha256', $key, true)), ':', -22);
         }
 

src/Symfony/Component/Cache/Traits/PhpArrayTrait.php

@@ -66,15 +66,15 @@ return array(
 EOF;
 
         foreach ($values as $key => $value) {
-            CacheItem::validateKey(is_int($key) ? (string) $key : $key);
+            CacheItem::validateKey(\is_int($key) ? (string) $key : $key);
 
-            if (null === $value || is_object($value)) {
+            if (null === $value || \is_object($value)) {
                 try {
                     $value = serialize($value);
                 } catch (\Exception $e) {
                     throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, get_class($value)), 0, $e);
                 }
-            } elseif (is_array($value)) {
+            } elseif (\is_array($value)) {
                 try {
                     $serialized = serialize($value);
                     $unserialized = unserialize($serialized);
@@ -85,12 +85,12 @@ EOF;
                 if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
                     $value = $serialized;
                 }
-            } elseif (is_string($value)) {
+            } elseif (\is_string($value)) {
                 // Serialize strings if they could be confused with serialized objects or arrays
                 if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
                     $value = serialize($value);
                 }
-            } elseif (!is_scalar($value)) {
+            } elseif (!\is_scalar($value)) {
                 throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
             }
 

src/Symfony/Component/Cache/Traits/PhpFilesTrait.php

@@ -96,7 +96,7 @@ trait PhpFilesTrait
         foreach ($values as $id => $value) {
             if ('N;' === $value) {
                 $values[$id] = null;
-            } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+            } elseif (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
                 $values[$id] = parent::unserialize($value);
             }
         }
@@ -122,21 +122,21 @@ trait PhpFilesTrait
         $allowCompile = 'cli' !== PHP_SAPI || ini_get('opcache.enable_cli');
 
         foreach ($values as $key => $value) {
-            if (null === $value || is_object($value)) {
+            if (null === $value || \is_object($value)) {
                 $value = serialize($value);
-            } elseif (is_array($value)) {
+            } elseif (\is_array($value)) {
                 $serialized = serialize($value);
                 $unserialized = parent::unserialize($serialized);
                 // Store arrays serialized if they contain any objects or references
                 if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
                     $value = $serialized;
                 }
-            } elseif (is_string($value)) {
+            } elseif (\is_string($value)) {
                 // Serialize strings if they could be confused with serialized objects or arrays
                 if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
                     $value = serialize($value);
                 }
-            } elseif (!is_scalar($value)) {
+            } elseif (!\is_scalar($value)) {
                 throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
             }
 

src/Symfony/Component/Cache/Traits/RedisTrait.php

@@ -240,7 +240,7 @@ trait RedisTrait
             $cursor = null;
             do {
                 $keys = $host instanceof \Predis\Client ? $host->scan($cursor, 'MATCH', $namespace.'*', 'COUNT', 1000) : $host->scan($cursor, $namespace.'*', 1000);
-                if (isset($keys[1]) && is_array($keys[1])) {
+                if (isset($keys[1]) && \is_array($keys[1])) {
                     $cursor = $keys[0];
                     $keys = $keys[1];
                 }

src/Symfony/Component/Console/Descriptor/JsonDescriptor.php

@@ -121,7 +121,7 @@ class JsonDescriptor extends Descriptor
     {
         return array(
             'name' => '--'.$option->getName(),
-            'shortcut' => $option->getShortcut() ? '-'.implode('|-', explode('|', $option->getShortcut())) : '',
+            'shortcut' => $option->getShortcut() ? '-'.str_replace('|', '|-', $option->getShortcut()) : '',
             'accept_value' => $option->acceptValue(),
             'is_value_required' => $option->isValueRequired(),
             'is_multiple' => $option->isArray(),

src/Symfony/Component/Console/Descriptor/MarkdownDescriptor.php

@@ -70,7 +70,7 @@ class MarkdownDescriptor extends Descriptor
     {
         $name = '--'.$option->getName();
         if ($option->getShortcut()) {
-            $name .= '|-'.implode('|-', explode('|', $option->getShortcut())).'';
+            $name .= '|-'.str_replace('|', '|-', $option->getShortcut()).'';
         }
 
         $this->write(

src/Symfony/Component/Console/Descriptor/XmlDescriptor.php

@@ -218,7 +218,7 @@ class XmlDescriptor extends Descriptor
         $pos = strpos($option->getShortcut(), '|');
         if (false !== $pos) {
             $objectXML->setAttribute('shortcut', '-'.substr($option->getShortcut(), 0, $pos));
-            $objectXML->setAttribute('shortcuts', '-'.implode('|-', explode('|', $option->getShortcut())));
+            $objectXML->setAttribute('shortcuts', '-'.str_replace('|', '|-', $option->getShortcut()));
         } else {
             $objectXML->setAttribute('shortcut', $option->getShortcut() ? '-'.$option->getShortcut() : '');
         }

src/Symfony/Component/Console/Input/InputOption.php

@@ -195,7 +195,7 @@ class InputOption
      *
      * @return bool
      */
-    public function equals(InputOption $option)
+    public function equals(self $option)
     {
         return $option->getName() === $this->getName()
             && $option->getShortcut() === $this->getShortcut()

src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.json

@@ -21,7 +21,8 @@
                 "compound",
                 "data_class",
                 "empty_data",
-                "error_bubbling"
+                "error_bubbling",
+                "trim"
             ]
         },
         "parent": {
@@ -43,7 +44,6 @@
                 "property_path",
                 "required",
                 "translation_domain",
-                "trim",
                 "upload_max_size_message"
             ]
         },

src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt

@@ -11,7 +11,7 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
   choice_name                 data_class           attr                      csrf_message           
   choice_translation_domain   empty_data           auto_initialize           csrf_protection        
   choice_value                error_bubbling       block_name                csrf_token_id          
-  choices                                          by_reference              csrf_token_manager     
+  choices                     trim                 by_reference              csrf_token_manager     
   expanded                                         data                                             
   group_by                                         disabled                                         
   multiple                                         inherit_data                                     
@@ -24,7 +24,6 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice")
                                                    property_path                                    
                                                    required                                         
                                                    translation_domain                               
-                                                   trim                                             
                                                    upload_max_size_message                          
  --------------------------- -------------------- ------------------------- ----------------------- 
 

src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php

@@ -160,10 +160,6 @@ class LazyLoadingMetadataFactory implements MetadataFactoryInterface
 
         $class = ltrim(is_object($value) ? get_class($value) : $value, '\\');
 
-        if (class_exists($class) || interface_exists($class)) {
+        return class_exists($class) || interface_exists($class, false);
-            return true;
-        }
-
-        return false;
     }
 }