Commit Graph

21311 Commits

Author SHA1 Message Date
Nicolas Grekas
b09df56a4e Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] Fix test related to PSR-4
2015-04-24 21:22:47 +02:00
Nicolas Grekas
4cc4f079c5 [FrameworkBundle] Fix test related to PSR-4 2015-04-24 21:21:36 +02:00
Nicolas Grekas
2bc34ce403 [Debug] Fix tests 2015-04-24 19:52:00 +02:00
Nicolas Grekas
f9efbd38d5 Merge branch '2.8'
* 2.8:
  Fix test
2015-04-24 18:45:10 +02:00
Nicolas Grekas
dc89425c7f Merge branch '2.7' into 2.8
* 2.7:
  Fix test
2015-04-24 18:45:00 +02:00
Nicolas Grekas
0cbe1e011d Fix test 2015-04-24 18:44:40 +02:00
Nicolas Grekas
32fa910d3e Merge branch '2.8'
* 2.8:
  [Debug] Fix deprecated use of DebugClassLoader
  Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
  [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 17:39:13 +02:00
Nicolas Grekas
e6d05b7dc4 Merge branch '2.7' into 2.8
* 2.7:
  [Debug] Fix deprecated use of DebugClassLoader
  Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
  [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 17:39:02 +02:00
Nicolas Grekas
62808e4078 feature #14462 Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response" (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"

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

This partially reverts commit 22f4807522:
it broke BC (see https://github.com/silexphp/Silex/pull/1142 and 22f4807522 (commitcomment-10857485))

Commits
-------

10c5ffb Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
2015-04-24 17:37:58 +02:00
Nicolas Grekas
e0c6f444a3 Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix deprecated use of DebugClassLoader
  [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 17:36:44 +02:00
Nicolas Grekas
dc86ff71e2 minor #14464 [Debug] Fix deprecated use of DebugClassLoader (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Fix deprecated use of DebugClassLoader

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

Commits
-------

4a6100a [Debug] Fix deprecated use of DebugClassLoader
2015-04-24 17:35:34 +02:00
Nicolas Grekas
4a6100a6f2 [Debug] Fix deprecated use of DebugClassLoader 2015-04-24 12:55:50 +02:00
Bernhard Schussek
8bf855620f [Validator] Fixed Choice when an empty array is used in the "choices" option 2015-04-24 12:06:28 +02:00
Bernhard Schussek
d206ffd212 bug #14448 [Validator] Fixed Choice when an empty array is used in the "choices" option (webmozart)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] Fixed Choice when an empty array is used in the "choices" option

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

Commits
-------

a5a41b2 [Validator] Fixed Choice when an empty array is used in the "choices" option
2015-04-24 11:48:58 +02:00
Nicolas Grekas
10c5ffbdd0 Revert "[HttpKernel] Throw a LogicException when kernel.exception does not led to a Response"
This partially reverts commit 22f4807522.
2015-04-24 09:21:43 +02:00
Nicolas Grekas
6b738fd700 Merge branch '2.8'
* 2.8: (61 commits)
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.
  [VarDumper] Allow preserving a subset of cut arrays
  [Console] Bind the closure (code) to the Command if possible
  [VarDumper] Added support for SplFileObject
  [VarDumper] Added support for SplFileInfo
  Update DebugClassLoader.php
  inject asset packages in assets helper service
  [travis] Do not exclude legacy tests on 2.7
  [HttpFoundation] remove getExtension method
  [2.6][Translation] fix legacy tests.
  [Form] Removed remaining deprecation notices in the test suite
  [Form] Moved deprecation notice triggers to file level
  [Debug] Map PHP errors to LogLevel::CRITICAL
  [FrameworkBundle][Server Command] add address port number option.
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.7][Translation] remove duplicate code for loading catalogue.
  ...

Conflicts:
	composer.json
	src/Symfony/Bridge/Swiftmailer/composer.json
	src/Symfony/Component/Console/Helper/DialogHelper.php
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
	src/Symfony/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
	src/Symfony/Component/Locale/composer.json
2015-04-24 09:12:41 +02:00
Nicolas Grekas
f5a0ac2945 Merge branch '2.7' into 2.8
* 2.7: (40 commits)
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.
  Update DebugClassLoader.php
  inject asset packages in assets helper service
  [travis] Do not exclude legacy tests on 2.7
  [HttpFoundation] remove getExtension method
  [2.6][Translation] fix legacy tests.
  [Form] Removed remaining deprecation notices in the test suite
  [Form] Moved deprecation notice triggers to file level
  [Debug] Map PHP errors to LogLevel::CRITICAL
  [Routing][DependencyInjection] Support .yaml extension in YAML loaders
  [DX] improve file loader error for router/other resources in bundle
  [FrameworkBundle] Initialize translator with the default locale.
  [FrameworkBundle] Fix Routing\DelegatingLoader resiliency to fatal errors
  [2.7][Translation] remove duplicate code for loading catalogue.
  [2.6][Translation] remove duplicate code for loading catalogue.
  [HttpKernel] Cleanup ExceptionListener
  CS fixes
  [DependencyInjection] Show better error when the Yaml component is not installed
  [2.3] SCA for Components - reference mismatches
  ...
2015-04-24 09:03:44 +02:00
Nicolas Grekas
1b34f2cb7d Merge branch '2.6' into 2.7
* 2.6:
  [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
  [2.6][Translator] Extend, refactor and simplify Translator tests.

Conflicts:
	src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
	src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
2015-04-24 09:02:30 +02:00
Nicolas Grekas
750792e32a minor #14418 [travis] Do not exclude legacy tests on 2.7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] Do not exclude legacy tests on 2.7

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

This is to be reverted on 2.8, where legacy tests should be excluded.

Commits
-------

8e39a08 [travis] Do not exclude legacy tests on 2.7
2015-04-24 08:20:20 +02:00
Nicolas Grekas
d90891a372 bug #14451 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups

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

This is already tested: 2.7 fails because this patch is missing.

Commits
-------

98ed078 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups
2015-04-24 08:18:45 +02:00
Christian Flothmann
faee0d714b [Filesystem] deprecate chmod support in dumpFile()
The ability to support a custom permission mask in the `dumpFile()`
method is deprecated since Symfony Symfony 2.3.12. This commit adds the
`trigger_error()` call if a custom permission mask is passed.
2015-04-23 23:48:30 +02:00
Diego Saint Esteben
2892902ead Fixed tests 2015-04-23 18:00:03 -03:00
Nicolas Grekas
a4e3e072d0 feature #14443 [VarDumper] Allow preserving a subset of cut arrays (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Allow preserving a subset of cut arrays

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

Commits
-------

208ca94 [VarDumper] Allow preserving a subset of cut arrays
2015-04-23 19:06:49 +02:00
Christophe Coevoet
e861134580 feature #14431 [Console] Bind the closure (code) to the Command if possible (lyrixx)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] Bind the closure (code) to the Command if possible

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

This allow this kind of code:

```php
#!/usr/bin/env php
<?php

require __DIR__.'/vendor/autoload.php';

use Symfony\Component\Console\Application;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

$application = new Application();

$application->add((new Command('process')))
    ->setDescription('Play all other commands')
    ->setCode(function (InputInterface $input, OutputInterface $output) use ($application) {
        $application = $this->getApplication();
        $help = $application->find('help');
        $output->writeln($help->getHelp());
    })
;
$application->run();
```

Commits
-------

ff4424a [Console] Bind the closure (code) to the Command if possible
2015-04-23 11:07:11 +02:00
Nicolas Grekas
98ed078029 [Debug] Fix ClassNotFoundFatalErrorHandler candidates lookups 2015-04-23 10:57:12 +02:00
Per Modin
7c2b8755e8 [StringUtil] Fixed singularification of 'selfies' 2015-04-23 05:20:57 +02:00
Abdellatif Ait boudad
386f7332c9 minor #14437 [2.6][Translator] Extend, refactor and simplify Translator tests. (mpdude)
This PR was squashed before being merged into the 2.6 branch (closes #14437).

Discussion
----------

[2.6][Translator] Extend, refactor and simplify Translator tests.

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

These are the improvements from #14291 that we can easily backport to the 2.6 branch as requested [here](https://github.com/symfony/symfony/pull/14291#issuecomment-94863733).

Commits
-------

a8c4471 [2.6][Translator] Extend, refactor and simplify Translator tests.
2015-04-22 22:34:18 +01:00
Matthias Pigulla
a8c44713c4 [2.6][Translator] Extend, refactor and simplify Translator tests. 2015-04-22 22:34:04 +01:00
Abdellatif Ait boudad
520660302a minor #14316 [Translation] improved exception when missing required component (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation] improved exception when missing required component

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

Commits
-------

c3bd418 improved exception when missing required component
2015-04-22 22:21:47 +01:00
Restless-ET
b62eb73590 Fix Portuguese (Portugal) translation for Security 2015-04-22 16:50:37 +01:00
Christian Flothmann
c3bd418483 improved exception when missing required component 2015-04-22 17:09:08 +02:00
Bernhard Schussek
a5a41b2f21 [Validator] Fixed Choice when an empty array is used in the "choices" option 2015-04-22 16:59:03 +02:00
Christian Flothmann
8b3b3ce18a [DependencyInjection] resolve circular reference
This issue has been fixed in #11422. Due to a bad merge in
3bed1b7988 it partially appeared again in
Symfony 2.6 or higher.
2015-04-22 16:02:46 +02:00
Nicolas Grekas
208ca94b67 [VarDumper] Allow preserving a subset of cut arrays 2015-04-22 15:44:48 +02:00
Nicolas Grekas
449b18c2e8 feature #14424 [VarDumper] Added support for SplFileInfo (lyrixx)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Added support for SplFileInfo

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

Before:
```
SplFileInfo {#3}
```

After:
```
SplFileInfo {#3
  path: "/home/greg/dev/github.com/lyrixx/gaga-photo/fixtures"
  filename: "grisou.jpg"
  basename: "grisou.jpg"
  pathname: "/home/greg/dev/github.com/lyrixx/gaga-photo/fixtures/grisou.jpg"
  extension: "jpg"
  realPath: "/home/greg/dev/github.com/lyrixx/gaga-photo/fixtures/grisou.jpg"
  aTime: 2015-04-20 23:21:15
  mTime: 2014-08-17 15:37:36
  cTime: 2015-04-20 23:09:51
  inode: 12197643
  size: 966553
  perms: 0100750
  owner: 1000
  group: 1000
  type: "file"
  writable: true
  readable: true
  executable: true
  file: true
  dir: false
  link: false
}
```

For a link:

```
SplFileInfo {#3
  path: ""
  filename: "link"
  basename: "link"
  pathname: "link"
  extension: ""
  realPath: "/home/greg/dev/github.com/symfony/var-dumper/composer.json"
  aTime: 2015-04-20 23:39:15
  mTime: 2015-04-20 23:39:15
  cTime: 2015-04-20 23:39:15
  inode: 11272232
  size: 967
  perms: 0100644
  owner: 1000
  group: 1000
  type: "link"
  writable: true
  readable: true
  executable: false
  file: true
  dir: false
  link: true
  linkTarget: "composer.json"
}
```

For a remote file:

```
SplFileInfo {#3
  path: "http://google.com"
  filename: "foobar.php"
  basename: "foobar.php"
  pathname: "http://google.com/foobar.php"
  extension: "php"
  realPath: false
  writable: false
  readable: false
  executable: false
  file: false
  dir: false
  link: false
}
```

For a CSV:
```
SplFileObject {#3
  path: ""
  filename: "test.csv"
  basename: "test.csv"
  pathname: "test.csv"
  extension: "csv"
  realPath: "/home/greg/dev/github.com/symfony/var-dumper/test.csv"
  aTime: 2015-04-21 12:55:07
  mTime: 2015-04-21 12:55:07
  cTime: 2015-04-21 12:55:07
  inode: 11272237
  size: 0
  perms: 0100644
  owner: 1000
  group: 1000
  type: "file"
  writable: true
  readable: true
  executable: false
  file: true
  dir: false
  link: false
  csvControl: array:2 [
    0 => ","
    1 => """
  ]
  flags: SKIP_EMPTY|READ_CSV
  maxLineLen: 0
  fstat: array:7 [
    "dev" => 64513
    "ino" => 11272237
    "nlink" => 1
    "rdev" => 0
    "blksize" => 4096
    "blocks" => 0
    "…" => "…20"
  ]
  eof: false
  key: 0
}

Commits
-------

e75c233 [VarDumper] Added support for SplFileObject
eb50b13 [VarDumper] Added support for SplFileInfo
2015-04-22 11:38:32 +02:00
Grégoire Pineau
ff4424a668 [Console] Bind the closure (code) to the Command if possible 2015-04-22 11:30:19 +02:00
Dariusz Ruminski
d5742c18b0 CS: unalign = 2015-04-22 09:13:42 +02:00
Diego Saint Esteben
34e000e59a Show a better error when the port is in use 2015-04-21 22:28:59 -03:00
Dariusz Ruminski
1233baa669 CS: unalign => 2015-04-21 22:51:01 +02:00
Grégoire Pineau
e75c233b88 [VarDumper] Added support for SplFileObject 2015-04-21 15:00:43 +02:00
Grégoire Pineau
eb50b139d6 [VarDumper] Added support for SplFileInfo 2015-04-21 14:53:14 +02:00
Fabien Potencier
c16930f9ae bug #14422 Update DebugClassLoader.php (userfriendly)
This PR was merged into the 2.7 branch.

Discussion
----------

Update DebugClassLoader.php

Using name property of ReflectionClass instance in strncmp instead of __toString() return value, the latter seemed to breaking one of hte vendor bundles we use, and it seems fine now with the former.

Commits
-------

dcc6586 Update DebugClassLoader.php
2015-04-21 07:40:09 +02:00
Fabien Potencier
b66a713fed bug #14419 inject asset packages in assets helper service (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

inject asset packages in assets helper service

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

Commits
-------

6928507 inject asset packages in assets helper service
2015-04-21 07:37:05 +02:00
Moritz Kraft
dcc65866c9 Update DebugClassLoader.php
Using name property of ReflectionClass instance in strncmp instead of __toString() return value, the latter seemed to breaking one of hte vendor bundles we use, and it seems fine now with the former.
2015-04-20 18:36:32 +01:00
Christian Flothmann
69285072ab inject asset packages in assets helper service 2015-04-20 18:41:42 +02:00
Nicolas Grekas
8e39a08373 [travis] Do not exclude legacy tests on 2.7 2015-04-20 16:58:30 +02:00
Nicolas Grekas
bf8f70607a Merge branch '2.6' into 2.7
* 2.6:
  [2.6][Translation] fix legacy tests.
  [EventDispatcher] make listeners removable from an executed listener

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
2015-04-20 13:53:55 +02:00
Fabien Potencier
db243627e5 minor #14304 [EventDispatcher] Added the sorted priority information on phpdoc of the getListeners method (dupuchba)
This PR was merged into the 2.3 branch.

Discussion
----------

[EventDispatcher] Added the sorted priority information on phpdoc of the getListeners method

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

Added the sorting by descending priority information on the `EventDisparcherInterface`

Commits
-------

c3eecb5 Add better phpdoc message for getListeners method of the EventDispatcher
2015-04-20 12:41:44 +02:00
Fabien Potencier
f48cc1ba34 bug #14355 [2.6][EventDispatcher] make listeners removable from an executed listener (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][EventDispatcher] make listeners removable from an executed listener

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

Commits
-------

f36803e [EventDispatcher] make listeners removable from an executed listener
2015-04-19 19:01:19 +02:00
Fabien Potencier
d5ed6ecdf6 minor #14366 [HttpFoundation] remove getExtension method (dosten)
This PR was squashed before being merged into the 2.7 branch (closes #14366).

Discussion
----------

[HttpFoundation] remove getExtension method

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

Since the minimum PHP version in 2.7 is 5.3.9 we can delete the `getExtension` method and use the real `\SplFileInfo::getExtension()`

Commits
-------

55ecf3b [HttpFoundation] remove getExtension method
2015-04-19 18:59:32 +02:00