Skip to content

Commit b62ecd7

Browse files
fabpotfabpot
committed
Merge branch '2.7'
* 2.7: (65 commits) 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 Fix PHP Fatal error: Cannot call constructor in symfony/console/Symfony/Component/Console/Helper/DialogHelper.php on line 37 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 Append to PR #12737 referring Ticket #12704 Issue #12658 Add a deprecation note about Translator's setFallbackLocale... Issue #12606 Adding warning logs about the deprecation of [...]/Tests/FormIntegration... Hackday deprecated 12621 Added deprecation log for validate and validateValue on ExecutionContext... [Console] [Hackday] [2.7] Add a deprecation note about ProgressHelper [Hackday][2.7] Add a deprecation note about MetadataInterface's accept() method [Validator] Added a deprecation note about setPropertyAccessor #12698 [Locale] Adding a deprecation note about the Locale component ...
2 parents b2e7ca3 + eee1172 commit b62ecd7

File tree

473 files changed

+2204
-1521
lines changed

Some content is hidden

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

473 files changed

+2204
-1521
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
},

‎phpunit.xml.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
bootstrap="autoload.php.dist"
88
>
99
<php>
10+
<!-- Disable E_USER_DEPRECATED until 3.0 -->
11+
<!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
12+
<ini name="error_reporting" value="-16385"/>
13+
1014
<ini name="intl.default_locale" value="en"/>
1115
<ini name="intl.error_level" value="0"/>
1216
<ini name="memory_limit" value="-1"/>

‎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
{

0 commit comments

Comments
 (0)