Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit c86a1a1

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.0'
* 3.0: (31 commits) Drop hirak/prestissimo [MonologBridge] Uninstallable together with symfony/http-kernel in 3.0.6 bumped Symfony version to 3.0.7 updated VERSION for 3.0.6 updated CHANGELOG for 3.0.6 bumped Symfony version to 2.8.7 updated VERSION for 2.8.6 updated CHANGELOG for 2.8.6 bumped Symfony version to 2.7.14 updated VERSION for 2.7.13 updated CHANGELOG for 2.7.13 bumped Symfony version to 2.3.42 [Debug] Fix fatal error handlers on PHP 7 updated VERSION for 2.3.41 update CONTRIBUTORS for 2.3.41 updated CHANGELOG for 2.3.41 fixed bad merge Fixed issue with blank password with Ldap limited the maximum length of a submitted username [2.3][Component/Security] Fixed phpdoc in AnonymousToken constructor for user param ... Conflicts: src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents 97ebca1 + be8a0b1 commit c86a1a1
Copy full SHA for c86a1a1

File tree

Expand file treeCollapse file tree

25 files changed

+175
-101
lines changed
Filter options
Expand file treeCollapse file tree

25 files changed

+175
-101
lines changed

‎.composer/composer.json

Copy file name to clipboardExpand all lines: .composer/composer.json
-5Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.composer/composer.lock

Copy file name to clipboardExpand all lines: .composer/composer.lock
-70Lines changed: 0 additions & 70 deletions
This file was deleted.

‎.travis.yml

