Merge branch '4.1' into 4.2

* 4.1:
  [Routing] fix trailing slash redirection
  calculate cache keys for property setters depending on the value
  updated VERSION for 2.8.48
  update CONTRIBUTORS for 2.8.48
  updated CHANGELOG for 2.8.48

CONTRIBUTORS.md

@@ -14,9 +14,9 @@ Symfony is the result of the work of many people who made the code better
  - Victor Berchet (victor)
  - Robin Chalas (chalas_r)
  - Kévin Dunglas (dunglas)
+ - Maxime Steinhausser (ogizanagi)
  - Jakub Zalas (jakubzalas)
  - Johannes S (johannes)
- - Maxime Steinhausser (ogizanagi)
  - Kris Wallsmith (kriswallsmith)
  - Ryan Weaver (weaverryan)
  - Javier Eguiluz (javier.eguiluz)
@@ -37,8 +37,8 @@ Symfony is the result of the work of many people who made the code better
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
  - Jules Pietri (heah)
- - Eriksen Costa (eriksencosta)
  - Yonel Ceruto (yonelceruto)
+ - Eriksen Costa (eriksencosta)
  - Guilhem Niot (energetick)
  - Sarah Khalil (saro0h)
  - Jonathan Wage (jwage)
@@ -70,6 +70,7 @@ Symfony is the result of the work of many people who made the code better
  - Gábor Egyed (1ed)
  - Mathieu Piot (mpiot)
  - Titouan Galopin (tgalopin)
+ - Vladimir Reznichenko (kalessil)
  - Michel Weimerskirch (mweimerskirch)
  - Andrej Hudec (pulzarraider)
  - Konstantin Myakshin (koc)
@@ -77,7 +78,6 @@ Symfony is the result of the work of many people who made the code better
  - Jáchym Toušek (enumag)
  - Charles Sarrazin (csarrazi)
  - David Maicher (dmaicher)
- - Vladimir Reznichenko (kalessil)
  - Christian Raue
  - Issei Murasawa (issei_m)
  - Arnout Boks (aboks)
@@ -86,13 +86,13 @@ Symfony is the result of the work of many people who made the code better
  - Dariusz Górecki (canni)
  - Douglas Greenshields (shieldo)
  - Dariusz Ruminski
+ - Grégoire Paris (greg0ire)
  - Lee McDermott
  - Brandon Turner
  - Luis Cordova (cordoval)
  - Graham Campbell (graham)
  - Daniel Holmes (dholmes)
  - Toni Uebernickel (havvg)
- - Grégoire Paris (greg0ire)
  - Bart van den Burg (burgov)
  - Jordan Alliot (jalliot)
  - Jérôme Tamarelle (gromnan)
@@ -113,12 +113,12 @@ Symfony is the result of the work of many people who made the code better
  - lenar
  - Alexander Schwenn (xelaris)
  - Włodzimierz Gajda (gajdaw)
+ - Tomáš Votruba (tomas_votruba)
  - Peter Kokot (maastermedia)
  - Jacob Dreesen (jdreesen)
  - Florian Voutzinos (florianv)
  - Colin Frei
  - Adrien Brault (adrienbrault)
- - Tomáš Votruba (tomas_votruba)
  - Joshua Thijssen
  - excelwebzone
  - Gordon Franke (gimler)
@@ -179,6 +179,7 @@ Symfony is the result of the work of many people who made the code better
  - jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
  - James Halsall (jaitsu)
  - Matthieu Napoli (mnapoli)
+ - Florent Mata (fmata)
  - Warnar Boekkooi (boekkooi)
  - Alessandro Chitolina (alekitto)
  - Dmitrii Chekaliuk (lazyhammer)
@@ -193,7 +194,6 @@ Symfony is the result of the work of many people who made the code better
  - Dennis Benkert (denderello)
  - DQNEO
  - Benjamin Dulau (dbenjamin)
- - Florent Mata (fmata)
  - Mathieu Lemoine (lemoinem)
  - Thomas Calvet (fancyweb)
  - Christian Schmidt
@@ -258,6 +258,7 @@ Symfony is the result of the work of many people who made the code better
  - Benoît Burnichon (bburnichon)
  - Roman Marintšenko (inori)
  - Xavier Montaña Carreras (xmontana)
+ - François-Xavier de Guillebon (de-gui_f)
  - Mickaël Andrieu (mickaelandrieu)
  - Maxime Veber (nek-)
  - Xavier Perez
@@ -294,7 +295,9 @@ Symfony is the result of the work of many people who made the code better
  - Thomas Lallement (raziel057)
  - mcfedr (mcfedr)
  - Colin O'Dell (colinodell)
+ - Fabien Bourigault (fbourigault)
  - Giorgio Premi
