diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.4' into 5.0

Browse Source 
* 4.4:
  [FrameworkBundle] Fix session.attribute_bag service definition
  [Routing] Remove unused properties from the Route annotation
  [Routing] Add missing _locale requirements
  Update LdapBindAuthenticationProvider.php
  Add reproducer to for hit after update expire cacheItem
  [Cache] fix FilesystemTagAwareAdapter failing when a tag link preexists
This commit is contained in:
Nicolas Grekas 2020-04-21 23:02:50 +02:00
commit 4042cc49d1
12 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Resources/config/session.xml
View File

@ -41,7 +41,8 @@
<service id="Symfony\Component\HttpFoundation\Session\Flash\FlashBagInterface" alias="session.flash_bag" />
<service id="session.attribute_bag" class="Symfony\Component\HttpFoundation\Session\Attribute\AttributeBag">
<factory service="session" method="getAttributeBag"/>
<factory service="session" method="getBag"/>
<argument>attributes</argument>
</service>
<service id="session.storage.mock_file" class="Symfony\Component\HttpFoundation\Session\Storage\MockFileSessionStorage">

2
src/Symfony/Component/Cache/Adapter/FilesystemTagAwareAdapter.php
View File

@ -107,7 +107,7 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune
$file = $this->getFile($id);
if (!@symlink($file, $this->getFile($id, true, $tagFolder))) {
if (!@symlink($file, $tagLink = $this->getFile($id, true, $tagFolder)) && !is_link($tagLink)) {
@unlink($file);
$failed[] = $id;
}

38
src/Symfony/Component/Cache/Tests/Traits/TagAwareTestTrait.php
View File

@ -141,4 +141,42 @@ trait TagAwareTestTrait
$i = $pool->getItem('k');
$this->assertSame(['foo' => 'foo'], $i->getMetadata()[CacheItem::METADATA_TAGS]);
}
public function testRefreshAfterExpires()
{
$pool = $this->createCachePool();
$pool->clear();
$cacheItem = $pool->getItem('test');
$this->assertFalse($cacheItem->isHit());
// write cache with expires
$cacheItem->set('test');
$cacheItem->tag('1234');
$cacheItem->expiresAfter(1);
$pool->save($cacheItem);
$cacheItem = $pool->getItem('test');
$this->assertTrue($cacheItem->isHit());
// wait until expired
sleep(2);
// item should not longer be a hit
$cacheItem = $pool->getItem('test');
$this->assertFalse($cacheItem->isHit());
// update expired item
$cacheItem->set('test');
$cacheItem->tag('1234');
$cacheItem->expiresAfter(1);
$pool->save($cacheItem);
// item should be again a hit
$cacheItem = $pool->getItem('test');
$this->assertTrue($cacheItem->isHit());
}
}

3
src/Symfony/Component/Routing/Annotation/Route.php
View File