Copy file name to clipboardExpand all lines: .travis.yml
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ before_install:
5757
- if [[ ! $skip && $PHP != hhvm ]]; then echo extension = redis.so >> $INI_FILE; fi;
5858
- if [[ ! $skip && $PHP != hhvm ]]; then phpenv config-rm xdebug.ini; fi
5959
- if [[ ! $skip ]]; then composer self-update --stable; fi
60-
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; composer global install; fi
60+
- if [[ ! $skip ]]; then cp .composer/* ~/.composer/; fi
6161
- if [[ ! $skip ]]; then ./phpunit install; fi
62-
- if [[ ! $skip && $deps ]]; then composer global remove hirak/prestissimo; fi
6362
- if [[ ! $skip ]]; then export PHPUNIT=$(readlink -f ./phpunit); fi
6463
- if [[ ! $skip ]]; then ldapadd -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/base.ldif; fi
6564
- if [[ ! $skip ]]; then ldapadd -h localhost:3389 -D cn=admin,dc=symfony,dc=com -w symfony -f src/Symfony/Component/Ldap/Tests/Fixtures/data/fixtures.ldif; fi

‎CHANGELOG-3.0.md

Copy file name to clipboardExpand all lines: CHANGELOG-3.0.md
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,18 @@ in 3.0 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.0.0...v3.0.1
99

10+
* 3.0.6 (2016-05-10)
11+
12+
* security #18736 Fixed issue with blank password with Ldap (csarrazi)
13+
* security #18733 limited the maximum length of a submitted username (fabpot)
14+
* bug #18730 [FrameworkBundle] prevent calling get() for service_container service (xabbuh)
15+
* bug #18705 added a conflict between Monolog bridge 2.8 and HTTP Kernel 3.0+ (fabpot)
16+
* bug #18709 [DependencyInjection] top-level anonymous services must be public (xabbuh)
17+
* bug #18388 [EventDispatcher] check for method to exist (xabbuh)
18+
* bug #18699 [DependencyInjection] Use the priority of service decoration on service with parent (hason)
19+
* bug #18692 add @Event annotation for KernelEvents (Haehnchen)
20+
* bug #18246 [DependencyInjection] fix ambiguous services schema (backbone87)
21+
1022
* 3.0.5 (2016-05-03)
1123

1224
* bug #18180 [Form] fixed BC break with pre selection of choices with `ChoiceType` and its children (HeahDude)

‎CONTRIBUTORS.md

Copy file name to clipboardExpand all lines: CONTRIBUTORS.md
+6-4Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Symfony is the result of the work of many people who made the code better
4040
- Alexandre Salomé (alexandresalome)
4141
- William Durand (couac)
4242
- ornicar
43+
- Jules Pietri (heah)
4344
- stealth35 ‏ (stealth35)
4445
- Alexander Mols (asm89)
45-
- Jules Pietri (heah)
4646
- Francis Besset (francisbesset)
4747
- Bulat Shakirzyanov (avalanche123)
4848
- Saša Stamenković (umpirsky)
@@ -129,6 +129,7 @@ Symfony is the result of the work of many people who made the code better
129129
- Arnaud Kleinpeter (nanocom)
130130
- Joel Wurtz (brouznouf)
131131
- Philipp Wahala (hifi)
132+
- Titouan Galopin (tgalopin)
132133
- Richard Shank (iampersistent)
133134
- Thomas Rabaix (rande)
134135
- Vincent AUBERT (vincent)
@@ -141,7 +142,6 @@ Symfony is the result of the work of many people who made the code better
141142
- Michał Pipa (michal.pipa)
142143
- Amal Raghav (kertz)
143144
- Jonathan Ingram (jonathaningram)
144-
- Titouan Galopin (tgalopin)
145145
- Artur Kotyrba
146146
- Rouven Weßling (realityking)
147147
- Warnar Boekkooi (boekkooi)
@@ -240,6 +240,7 @@ Symfony is the result of the work of many people who made the code better
240240
- Michael Holm (hollo)
241241
- Marc Weistroff (futurecat)
242242
- Hidde Wieringa (hiddewie)
243+
- Daniel Espendiller
243244
- Chris Smith (cs278)
244245
- Florian Klein (docteurklein)
245246
- Manuel Kiessling (manuelkiessling)
@@ -436,6 +437,7 @@ Symfony is the result of the work of many people who made the code better
436437
- Benjamin Leveque (benji07)
437438
- Nate (frickenate)
438439
- jhonnyL
440+
- Jhonny Lidfors (jhonne)
439441
- sasezaki
440442
- Dawid Pakuła (zulusx)
441443
- Florian Rey (nervo)
@@ -611,7 +613,6 @@ Symfony is the result of the work of many people who made the code better
611613
- Adrien Lucas (adrienlucas)
612614
- James Michael DuPont
613615
- Tom Klingenberg
614-
- Jhonny Lidfors (jhonne)
615616
- Christopher Hall (mythmakr)
616617
- Paul Kamer (pkamer)
617618
- Rafał Wrzeszcz (rafalwrzeszcz)
@@ -904,7 +905,6 @@ Symfony is the result of the work of many people who made the code better
904905
- Albin Kerouaton
905906
- Sébastien HOUZÉ
906907
- Jingyu Wang
907-
- Daniel Espendiller
908908
- steveYeah
909909
- Samy Dindane (dinduks)
910910
- Keri Henare (kerihenare)
@@ -945,6 +945,7 @@ Symfony is the result of the work of many people who made the code better
945945
- Tadcka
946946
- Beth Binkovitz
947947
- Romain Geissler
948+
- Oliver Hoff
948949
- Tomaz Ahlin
949950
- Benjamin Cremer (bcremer)
950951
- Marcus Stöhr (dafish)
@@ -1302,6 +1303,7 @@ Symfony is the result of the work of many people who made the code better
13021303
- znerol
13031304
- Christian Eikermann
13041305
- Antonio Angelino
1306+
- Shawn Iwinski
13051307
- Vladimir Sazhin
13061308
- lol768
13071309
- jamogon

‎appveyor.yml

Copy file name to clipboardExpand all lines: appveyor.yml
+2-3Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ init:
1818
install:
1919
- IF EXIST c:\php (SET PHP=0) ELSE (mkdir c:\php)
2020
- cd c:\php
21-
- IF %PHP%==1 appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem
21+
- IF %PHP%==1 appveyor DownloadFile https://raw.githubusercontent.com/symfony/binary-utils/master/cacert.pem
2222
- IF %PHP%==1 appveyor DownloadFile http://windows.php.net/downloads/releases/archives/php-5.5.9-nts-Win32-VC11-x86.zip
2323
- IF %PHP%==1 7z x php-5.5.9-nts-Win32-VC11-x86.zip -y >nul
2424
- IF %PHP%==1 del /Q *.zip
@@ -45,12 +45,11 @@ install:
4545
- IF %PHP%==1 echo extension=php_pdo_sqlite.dll >> php.ini-max
4646
- IF %PHP%==1 echo extension=php_curl.dll >> php.ini-max
4747
- IF %PHP%==1 echo curl.cainfo=c:\php\cacert.pem >> php.ini-max
48-
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.2/composer.phar
48+
- IF %PHP%==1 appveyor DownloadFile https://getcomposer.org/download/1.0.3/composer.phar
4949
- copy /Y php.ini-max php.ini
5050
- cd c:\projects\symfony
5151
- mkdir %APPDATA%\Composer
5252
- copy /Y .composer\* %APPDATA%\Composer\
53-
- composer global install --no-progress --ansi
5453
- php phpunit install
5554
- IF %APPVEYOR_REPO_BRANCH%==master (SET COMPOSER_ROOT_VERSION=dev-master) ELSE (SET COMPOSER_ROOT_VERSION=%APPVEYOR_REPO_BRANCH%.x-dev)
5655
- composer update --no-progress --ansi

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/ContainerBuilderTest.php
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ public function testCreateProxyServiceWithRuntimeInstantiator()
3333
$builder->register('foo1', 'ProxyManagerBridgeFooClass')->setFile(__DIR__.'/Fixtures/includes/foo.php');
3434
$builder->getDefinition('foo1')->setLazy(true);
3535

36+
$builder->compile();
37+
3638
/* @var $foo1 \ProxyManager\Proxy\LazyLoadingInterface|\ProxyManager\Proxy\ValueHolderInterface */
3739
$foo1 = $builder->get('foo1');
3840

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/Descriptor.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,10 @@ protected function resolveServiceDefinition(ContainerBuilder $builder, $serviceI
256256
return $builder->getAlias($serviceId);
257257
}
258258

