Commit Graph

16824 Commits

Author SHA1 Message Date
Fabien Potencier
1cda2d43c4 [HttpKernel] tweaked value exporter 2014-02-28 14:42:14 +01:00
Sebastiaan Stok
63032c7c89 fixed Kernel::stripComments() normalizing new-lines
This makes normalizing new-lines less error-prone
when a string contains multiple new line-lines
2014-02-28 13:42:15 +01:00
Quentin Schuler
3f297eaa18 Improves the readability of the collected arrays in the profiler. 2014-02-28 13:12:58 +01:00
Fabien Potencier
e756686bb4 added a BC comment 2014-02-28 09:17:36 +01:00
Fabien Potencier
79999ffd5c bug #10348 Update FileLoader to fix issue #10339 (msumme)
This PR was merged into the 2.3 branch.

Discussion
----------

Update FileLoader to fix issue #10339

This fixes an issue in Symfony\Component\Config\Loader\FileLoader

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

Commits
-------

3988728 Update FileLoader to fix issue #10339
2014-02-28 09:16:24 +01:00
Max Summe
3988728169 Update FileLoader to fix issue #10339
FileLoader now uses resolved FileLoader's (the one that explicitly
supports that resource) FileLocatorInterface instance before falling
back to its own when trying to load resources in import() method.
2014-02-27 21:56:34 -06:00
Fabien Potencier
cb4a9cc2eb Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.12
  updated VERSION for 2.3.11
  update CONTRIBUTORS for 2.3.11
  updated CHANGELOG for 2.3.11
  Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-02-27 18:04:59 +01:00
