Commit Graph

2882 Commits

Author SHA1 Message Date
Nicolas Grekas
3fc766ff4b [Bridge\Twig] Lazy-load deps 2017-11-07 18:37:38 +01:00
Nicolas Grekas
82ce33d5eb [3.4] Remove useless docblocks 2017-11-07 15:28:09 +01:00
Nicolas Grekas
629895c3ef Merge branch '3.3' into 3.4
* 3.3:
  [3.3] More docblock fixes
  [2.7] More docblock fixes
2017-11-07 15:20:24 +01:00
Nicolas Grekas
7b6cabad22 [3.3] More docblock fixes 2017-11-07 15:16:22 +01:00
Nicolas Grekas
69b48d0122 bug #24851 [TwigBridge] Fix BC break due required twig environment (ro0NL)
This PR was squashed before being merged into the 3.4 branch (closes #24851).

Discussion
----------

[TwigBridge] Fix BC break due required twig environment

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes/no
| Fixed tickets | https://github.com/symfony/symfony/pull/24236#discussion_r149241720
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

See https://github.com/ezsystems/ezplatform-design-engine/pull/12 + https://github.com/silexphp/Silex-WebProfiler/pull/126 + https://github.com/bolt/bolt/pull/7154

Sorry for that :)

cc @fabpot

Commits
-------

243e4b2 [TwigBridge] Fix BC break due required twig environment
2017-11-07 14:35:34 +01:00
Roland Franssen
243e4b2e2f [TwigBridge] Fix BC break due required twig environment 2017-11-07 14:35:31 +01:00
Nicolas Grekas
c4ae73939e Merge branch '3.3' into 3.4
* 3.3:
  Random fixes
  Docblock fixes
  [HttpKernel] Enhance deprecation message
  [SecurityBundle] Fix the datacollector to properly support decision.object being null
2017-11-07 13:10:25 +01:00
Nicolas Grekas
39a5801fc9 Merge branch '2.8' into 3.3
* 2.8:
  Docblock fixes
2017-11-07 12:58:40 +01:00
Nicolas Grekas
96dcb10a80 Merge branch '2.7' into 2.8
* 2.7:
  Docblock fixes
2017-11-07 12:56:23 +01:00
Nicolas Grekas
b56bfe7d8a Docblock fixes 2017-11-07 12:54:30 +01:00
Nicolas Grekas
73982760f7 Merge branch '3.3' into 3.4
* 3.3:
  [Serializer] Fix extra attributes when no group specified
  [Intl] Make intl-data tests pass and save language aliases again
  [Console] Fix CommandTester::setInputs() docblock
  [Serializer] readd default argument value
  [VarDumper] fix trailling comma when dumping an exception
  Remove useless docblocks
  [FrameworkBundle] Fix docblocks
  [PropertyInfo] Remove useless docblocks
2017-11-05 17:10:10 +01:00
Nicolas Grekas
b354d6ca84 Merge branch '2.8' into 3.3
* 2.8:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
  [PropertyInfo] Remove useless docblocks
2017-11-05 16:47:03 +01:00
Nicolas Grekas
9bc9474ff0 Merge branch '2.7' into 2.8
* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
2017-11-05 16:25:56 +01:00
Gabriel Ostrolucký
5810983e30 Fix displaying errors for bootstrap 4 2017-11-04 14:34:38 +01:00
Grégoire Pineau
25e0117152 [PhpUnitBridge] Fixed fatal error in CoverageListener when something goes wrong in Test::setUpBeforeClass 2017-11-03 11:03:57 +01:00
Fabien Potencier
5c46e393c7 Merge branch '3.3' into 3.4
* 3.3:
  removed extra whitespace
  Removes \n or space when / are empty
  [HttpFoundation] add Early Hints in Reponse to fix test
  Throwing exception if redis and predis unavailable
