Commit Graph

22002 Commits

Author SHA1 Message Date
Elan Ruusamäe
18b6964744 fix debug-ext 003.phpt
in my environment the filename is filled, not "-"

$ php --version
PHP 5.5.27 (cli) (built: Jul 17 2015 12:32:05)
Copyright (c) 1997-2015 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
2015-08-07 08:53:47 +02:00
Mathieu Rochette
500c57e6df [Yaml] Nested merge keys 2015-08-06 22:04:45 +02:00
Fabien Potencier
19ee814cee minor #15470 [FrameworkBundle] [Command] removed unused variable. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] [Command] removed unused variable.

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

Commits
-------

117e054 [FrameworkBundle] [Command] removed unused variable.
2015-08-06 12:02:52 +02:00
Nicolas Grekas
5d8e00f457 Merge branch '2.7' into 2.8
* 2.7:
  Fix one dependency requirement

Conflicts:
	src/Symfony/Component/Serializer/composer.json
2015-08-06 11:13:37 +02:00
Nicolas Grekas
b08b43e313 Fix one dependency requirement 2015-08-06 11:12:43 +02:00
Nicolas Grekas
71852f8add Merge branch '2.7' into 2.8
* 2.7:
  [travis] Build standalone phpunit without symfony/yaml

Conflicts:
	.travis.yml
	src/Symfony/Bundle/TwigBundle/composer.json
2015-08-06 10:36:27 +02:00
Nicolas Grekas
500a2c4504 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Build standalone phpunit without symfony/yaml

Conflicts:
	.travis.yml
	src/Symfony/Bundle/TwigBundle/composer.json
2015-08-06 10:34:04 +02:00
Nicolas Grekas
7ebda1e155 minor #15473 [travis] Build standalone phpunit without symfony/yaml (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Build standalone phpunit without symfony/yaml

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

phpunit mixed as a dependency does not work at all. Let's build it standalone, without symfony/yaml.

Commits
-------