@ -31,9 +31,6 @@ class Route
private $methods = [];
private $schemes = [];
private $condition;
private $locale;
private $format;
private $utf8;
/**
* @param array $data An array of key/value parameters

2
src/Symfony/Component/Routing/Loader/Configurator/ImportConfigurator.php
View File

@ -13,6 +13,7 @@ namespace Symfony\Component\Routing\Loader\Configurator;
use Symfony\Component\Routing\Route;
use Symfony\Component\Routing\RouteCollection;
use Symfony\Component\Routing\RouteCompiler;
/**
* @author Nicolas Grekas <p@tchwork.com>
@ -63,6 +64,7 @@ class ImportConfigurator
foreach ($prefix as $locale => $localePrefix) {
$localizedRoute = clone $route;
$localizedRoute->setDefault('_locale', $locale);
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
$localizedRoute->setDefault('_canonical_route', $name);
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
$this->route->add($name.'.'.$locale, $localizedRoute);

1
src/Symfony/Component/Routing/Loader/XmlFileLoader.php
View File

@ -211,6 +211,7 @@ class XmlFileLoader extends FileLoader
$localizedRoute = clone $route;
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
$localizedRoute->setDefault('_locale', $locale);
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
$localizedRoute->setDefault('_canonical_route', $name);
$subCollection->add($name.'.'.$locale, $localizedRoute);
}

1
src/Symfony/Component/Routing/Loader/YamlFileLoader.php
View File

@ -216,6 +216,7 @@ class YamlFileLoader extends FileLoader
foreach ($prefix as $locale => $localePrefix) {
$localizedRoute = clone $route;
$localizedRoute->setDefault('_locale', $locale);
$localizedRoute->setRequirement('_locale', preg_quote($locale, RouteCompiler::REGEX_DELIMITER));
$localizedRoute->setDefault('_canonical_route', $name);
$localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
$subCollection->add($name.'.'.$locale, $localizedRoute);

2
src/Symfony/Component/Routing/Tests/Fixtures/php_dsl_sub_i18n.php
View File

@ -8,4 +8,6 @@ return function (RoutingConfigurator $routes) {
$add('foo', ['fr' => '/foo']);
$add('bar', ['fr' => '/bar']);
$routes->add('non_localized', '/non-localized');
};

1
src/Symfony/Component/Routing/Tests/Loader/PhpFileLoaderTest.php
View File

@ -234,6 +234,7 @@ class PhpFileLoaderTest extends TestCase
$expectedCollection->add('baz.en', (new Route('/baz'))->setDefaults(['_locale' => 'en', '_canonical_route' => 'baz'])->setRequirement('_locale', 'en'));
$expectedCollection->add('c_foo.fr', (new Route('/ench/pub/foo'))->setDefaults(['_locale' => 'fr', '_canonical_route' => 'c_foo'])->setRequirement('_locale', 'fr'));
$expectedCollection->add('c_bar.fr', (new Route('/ench/pub/bar'))->setDefaults(['_locale' => 'fr', '_canonical_route' => 'c_bar'])->setRequirement('_locale', 'fr'));
$expectedCollection->add('non_localized.fr', (new Route('/ench/non-localized'))->setDefaults(['_locale' => 'fr', '_canonical_route' => 'non_localized'])->setRequirement('_locale', 'fr'));
$expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_sub_i18n.php')));
$expectedCollection->addResource(new FileResource(realpath(__DIR__.'/../Fixtures/php_dsl_i18n.php')));

3
src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
View File

@ -201,6 +201,9 @@ class XmlFileLoaderTest extends TestCase
$this->assertEquals('/le-prefix/suffix', $routeCollection->get('imported.fr')->getPath());
$this->assertEquals('/the-prefix/suffix', $routeCollection->get('imported.en')->getPath());
$this->assertSame('fr', $routeCollection->get('imported.fr')->getRequirement('_locale'));
$this->assertSame('en', $routeCollection->get('imported.en')->getRequirement('_locale'));
}
/**

3
src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php
View File

@ -334,6 +334,9 @@ class YamlFileLoaderTest extends TestCase
$this->assertCount(2, $routes);
$this->assertEquals('/nl/imported', $routes->get('imported.nl')->getPath());
$this->assertEquals('/en/imported', $routes->get('imported.en')->getPath());
$this->assertSame('nl', $routes->get('imported.nl')->getRequirement('_locale'));
$this->assertSame('en', $routes->get('imported.en')->getRequirement('_locale'));
}
public function testImportingRoutesWithOfficialLocales()

4
src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php
View File

@ -82,14 +82,13 @@ class LdapBindAuthenticationProvider extends UserAuthenticationProvider
}
try {
$username = $this->ldap->escape($username, '', LdapInterface::ESCAPE_DN);
if ($this->queryString) {
if ('' !== $this->searchDn && '' !== $this->searchPassword) {
$this->ldap->bind($this->searchDn, $this->searchPassword);
} else {
throw new LogicException('Using the "query_string" config without using a "search_dn" and a "search_password" is not supported.');
}
$username = $this->ldap->escape($username, '', LdapInterface::ESCAPE_FILTER);
$query = str_replace('{username}', $username, $this->queryString);
$result = $this->ldap->query($this->dnString, $query)->execute();
if (1 !== $result->count()) {
@ -98,6 +97,7 @@ class LdapBindAuthenticationProvider extends UserAuthenticationProvider
$dn = $result[0]->getDn();
} else {
$username = $this->ldap->escape($username, '', LdapInterface::ESCAPE_DN);
$dn = str_replace('{username}', $username, $this->dnString);
}