Commit Graph

719 Commits

Author SHA1 Message Date
Fabien Potencier
782ba96f76 Merge branch '2.5'
* 2.5:
  updated VERSION for 2.4.7
  updated CHANGELOG for 2.4.7
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  fix the return types
  add missing docblock for ProcessBuilder::addEnvironmentVariables()
  bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  Remove Expression Language services when the component is unavailable
  Added SK translations
  [Console] Make sure formatter is the same
2014-07-08 14:21:41 +02:00
Fabien Potencier
47c686db88 Merge branch '2.4' into 2.5
* 2.4:
  updated VERSION for 2.4.7
  updated CHANGELOG for 2.4.7
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  add missing docblock for ProcessBuilder::addEnvironmentVariables()
  bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  Remove Expression Language services when the component is unavailable
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-08 14:21:33 +02:00
Fabien Potencier
8185106a8d Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.18
  updated VERSION for 2.3.17
  update CONTRIBUTORS for 2.3.17
  updated CHANGELOG for 2.3.17
  added XSD to PHPUnit configuration
  bug #11319 [HttpKernel] Ensure the storage exists before purging it in ProfilerTest
  [Translation] Added unescaping of ids in PoFileLoader
  updated italian translation for validation messages
  [DomCrawler] Fix docblocks and formatting.
  [DomCrawler] Remove the query string and the anchor of the uri of a link
  Simplified the Travis test command
  [Console] Make sure formatter is the same

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-07-08 13:46:35 +02:00
Christian Raue
84b5581521 added XSD to PHPUnit configuration 2014-07-07 11:57:21 +02:00
akimsko
64328d967d [Console] Make sure formatter is the same
The parent constructor will create a new formatter if the $formatter parameter is null
This fix avoids that the formatter becomes 2 different instances in $this and $this->stderr
2014-07-02 15:19:50 +02:00
Fabien Potencier
d38a4b3414 Merge branch '2.5'
* 2.5:
  fixed previous merge
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Yaml] fix overwriting of keys after merged map
  [Yaml] fix priority of sequence merges according to spec
  [Console] Fixed notice in QuestionHelper
  [Console] Fixed notice in DialogHelper
  [Yaml] refactoring of merges for performance
  [Console] remove weird use statement
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  [FrameworkBundle] Redirect server output to /dev/null in case no verbosity is needed
  Add framework-bundle

Conflicts:
	src/Symfony/Component/Yaml/Parser.php
2014-06-20 19:41:51 +02:00
Fabien Potencier
76d3c9e185 Merge branch '2.4' into 2.5
* 2.4:
  fixed previous merge
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Console] Fixed notice in DialogHelper
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  Add framework-bundle

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
2014-06-20 19:38:20 +02:00
Fabien Potencier
b387477d51 Merge branch '2.3' into 2.4
* 2.3:
  Added missing `break` statement
  don't disable constructor calls to mockups of classes that extend internal PHP classes
  Small comment update according to PSR-2
  [Console] Fixed notice in DialogHelper
  [HttpFoundation] Fixed Request::getPort returns incorrect value under IPv6
  [Filesystem] Fix test suite on OSX
  Add framework-bundle

Conflicts:
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2014-06-20 19:36:47 +02:00
Fabien Potencier
cd0309f847 minor #11162 [Console] remove weird use statement (cordoval)
This PR was merged into the 2.5 branch.

Discussion
----------

[Console] remove weird use statement

|Q            |A     |
|---          |---   |
|Bug Fix?     |yes   |
|New Feature? |no    |
|BC Breaks?   |no    |
|Deprecations?|no    |
|Tests Pass?  |yes     |
|Fixed Tickets| |
|License      |MIT   |
|Doc PR       |      |

Commits
-------