+ - Jan Schädlich (jschaedl)
  - Beau Simensen (simensen)
  - Michael Hirschler (mvhirsch)
  - Robert Kiss (kepten)
@@ -305,8 +308,8 @@ Symfony is the result of the work of many people who made the code better
  - Jérôme Parmentier (lctrs)
  - Michael Babker (mbabker)
  - Peter Kruithof (pkruithof)
- - François-Xavier de Guillebon (de-gui_f)
  - Michael Holm (hollo)
+ - Remon van de Kamp (rpkamp)
  - Marc Weistroff (futurecat)
  - Christian Schmidt
  - MatTheCat
@@ -350,8 +353,6 @@ Symfony is the result of the work of many people who made the code better
  - Ricard Clau (ricardclau)
  - Mark Challoner (markchalloner)
  - Gennady Telegin (gtelegin)
- - Jan Schädlich (jschaedl)
- - Fabien Bourigault (fbourigault)
  - Ben Davies (bendavies)
  - Erin Millard
  - Artur Melo (restless)
@@ -445,6 +446,7 @@ Symfony is the result of the work of many people who made the code better
  - lancergr
  - Zan Baldwin
  - Mihai Stancu
+ - Ivan Nikolaev (destillat)
  - Olivier Dolbeau (odolbeau)
  - Jan Rosier (rosier)
  - Alessandro Lai (jean85)
@@ -461,7 +463,6 @@ Symfony is the result of the work of many people who made the code better
  - Boris Vujicic (boris.vujicic)
  - Chris Sedlmayr (catchamonkey)
  - Mateusz Sip (mateusz_sip)
- - Remon van de Kamp
  - Kamil Kokot (pamil)
  - Seb Koelen
  - Christoph Mewes (xrstf)
@@ -470,6 +471,7 @@ Symfony is the result of the work of many people who made the code better
  - Dirk Pahl (dirkaholic)
  - cedric lombardot (cedriclombardot)
  - Jonas Flodén (flojon)
+ - Gonzalo Vilaseca (gonzalovilaseca)
  - Marcin Sikoń (marphi)
  - Dominik Zogg (dominik.zogg)
  - Marek Pietrzak
@@ -643,7 +645,6 @@ Symfony is the result of the work of many people who made the code better
  - adev
  - Stefan Warman
  - Arkadius Stefanski (arkadius)
- - Gonzalo Vilaseca (gonzalovilaseca)
  - Tristan Maindron (tmaindron)
  - Wesley Lancel
  - Ke WANG (yktd26)
@@ -665,6 +666,7 @@ Symfony is the result of the work of many people who made the code better
  - Sergey (upyx)
  - Michael Devery (mickadoo)
  - Antoine Corcy
+ - Dmitrii Poddubnyi (karser)
  - Sascha Grossenbacher
  - Szijarto Tamas
  - Robin Lehrmann (robinlehrmann)
@@ -804,7 +806,6 @@ Symfony is the result of the work of many people who made the code better
  - Sofiane HADDAG (sofhad)
  - frost-nzcr4
  - Bozhidar Hristov
- - Ivan Nikolaev (destillat)
  - Laurent Bassin (lbassin)
  - andrey1s
  - Abhoryo
@@ -989,6 +990,7 @@ Symfony is the result of the work of many people who made the code better
  - Mathieu Santostefano
  - Arjan Keeman
  - Máximo Cuadros (mcuadros)
+ - Lukas Mencl
  - tamirvs
  - julien.galenski
  - Christian Neff
@@ -1290,6 +1292,7 @@ Symfony is the result of the work of many people who made the code better
  - Adrien Samson (adriensamson)
  - Samuel Gordalina (gordalina)
  - Max Romanovsky (maxromanovsky)
+ - Nicolas Eeckeloo (neeckeloo)
  - Mathieu Morlon
  - Daniel Tschinder
  - Arnaud CHASSEUX
@@ -1351,6 +1354,7 @@ Symfony is the result of the work of many people who made the code better
  - Andrew (drew)
  - kor3k kor3k (kor3k)
  - Stelian Mocanita (stelian)
+ - Thomas Bisignani (toma)
  - Justin (wackymole)
  - Flavian (2much)
  - Gautier Deuette
@@ -1448,6 +1452,7 @@ Symfony is the result of the work of many people who made the code better
  - Phobetor
  - Andreas
  - Markus
+ - Daniel Gorgan
  - Thomas Chmielowiec
  - shdev
  - Andrey Ryaguzov
@@ -1499,6 +1504,7 @@ Symfony is the result of the work of many people who made the code better
  - David Barratt
  - Pavel.Batanov
  - avi123
+ - Pavel Prischepa
  - alsar
  - downace
  - Aarón Nieves Fernández
