Commit Graph

21832 Commits

Author SHA1 Message Date
Fabien Potencier
15ff8652b8 feature #14993 [Profiler][Translation] added filter. (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[Profiler][Translation] added filter.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets  | ~
| Tests pass?   | yes
| License       | MIT

![selection_017](https://cloud.githubusercontent.com/assets/1753742/8159914/c2c8ad68-135a-11e5-9ae3-f2e055ea3230.jpg)

Commits
-------

65f9291 [Profiler][Translation] added filter.
2015-06-15 16:44:02 +02:00
Fabien Potencier
c4f43e7e40 minor #14990 [WebProfilerBundle][logger] remove duplicated deprecation message (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle][logger] remove duplicated deprecation message

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Fixed tickets  | ~
| Tests pass?   | yes
| License       | MIT

Commits
-------

c907f8c [WebProfilerBundle][logger] remove duplicated deprecation message
2015-06-15 16:42:01 +02:00
Abdellatif Ait boudad
65f92916a2 [Profiler][Translation] added filter. 2015-06-15 14:23:50 +00:00
Tobias Schultze
d4b669bb63 minor #14890 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #14890).

Discussion
----------

[2.3] Static Code Analysis for Components

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Static Code Analysis with Php Inspections (EA Extended):
    - not optimal regular expressions usage
    - strlen miss-use
    - not optimal conditional statements in Process and Filesystem
    - unsafe uniquid usage

PS: re-creating to no spam history log with reverts

Commits
-------

4a4fea7 [2.3] Static Code Analysis for Components
2015-06-15 15:02:12 +02:00
Vladimir Reznichenko
4a4fea742b [2.3] Static Code Analysis for Components 2015-06-15 15:02:08 +02:00
Iltar van der Berg
ade1fef3ae Added a small Upgrade note regarding security.context 2015-06-15 08:46:44 +02:00
Fabien Potencier
ddddeb5a24 added missing deprecation in CHANGELOG 2015-06-14 19:35:57 +02:00
Fabien Potencier
7ccc6c7852 [Security] removed obsolete translations 2015-06-14 19:05:52 +02:00
Fabien Potencier
94c7b25ceb bug #14974 [2.6][Security][Translation] #14920 update translations (vincentaubert)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Security][Translation] #14920 update translations

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14920
| License       | MIT
| Doc PR        |

Commits
-------

dfd3e62 [2.6][Security][Translation] #14920 update translations
2015-06-14 18:51:06 +02:00
Vincent AUBERT
dfd3e62dc3 [2.6][Security][Translation] #14920 update translations 2015-06-14 13:45:05 +02:00
Tobias Schultze
11010ca691 minor #14965 [Config] Remove duplicated paths (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] Remove duplicated paths

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

If someone sets the same path twice, the file locator will search for the the same file twice. We should remove duplicated paths before locate a file.

Commits
-------

97de887 Remove duplicated paths
2015-06-13 16:06:26 +02:00
Fabien Potencier
456542a406 minor #14966 [Config] Remove extra argument from method call (dosten)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[Config] Remove extra argument from method call

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

The `$mode` argument of `Filesystem::dumpFile()` is removed in 3.0.

Commits
-------

f58e5f9 Remove parameter from method call
2015-06-13 00:00:40 +02:00
Diego Saint Esteben
f58e5f9c19 Remove parameter from method call 2015-06-12 17:23:52 -03:00
Diego Saint Esteben
97de887222 Remove duplicated paths 2015-06-12 16:45:17 -03:00
Abdellatif Ait boudad
c907f8cb04 [WebProfilerBundle][logger] remove duplicated deprecation message 2015-06-12 19:24:25 +00:00
Fabien Potencier
d209d1c35a bug #14950 [Form] Fixed: Filter non-integers when selecting entities by int ID (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed: Filter non-integers when selecting entities by int ID

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14583 (for Doctrine, not Propel)
| License       | MIT
| Doc PR        | -

This PR fixes #14583 for Doctrine. Non-integer values (like `""`) are not passed to the database anymore when selecting entities by integer PK, which causes an error on some DBMSs (like PostgreSQL).

Commits
-------

352be8e [Form] Fixed: Filter non-integers when selecting entities by int ID
2015-06-12 17:08:08 +02:00
Bernhard Schussek
352be8e571 [Form] Fixed: Filter non-integers when selecting entities by int ID 2015-06-12 10:52:26 +02:00
Nicolas Grekas
edf793ead2 [VarDumper] Cherry-pick code style fixes from 2.7 2015-06-12 10:17:57 +02:00
Fabien Potencier
88e99d2244 bug #14930 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment fr… (Incognito)
This PR was submitted for the master branch but it was merged into the 2.6 branch instead (closes #14930).

Discussion
----------

Bug #14836 [HttpFoundation] Moves default JSON encoding assignment fr…

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | #14918, #14836
| License       | MIT
| Doc PR        | no

Moves the assignment of the encoding flags to a property so the class can be extended without needing to re-write the constructor and perform the encoding of data twice.

For more information please see https://github.com/symfony/symfony/issues/14836

Commits
-------

25e0d63 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property
2015-06-12 00:49:26 +02:00
Brian Graham
25e0d630b8 Bug #14836 [HttpFoundation] Moves default JSON encoding assignment from constructor to property 2015-06-12 00:49:26 +02:00
Fabien Potencier
58f1420722 bumped Symfony version to 2.7.2 2015-06-12 00:37:12 +02:00
Fabien Potencier
932b6e7499 updated VERSION for 2.7.1 2015-06-11 23:15:28 +02:00
Fabien Potencier
727be373d2 updated CHANGELOG for 2.7.1 2015-06-11 23:14:30 +02:00
Fabien Potencier
5f36605e0e minor #14954 fix Merge branch '2.7' into 2.8 JsonFileLoader (gimler)
This PR was merged into the 2.8 branch.

Discussion
----------

fix Merge branch '2.7' into 2.8 JsonFileLoader

This fix a merge commit see 5593bdd56e. The `stream_is_local` and `file_exists` checks are all ready done in the parent `FileLoader` class.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets | none
| License       | MIT
| Doc PR        | none

Commits
-------

692deff fix Merge branch '2.7' into 2.8 JsonFileLoader
2015-06-11 21:33:21 +02:00
Gordon Franke
692deff7b0 fix Merge branch '2.7' into 2.8 JsonFileLoader 2015-06-11 21:27:42 +02:00
Fabien Potencier
72782bb7e5 minor #14940 Documented minor BC break introduced in AssetHelper (peterrehm)
This PR was squashed before being merged into the 2.7 branch (closes #14940).

Discussion
----------

Documented minor BC break introduced in AssetHelper

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14898
| License       | MIT
| Doc PR        | -

This should be an easy fix. As this AssetHelper is removed in 3.0 I think no correction for 3.0 would be needed.

Commits
-------

777dc45 Documented minor BC break introduced in AssetHelper
2015-06-11 21:15:31 +02:00
Peter Rehm
777dc4553a Documented minor BC break introduced in AssetHelper 2015-06-11 21:15:29 +02:00
Fabien Potencier
83bdaa5c0e bug #14835 [DependencyInjection] Fixed resolving of service configurators containing Definition objects (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] Fixed resolving of service configurators containing Definition objects

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14834
| License       | MIT
| Doc PR        | -

Commits
-------

6ebcddd [DependencyInjection] Fixed resolving of service configurators containing Definition objects
2015-06-11 21:13:11 +02:00
Fabien Potencier
da02fceb26 bug #14816 [TwigBridge] Make AppVariable check if security.context exists (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] Make AppVariable check if security.context exists

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

If security isn't configured in the application, neither the `security.context` service, nor the `security.token_storage` service exists.

Therefore, if a third-party bundle relies on the `app.user` or `app.security` (deprecated) check in Twig templates, an exception was thrown about asking for an non-existing service:

```yml
security: false
```

```twig
{% if app.user %}
    <div>
        ...
    </div>
{% endif %}
```
```
You have requested a non-existent service "security.context"
```

Instead, this patch checks if the `security.context` actually exists before trying to use it, and returns null otherwise.

Note that the **GlobalVariables** class, used for twig app globals in previous versions, and still used for PHP templating, behaves the same way.
So this is basically a BC break.

Commits
-------

ea71174 [TwigBridge] Make AppVariable check if security.context exists
2015-06-11 21:11:23 +02:00
Diego Saint Esteben
a2a449cc07 Removed deprecated stuff from the Console component 2015-06-11 16:11:14 -03:00
Fabien Potencier
7ac7ed85af fixed CS 2015-06-11 21:09:58 +02:00
Fabien Potencier
58fba34843 minor #14883 [2.7] Improved exception message if custom implementation of OptionsResolverInterface is used (phansys)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Improved exception message if custom implementation of OptionsResolverInterface is used

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Improved exception message if custom implementation of ```OptionsResolverInterface``` is used within ```AbstractType::setDefaultOptions()``` or ```AbstractTypeExtension::setDefaultOptions()```.

Before:
```
Argument 1 passed to Symfony\Component\Form\AbstractType::configureOptions() must be an instance of Symfony\Component\OptionsResolver\OptionsResolver, instance of Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver given
```

After:
```
Argument 1 passed to Symfony\Component\Form\AbstractType::setDefaultOptions() must be an instance of Symfony\Component\OptionsResolver\OptionsResolver, instance of Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver given
```

Commits
-------

aa945d3 [2.7] Improved exception message if custom implementation of ```OptionsResolverInterface``` is used
2015-06-11 21:07:54 +02:00
Fabien Potencier
2b858be7c4 minor #14953 Fix wrong merge (dosten)
This PR was merged into the 3.0-dev branch.

Discussion
----------

Fix wrong merge

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

51b44bc Fix wrong merge
2015-06-11 21:06:25 +02:00
Diego Saint Esteben
51b44bcc49 Fix wrong merge 2015-06-11 15:38:09 -03:00
Javier Spagnoletti
aa945d355f [2.7] Improved exception message if custom implementation of ``OptionsResolverInterface`` is used
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Improved exception message if custom implementation of ```OptionsResolverInterface```
is used within ```AbstractType::setDefaultOptions()``` or ```AbstractTypeExtension::setDefaultOptions()```.

Before:
```
Argument 1 passed to Symfony\Component\Form\AbstractType::configureOptions() must be an instance of Symfony\Component\OptionsResolver\OptionsResolver, instance of Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver given
```

After:
```
Argument 1 passed to Symfony\Component\Form\AbstractType::setDefaultOptions() must be an instance of Symfony\Component\OptionsResolver\OptionsResolver, instance of Symfony\Component\Form\Tests\Fixtures\CustomOptionsResolver given
```
2015-06-11 15:21:12 -03:00
Diego Saint Esteben
dbfca37703 [Config] Add deprecation warning
If someone extends FileLoader and do not call the parent constructor a
deprecation warning should be triggered.
2015-06-11 14:55:28 -03:00
Fabien Potencier
beeba9d62a minor #14886 [Routing] improved message for deprecated requirements (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Routing] improved message for deprecated requirements

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

ef15e11 improved message for deprecated requirements
2015-06-11 19:41:47 +02:00
Fabien Potencier
eedd79bac7 Merge branch '2.8'
* 2.8: (36 commits)
  Fix test name
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one
  [2.3] Fix tests on Windows
  [Yaml] remove partial deprecation annotation
  [HttpFoundation] Postpone setting the date header on a Response
  [Console] SymfonyStyle : Fix blocks wordwrapping
  [Console] SymfonyStyle : Fix blocks output is broken on windows cmd
  [toolbar] Merged colored icons in toolbar
  [Validator] remove partial deprecation annotation
  Updated UPGRADE-2.4.md
  added missing "
  Silence invasive deprecation warnings, opt-in for warnings
  [Form] Support DateTimeImmutable in transform()
  Show the FormType and FormTypeExtension in case of deprecated use of setDefaultOptions
  Removed route name from the debugbar.
  [FrameworkBundle] Document form.csrf_provider service deprecation
  [Form] add test to avoid regression of #14891
  without this change allways the legacy code get called
  ...

Conflicts:
	UPGRADE-2.4.md
	UPGRADE-2.7.md
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Monolog/Logger.php
	src/Symfony/Bridge/Swiftmailer/DataCollector/MessageDataCollector.php
	src/Symfony/Bridge/Twig/AppVariable.php
	src/Symfony/Bridge/Twig/Extension/AssetExtension.php
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingAssetHelperPass.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
	src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
	src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PackageFactory.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Asset/PathPackage.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Debugger.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/AssetsHelper.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/Debug/TimedTwigEngine.php
	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
	src/Symfony/Bundle/TwigBundle/TwigDefaultEscapingStrategy.php
	src/Symfony/Bundle/TwigBundle/TwigEngine.php
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php
	src/Symfony/Component/ClassLoader/DebugClassLoader.php
	src/Symfony/Component/ClassLoader/DebugUniversalClassLoader.php
	src/Symfony/Component/ClassLoader/UniversalClassLoader.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Command/Command.php
	src/Symfony/Component/Console/Helper/DialogHelper.php
	src/Symfony/Component/Console/Helper/HelperSet.php
	src/Symfony/Component/Console/Helper/ProgressBar.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/Console/Input/InputDefinition.php
	src/Symfony/Component/Console/Input/StringInput.php
	src/Symfony/Component/Debug/DebugClassLoader.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Debug/Exception/DummyException.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
	src/Symfony/Component/DependencyInjection/Definition.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
	src/Symfony/Component/DependencyInjection/SimpleXMLElement.php
	src/Symfony/Component/EventDispatcher/Event.php
	src/Symfony/Component/Filesystem/Filesystem.php
	src/Symfony/Component/Form/Deprecated/FormEvents.php
	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
	src/Symfony/Component/Form/ResolvedFormType.php
	src/Symfony/Component/HttpFoundation/Session/Flash/FlashBag.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/LegacyPdoSessionHandler.php
	src/Symfony/Component/HttpKernel/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Debug/ExceptionHandler.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/HttpKernel/DependencyInjection/ContainerAwareHttpKernel.php
	src/Symfony/Component/HttpKernel/DependencyInjection/FragmentRendererPass.php
	src/Symfony/Component/HttpKernel/DependencyInjection/RegisterListenersPass.php
	src/Symfony/Component/HttpKernel/EventListener/ErrorsLoggerListener.php
	src/Symfony/Component/HttpKernel/EventListener/EsiListener.php
	src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php
	src/Symfony/Component/HttpKernel/EventListener/LocaleListener.php
	src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
	src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
	src/Symfony/Component/HttpKernel/Exception/FatalErrorException.php
	src/Symfony/Component/HttpKernel/Exception/FlattenException.php
	src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
	src/Symfony/Component/HttpKernel/HttpCache/Esi.php
	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategy.php
	src/Symfony/Component/HttpKernel/HttpCache/EsiResponseCacheStrategyInterface.php
	src/Symfony/Component/HttpKernel/HttpCache/HttpCache.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Log/NullLogger.php
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Locale/Exception/MethodArgumentNotImplementedException.php
	src/Symfony/Component/Locale/Exception/MethodArgumentValueNotImplementedException.php
	src/Symfony/Component/Locale/Exception/MethodNotImplementedException.php
	src/Symfony/Component/Locale/Exception/NotImplementedException.php
	src/Symfony/Component/Locale/Locale.php
	src/Symfony/Component/Locale/Stub/DateFormat/AmPmTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/DayOfWeekTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/DayOfYearTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/DayTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/FullTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/Hour1200Transformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/Hour1201Transformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/Hour2400Transformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/Hour2401Transformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/HourTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/MinuteTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/MonthTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/QuarterTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/SecondTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/TimeZoneTransformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/Transformer.php
	src/Symfony/Component/Locale/Stub/DateFormat/YearTransformer.php
	src/Symfony/Component/Locale/Stub/StubCollator.php
	src/Symfony/Component/Locale/Stub/StubIntl.php
	src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php
	src/Symfony/Component/Locale/Stub/StubLocale.php
	src/Symfony/Component/Locale/Stub/StubNumberFormatter.php
	src/Symfony/Component/OptionsResolver/OptionsResolver.php
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessUtils.php
	src/Symfony/Component/PropertyAccess/PropertyAccess.php
	src/Symfony/Component/Routing/Annotation/Route.php
	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
	src/Symfony/Component/Routing/Loader/YamlFileLoader.php
	src/Symfony/Component/Routing/Matcher/ApacheUrlMatcher.php
	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
	src/Symfony/Component/Routing/Route.php
	src/Symfony/Component/Serializer/Encoder/JsonDecode.php
	src/Symfony/Component/Serializer/Encoder/JsonEncode.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/AbstractNormalizer.php
	src/Symfony/Component/Templating/Asset/Package.php
	src/Symfony/Component/Templating/Asset/PackageInterface.php
	src/Symfony/Component/Templating/Asset/PathPackage.php
	src/Symfony/Component/Templating/Asset/UrlPackage.php
	src/Symfony/Component/Templating/Helper/AssetsHelper.php
	src/Symfony/Component/Templating/Helper/CoreAssetsHelper.php
	src/Symfony/Component/Templating/Loader/Loader.php
	src/Symfony/Component/Translation/Translator.php
	src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
	src/Symfony/Component/VarDumper/Cloner/Data.php
	src/Symfony/Component/Yaml/Yaml.php
2015-06-11 19:39:49 +02:00
Fabien Potencier
ae470cdf14 Merge branch '2.7' into 2.8
* 2.7:
  Fix test name
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [Form] Swap new ChoiceView constructor arguments to ease migrating from the deprecated one
  [2.3] Fix tests on Windows
  [Yaml] remove partial deprecation annotation
  Silence invasive deprecation warnings, opt-in for warnings
  Documenting how to keep option value BC - see #14377

Conflicts:
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Twig/composer.json
2015-06-11 19:27:52 +02:00
Fabien Potencier
99f95ac212 Merge branch '2.6' into 2.7
* 2.6:
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [2.3] Fix tests on Windows
2015-06-11 19:26:34 +02:00
Fabien Potencier
f0045deaba Merge branch '2.3' into 2.6
* 2.3:
  fixed CS
  Allow new lines in Messages translated with transchoice() (replacement for #14867)
  [2.3] Fix tests on Windows
2015-06-11 19:26:27 +02:00
Christian Flothmann
ef15e11e07 improved message for deprecated requirements 2015-06-11 19:20:40 +02:00
Fabien Potencier
9c29739eca bug #14946 [SecurityBundle] Update DoctrineBundle version (dosten)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[SecurityBundle] Update DoctrineBundle version

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

The versions < 1.4 of DoctrineBundle uses the old way to create a factory service, this is fixed in 1.4, so we should use at least this version in the tests.

Commits
-------

3d68b32 Update DoctrineBundle version
2015-06-11 18:39:15 +02:00
Diego Saint Esteben
3d68b32180 Update DoctrineBundle version 2015-06-11 12:23:14 -03:00
Fabien Potencier
17387fdc8e minor #14945 [Config] Fix test name (dosten)
This PR was merged into the 2.7 branch.

Discussion
----------

[Config] Fix test name

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

7bb0812 Fix test name
2015-06-11 16:45:09 +02:00
Diego Saint Esteben
7bb0812012 Fix test name 2015-06-11 11:06:56 -03:00
Fabien Potencier
009efb8dec fixed CS 2015-06-11 15:53:10 +02:00
Fabien Potencier
e54d7161ab bug #14897 Allow new lines in Messages translated with transchoice() (replacement for #14867) (azine)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #14897).

Discussion
----------

 Allow new lines in Messages translated with transchoice() (replacement for #14867)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Hi,
I found that the MessageSelector does not handle new lines in messages very well.
I suggest adding the "s" modifier to the regexp used to identify the parts and ranges.
What do you think?

PS: would be nice to have this change also in Symfony 2.6 & 2.7

Commits
-------

786b8a6  Allow new lines in Messages translated with transchoice() (replacement for #14867)
2015-06-11 15:52:49 +02:00
azine
786b8a664e Allow new lines in Messages translated with transchoice() (replacement for #14867) 2015-06-11 15:52:49 +02:00
Fabien Potencier
0e64108921 minor #14941 [FrameworkBundle][SecurityBundle] Fix security tests (dosten)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[FrameworkBundle][SecurityBundle] Fix security tests

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Since `templating.helper.assets` is only available when the `php` engine is enabled, this piece of code only makes sense when the `php` engine is enabled.
This PR also fixes the `SecurityBundle` tests, for the 3 remaining failing tests see doctrine/DoctrineBundle#435

Commits
-------

67994d6 Fixed tests
2015-06-11 15:51:18 +02:00