Skip to content

Commit eee1172

Browse files
fabpotfabpot
committed
Merge branch '2.6' into 2.7
* 2.6: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container [FrameworkBundle][Router Cmd] use debug namespace. [FrameworkBundle] Update deprecated service call Removed a dev annotation from a version constraint Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes [Filesystem] fix lock file permissions Remove dialog usage define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Fixed a docblock bumped Symfony version to 2.6.1 updated VERSION for 2.6.0 updated CHANGELOG for 2.6.0 removed unneeded check Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents 3b7f035 + 83ee704 commit eee1172

File tree

389 files changed

+1763
-1500
lines changed

Some content is hidden

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

389 files changed

+1763
-1500
lines changed

‎CHANGELOG-2.6.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ in 2.6 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/v2.6.0...v2.6.1
99

10+
* 2.6.0 (2014-11-28)
11+
12+
* bug #12553 [Debug] fix error message on double exception (nicolas-grekas)
13+
* bug #12550 [FrameworkBundle] backport #12489 (xabbuh)
14+
* bug #12437 [Validator] make DateTime objects represented as strings in the violation message (hhamon)
15+
* bug #12575 [WebProfilerBundle] Remove usage of app.request in search bar template (jeromemacias)
16+
* bug #12570 Fix initialized() with aliased services (Daniel Wehner)
17+
1018
* 2.6.0-BETA2 (2014-11-23)
1119

1220
* bug #12555 [Debug] fix ENT_SUBSTITUTE usage (nicolas-grekas)

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"doctrine/doctrine-bundle": "~1.2",
7575
"monolog/monolog": "~1.11",
7676
"propel/propel1": "~1.6",
77-
"ircmaxell/password-compat": "1.0.*",
77+
"ircmaxell/password-compat": "~1.0",
7878
"ocramius/proxy-manager": ">=0.3.1,<0.6-dev",
7979
"egulias/email-validator": "~1.2"
8080
},

‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ public function __construct(ContainerInterface $container)
4040
/**
4141
* Dispatches an event to all registered listeners.
4242
*
43-
* @param string $eventName The name of the event to dispatch. The name of the event is
44-
* the name of the method that is invoked on listeners.
43+
* @param string $eventName The name of the event to dispatch. The name of the event is
44+
* the name of the method that is invoked on listeners.
4545
* @param EventArgs $eventArgs The event arguments to pass to the event handlers/listeners.
4646
* If not supplied, the single empty EventArgs instance is used.
47+
*
4748
* @return bool
4849
*/
4950
public function dispatchEvent($eventName, EventArgs $eventArgs = null)
@@ -81,7 +82,7 @@ public function getListeners($event = null)
8182
*
8283
* @param string $event
8384
*
84-
* @return bool TRUE if the specified event has any listeners, FALSE otherwise.
85+
* @return bool TRUE if the specified event has any listeners, FALSE otherwise.
8586
*/
8687
public function hasListeners($event)
8788
{

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,12 @@ protected function loadCacheDriver($cacheName, $objectManagerName, array $cacheD
398398

399399
/**
400400
* Returns a modified version of $managerConfigs.
401+
*
401402
* The manager called $autoMappedManager will map all bundles that are not mepped by other managers.
403+
*
402404
* @param array $managerConfigs
403405
* @param array $bundles
406+
*
404407
* @return array The modified version of $managerConfigs.
405408
*/
406409
protected function fixManagersAutoMappings(array $managerConfigs, array $bundles)

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class RegisterEventListenersAndSubscribersPass implements CompilerPassInterface
3535
* @param string $connections Parameter ID for connections
3636
* @param string $managerTemplate sprintf() template for generating the event
3737
* manager's service ID for a connection name
38-
* @param string $tagPrefix Tag prefix for listeners and subscribers
38+
* @param string $tagPrefix Tag prefix for listeners and subscribers
3939
*/
4040
public function __construct($connections, $managerTemplate, $tagPrefix)
4141
{

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function process(ContainerBuilder $container)
168168
* @return string The name of the chain driver service
169169
*
170170
* @throws ParameterNotFoundException if non of the managerParameters has a
171-
* non-empty value.
171+
* non-empty value.
172172
*/
173173
protected function getChainDriverServiceName(ContainerBuilder $container)
174174
{
@@ -179,7 +179,7 @@ protected function getChainDriverServiceName(ContainerBuilder $container)
179179
* Create the service definition for the metadata driver.
180180
*
181181
* @param ContainerBuilder $container passed on in case an extending class
182-
* needs access to the container.
182+
* needs access to the container.
183183
*
184184
* @return Definition|Reference the metadata driver to add to all chain drivers
185185
*/

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,8 @@ public function getIndicesForValues(array $values)
369369
*
370370
* @param mixed $entity The choice to create an index for
371371
*
372-
* @return int|string A unique index containing only ASCII letters,
373-
* digits and underscores.
372+
* @return int|string A unique index containing only ASCII letters,
373+
* digits and underscores.
374374
*/
375375
protected function createIndex($entity)
376376
{
@@ -390,7 +390,7 @@ protected function createIndex($entity)
390390
*
391391
* @param mixed $entity The choice to create a value for
392392
*
393-
* @return int|string A unique value without character limitations.
393+
* @return int|string A unique value without character limitations.
394394
*/
395395
protected function createValue($entity)
396396
{
@@ -448,7 +448,7 @@ private function load()
448448
*
449449
* @param object $entity The entity for which to get the identifier
450450
*
451-
* @return array The identifier values
451+
* @return array The identifier values
452452
*
453453
* @throws RuntimeException If the entity does not exist in Doctrine's identity map
454454
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function getEntities();
3131
* @param string $identifier The identifier field of the object. This method
3232
* is not applicable for fields with multiple
3333
* identifiers.
34-
* @param array $values The values of the identifiers.
34+
* @param array $values The values of the identifiers.
3535
*
3636
* @return array The entities.
3737
*/

‎src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function transform($collection)
5454
*
5555
* @param mixed $array An array of entities
5656
*
57-
* @return Collection A collection of entities
57+
* @return Collection A collection of entities
5858
*/
5959
public function reverseTransform($array)
6060
{

‎src/Symfony/Bridge/Doctrine/Form/Type/EntityType.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ class EntityType extends DoctrineType
2222
* @param ObjectManager $manager
2323
* @param mixed $queryBuilder
2424
* @param string $class
25+
*
2526
* @return ORMQueryBuilderLoader
2627
*/
2728
public function getLoader(ObjectManager $manager, $queryBuilder, $class)

‎src/Symfony/Bridge/Monolog/Tests/Processor/WebProcessorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public function testUsesRequestServerData()
5252
}
5353

5454
/**
55-
* @param int $level
56-
* @param string $message
55+
* @param int $level
56+
* @param string $message
5757
*
5858
* @return array Record
5959
*/

‎src/Symfony/Bridge/Propel1/Form/ChoiceList/ModelChoiceList.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ public function getIndicesForValues(array $values)
368368
*
369369
* @param mixed $model The choice to create an index for
370370
*
371-
* @return int|string A unique index containing only ASCII letters,
372-
* digits and underscores.
371+
* @return int|string A unique index containing only ASCII letters,
372+
* digits and underscores.
373373
*/
374374
protected function createIndex($model)
375375
{
@@ -389,7 +389,7 @@ protected function createIndex($model)
389389
*
390390
* @param mixed $model The choice to create a value for
391391
*
392-
* @return int|string A unique value without character limitations.
392+
* @return int|string A unique value without character limitations.
393393
*/
394394
protected function createValue($model)
395395
{

‎src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ class PropelUserProvider implements UserProviderInterface
4747
/**
4848
* Default constructor
4949
*
50-
* @param string $class The User model class.
51-
* @param string|null $property The property to use to retrieve a user.
50+
* @param string $class The User model class.
51+
* @param string|null $property The property to use to retrieve a user.
5252
*/
5353
public function __construct($class, $property = null)
5454
{

‎src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function __get($name)
9797

9898
/**
9999
* @param string $name
100-
* @param mixed $value
100+
* @param mixed $value
101101
*/
102102
public function __set($name, $value)
103103
{

‎src/Symfony/Bridge/ProxyManager/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"ocramius/proxy-manager": ">=0.3.1,<0.6-dev"
2222
},
2323
"require-dev": {
24-
"symfony/config": "2.3"
24+
"symfony/config": "~2.3"
2525
},
2626
"autoload": {
2727
"psr-0": {

‎src/Symfony/Bridge/Twig/Extension/CodeExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,9 @@ public function fileExcerpt($file, $line)
152152
/**
153153
* Formats a file path.
154154
*
155-
* @param string $file An absolute file path
156-
* @param int $line The line number
157-
* @param string $text Use this text for the link rather than the file path
155+
* @param string $file An absolute file path
156+
* @param int $line The line number
157+
* @param string $text Use this text for the link rather than the file path
158158
*
159159
* @return string
160160
*/
@@ -189,8 +189,8 @@ public function formatFile($file, $line, $text = null)
189189
/**
190190
* Returns the link for a given file/line pair.
191191
*
192-
* @param string $file An absolute file path
193-
* @param int $line The line number
192+
* @param string $file An absolute file path
193+
* @param int $line The line number
194194
*
195195
* @return string A link of false
196196
*/

‎src/Symfony/Bridge/Twig/Extension/FormExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public function humanize($text)
137137
* @param ChoiceView $choice The choice to check.
138138
* @param string|array $selectedValue The selected value to compare.
139139
*
140-
* @return bool Whether the choice is selected.
140+
* @return bool Whether the choice is selected.
141141
*
142142
* @see ChoiceView::isSelected()
143143
*/

‎src/Symfony/Bridge/Twig/Extension/HttpKernelExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(FragmentHandler $handler)
3636
public function getFunctions()
3737
{
3838
return array(
39-
new \Twig_SimpleFunction('render',array($this, 'renderFragment'), array('is_safe' => array('html'))),
39+
new \Twig_SimpleFunction('render', array($this, 'renderFragment'), array('is_safe' => array('html'))),
4040
new \Twig_SimpleFunction('render_*', array($this, 'renderFragmentStrategy'), array('is_safe' => array('html'))),
4141
new \Twig_SimpleFunction('controller', array($this, 'controller')),
4242
);
@@ -45,8 +45,8 @@ public function getFunctions()
4545
/**
4646
* Renders a fragment.
4747
*
48-
* @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
49-
* @param array $options An array of options
48+
* @param string|ControllerReference $uri A URI as a string or a ControllerReference instance
49+
* @param array $options An array of options
5050
*
5151
* @return string The fragment content
5252
*

‎src/Symfony/Bridge/Twig/Form/TwigRendererEngine.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function renderBlock(FormView $view, $resource, $blockName, array $variab
7474
* @param FormView $view The form view for finding the applying themes.
7575
* @param string $blockName The name of the block to load.
7676
*
77-
* @return bool True if the resource could be loaded, false otherwise.
77+
* @return bool True if the resource could be loaded, false otherwise.
7878
*/
7979
protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName)
8080
{

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/RouterCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function warmUp($cacheDir)
4949
/**
5050
* Checks whether this warmer is optional or not.
5151
*
52-
* @return bool always true
52+
* @return bool always true
5353
*/
5454
public function isOptional()
5555
{

‎src/Symfony/Bundle/FrameworkBundle/CacheWarmer/TemplatePathsCacheWarmer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function warmUp($cacheDir)
5555
/**
5656
* Checks whether this warmer is optional or not.
5757
*
58-
* @return bool always true
58+
* @return bool always true
5959
*/
6060
public function isOptional()
6161
{

‎src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
9696
} elseif (TraceableUrlMatcher::ROUTE_MATCHES == $trace['level']) {
9797
$output->writeln(sprintf('<fg=green>Route "%s" matches</>', $trace['name']));
9898

99-
$routerDebugcommand = $this->getApplication()->find('router:debug');
99+
$routerDebugcommand = $this->getApplication()->find('debug:router');
100100
$output->writeln('');
101101
$routerDebugcommand->run(new ArrayInput(array('name' => $trace['name'])), $output);
102102

‎src/Symfony/Bundle/FrameworkBundle/Command/ServerStartCommand.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ protected function configure()
7171
*/
7272
protected function execute(InputInterface $input, OutputInterface $output)
7373
{
74-
if (defined('HHVM_VERSION')) {
75-
$output->writeln('<error>This command is not supported on HHVM.</error>');
76-
77-
return 1;
78-
}
7974
if (!extension_loaded('pcntl')) {
8075
$output->writeln('<error>This command needs the pcntl extension to run.</error>');
8176
$output->writeln('You can either install it or use the <info>server:run</info> command instead to run the built-in web server.');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function getKernel()
6363
* @param InputInterface $input An Input instance
6464
* @param OutputInterface $output An Output instance
6565
*
66-
* @return int 0 if everything went fine, or an error code
66+
* @return int 0 if everything went fine, or an error code
6767
*/
6868
public function doRun(InputInterface $input, OutputInterface $output)
6969
{

‎src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ class Controller extends ContainerAware
3838
/**
3939
* Generates a URL from the given parameters.
4040
*
41-
* @param string $route The name of the route
42-
* @param mixed $parameters An array of parameters
43-
* @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
41+
* @param string $route The name of the route
42+
* @param mixed $parameters An array of parameters
43+
* @param bool|string $referenceType The type of reference (one of the constants in UrlGeneratorInterface)
4444
*
4545
* @return string The generated URL
4646
*
@@ -71,8 +71,8 @@ public function forward($controller, array $path = array(), array $query = array
7171
/**
7272
* Returns a RedirectResponse to the given URL.
7373
*
74-
* @param string $url The URL to redirect to
75-
* @param int $status The status code to use for the Response
74+
* @param string $url The URL to redirect to
75+
* @param int $status The status code to use for the Response
7676
*
7777
* @return RedirectResponse
7878
*/
@@ -123,11 +123,11 @@ protected function addFlash($type, $message)
123123
*/
124124
protected function isGranted($attributes, $object = null)
125125
{
126-
if (!$this->container->has('security.context')) {
126+
if (!$this->container->has('security.authorization_checker')) {
127127
throw new \LogicException('The SecurityBundle is not registered in your application.');
128128
}
129129

130-
return $this->container->get('security.context')->isGranted($attributes, $object);
130+
return $this->container->get('security.authorization_checker')->isGranted($attributes, $object);
131131
}
132132

133133
/**
@@ -324,7 +324,7 @@ public function getUser()
324324
*
325325
* @param string $id The service id
326326
*
327-
* @return bool true if the service id is defined, false otherwise
327+
* @return bool true if the service id is defined, false otherwise
328328
*/
329329
public function has($id)
330330
{

‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(ContainerInterface $container, ControllerNameParser
4848
*
4949
* @return mixed A PHP callable
5050
*
51-
* @throws \LogicException When the name could not be parsed
51+
* @throws \LogicException When the name could not be parsed
5252
* @throws \InvalidArgumentException When the controller class does not exist
5353
*/
5454
protected function createController($controller)

0 commit comments

Comments
 (0)