Skip to content
This repository was archived by the owner on May 31, 2024. It is now read-only.

Commit 48526dc

Browse files
committed
Merge branch '2.6' into 2.7
* 2.6: CS: fix some license headers CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline use visited lookup with reference to gain performance Replace GET parameters when changed [FrameworkBundle][debug:config] added support for dynamic configurations. [WebProfiler] Fix partial search on url in list Conflicts: src/Symfony/Bridge/Propel1/Form/EventListener/TranslationCollectionFormListener.php src/Symfony/Bridge/Propel1/Form/EventListener/TranslationFormListener.php
2 parents 71583a6 + fedc844 commit 48526dc

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Acl/Domain/Acl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/*
34
* This file is part of the Symfony package.
45
*

Http/RememberMe/RememberMeServicesInterface.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
<?php
2-
namespace Symfony\Component\Security\Http\RememberMe;
3-
4-
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
5-
use Symfony\Component\HttpFoundation\Response;
6-
use Symfony\Component\HttpFoundation\Request;
72

83
/*
94
* This file is part of the Symfony package.
@@ -14,6 +9,12 @@
149
* file that was distributed with this source code.
1510
*/
1611

12+
namespace Symfony\Component\Security\Http\RememberMe;
13+
14+
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
15+
use Symfony\Component\HttpFoundation\Response;
16+
use Symfony\Component\HttpFoundation\Request;
17+
1718
/**
1819
* Interface that needs to be implemented by classes which provide remember-me
1920
* capabilities.

0 commit comments

Comments
 (0)