Skip to content

Commit 0890970

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.3' into 4.4
* 4.3: (23 commits) fix merge [SecurityBundle] fix return type declarations [BrowserKit] fix return type declarations [PropertyInfo] fix return type declarations [Bridge/Doctrine] fix return type declarations [Form] fix return type declarations [Console] fix return type declarations [Intl] fix return type declarations [Templating] fix return type declarations [DomCrawler] fix return type declarations [Validator] fix return type declarations [Process] fix return type declarations [Workflow] fix return type declarations [Cache] fix return type declarations [Serializer] fix return type declarations [Translation] fix return type declarations [DI] fix return type declarations [Config] fix return type declarations [HttpKernel] Fix return type declarations [Security] Fix return type declarations ...
2 parents 6c9b87c + 9e154e7 commit 0890970

File tree

118 files changed

+494
-435
lines changed

Some content is hidden

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

118 files changed

+494
-435
lines changed

‎src/Symfony/Bridge/Doctrine/Form/ChoiceList/ORMQueryBuilderLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,6 @@ public function getEntitiesByIds($identifier, array $values)
8484
return $qb->andWhere($where)
8585
->getQuery()
8686
->setParameter($parameter, $values, $parameterType)
87-
->getResult();
87+
->getResult() ?: [];
8888
}
8989
}

‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ protected function doLeaveNode(Node $node, Environment $env)
113113