4dd0de6 [travis] Build standalone phpunit without symfony/yaml
2015-08-06 10:32:28 +02:00
Nicolas Grekas
4dd0de6694 [travis] Build standalone phpunit without symfony/yaml 2015-08-06 10:22:42 +02:00
Hugo Hamon
117e054f87 [FrameworkBundle] [Command] removed unused variable. 2015-08-05 19:26:57 -04:00
Christian Flothmann
060c1670ba [FrameworkBundle] fix serializer config check 2015-08-05 21:44:23 +02:00
Nicolas Grekas
fceeb5d909 Merge branch '2.7' into 2.8
* 2.7:
  Clean wrong whitespaces
  [travis] Build phpunit with local components
  do not remove space between attributes
  [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()
  Fix the retrieval of the default value for variadic arguments
  Annotated routes with a variadic parameter
  Fixing DbalSessionHandler to work with a Oracle "limitation" or bug?
  Update EngineInterface.php
  let Travis builds fail when PHP 7 jobs fail

Conflicts:
	.travis.yml
2015-08-05 17:58:16 +02:00
Fabien Potencier
a00687f43a feature #15416 [DependencyInjection] Added a way to define the priority of service decoration (dosten)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Added a way to define the priority of service decoration

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #10634
| License       | MIT
| Doc PR        | symfony/symfony-docs#5600

This PR adds a way to define the priority of service decoration, so, the service with the highest priority will be applied first (the default priority is zero).

```yaml
services:
    foo:
        class: Foo

    bar:
        class: Bar
        arguments: ['@bar.inner']
        decorates: foo
        public: false

    foobar:
        class: Foobar
        arguments: ['@foobar.inner']
        decorates: foo
        decoration_priority: 1
        public: false
```

This will result in this code:

```php
$this->services['foo'] = new Bar(new Foobar(new Foo)));
```

Commits
-------

75c98cb Added a way to define the priority of service decoration
2015-08-05 17:50:26 +02:00
Nicolas Grekas
9ce3200436 Merge branch '2.3' into 2.7
* 2.3:
  Clean wrong whitespaces
  [travis] Build phpunit with local components
  do not remove space between attributes
  [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()
  Fix the retrieval of the default value for variadic arguments
  Annotated routes with a variadic parameter
  Fixing DbalSessionHandler to work with a Oracle "limitation" or bug?
  Update EngineInterface.php
  let Travis builds fail when PHP 7 jobs fail

Conflicts:
	.travis.yml
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
2015-08-05 17:45:00 +02:00
Nicolas Grekas
7fdba25e4f Clean wrong whitespaces 2015-08-05 17:43:06 +02:00
Fabien Potencier
805cd9fd61 minor #14115 let Travis builds fail when PHP 7 jobs fail (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

let Travis builds fail when PHP 7 jobs fail

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

Commits
-------

ecc3df5 let Travis builds fail when PHP 7 jobs fail
2015-08-05 17:26:49 +02:00
Fabien Potencier
3c62ff88ff minor #15457 [travis] Build phpunit with local components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Build phpunit with local components

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

The tests for PHP7 currently fail because travis ships with a phar phpunit that embeds the yaml components. This one takes priority over the one in the repo. But it is outdated.
The issue arose with PHP7 tests but could have happen with any build.

Commits
-------

ce2a371 [travis] Build phpunit with local components
2015-08-05 17:25:44 +02:00
Nicolas Grekas
ce2a3717fd [travis] Build phpunit with local components 2015-08-05 17:18:22 +02:00
Nicolas Grekas
6c0dc5c865 minor #15450 [Console] Handle false return value from readline (michaelperrin)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] Handle false return value from readline

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

Following #15382 and as @stof mentioned, the `false` value can be returned by `readline()` and should be handled. This fixes the problem.

Commits
-------

f5ca270 [Console] Handle false return value from readline
2015-08-05 09:21:02 +02:00
Michaël Perrin
f5ca270e75 [Console] Handle false return value from readline
"readline()" returns "false" when the user presses CTRL+D.
2015-08-04 17:59:05 +02:00
Fabien Potencier
0064d9ebf4 bug #15445 do not remove space between attributes (greg0ire)
This PR was merged into the 2.3 branch.

Discussion
----------

do not remove space between attributes

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

This piece of code adds a space then removes it immediately. One could think that only the space after the last element of the loop is removed, but this is not the case. Space between loop elements are also removed.

Commits
-------

8d2b888 do not remove space between attributes
2015-08-04 14:17:43 +02:00
Nicolas Grekas
af0b8eb26c [Debug] Enhance DebugClassLoader performance on MacOSX 2015-08-04 12:48:55 +02:00
Grégoire Paris
8d2b8881f5 do not remove space between attributes
This piece of code adds a space then removes it immediately. One could think that only the space after the last element of the loop is removed, but this is not the case. Space between loop elements are also removed.
2015-08-04 12:17:13 +02:00
Christophe Coevoet
328ec0133e bug #15263 [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() (axiac)
This PR was squashed before being merged into the 2.3 branch (closes #15263).

Discussion
----------

[HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()

| Q             | A
| ------------- | ---
| Fixed tickets | #15262
| License       | MIT

'proxy-revalidate' is not a header on its own but a 'Cache-Control' directive
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9

Commits
-------

6c22f0a [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()
2015-08-03 19:22:19 +02:00
Valentin VALCIU
6c22f0af24 [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() 2015-08-03 19:22:14 +02:00
Fabien Potencier
64d050769b feature #15433 Allow to define Enum nodes with 1 single element (javiereguiluz)
This PR was squashed before being merged into the 2.8 branch (closes #15433).

Discussion
----------

Allow to define Enum nodes with 1 single element

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

Commits
-------

68f0818 Allow to define Enum nodes with 1 single element
2015-08-03 10:27:56 +02:00
Javier Eguiluz
68f0818a6c Allow to define Enum nodes with 1 single element 2015-08-03 10:27:53 +02:00
Nicolas Grekas
6888c1f256 Merge branch '2.7' into 2.8
* 2.7:
  [Locale] Fix Intl requirement
  Better Iban Validation

Conflicts:
	src/Symfony/Component/Locale/composer.json
	src/Symfony/Component/Validator/Constraints/Iban.php
2015-08-02 10:31:38 +02:00
Nicolas Grekas
eb08baa9fc Fix "[Form] Add flexibility for EntityType"
This fixes commit e0a1294a44.
2015-08-02 10:01:14 +02:00
Tobias Schultze
a5a9385dbb minor #15429 Remove the duplicated rendering of deprecation messages in the profiler (stof)
This PR was merged into the 2.8 branch.

Discussion
----------

Remove the duplicated rendering of deprecation messages in the profiler

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

The issue was already fixed in the 2.7 branch in https://github.com/symfony/symfony/pull/14990 but the fix was lost in 2.8 because of a wrong conflict resolution when merging branches.

Commits
-------

4fefd3d Remove the duplicated rendering of deprecation messages in the profiler
2015-08-01 23:22:00 -05:00
Tobias Schultze
e5909bea2c bug #15425 [Routing] Fix the retrieval of the default value for variadic arguments in the annotation loader (wdalmut, stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[Routing] Fix the retrieval of the default value for variadic arguments in the annotation loader

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

This takes the test submitted in #13690 and implements the fix for this bug

Commits
-------

73c5eff Fix the retrieval of the default value for variadic arguments
9b7d4c7 Annotated routes with a variadic parameter
2015-08-01 23:19:31 -05:00
Christophe Coevoet
4fefd3d1e7 Remove the duplicated rendering of deprecation messages in the profiler 2015-08-02 01:52:06 +02:00
Christophe Coevoet
704760b276 Add support for variadic arguments in the GetSetNormalizer 2015-08-01 21:55:55 +02:00
Christophe Coevoet
73c5eff44d Fix the retrieval of the default value for variadic arguments 2015-08-01 21:33:42 +02:00
Walter Dal Mut
9b7d4c7613 Annotated routes with a variadic parameter
There are no variadic default values and that generate a fatal error.
2015-08-01 21:19:19 +02:00
Nicolas Grekas
e23eb56ffe [Locale] Fix Intl requirement 2015-08-01 18:50:08 +02:00
Fabien Potencier
69171d48ea bug #15074 Fixing DbalSessionHandler to work with a Oracle "limitation" or bug? (nuncanada)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15074).

Discussion
----------

Fixing DbalSessionHandler to work with a Oracle "limitation" or bug?

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

Commits
-------

c314659 Fixing DbalSessionHandler to work with a Oracle "limitation" or bug?
2015-08-01 16:15:14 +02:00
nuncanada
c3146592d9 Fixing DbalSessionHandler to work with a Oracle "limitation" or bug? 2015-08-01 16:15:13 +02:00
Fabien Potencier
041c489548 minor #15080 Update EngineInterface.php (johnnypeck)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #15080).

Discussion
----------

Update EngineInterface.php

Grammer in doc comment.

Commits
-------

d60b2bb Update EngineInterface.php
2015-08-01 16:10:55 +02:00
Johnny Peck
d60b2bba60 Update EngineInterface.php
Grammer in doc comment.
2015-08-01 16:10:55 +02:00
Fabien Potencier
a4100f95e7 bug #13828 [Validator] Improve Iban Validation (afurculita)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Improve Iban Validation

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

This PR adds 2 more checks for better IBAN validation: the validation of the country code (represented by the first 2 letters) and the format validation according to the country format regex based on http://www.swift.com/dsp/resources/documents/IBAN_Registry.pdf.

Commits
-------

07b38de Better Iban Validation
2015-08-01 14:02:04 +02:00
Fabien Potencier
317d30b6ef feature #13990 [Form] Add flexibility for EntityType (raziel057)
This PR was submitted for the 2.7 branch but it was merged into the 2.8 branch instead (closes #13990).

Discussion
----------

[Form] Add flexibility for EntityType

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

Sometimes it can be usefull to return null rather than a QueryBuilder from the closure attached to the ``query_builder`` attribute of an EntityType.

For example, if I have the following method in a "DelegateRepository", which can return a QueryBuilder or null:

```php
public function getQbForOfficers()
{
    $permanentMeeting = $this->getEntityManager()->getRepository('MyBundle:PermanentMeeting')->findOneBy(array());

    if ($permanentMeeting === null || $permanentMeeting->getMeeting() === null) {
        return null;
    }

    $qb = $this->getEntityManager()->createQueryBuilder();
    $qb->select('p')
        ->from('MyBundle:Delegate', 'p')
        ->andWhere('p.meeting = :meetingId')
        ->setParameter('meetingId', $permanentMeeting->getMeeting()->getId());

    return $qb;
}
```

To be able to present a list without entries when creating an entity field like this:

```php
$event->getForm()->add('officers', 'entity', array(
	'class' => 'MyBundle:Delegate',
	'property' => 'fullName',
	'query_builder' => function(EntityRepository $er) use ($meeting, $delegationId) {
	    return $er->getQbForOfficers();
	}
)));
```

Rather than using the "choices" attributes (more verbose and which requires the injection of the entityManager):

```php
$qb = $this->entityManager->getRepository('PTCNoventoBundle:Delegate')->getQbForOfficers();

$officers = ($qb !== null) ? $qb->getQuery()->getResult() : array();

$event->getForm()->add('officers', 'entity', array(
	'class' => 'PTCNoventoBundle:Delegate',
	'property' => 'fullName',
	'choices' => $officers,
));
```

Commits
-------

e0a1294 [Form] Add flexibility for EntityType
2015-08-01 14:00:55 +02:00
Thomas Lallement
e0a1294a44 [Form] Add flexibility for EntityType 2015-08-01 14:00:54 +02:00
Fabien Potencier
c856a010a2 feature #15382 [Console] Use readline for user input when available #DX (michaelperrin)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] Use readline for user input when available #DX

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

Given I am entering data in an user input
When I use left and right keys to make some changes in what I have typed
Then the cursor should move accordingly instead of adding characters at the end of the line

To make it simple: using the arrow keys (←  →)  to make changes to what I already typed would be much handier than getting `^[[D` and `^[[C` characters in the terminal and having to delete all chars to type everything again.

I could not add any extra tests to this as the STDIN can't be used during tests. But they are not breaking and I tried again all types of questions (text, choices, hidden) by myself.

Note that `readline` can't be used for hidden questions, as `stty -echo` is not taken into account.

Commits
-------

0534899 [Console] Fix Symfony coding standards violations
8b63d62 [Console] Use readline for user input when available
2015-08-01 13:59:20 +02:00
Michaël Perrin
05348991c2 [Console] Fix Symfony coding standards violations 2015-08-01 11:47:02 +02:00
Michaël Perrin
8b63d6209d [Console] Use readline for user input when available
This allows to use arrow keys in the terminal instead of having weird characters
2015-08-01 11:46:56 +02:00
Nicolas Grekas
48aa3e1453 Merge branch '2.7' into 2.8
* 2.7:
  [Locale] Add missing @group legacy annotations
  Fix security-acl deps
  Fix doctrine mapping validation type error
  Remove skipping of tests based on ICU data version whenever possible
  Fix the handling of null as locale in the stub intl classes
  do not dump leading backslashes in class names
  fix issue #15377
  Skip ::class constant
  [Config] type specific check for emptiness

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/TimeTypeTest.php
2015-08-01 11:43:59 +02:00
Nicolas Grekas
07fb308225 [Locale] Add missing @group legacy annotations 2015-08-01 11:35:48 +02:00
Nicolas Grekas
9fdf314cfa [Form] Add missing @group legacy annotations 2015-08-01 11:27:02 +02:00
Nicolas Grekas
2abdd50414 [Form] Use FQCN form types 2015-08-01 11:22:02 +02:00