@@ -1613,6 +1619,7 @@ Symfony is the result of the work of many people who made the code better
  - David Zuelke
  - Adrian
  - Oleg Andreyev
+ - neFAST
  - Pierre Rineau
  - Maxim Lovchikov
  - adenkejawen
@@ -1710,7 +1717,6 @@ Symfony is the result of the work of many people who made the code better
  - Giovanni Albero (johntree)
  - Jorge Martin (jorgemartind)
  - Joeri Verdeyen (jverdeyen)
- - Dmitrii Poddubnyi (karser)
  - Kevin Verschaeve (keversc)
  - Kevin Herrera (kherge)
  - Luis Ramón López López (lrlopez)
@@ -1872,6 +1878,7 @@ Symfony is the result of the work of many people who made the code better
  - zorn
  - Yuriy Potemkin
  - Emilie Lorenzo
+ - Edvin Hultberg
  - Benjamin Long
  - Matt Janssen
  - Ben Miller
@@ -1992,6 +1999,7 @@ Symfony is the result of the work of many people who made the code better
  - Alex Carol (picard89)
  - Daniel Perez Pinazo (pitiflautico)
  - Phil Taylor (prazgod)
+ - Maxim Pustynnikov (pustynnikov)
  - Brayden Williams (redstar504)
  - Rich Sage (richsage)
  - Rokas Mikalkėnas (rokasm)

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

@@ -587,7 +587,8 @@ class PropertyAccessor implements PropertyAccessorInterface
      */
     private function getWriteAccessInfo(string $class, string $property, $value): array
     {
-        $key = str_replace('\\', '.', $class).'..'.$property;
+        $useAdderAndRemover = \is_array($value) || $value instanceof \Traversable;
+        $key = str_replace('\\', '.', $class).'..'.$property.'..'.(int) $useAdderAndRemover;
 
         if (isset($this->writePropertyCache[$key])) {
             return $this->writePropertyCache[$key];
@@ -607,6 +608,16 @@ class PropertyAccessor implements PropertyAccessorInterface
         $camelized = $this->camelize($property);
         $singulars = (array) Inflector::singularize($camelized);
 
+        if ($useAdderAndRemover) {
+            $methods = $this->findAdderAndRemover($reflClass, $singulars);
+
+            if (null !== $methods) {
+                $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_ADDER_AND_REMOVER;
+                $access[self::ACCESS_ADDER] = $methods[0];
+                $access[self::ACCESS_REMOVER] = $methods[1];
+            }
+        }
+
         if (!isset($access[self::ACCESS_TYPE])) {
             $setter = 'set'.$camelized;
             $getsetter = lcfirst($camelized); // jQuery style, e.g. read: last(), write: last($item)
@@ -628,22 +639,16 @@ class PropertyAccessor implements PropertyAccessorInterface
                 $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_MAGIC;
                 $access[self::ACCESS_NAME] = $setter;
             } elseif (null !== $methods = $this->findAdderAndRemover($reflClass, $singulars)) {
-                if (\is_array($value) || $value instanceof \Traversable) {
+                $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
-                    $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_ADDER_AND_REMOVER;
+                $access[self::ACCESS_NAME] = sprintf(
-                    $access[self::ACCESS_ADDER] = $methods[0];
+                    'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
-                    $access[self::ACCESS_REMOVER] = $methods[1];
+                    'the new value must be an array or an instance of \Traversable, '.
-                } else {
+                    '"%s" given.',
-                    $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
+                    $property,
-                    $access[self::ACCESS_NAME] = sprintf(
+                    $reflClass->name,
-                        'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
+                    implode('()", "', $methods),
-                        'the new value must be an array or an instance of \Traversable, '.
+                    \is_object($value) ? \get_class($value) : \gettype($value)
-                        '"%s" given.',
+                );
-                        $property,
-                        $reflClass->name,
-                        implode('()", "', $methods),
-                        \is_object($value) ? \get_class($value) : \gettype($value)
-                    );
-                }
             } else {
                 $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
                 $access[self::ACCESS_NAME] = sprintf(
@@ -680,6 +685,18 @@ class PropertyAccessor implements PropertyAccessorInterface
 
         $access = $this->getWriteAccessInfo(\get_class($object), $property, array());
 
+        $isWritable = self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]
+            || self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]
+            || self::ACCESS_TYPE_ADDER_AND_REMOVER === $access[self::ACCESS_TYPE]
+            || (!$access[self::ACCESS_HAS_PROPERTY] && property_exists($object, $property))
+            || self::ACCESS_TYPE_MAGIC === $access[self::ACCESS_TYPE];
+
+        if ($isWritable) {
+            return true;
+        }
+
+        $access = $this->getWriteAccessInfo(\get_class($object), $property, '');
+
         return self::ACCESS_TYPE_METHOD === $access[self::ACCESS_TYPE]
             || self::ACCESS_TYPE_PROPERTY === $access[self::ACCESS_TYPE]
             || self::ACCESS_TYPE_ADDER_AND_REMOVER === $access[self::ACCESS_TYPE]

src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php

@@ -708,7 +708,27 @@ class PropertyAccessorTest extends TestCase
         $this->propertyAccessor->isWritable($object, 'emails'); //cache access info
         $this->propertyAccessor->setValue($object, 'emails', array('test@email.com'));
 
-        self::assertEquals(array('test@email.com'), $object->getEmails());
+        $this->assertEquals(array('test@email.com'), $object->getEmails());
-        self::assertNull($object->getEmail());
+        $this->assertNull($object->getEmail());
+    }
+
+    public function testAdderAndRemoverArePreferredOverSetter()
+    {
+        $object = new TestPluralAdderRemoverAndSetter();
+
+        $this->propertyAccessor->isWritable($object, 'emails'); //cache access info
+        $this->propertyAccessor->setValue($object, 'emails', array('test@email.com'));
+
+        $this->assertEquals(array('test@email.com'), $object->getEmails());
+    }
+
+    public function testAdderAndRemoverArePreferredOverSetterForSameSingularAndPlural()
+    {
+        $object = new TestPluralAdderRemoverAndSetterSameSingularAndPlural();
+
+        $this->propertyAccessor->isWritable($object, 'aircraft'); //cache access info
+        $this->propertyAccessor->setValue($object, 'aircraft', array('aeroplane'));
+
+        $this->assertEquals(array('aeroplane'), $object->getAircraft());
     }
 }