2017-10-31 08:19:40 -07:00
Fabien Potencier
30f3b91cad removed extra whitespace 2017-10-31 08:12:41 -07:00
Kirk Madera
0d8edaec79 Removes \n or space when / are empty 2017-10-31 08:11:27 -07:00
Fabien Potencier
2280f844bf fixed tests 2017-10-30 14:07:44 -07:00
Fabien Potencier
dbf544487f fixed CS 2017-10-30 12:08:07 -07:00
Arkadius Stefanski
f84749f745 [Bridge\Twig] fix bootstrap checkbox_row to render properly & remove spaceless 2017-10-30 12:07:24 -07:00
Fabien Potencier
856f21abba bug #24703 [TwigBridge] Bootstrap 4 form theme fixes (vudaltsov)
This PR was squashed before being merged into the 3.4 branch (closes #24703).

Discussion
----------

[TwigBridge] Bootstrap 4 form theme fixes

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

Some fixes for compound forms and their labels.

1. Do not add `.form-control-label` and `.col-form-legend` at the same time. It's enough to have only one of them.
1. Use legends instead of labels for compound fields. I think it makes more sense to have nested `fieldsets` than `labels` without `for` in a compound form. An example of nested fieldsets is given at the bottom of [this page](https://dev.w3.org/html5/spec-preview/the-fieldset-element.html).

Commits
-------

e55c67ad17 [TwigBridge] Bootstrap 4 form theme fixes
2017-10-29 14:03:05 -07:00
Valentin Udaltsov
e55c67ad17 [TwigBridge] Bootstrap 4 form theme fixes 2017-10-29 14:03:02 -07:00
Nicolas Grekas
2443511324 Remove useless docblocks 2017-10-29 10:49:53 +01:00
Fabien Potencier
98dae3edb1 bug #24710 [TwigBridge] Fix template paths in profiler (ro0NL)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBridge] Fix template paths in profiler

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes/no
| Fixed tickets | #24540
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Fixes the profiler being unavailable with non filesystem templates.

![image](https://user-images.githubusercontent.com/1047696/32117680-87866354-bb4f-11e7-9cb9-428ad6751a1e.png)

Commits
-------

c9174dff7c [TwigBridge] Fix template paths in profiler
2017-10-28 15:07:58 -07:00
Nicolas Grekas
c7e59b3a5b Merge branch '3.3' into 3.4
* 3.3:
  Ensure DeprecationErrorHandler::collectDeprecations() is triggered
  [FrameworkBundle] Allow to disable assets via framework:assets xml configuration
  fixed $_ENV/$_SERVER precedence in test framework
  [HttpFoundation] Fix FileBag issue with associative arrays
  [DI] Throw when a service name or an alias contains dynamic values (prevent an infinite loop)
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.
2017-10-28 18:49:05 +02:00
Nicolas Grekas
e7b555e2c9 Merge branch '2.8' into 3.3
* 2.8:
  [HttpFoundation] Fix FileBag issue with associative arrays
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.
2017-10-28 18:47:30 +02:00
Nicolas Grekas
865622e630 Merge branch '2.7' into 2.8
* 2.7:
  [HttpFoundation] Fix FileBag issue with associative arrays
  fix the phpdoc that is not really inherited from response
  Minor docblock cleanup
  Remove redundant sprintf arguments.
2017-10-28 18:44:51 +02:00
Alex Pott
e7da1606f0 Ensure DeprecationErrorHandler::collectDeprecations() is triggered 2017-10-28 18:21:46 +02:00
Arkadius Stefanski
8ac8f9d2a8 [TwigBridge] Re-add Bootstrap 3 Checkbox Layout 2017-10-27 20:50:34 +02:00
Roland Franssen
c9174dff7c [TwigBridge] Fix template paths in profiler 2017-10-27 19:44:44 +02:00
Tobias Schultze
85551141a5 minor #24613 Remove redundant sprintf argument. (Aliance)
This PR was merged into the 2.7 branch.

Discussion
----------

Remove redundant sprintf argument.

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

cc @fabpot @ogizanagi

Commits
-------

c8012f0448 Remove redundant sprintf arguments.
2017-10-26 16:04:37 +02:00
Nicolas Grekas
78426b79d2 Merge branch '3.3' into 3.4
* 3.3:
  Revert "minor #24685 Make it easy for Drupal to use the PHPUnit bridge (alexpott)"
2017-10-25 18:54:45 +02:00
Nicolas Grekas
ea3a9a9f96 Revert "minor #24685 Make it easy for Drupal to use the PHPUnit bridge (alexpott)"
This reverts commit 41509a2dcf, reversing
changes made to 3e3e74c3fa.
2017-10-25 18:54:16 +02:00
Nicolas Grekas
82032814b7 Merge branch '3.3' into 3.4
* 3.3:
  Make it easy for Drupal to use the PHPUnit bridge
2017-10-25 16:41:49 +02:00
Alex Pott
1de6bf87b9 Make it easy for Drupal to use the PHPUnit bridge 2017-10-25 16:41:18 +02:00
Nicolas Grekas
ed8c731177 Merge branch '3.3' into 3.4
* 3.3:
  Fix phpunit bridge
2017-10-25 11:57:07 +02:00
Nicolas Grekas
3e3e74c3fa Fix phpunit bridge 2017-10-25 11:55:09 +02:00
Nicolas Grekas
8d179a3bdd Merge branch '3.3' into 3.4
* 3.3:
  Fix simple-phpunit
2017-10-25 11:25:19 +02:00
Nicolas Grekas
7e6e2f07e2 Fix simple-phpunit 2017-10-25 11:25:11 +02:00
Nicolas Grekas
c98db6ae2e Merge branch '3.3' into 3.4
* 3.3:
  Fix isolated error handling
2017-10-25 10:01:59 +02:00
Alex Pott
b1a22059e7 Fix isolated error handling 2017-10-25 10:00:59 +02:00
Nicolas Grekas
03b01c36e4 Merge branch '3.3' into 3.4
* 3.3:
  Ensure that PHPUnit's error handler is still working in isolated tests
  Fix review points
2017-10-24 19:17:17 +02:00
Nicolas Grekas
e6d949b233 minor #24604 Fix deprecation triggering test deduction (alexpott)
This PR was merged into the 3.3 branch.

Discussion
----------

Fix deprecation triggering test deduction

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->
This PR is just testing some additions https://github.com/symfony/symfony/pull/24597 - I want to see if the travis run is successful.

Commits
-------

5333680 Fix review points
2017-10-24 19:16:44 +02:00
Alex Pott
dc7e5a39fa Ensure that PHPUnit's error handler is still working in isolated tests 2017-10-24 19:15:51 +02:00
Alex Pott
5333680f7d Fix review points 2017-10-24 17:40:01 +01:00
Nicolas Grekas
b7439238c9 Merge branch '3.3' into 3.4
* 3.3:
  fix deprecation triggering test detection
2017-10-24 18:03:34 +02:00
Nicolas Grekas
4365d23e38 bug #24597 [PhpUnitBridge] fix deprecation triggering test detection (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[PhpUnitBridge] fix deprecation triggering test detection

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/24548#issuecomment-336438768, #24568
| License       | MIT
| Doc PR        |

Commits
-------

da617e8 fix deprecation triggering test detection
2017-10-24 17:58:59 +02:00
Nicolas Grekas
fd225b0719 Minor docblock cleanup 2017-10-24 16:20:57 +02:00
Nicolas Grekas
1e1b37753c Merge branch '3.3' into 3.4
* 3.3:
  [DI] minor docblock fixes
2017-10-24 16:12:06 +02:00