114114
/**
115115
* {@inheritdoc}
116+
*
117+
* @return int
116118
*/
117119
public function getPriority()
118120
{

‎src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,8 @@ protected function doLeaveNode(Node $node, Environment $env)
103103

104104
/**
105105
* {@inheritdoc}
106+
*
107+
* @return int
106108
*/
107109
public function getPriority()
108110
{

‎src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ protected function canBeExtracted($file)
106106
}
107107

108108
/**
109-
* @param string|array $directory
110-
*
111-
* @return array
109+
* {@inheritdoc}
112110
*/
113111
protected function extractFromDirectory($directory)
114112
{

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,9 +2003,7 @@ private function registerMailerConfiguration(array $config, ContainerBuilder $co
20032003
}
20042004

20052005
/**
2006-
* Returns the base path for the XSD files.
2007-
*
2008-
* @return string The XSD base path
2006+
* {@inheritdoc}
20092007
*/
20102008
public function getXsdValidationBasePath()
20112009
{

‎src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/Fixture/TestAppKernel.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ public function registerContainerConfiguration(LoaderInterface $loader)
3636
$loader->load(__DIR__.\DIRECTORY_SEPARATOR.'config.yml');
3737
}
3838

39+
public function setAnnotatedClassCache(array $annotatedClasses)
40+
{
41+
$annotatedClasses = array_diff($annotatedClasses, ['Symfony\Bundle\WebProfilerBundle\Controller\ExceptionController', 'Symfony\Bundle\TwigBundle\Controller\ExceptionController']);
42+
43+
parent::setAnnotatedClassCache($annotatedClasses);
44+
}
45+
3946
protected function build(ContainerBuilder $container)
4047
{
4148
$container->register('logger', NullLogger::class);

‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ProfilerTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ public function testProfilerIsDisabled($insulate)
2424
}
2525

2626
$client->request('GET', '/profiler');
27-
$this->assertFalse($client->getProfile());
27+
$this->assertNull($client->getProfile());
2828

2929
// enable the profiler for the next request
3030
$client->enableProfiler();
31-
$this->assertFalse($client->getProfile());
31+
$this->assertNull($client->getProfile());
3232
$client->request('GET', '/profiler');
3333
$this->assertIsObject($client->getProfile());
3434

3535
$client->request('GET', '/profiler');
36-
$this->assertFalse($client->getProfile());
36+
$this->assertNull($client->getProfile());
3737
}
3838

3939
public function getConfigs()

‎src/Symfony/Bundle/SecurityBundle/DataCollector/SecurityDataCollector.php

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ public function getUser()
259259
/**
260260
* Gets the roles of the user.
261261
*
262-
* @return array The roles
262+
* @return array|Data
263263
*/
264264
public function getRoles()
265265
{
@@ -269,7 +269,7 @@ public function getRoles()
269269
/**
270270
* Gets the inherited roles of the user.
271271
*
272-
* @return array The inherited roles
272+
* @return array|Data
273273
*/
274274
public function getInheritedRoles()
275275
{
@@ -297,16 +297,25 @@ public function isAuthenticated()
297297
return $this->data['authenticated'];
298298
}
299299

300+
/**
301+
* @return bool
302+
*/
300303
public function isImpersonated()
301304
{
302305
return $this->data['impersonated'];
303306
}
304307

308+
/**
309+
* @return string|null
310+
*/
305311
public function getImpersonatorUser()
306312
{
307313
return $this->data['impersonator_user'];
308314
}
309315

316+
/**
317+
* @return string|null
318+
*/
310319
public function getImpersonationExitPath()
311320
{
312321
return $this->data['impersonation_exit_path'];
@@ -315,7 +324,7 @@ public function getImpersonationExitPath()
315324
/**
316325
* Get the class name of the security token.
317326
*
318-
* @return string The token
327+
* @return string|Data|null The token
319328
*/
320329
public function getTokenClass()
321330
{
@@ -325,7 +334,7 @@ public function getTokenClass()
325334
/**
326335
* Get the full security token class as Data object.
327336
*
328-
* @return Data
337+
* @return Data|null
329338
*/
330339
public function getToken()
331340
{
@@ -335,7 +344,7 @@ public function getToken()
335344
/**
336345
* Get the logout URL.
337346
*
338-
* @return string The logout URL
347+
* @return string|null The logout URL
339348
*/
340349
public function getLogoutUrl()
341350
{
@@ -345,7 +354,7 @@ public function getLogoutUrl()
345354
/**
346355
* Returns the FQCN of the security voters enabled in the application.
347356
*
348-
* @return string[]
357+
* @return string[]|Data
349358
*/
350359
public function getVoters()
351360
{
@@ -365,7 +374,7 @@ public function getVoterStrategy()
365374
/**
366375
* Returns the log of the security decisions made by the access decision manager.
367376
*
368-
* @return array
377+
* @return array|Data
369378
*/
370379
public function getAccessDecisionLog()
371380
{
@@ -375,13 +384,16 @@ public function getAccessDecisionLog()
375384
/**
376385
* Returns the configuration of the current firewall context.
377386
*
378-
* @return array
387+
* @return array|Data
379388
*/
380389
public function getFirewall()
381390
{
382391
return $this->data['firewall'];
383392
}
384393

394+
/**
395+
* @return array|Data
396+
*/
385397
public function getListeners()
386398
{
387399
return $this->data['listeners'];

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ abstract protected function getListenerId();
130130
* @param ContainerBuilder $container
131131
* @param string $id
132132
* @param array $config
133-
* @param string $defaultEntryPointId
133+
* @param string|null $defaultEntryPointId
134134
*
135-
* @return string the entry point id
135+
* @return string|null the entry point id
136136
*/
137137
protected function createEntryPoint($container, $id, $config, $defaultEntryPointId)
138138
{

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/SecurityFactoryInterface.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ interface SecurityFactoryInterface
2424
/**
2525
* Configures the container services required to use the authentication listener.
2626
*
27-
* @param string $id The unique id of the firewall
28-
* @param array $config The options array for the listener
29-
* @param string $userProvider The service id of the user provider
30-
* @param string $defaultEntryPoint
27+
* @param string $id The unique id of the firewall
28+
* @param array $config The options array for the listener
29+
* @param string $userProvider The service id of the user provider
30+
* @param string|null $defaultEntryPoint
3131
*
3232
* @return array containing three values:
3333
* - the provider id

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy