diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.3' into 3.4

Browse Source 
* 3.3:
  [WebProfilerBundle] add missing tests
  Fix dump panel hidden when closing a dump
  FormInterface::getPropertyPath(): PropertyPathInterface|null
  [FrameworkBundle][Routing] Remove unused logger argument
This commit is contained in:
Nicolas Grekas 2017-11-05 17:59:57 +01:00
commit 31e64bf7c5
10 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
View File

@ -59,7 +59,6 @@
</service>
<service id="router.default" class="Symfony\Bundle\FrameworkBundle\Routing\Router">
<tag name="monolog.logger" channel="router" />
<argument type="service" id="service_container" />
<argument>%router.resource%</argument>
<argument type="collection">
@ -75,7 +74,6 @@
<argument key="matcher_cache_class">%router.options.matcher.cache_class%</argument>
</argument>
<argument type="service" id="router.request_context" on-invalid="ignore" />
<argument type="service" id="logger" on-invalid="ignore" />
<call method="setConfigCacheFactory">
<argument type="service" id="config_cache_factory" />
</call>

10
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
View File

@ -98,6 +98,16 @@
Sfjs.toggleClass(this.parentNode, 'hover');
});
var dumpInfo = document.querySelector('.sf-toolbar-block-dump .sf-toolbar-info');
if (null !== dumpInfo) {
Sfjs.addEventListener(dumpInfo, 'sfbeforedumpcollapse', function () {
dumpInfo.style.minHeight = dumpInfo.getBoundingClientRect().height+'px';
});
Sfjs.addEventListener(dumpInfo, 'mouseleave', function () {
dumpInfo.style.minHeight = '';
});
}
},
function(xhr) {
if (xhr.status !== 0) {

17
src/Symfony/Bundle/WebProfilerBundle/Tests/EventListener/WebDebugToolbarListenerTest.php
View File

@ -84,12 +84,29 @@ class WebDebugToolbarListenerTest extends TestCase
$this->assertEquals("<html><head></head><body>\nWDT\n</body></html>", $response->getContent());
}
/**
* @depends testToolbarIsInjected
*/
public function testToolbarIsNotInjectedOnNonHtmlContentType()
{
$response = new Response('<html><head></head><body></body></html>');
$response->headers->set('X-Debug-Token', 'xxxxxxxx');
$response->headers->set('Content-Type', 'text/xml');
$event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(), HttpKernelInterface::MASTER_REQUEST, $response);
$listener = new WebDebugToolbarListener($this->getTwigMock());
$listener->onKernelResponse($event);
$this->assertEquals('<html><head></head><body></body></html>', $response->getContent());
}
/**
* @depends testToolbarIsInjected
*/
public function testToolbarIsNotInjectedOnContentDispositionAttachment()
{
$response = new Response('<html><head></head><body></body></html>');
$response->headers->set('X-Debug-Token', 'xxxxxxxx');
$response->headers->set('Content-Disposition', 'attachment; filename=test.html');
$event = new FilterResponseEvent($this->getKernelMock(), $this->getRequestMock(false, 'html'), HttpKernelInterface::MASTER_REQUEST, $response);

2
src/Symfony/Component/Form/FormInterface.php
View File

@ -171,7 +171,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
/**
* Returns the property path that the form is mapped to.
*
* @return \Symfony\Component\PropertyAccess\PropertyPathInterface The property path
* @return \Symfony\Component\PropertyAccess\PropertyPathInterface|null The property path
*/
public function getPropertyPath();

4
src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt
View File

@ -16,8 +16,8 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain
Allowed values - %s
---------------- --------------------%s
Normalizer Closure { %s
parameters: 2, %s
file: "%s%eExtension%eCore%eType%eChoiceType.php",
parameters: 2 %s
file: "%s%eExtension%eCore%eType%eChoiceType.php"
line: "%s to %s" %s
} %s
---------------- --------------------%s

8
src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt
View File

@ -9,13 +9,13 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data)
%s
Closure(s): [ %s
Closure { %s
parameters: 1, %s
file: "%s%eExtension%eCore%eType%eFormType.php",
parameters: 1 %s
file: "%s%eExtension%eCore%eType%eFormType.php"
line: "%s to %s" %s
}, %s
Closure { %s
parameters: 2, %s
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",
parameters: 2 %s
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
line: "%s to %s" %s
} %s
] %s

4
src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt
View File

@ -17,8 +17,8 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo)
] %s
---------------- --------------------%s
Normalizer Closure { %s
parameters: 2, %s
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php",
parameters: 2 %s
file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php"
line: "%s to %s" %s
} %s
---------------- --------------------%s

2
src/Symfony/Component/Form/composer.json
View File

@ -32,7 +32,7 @@
"symfony/http-kernel": "^3.3.5|~4.0",
"symfony/security-csrf": "~2.8|~3.0|~4.0",
"symfony/translation": "~2.8|~3.0|~4.0",
"symfony/var-dumper": "~3.3|~4.0",
"symfony/var-dumper": "^3.3.11|~4.0",
"symfony/console": "~3.4|~4.0"
},
"conflict": {

7
src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
View File

@ -165,6 +165,13 @@ function toggle(a, recursive) {
return false;
}
if (doc.createEvent && s.dispatchEvent) {
var event = doc.createEvent('Event');
event.initEvent('sf-dump-expanded' === newClass ? 'sfbeforedumpexpand' : 'sfbeforedumpcollapse', true, false);
s.dispatchEvent(event);
}
a.lastChild.innerHTML = arrow;
s.className = s.className.replace(/\bsf-dump-(compact|expanded)\b/, newClass);

8
src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
View File

@ -147,10 +147,10 @@ RuntimeException {
#file: "%ACliDumperTest.php"
#line: %d
trace: {
%ACliDumperTest.php:%d: {
:
: $ex = new \RuntimeException('foo');
:
%ACliDumperTest.php:%d {
›
› $ex = new \RuntimeException('foo');
›
}
%A
}