259+
if ('service_container' === $serviceId) {
260+
return $builder;
261+
}
262+
259263
// the service has been injected in some special way, just return the service
260264
return $builder->get($serviceId);
261265
}

‎src/Symfony/Component/Debug/ErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/ErrorHandler.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ public function handleException($exception, array $error = null)
494494
}
495495
$type = $exception instanceof FatalErrorException ? $exception->getSeverity() : E_ERROR;
496496

497-
if ($this->loggedErrors & $type) {
497+
if (($this->loggedErrors & $type) || $exception instanceof FatalThrowableError) {
498498
$e = array(
499499
'type' => $type,
500500
'file' => $exception->getFile(),
@@ -521,9 +521,9 @@ public function handleException($exception, array $error = null)
521521
} else {
522522
$message = 'Uncaught Exception: '.$exception->getMessage();
523523
}
524-
if ($this->loggedErrors & $e['type']) {
525-
$this->loggers[$e['type']][0]->log($this->loggers[$e['type']][1], $message, $e);
526-
}
524+
}
525+
if ($this->loggedErrors & $type) {
526+
$this->loggers[$type][0]->log($this->loggers[$type][1], $message, $e);
527527
}
528528
if ($exception instanceof FatalErrorException && !$exception instanceof OutOfMemoryException && $error) {
529529
foreach ($this->getFatalErrorHandlers() as $handler) {

‎src/Symfony/Component/Debug/Exception/FatalThrowableError.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Exception/FatalThrowableError.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function __construct(\Throwable $e)
2727
$message = 'Type error: '.$e->getMessage();
2828
$severity = E_RECOVERABLE_ERROR;
2929
} else {
30-
$message = 'Fatal error: '.$e->getMessage();
30+
$message = $e->getMessage();
3131
$severity = E_ERROR;
3232
}
3333

‎src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
+18Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,24 @@ public function testHandleFatalError()
448448
}
449449
}
450450