c117e8e [Console] remove weird use statement
2014-06-19 18:27:19 +02:00
florianv
9fe4b88aaa [Console] Fixed notice in QuestionHelper 2014-06-19 01:05:50 +02:00
florianv
ff6c65ecf7 [Console] Fixed notice in DialogHelper 2014-06-19 01:02:32 +02:00
Luis Cordova
c117e8eaa8 [Console] remove weird use statement 2014-06-18 07:37:22 -05:00
Romain Neutron
edc1bfeb2b [Console] Add process helper tests 2014-06-11 08:54:52 +02:00
Fabien Potencier
faffe7e3a8 [Console] added a Process helper 2014-06-10 19:20:02 +02:00
Fabien Potencier
8f0b984d76 Merge branch '2.5'
* 2.5: (25 commits)
  [Bridge][Twig] Replace deprecated features
  Yaml component change in 2.5
  [HttpFoundation] fix switch statement
  [serializer] fixed whitespace issue when decoding xml
  [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler
  #10862 loadClassMetadata vs loadValidatorMetadata: revert default config
  fixed previous merge
  Added phpdoc for Cache-Control directives methods
  [Console] OutputFormatter Unset Bold has wrong id
  [Debug] fix debug handlers config
  [Serializer] fixed bc-break with cdata-section nodes
  Remove undefined variable $e
  [Debug] fix wrong case mismatch exception
  bumped Symfony version to 2.5.1
  bumped Symfony version to 2.4.7
  bumped Symfony version to 2.3.17
  Fix a parameter name in a test
  updated VERSION for 2.5.0
  updated CHANGELOG for 2.5.0
  updated VERSION for 2.4.6
  ...

Conflicts:
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2014-06-07 17:54:31 +02:00
Denis Zunke
724bb50942 [Console] OutputFormatter Unset Bold has wrong id 2014-06-03 22:33:46 +02:00
Fabien Potencier
a11645c637 updated version to 2.6 2014-05-23 16:36:49 +02:00
Yannick
bbe1045989 [Validator][Console][HttpFoundation] Use "KiB" everywhere (instead of "kB") 2014-05-22 10:54:24 +02:00
Jakub Zalas
8e2d69e458 [Console] Update test fixtures to match the new way we handle colors. 2014-05-15 09:56:35 +01:00
Fabien Potencier
c0187c1465 Merge branch '2.4'
* 2.4:
  Explicitly define the encoding.
2014-05-14 23:48:41 +02:00
Fabien Potencier
35a0ee6f03 Merge branch '2.3' into 2.4
* 2.3:
  Explicitly define the encoding.
2014-05-14 23:48:29 +02:00
Jakub Zalas
619ff5818f Explicitly define the encoding. 2014-05-14 14:35:53 +01:00
Fabien Potencier
f50c382979 Merge branch '2.4'
* 2.4:
  Disable 5.6 until it is stable again.
  Update the fixtures.
  fixed CS
  [HttpKernel] fixed default TTL not applied under certain conditions
  Added test when TTL has expired
  [DomCrawler] Fixed image input case sensitive
2014-05-14 08:54:00 +02:00
Fabien Potencier
fad6a591fc Merge branch '2.3' into 2.4
* 2.3:
  Disable 5.6 until it is stable again.
  Update the fixtures.
  [HttpKernel] fixed default TTL not applied under certain conditions
  Added test when TTL has expired
2014-05-14 08:53:52 +02:00
Jakub Zalas
8cadb49613 Update the fixtures. 2014-05-13 14:44:05 +01:00
Fabien Potencier
c56c198e52 Merge branch '2.3' into 2.4
* 2.3:
  fixed CS
  [DomCrawler] Fixed image input case sensitive
2014-05-13 10:58:07 +02:00
Fabien Potencier
46725c9cc8 fixed CS 2014-05-13 10:47:23 +02:00
Fabien Potencier
7e4b4a7ebb Merge branch '2.4'
* 2.4:
  Lower mbstring dependency
  [Console]Improve formatter for double-width character
  Lower mbstring dep, remove it for Yaml and CssSelector components
  [Security] Add check for supported attributes in AclVoter
  [Form] Fixed TrimListenerTest as of PHP 5.5
  Added more IDE links
  [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
  [Security] fixed wrong PHPDoc of the TokenGeneratorInterface
  [Finder] fixed typehint of the Finder::addAdapter() method
  [TwigBridge][Transchoice] set %count% from the current context.
  [DependencyInjection] Fix travis unit tests
  Update PHPUnit before run
  [Validator] fixed wrong test
  [WebProfilerBundle] added test case for #10773
  [WebProfilerBundle] fixed profiler homepage, fixed #10806
  [WebProfilerBundle] Added test case for #10806
  changed travis to run on the nightly builds of HHVM until everything gets stable
  Fixed issue #5427
  Allow URLs that don't contain a path

Conflicts:
	.travis.yml
	src/Symfony/Component/Console/Application.php
2014-05-12 11:28:39 +02:00
Fabien Potencier
934cd28ba6 Merge branch '2.3' into 2.4
* 2.3:
  [Console]Improve formatter for double-width character
  Lower mbstring dep, remove it for Yaml and CssSelector components
  [Security] Add check for supported attributes in AclVoter
  [Form] Fixed TrimListenerTest as of PHP 5.5
  Added more IDE links
  [DependencyInjection] Fix parameter description in ConfigurationExtensionInterface
  [Finder] fixed typehint of the Finder::addAdapter() method
  [TwigBridge][Transchoice] set %count% from the current context.
  [DependencyInjection] Fix travis unit tests
  Update PHPUnit before run
  [Validator] fixed wrong test
  [WebProfilerBundle] added test case for #10773
  [WebProfilerBundle] fixed profiler homepage, fixed #10806
  [WebProfilerBundle] Added test case for #10806
  changed travis to run on the nightly builds of HHVM until everything gets stable
  Fixed issue #5427
  Allow URLs that don't contain a path

Conflicts:
	.travis.yml
2014-05-12 11:27:48 +02:00
Fabien Potencier
d9fec7065b minor #10890 Lower mbstring dep, remove it for Yaml and CssSelector components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Lower mbstring dep, remove it for Yaml and CssSelector components

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

Commits
-------

a4b805d Lower mbstring dep, remove it for Yaml and CssSelector components
2014-05-12 11:26:07 +02:00
Fabien Potencier
a29a60debd bug #10714 [Console]Improve formatter for double-width character (denkiryokuhatsuden)
This PR was squashed before being merged into the 2.3 branch (closes #10714).

Discussion
----------

[Console]Improve formatter for double-width character

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes for one that expecting current broken output
| Deprecations? | no
| Fixed tickets |
| Tests pass?   | yes
| License       | MIT
| Doc PR        |

EDIT: fixed the table above not to remove irrelevant line

As mb_strlen just returns "how many chars in the string",
formatting with double-width character is bit broken.

The test I add is skipped when mbstring extension is not loaded.
I'm afraid if some of you cannot properly display japanese string.
(表示するテキスト just means "Some text to display")

Commits
-------

a52f41d [Console]Improve formatter for double-width character
2014-05-12 11:19:00 +02:00
Daisuke Ohata
a52f41d414 [Console]Improve formatter for double-width character 2014-05-12 11:16:18 +02:00
Nicolas Grekas
a4b805dbf2 Lower mbstring dep, remove it for Yaml and CssSelector components 2014-05-12 11:13:35 +02:00
Joseph Bielawski
de2410a8c2 [Console] Make Helper\Table::setStyle() chainable
Fixes #10874.
2014-05-09 10:15:02 +02:00
Fabien Potencier
f4f09d176b bug #10798 [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared (romainneutron)
This PR was merged into the 2.5-dev branch.

Discussion
----------

[Console] Fix #10795: Allow instancing Console Application when STDIN is not declared

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

Commits
-------

3a5a525 [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared
2014-04-28 15:26:08 +02:00
Romain Neutron
3a5a525aee [Console] Fix #10795: Allow instancing Console Application when STDIN is not declared 2014-04-28 14:32:01 +02:00
Fabien Potencier
23286bc512 Merge branch '2.4'
* 2.4:
  bumped Symfony version to 2.4.5
  updated VERSION for 2.4.4
  updated CHANGELOG for 2.4.4
  bumped Symfony version to 2.3.14
  updated VERSION for 2.3.13
  update CONTRIBUTORS for 2.3.13
  updated CHANGELOG for 2.3.13
  Updated Serbian validation translation
  [Console] Fixed the rendering of exceptions on HHVM with a terminal width
  [WebProfilerBundle ] Fixed an edge case on WDT loading
  [Security] removed $csrfTokenManager type hint from SimpleFormAuthenticationListener constructor argument
  fixed typo
  [Process] Disable TTY mode on Windows platform
  [Validator] added missing ANNOTATION config to @Target annotation
  [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2014-04-28 07:15:04 +02:00
Fabien Potencier
8003cfe801 Merge branch '2.3' into 2.4
* 2.3:
  bumped Symfony version to 2.3.14
  updated VERSION for 2.3.13
  update CONTRIBUTORS for 2.3.13
  updated CHANGELOG for 2.3.13
  [Console] Fixed the rendering of exceptions on HHVM with a terminal width
  [WebProfilerBundle ] Fixed an edge case on WDT loading
  fixed typo
  [Process] Disable TTY mode on Windows platform
  [Validator] added missing ANNOTATION config to @Target annotation
  [Finder] Fix ignoring of unreadable dirs in the RecursiveDirectoryIterator.

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Validator/Constraints/Callback.php
2014-04-27 15:34:57 +02:00
Christophe Coevoet
6e57380d14 [Console] Fixed the rendering of exceptions on HHVM with a terminal width 2014-04-26 13:09:19 +02:00
Romain Neutron
90294ec90c Fix doc blocks 2014-04-18 22:54:24 +02:00
Romain Neutron
de5d62775a Fix doc blocks 2014-04-18 22:17:16 +02:00
Fabien Potencier
f72eb34fc4 fixed types in phpdocs 2014-04-16 12:36:34 +02:00
Fabien Potencier
2314328b16 Merge branch '2.4'
* 2.4:
  fixed types in phpdocs
  fixed types in phpdocs

Conflicts:
	src/Symfony/Component/Security/Core/Encoder/BasePasswordEncoder.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Serializer/Encoder/JsonEncoder.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Validator/Mapping/ClassMetadata.php
	src/Symfony/Component/Validator/Mapping/ElementMetadata.php
	src/Symfony/Component/Validator/Mapping/MemberMetadata.php
	src/Symfony/Component/Validator/MetadataFactoryInterface.php
2014-04-16 12:36:21 +02:00
Fabien Potencier
0ecdda1770 fixed types in phpdocs 2014-04-16 12:34:42 +02:00
Fabien Potencier
d5bd9bdd68 Merge branch '2.3' into 2.4
* 2.3:
  fixed types in phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Templating/PhpEngine.php
2014-04-16 12:34:31 +02:00
Fabien Potencier
e96b018805 fixed types in phpdocs 2014-04-16 12:30:19 +02:00
Fabien Potencier
24dde55feb made types consistent with those defined in Hack 2014-04-16 10:09:01 +02:00
Fabien Potencier
df3d543349 Merge branch '2.4'
* 2.4:
  made types consistent with those defined in Hack
  made {@inheritdoc} annotations consistent across the board
  made {@inheritdoc} annotations consistent across the board
  fixed types in phpdocs
  [Debug] Fixed ClassNotFoundFatalErrorHandler on windows.
  made phpdoc types consistent with those defined in Hack
  Add support Thai translations
  [Validator] Add missing czech translations
  made types consistent with those defined in Hack
  removed extra/unsupported arguments
  [HttpKernel] fixed an error message
  [TwigBundle] removed undefined argument
  [Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.

Conflicts:
	src/Symfony/Component/Console/Helper/TableHelper.php
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/Form/FormError.php
	src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
	src/Symfony/Component/Process/ProcessPipes.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Security/Http/RememberMe/TokenBasedRememberMeServices.php
	src/Symfony/Component/Translation/Dumper/FileDumper.php
	src/Symfony/Component/Validator/ConstraintViolation.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php
	src/Symfony/Component/Validator/ExecutionContextInterface.php
	src/Symfony/Component/Validator/Mapping/BlackholeMetadataFactory.php
2014-04-16 10:08:40 +02:00
Fabien Potencier
041cb7b103 made types consistent with those defined in Hack 2014-04-16 10:04:32 +02:00
Fabien Potencier
03f0c2de8a made {@inheritdoc} annotations consistent across the board 2014-04-16 10:03:46 +02:00