src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetter.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyAccess\Tests;
+
+class TestPluralAdderRemoverAndSetter
+{
+    private $emails = array();
+
+    public function getEmails()
+    {
+        return $this->emails;
+    }
+
+    public function setEmails(array $emails)
+    {
+        $this->emails = array('foo@email.com');
+    }
+
+    public function addEmail($email)
+    {
+        $this->emails[] = $email;
+    }
+
+    public function removeEmail($email)
+    {
+        $this->emails = array_diff($this->emails, array($email));
+    }
+}

src/Symfony/Component/PropertyAccess/Tests/TestPluralAdderRemoverAndSetterSameSingularAndPlural.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Symfony\Component\PropertyAccess\Tests;
+
+class TestPluralAdderRemoverAndSetterSameSingularAndPlural
+{
+    private $aircraft = array();
+
+    public function getAircraft()
+    {
+        return $this->aircraft;
+    }
+
+    public function setAircraft(array $aircraft)
+    {
+        $this->aircraft = array('plane');
+    }
+
+    public function addAircraft($aircraft)
+    {
+        $this->aircraft[] = $aircraft;
+    }
+
+    public function removeAircraft($aircraft)
+    {
+        $this->aircraft = array_diff($this->aircraft, array($aircraft));
+    }
+}

src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherTrait.php

@@ -130,7 +130,7 @@ trait PhpMatcherTrait
                         continue;
                     }
 
-                    if ('/' === $pathinfo || $hasTrailingSlash === ('/' === $pathinfo[-1])) {
+                    if ('/' === $pathinfo || (!$hasTrailingSlash ? '/' !== $pathinfo[-1] || !preg_match($regex, substr($pathinfo, 0, -1), $n) || $m !== (int) $n['MARK'] : '/' === $pathinfo[-1])) {
                         // no-op
                     } elseif ($this instanceof RedirectableUrlMatcherInterface) {
                         return null;

src/Symfony/Component/Routing/Matcher/UrlMatcher.php

@@ -160,8 +160,13 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
                 continue;
             }
 
-            if ($supportsTrailingSlash && $hasTrailingSlash !== ('/' === $pathinfo[-1])) {
+            if ($supportsTrailingSlash) {
-                return;
+                if (!$hasTrailingSlash && '/' === $pathinfo[-1] && preg_match($regex, substr($pathinfo, 0, -1))) {
+                    return;
+                }
+                if ($hasTrailingSlash && '/' !== $pathinfo[-1]) {
+                    return;
+                }
             }
 
             $hostMatches = array();

src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php

@@ -683,6 +683,15 @@ class UrlMatcherTest extends TestCase
         $this->assertEquals('b', $matcher->match('/bar/abc.123')['_route']);
     }
 
+    public function testSlashVariant()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/foo/{bar}', array(), array('bar' => '.*')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('a', $matcher->match('/foo/')['_route']);
+    }
+
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         return new UrlMatcher($routes, $context ?: new RequestContext());