Fabien Potencier
1c0fcd0252 bumped Symfony version to 2.3.12 2014-02-27 17:33:40 +01:00
Fabien Potencier
aa5b228e87 updated VERSION for 2.3.11 2014-02-27 15:55:30 +01:00
Fabien Potencier
75b94ab601 update CONTRIBUTORS for 2.3.11 2014-02-27 15:55:21 +01:00
Fabien Potencier
812f870ce5 updated CHANGELOG for 2.3.11 2014-02-27 15:55:17 +01:00
Fabien Potencier
186f0855a8 bug #10306 [Serializer] Throw exception when unable to normalize embedded object (gquemener)
This PR was submitted for the 2.1 branch but it was merged into the 2.4 branch instead (closes #10306).

Discussion
----------

[Serializer] Throw exception when unable to normalize embedded object

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

This PR intends to prevent Fatal Error about calling undefined method `normalize()` on object `$serializer` in the `GetSetMethodNormalizer` when injected serializer does not implement the `NormalizerInterface`.

Commits
-------

8a54920 [Serializer] Throw exception when unable to normalize embedded object
2014-02-27 15:27:31 +01:00
Gildas Quéméner
a92aa5e849 Throw exception when unable to normalize embedded object
Added a check to ensure that injected serializer of the
GetSetMethodNormalizer is a normalizer before normalizing object value.
2014-02-27 15:27:25 +01:00
Fabien Potencier
4986f6db46 bug #10338 [ExpressionLanguage] Fixed evaluation of short circuit operators (florianv)
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes #10338).

Discussion
----------

[ExpressionLanguage] Fixed evaluation of short circuit operators

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

Commits
-------

fba0a40 [ExpressionLanguage] Fixed evaluation of short circuit operators
2014-02-27 14:31:10 +01:00
florianv
3a46a8e799 Fixed evaluation of short circuit operators 2014-02-27 14:31:09 +01:00
Fabien Potencier
ca60916331 minor #10323 [Yaml] Fixed minor performance related issues in Yaml\Inline. (sun)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10323).

Discussion
----------

[Yaml] Fixed minor performance related issues in Yaml\Inline.

Follow-up to #10312

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

Commits
-------

a36fef5 Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline.
2014-02-25 22:36:55 +01:00
sun
108e169353 Follow-up to #10312: Fixed minor performance related issues in Yaml\Inline. 2014-02-25 22:36:55 +01:00
Fabien Potencier
7baeaa2fd7 Merge branch '2.4'
* 2.4:
  [Process] minor fixes
  Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls.
  Avoid unnecessary line indentation calculation.
  Optimise Inline::evaluateScalar() for parsing strings.
  fixed CS
  fixed parsing Mongo DSN and added Test for it
  () is also a valid delimiter
  Adding PHP 5.6 to travis-ci tests
  Update BCryptPasswordEncoder.php
  [Validator] Removed PHP <5.3.3 specific code which is not officially supported.
  Fixed wrong redirect url if path contains some query parameters
2014-02-24 17:21:51 +01:00
Fabien Potencier
81e27d2a3e Merge branch '2.3' into 2.4
* 2.3:
  [Process] minor fixes
  Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls.
  Avoid unnecessary line indentation calculation.
  Optimise Inline::evaluateScalar() for parsing strings.
  fixed CS
  fixed parsing Mongo DSN and added Test for it
  () is also a valid delimiter
  Adding PHP 5.6 to travis-ci tests
  Update BCryptPasswordEncoder.php
  [Validator] Removed PHP <5.3.3 specific code which is not officially supported.
  Fixed wrong redirect url if path contains some query parameters
2014-02-24 17:20:54 +01:00
Fabien Potencier
30f35c08a1 minor #10305 [Process] minor fixes (aeryaguzov)
This PR was squashed before being merged into the 2.3 branch (closes #10305).

Discussion
----------

[Process] minor fixes

| Q             | A
| ------------- | ---
| Fixed tickets | [n/a]
| License       | MIT

The "same" PR as #10220, but on "2.3" branch

Commits
-------

f03e5dc [Process] minor fixes
2014-02-24 17:20:12 +01:00
Andrey Ryaguzov
f03e5dcd40 [Process] minor fixes 2014-02-24 17:20:12 +01:00
Fabien Potencier
a8209307f8 bug #10308 [Debug] enhance non-PSR-0 compatibility for case mismatch test (nicolas-grekas)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Debug] enhance non-PSR-0 compatibility for case mismatch test

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

Fix compatibility with non-PSR-0/4 loading schemes.
See https://github.com/symfony/symfony/pull/10201#issuecomment-35567573

Commits
-------

120e197 [Debug] enhance non-PSR-0 compatibility for case mismatch test
2014-02-24 17:18:53 +01:00
Fabien Potencier
eed7a864d8 minor #10317 [YAML] Improve performance of getNextEmbedBlock (alexpott)
This PR was merged into the 2.3 branch.

Discussion
----------

[YAML] Improve performance of getNextEmbedBlock

| 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

By removing unnecessary preg_match and function calls - isCurrentLineEmpty() contains a call to isCurrentLineBlank() - therefore this function is called twice every time this condition is hit. The preg_match appears to legacy handling of blank lines.

This improves the performance of the Drupal 8 installer.
![image](https://f.cloud.github.com/assets/769634/2241426/69effb0c-9cd1-11e3-9145-e4fabd2ec870.png)

Commits
-------

995a033 Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls.
2014-02-24 17:11:10 +01:00
Fabien Potencier
ca4736b4a1 [Console] fixed missing abstract keyword 2014-02-24 17:03:53 +01:00
Fabien Potencier
537f1fafbf minor #10315 Fix typo in method name (fixe)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fix typo in method name

Commits
-------

01858d3 Fixed typo in method name
2014-02-24 17:03:19 +01:00
Fabien Potencier
9c582d9bea minor #10320 Fix typo in UPGRADE-3.0.md (hice3000)
This PR was merged into the 2.5-dev branch.

Discussion
----------

Fix typo in UPGRADE-3.0.md

Commits
-------

53c8189 Fix typo in UPGRADE-3.0.md
2014-02-24 17:02:25 +01:00
Malte N
53c81898e7 Fix typo in UPGRADE-3.0.md 2014-02-24 16:17:08 +01:00
Nicolas Grekas
120e197873 [Debug] enhance non-PSR-0 compatibility for case mismatch test 2014-02-24 14:11:02 +01:00
Alex Pott
995a033243 Improve performance of getNextEmbedBlock by removing unnecessary preg_match and function calls. 2014-02-23 23:16:29 +00:00
Fabien Potencier
6b0b504348 minor #10312 [Yaml] Optimise Inline::evaluateScalar() for parsing strings. (alexpott)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10312).

Discussion
----------

[Yaml] Optimise Inline::evaluateScalar() for parsing strings.

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

The Drupal 8 installer does a lot of YAML parsing. With the patch attached it is significantly quicker.
![image](https://f.cloud.github.com/assets/769634/2237906/630c3308-9bcf-11e3-8038-35cbbeedd7e6.png)

https://drupal.org/node/1851234

Commits
-------

10c898d Avoid unnecessary line indentation calculation.
c65a647 Optimise Inline::evaluateScalar() for parsing strings.
2014-02-23 19:17:23 +01:00
Alex Pott
5e9f41eef4 Avoid unnecessary line indentation calculation. 2014-02-23 19:17:23 +01:00
Alex Pott
d5aca818b2 Optimise Inline::evaluateScalar() for parsing strings. 2014-02-23 19:17:23 +01:00
Tiago Ribeiro
01858d3ad1 Fixed typo in method name 2014-02-23 16:22:13 +00:00
Fabien Potencier
872647a8b2 [Security] simplified code 2014-02-22 08:00:45 +01:00
Fabien Potencier
6d926c8179 minor #10311 use core StringUtils to compare hashes (steelywing)
This PR was merged into the 2.5-dev branch.

Discussion
----------

use core StringUtils to compare hashes

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

Commits
-------

9fc01d2 use core StringUtils to compare hashes
2014-02-22 07:59:50 +01:00
Wing
9fc01d26fc use core StringUtils to compare hashes 2014-02-22 13:37:18 +08:00
Fabien Potencier
7ee758c5fb fixed CS 2014-02-21 07:38:26 +01:00
Fabien Potencier
a8955bf96c bug #10146 [WebProfilerBundle] fixed parsing Mongo DSN and added Test for it (malarzm)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10146).

Discussion
----------

[WebProfilerBundle] fixed parsing Mongo DSN and added Test for it

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

Commits
-------

5cd274b [WebProfilerBundle] fixed parsing Mongo DSN and added Test for it
2014-02-21 07:33:54 +01:00
Maciej Malarz
5f0557ef27 fixed parsing Mongo DSN and added Test for it
Applied Coding Standards patch

Applied Fabien's comments

[WebProfilerBundle] fixed parsing Mongo DSN and added Test for it

Removing whitespaces

Applied fabbot patch
2014-02-21 07:33:54 +01:00
Fabien Potencier
79baf8da48 feature #10165 [FrameworkBundle] config:dump-reference command can now dump current configuration (lyrixx)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle] config:dump-reference command can now dump current configuration

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

I did not add `xml` support as I don't know how to do that. ping @stof

sample:

```yaml
framework:
    secret: ThisTokenIsNotSoSecretChangeIt
    router:
        resource: /home/greg/dev/labs/se/app/config/routing_dev.yml
        strict_requirements: true
        http_port: 80
        https_port: 443
    form:
        enabled: true
        csrf_protection: { enabled: null, field_name: null }
    csrf_protection:
        enabled: true
        field_name: _token
    validation:
        enable_annotations: true
        enabled: true
        translation_domain: validators
    templating:
        engines: [twig]
        assets_version: null
        assets_version_format: '%%s?%%s'
        hinclude_default_template: null
        form: { resources: ['FrameworkBundle:Form'] }
        assets_base_urls: { http: {  }, ssl: {  } }
        loaders: {  }
        packages: {  }
    default_locale: en
    trusted_hosts: {  }
    trusted_proxies: {  }
    session:
        storage_id: session.storage.native
        handler_id: session.handler.native_file
        save_path: /home/greg/dev/labs/se/app/cache/dev/sessions
        metadata_update_threshold: '0'
    fragments:
        enabled: true
        path: /_fragment
    http_method_override: true
    profiler:
        only_exceptions: false
        enabled: true
        collect: true
        only_master_requests: false
        dsn: 'file:/home/greg/dev/labs/se/app/cache/dev/profiler'
        username: ''
        password: ''
        lifetime: 86400
    ide: null
    esi:
        enabled: false
    translator:
        enabled: false
        fallback: en
    annotations:
        cache: file
        file_cache_dir: /home/greg/dev/labs/se/app/cache/dev/annotations
        debug: true
    serializer:
        enabled: false
```

Commits
-------

19a368e [FramworkBundle] Added config:debug command
2014-02-20 22:26:25 +01:00
Fabien Potencier
aca3271cb8 feature #9862 [FrameworkBundle] Added configuration for additionnal request formats (gquemener)
This PR was squashed before being merged into the 2.5-dev branch (closes #9862).

Discussion
----------

[FrameworkBundle] Added configuration for additionnal request formats

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/8934
| License       | MIT
| Doc PR        |  https://github.com/symfony/symfony-docs/pull/3402

Reopening of https://github.com/symfony/symfony/pull/8944

# TODO
  - [x] Fix wrong xml configuration definition (Thanks @WouterJ)
  - [x] Change configuration key `additional_formats` to a more meaningful one
  - [x] Write documentation (new entry or replace http://symfony.com/doc/current/cookbook/request/mime_type.html ?)

Commits
-------

f90ba11 [FrameworkBundle] Added configuration for additionnal request formats
2014-02-20 22:18:33 +01:00
Gildas Quéméner
f90ba117f3 [FrameworkBundle] Added configuration for additionnal request formats 2014-02-20 22:18:32 +01:00
Fabien Potencier
5e665b5c7a bug #10299 [Finder] () is also a valid delimiter (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[Finder] () is also a valid delimiter

The `Regex` class should also accept `()` as delimiters, as they are valid PREG delimiters: http://3v4l.org/D8v54

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

Commits
-------

b7519c7 () is also a valid delimiter
2014-02-20 20:43:52 +01:00
Wouter J
b7519c7727 () is also a valid delimiter 2014-02-20 16:15:12 +01:00
Fabien Potencier
6e9358a9e9 feature #10257 [FrameworkBundle][Console] Load command from DIC after command from bundles. (lyrixx)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[FrameworkBundle][Console] Load command from DIC after command from bundles.

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

It's better to load a command from DIC after other one. Because it allow easy
override of default (symfony/assetic/doctrine) command. The end user could do:

    # config.yml
    services:
       assetic.command.dump:
           class: SensioLabs\Shim\Assetic\DumpCommand
           tags:
               - { name: console.command }

**Note**: This is not a new feature... It could be very cool to have it for symfony 2.4 ;)

Commits
-------

34f4ef5 [FrameworkBundle][Console] Load command from DIC after command from bundles.
2014-02-19 22:48:36 +01:00
Fabien Potencier
7ac17be3ae minor #10248 Adding PHP 5.6 to travis-ci tests (pborreli)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10248).

Discussion
----------

Adding PHP 5.6 to travis-ci tests

| 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

PHP 5.6.0alpha1 is available on travis-ci
tests are green

Commits
-------

7083a30 Adding PHP 5.6 to travis-ci tests
2014-02-19 22:46:50 +01:00
Pascal Borreli
b9d13f2b65 Adding PHP 5.6 to travis-ci tests 2014-02-19 22:46:50 +01:00
Fabien Potencier
26732d7468 bug #10255 [FrameworkBundle] Fixed wrong redirect url if path contains some query parameters (pulzarraider)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fixed wrong redirect url if path contains some query parameters

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

Commits
-------

a25d1e1 Fixed wrong redirect url if path contains some query parameters
2014-02-19 22:33:06 +01:00
Fabien Potencier
bbe716cc35 minor #10281 Update BCryptPasswordEncoder.php (Szymciosek)
This PR was submitted for the 2.3-dev branch but it was merged into the 2.3 branch instead (closes #10281).

Discussion
----------

Update BCryptPasswordEncoder.php

Commits
-------

4c81fb3 Update BCryptPasswordEncoder.php
2014-02-19 22:27:56 +01:00
szymek
04a506ee7d Update BCryptPasswordEncoder.php 2014-02-19 22:27:55 +01:00