451+
/**
452+
* @requires PHP 7
453+
*/
454+
public function testHandleErrorException()
455+
{
456+
$exception = new \Error("Class 'Foo' not found");
457+
458+
$handler = new ErrorHandler();
459+
$handler->setExceptionHandler(function () use (&$args) {
460+
$args = func_get_args();
461+
});
462+
463+
$handler->handleException($exception);
464+
465+
$this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $args[0]);
466+
$this->assertSame("Attempted to load class \"Foo\" from the global namespace.\nDid you forget a \"use\" statement?", $args[0]->getMessage());
467+
}
468+
451469
public function testHandleFatalErrorOnHHVM()
452470
{
453471
try {

‎src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Compiler/ResolveDefinitionTemplatesPass.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ private function resolveDefinition(ContainerBuilder $container, DefinitionDecora
156156
if (null === $decoratedService) {
157157
$def->setDecoratedService($decoratedService);
158158
} else {
159-
$def->setDecoratedService($decoratedService[0], $decoratedService[1]);
159+
$def->setDecoratedService($decoratedService[0], $decoratedService[1], $decoratedService[2]);
160160
}
161161
}
162162

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,10 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
294294
if ($services = $this->getChildren($node, 'service')) {
295295
$definitions[$id] = array($services[0], $file, false);
296296
$services[0]->setAttribute('id', $id);
297+
298+
// anonymous services are always private
299+
// we could not use the constant false here, because of XML parsing
300+
$services[0]->setAttribute('public', 'false');
297301
}
298302
}
299303
}
@@ -311,10 +315,6 @@ private function processAnonymousServices(\DOMDocument $xml, $file)
311315
// resolve definitions
312316
krsort($definitions);
313317
foreach ($definitions as $id => list($domElement, $file, $wild)) {
314-
// anonymous services are always private
315-
// we could not use the constant false here, because of XML parsing
316-
$domElement->setAttribute('public', 'false');
317-
318318
if (null !== $definition = $this->parseDefinition($domElement, $file)) {
319319
$this->container->setDefinition($id, $definition);
320320
}

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveDefinitionTemplatesPassTest.php
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,12 @@ public function testSetDecoratedServiceOnServiceHasParent()
253253
$container->register('parent', 'stdClass');
254254

255255
$container->setDefinition('child1', new DefinitionDecorator('parent'))
256-
->setDecoratedService('foo', 'foo_inner')
256+
->setDecoratedService('foo', 'foo_inner', 5)
257257
;
258258

259-
$this->assertEquals(array('foo', 'foo_inner', 0), $container->getDefinition('child1')->getDecoratedService());
259+
$this->process($container);
260+
261+
$this->assertEquals(array('foo', 'foo_inner', 5), $container->getDefinition('child1')->getDecoratedService());
260262
}
261263

262264
public function testDecoratedServiceCopiesDeprecatedStatusFromParent()

‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ public function testLoadAnonymousServices()
200200
$service = $container->getDefinition($id);
201201
}
202202
$this->assertEquals('BizClass', $service->getClass(), '->load() uses the same configuration as for the anonymous ones');
203-
$this->assertFalse($service->isPublic());
203+
$this->assertTrue($service->isPublic());
204204

205205
// anonymous services are shared when using decoration definitions
206206
$container->compile();

‎src/Symfony/Component/DependencyInjection/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/composer.json
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"suggest": {
2727
"symfony/yaml": "",
2828
"symfony/config": "",
29+
"symfony/expression-language": "For using expressions in service container configuration",
2930
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
3031
},
3132
"autoload": {

‎src/Symfony/Component/OptionsResolver/README.md

Copy file name to clipboardExpand all lines: src/Symfony/Component/OptionsResolver/README.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OptionsResolver Component
22
=========================
33

4-
The OptionsResolver component is `array_replace on steroids. It allows you to
4+
The OptionsResolver component is `array_replace` on steroids. It allows you to
55
create an options system with required options, defaults, validation (type,
66
value), normalization and more.
77

‎src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Provider/LdapBindAuthenticationProvider.php
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@ protected function checkAuthentication(UserInterface $user, UsernamePasswordToke
7373
$username = $token->getUsername();
7474
$password = $token->getCredentials();
7575

76+
if ('' === $password) {
77+
throw new BadCredentialsException('The presented password must not be empty.');
78+
}
79+
7680
try {
7781
$username = $this->ldap->escape($username, '', LdapInterface::ESCAPE_DN);
7882
$dn = str_replace('{username}', $username, $this->dnString);

‎src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Token/AnonymousToken.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AnonymousToken extends AbstractToken
2626
* Constructor.
2727
*
2828
* @param string $secret A secret used to make sure the token is created by the app and not by a malicious client
29-
* @param string $user The user
29+
* @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string.
3030
* @param RoleInterface[] $roles An array of roles
3131
*/
3232
public function __construct($secret, $user, array $roles = array())

‎src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Authentication/Token/PreAuthenticatedToken.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PreAuthenticatedToken extends AbstractToken
2626
/**
2727
* Constructor.
2828
*
29-
* @param string|object $user The user
29+
* @param string|object $user The user can be a UserInterface instance, or an object implementing a __toString method or the username as a regular string.
3030
* @param mixed $credentials The user credentials
3131
* @param string $providerKey The provider key
3232
* @param RoleInterface[]|string[] $roles An array of roles

‎src/Symfony/Component/Security/Core/Security.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Security.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ final class Security
2121
const ACCESS_DENIED_ERROR = '_security.403_error';
2222
const AUTHENTICATION_ERROR = '_security.last_error';
2323
const LAST_USERNAME = '_security.last_username';
24+
const MAX_USERNAME_LENGTH = 4096;
2425
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.