10BC0 merged branch fabpot/security-split (PR #9064) · symfony/symfony@b44bc0e · GitHub
[go: up one dir, main page]
Skip to content

Commit b44bc0e

Browse files
fabpotfabpot
committed
merged branch fabpot/security-split (PR #9064)
This PR was merged into the master branch. Discussion ---------- [Security] Split the component into 3 sub-components Core, ACL, HTTP | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #9047, #8848 | License | MIT | Doc PR | - The rationale behind this PR is to be able to use any of the sub components without requiring all the dependencies of the other sub components. Specifically, I'd like to use the core utils for an improved CSRF protection mechanism (#6554). Commits ------- 14e9f46 [Security] removed unneeded hard dependencies in Core 5dbec8a [Security] fixed README files 62bda79 [Security] copied the Resources/ directory to Core/Resources/ 7826781 [Security] Split the component into 3 sub-components Core, ACL, HTTP
2 parents 4705e6f + 14e9f46 commit b44bc0e

File tree

133 files changed

+2465
-107
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+2465
-107
lines changed

‎UPGRADE-3.0.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,10 @@ UPGRADE FROM 2.x to 3.0
328328
$route->setSchemes('https');
329329
```
330330

331+
### Security
332+
333+
* The `Resources/` directory was moved to `Core/Resources/`
334+
331335
### Translator
332336

333337
* The `Translator::setFallbackLocale()` method has been removed in favor of

‎composer.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@
4949
"symfony/proxy-manager-bridge": "self.version",
5050
"symfony/routing": "self.version",
5151
"symfony/security": "self.version",
52+
"symfony/security-acl": "self.version",
53+
"symfony/security-core": "self.version",
54+
"symfony/security-http": "self.version",
5255
"symfony/security-bundle": "self.version",
5356
"symfony/serializer": "self.version",
5457
"symfony/stopwatch": "self.version",

‎phpunit.xml.dist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<testsuite name="Symfony Test Suite">
2222
<directory>./src/Symfony/Bridge/*/Tests/</directory>
2323
<directory>./src/Symfony/Component/*/Tests/</directory>
24+
<directory>./src/Symfony/Component/*/*/Tests/</directory>
2425
<directory>./src/Symfony/Bundle/*/Tests/</directory>
2526
</testsuite>
2627
</testsuites>
@@ -37,6 +38,7 @@
3738
<exclude>
3839
<directory>./src/Symfony/Bridge/*/Tests</directory>
3940
<directory>./src/Symfony/Component/*/Tests</directory>
41+
<directory>./src/Symfony/Component/*/*/Tests</directory>
4042
<directory>./src/Symfony/Bundle/*/Tests</directory>
4143
<directory>./src/Symfony/Bundle/*/Resources</directory>
4244
<directory>./src/Symfony/Component/*/Resources</directory>

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,7 @@ private function registerTranslatorConfiguration(array $config, ContainerBuilder
566566
if (class_exists('Symfony\Component\Security\Core\Exception\AuthenticationException')) {
567567
$r = new \ReflectionClass('Symfony\Component\Security\Core\Exception\AuthenticationException');
568568

569-
$dirs[] = dirname($r->getFilename()).'/../../Resources/translations';
569+
$dirs[] = dirname($r->getFilename()).'/../Resources/translations';
570570
}
571571
$overridePath = $container->getParameter('kernel.root_dir').'/Resources/%s/translations';
572572
foreach ($container->getParameter('kernel.bundles') as $bundle => $class) {

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,19 +184,19 @@ public function testTranslator()
184184
$files = array_map(function($resource) { return realpath($resource[1]); }, $resources);
185185
$ref = new \ReflectionClass('Symfony\Component\Validator\Validator');
186186
$this->assertContains(
187-
strtr(dirname($ref->getFileName()) . '/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
187+
strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
188188
$files,
189189
'->registerTranslatorConfiguration() finds Validator translation resources'
190190
);
191191
$ref = new \ReflectionClass('Symfony\Component\Form\Form');
192192
$this->assertContains(
193-
strtr(dirname($ref->getFileName()) . '/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
193+
strtr(dirname($ref->getFileName()).'/Resources/translations/validators.en.xlf', '/', DIRECTORY_SEPARATOR),
194194
$files,
195195
'->registerTranslatorConfiguration() finds Form translation resources'
196196
);
197197
$ref = new \ReflectionClass('Symfony\Component\Security\Core\SecurityContext');
198198
$this->assertContains(
199-
strtr(dirname(dirname($ref->getFileName())) . '/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
199+
strtr(dirname($ref->getFileName()).'/Resources/translations/security.en.xlf', '/', DIRECTORY_SEPARATOR),
200200
$files,
201201
'->registerTranslatorConfiguration() finds Security translation resources'
202202
);

‎src/Symfony/Component/Security/Acl/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
vendor/
2+
composer.lock
3+
phpunit.xml

‎src/Symfony/Component/Security/Acl/LICENSE‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2004-2013 Fabien Potencier
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is furnished
8+
to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

‎src/Symfony/Component/Security/Acl/README.md‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Security Component - ACL (Access Control List)
2+
==============================================
3+
4+
Security provides an infrastructure for sophisticated authorization systems,
5+
which makes it possible to easily separate the actual authorization logic from
6+
so called user providers that hold the users credentials. It is inspired by
7+
the Java Spring framework.
8+
9+
Resources
10+
---------
11+
12+
Documentation:
13+
14+
http://symfony.com/doc/2.4/book/security.html
15+
16+
Tests
17+
-----
18+
19+
You can run the unit tests with the following command:
20+
21+
$ cd path/to/Symfony/Component/Security/Acl/
22+
$ composer.phar install --dev
23+
$ phpunit

‎src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderBenchmarkTest.php‎ renamed to ‎src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderBenchmarkTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Security\Tests\Acl\Dbal;
12+
namespace Symfony\Component\Security\Acl\Tests\Dbal;
1313

1414
use Symfony\Component\Security\Acl\Dbal\AclProvider;
1515
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;

‎src/Symfony/Component/Security/Tests/Acl/Dbal/AclProviderTest.php‎ renamed to ‎src/Symfony/Component/Security/Acl/Tests/Dbal/AclProviderTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Security\Tests\Acl\Dbal;
12+
namespace Symfony\Component\Security\Acl\Tests\Dbal;
1313

1414
use Symfony\Component\Security\Acl\Dbal\AclProvider;
1515
use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy;

0 commit comments

Comments
 (0)
0