Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 4973a5e

Browse filesBrowse files
committed
Merge branch '3.4' into 4.1
* 3.4: Fix: Adjust DocBlock \"ParserTest->getParserTestData()\" -> only some more tests [Lock] Pedantic improvements for lock [EventDispatcher] Fixed phpdoc on interface update year in license files [Console] Fix help text for single command applications Fix random test failure on lock improve error message when using test client without the BrowserKit component [Event Dispatcher] fixed 29703: TraceableEventDispatcher reset now sets callStack to null with test to dispatch after reset. Fixed minor typos Fix: Method can also return null [Stopwatch] Fixed phpdoc for category name
2 parents 9d67539 + 05efd12 commit 4973a5e
Copy full SHA for 4973a5e

File tree

Expand file treeCollapse file tree

77 files changed

+162
-95
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

77 files changed

+162
-95
lines changed

‎LICENSE

Copy file name to clipboardExpand all lines: LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bridge/Doctrine/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bridge/Doctrine/RegistryInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/RegistryInterface.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function getEntityManagers();
5252
* it makes sense to get a new one to replace the closed one.
5353
*
5454
* Be warned that you will get a brand new entity manager as
55-
* the existing one is not useable anymore. This means that any
55+
* the existing one is not usable anymore. This means that any
5656
* other object with a dependency on this entity manager will
5757
* hold an obsolete reference. You can inject the registry instead
5858
* to avoid this problem.

‎src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/Tests/DependencyInjection/DoctrineExtensionTest.php
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function testFixManagersAutoMappingsWithTwoAutomappings()
6464
);
6565

6666
$bundles = array(
67-
'FristBundle' => 'My\FristBundle',
67+
'FirstBundle' => 'My\FirstBundle',
6868
'SecondBundle' => 'My\SecondBundle',
6969
);
7070

@@ -98,7 +98,7 @@ public function getAutomappingData()
9898
array(),
9999
array(
100100
'mappings' => array(
101-
'FristBundle' => array(
101+
'FirstBundle' => array(
102102
'mapping' => true,
103103
'is_bundle' => true,
104104
),
@@ -132,7 +132,7 @@ public function getAutomappingData()
132132
),
133133
array(
134134
'mappings' => array(
135-
'FristBundle' => array(
135+
'FirstBundle' => array(
136136
'mapping' => true,
137137
'is_bundle' => true,
138138
),
@@ -153,7 +153,7 @@ public function testFixManagersAutoMappings(array $originalEm1, array $originalE
153153
);
154154

155155
$bundles = array(
156-
'FristBundle' => 'My\FristBundle',
156+
'FirstBundle' => 'My\FirstBundle',
157157
'SecondBundle' => 'My\SecondBundle',
158158
);
159159

‎src/Symfony/Bridge/Monolog/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Monolog/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bridge/PhpUnit/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2018 Fabien Potencier
1+
Copyright (c) 2014-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bridge/ProxyManager/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/ProxyManager/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bridge/Twig/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bundle/DebugBundle/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DebugBundle/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2014-2018 Fabien Potencier
1+
Copyright (c) 2014-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
2020
use Symfony\Bundle\FrameworkBundle\Routing\AnnotatedRouteControllerLoader;
2121
use Symfony\Bundle\FullStack;
22+
use Symfony\Component\BrowserKit\Client;
2223
use Symfony\Component\Cache\Adapter\AbstractAdapter;
2324
use Symfony\Component\Cache\Adapter\AdapterInterface;
2425
use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -190,6 +191,10 @@ public function load(array $configs, ContainerBuilder $container)
190191

191192
if (!empty($config['test'])) {
192193
$loader->load('test.xml');
194+
195+
if (!class_exists(Client::class)) {
196+
$container->removeDefinition('test.client');
197+
}
193198
}
194199

195200
if ($this->isConfigEnabled($container, $config['session'])) {

‎src/Symfony/Bundle/FrameworkBundle/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bundle\FrameworkBundle\Test;
1313

1414
use Symfony\Bundle\FrameworkBundle\Client;
15+
use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException;
1516

1617
/**
1718
* WebTestCase is the base class for functional tests.
@@ -32,7 +33,12 @@ protected static function createClient(array $options = array(), array $server =
3233
{
3334
$kernel = static::bootKernel($options);
3435

35-
$client = $kernel->getContainer()->get('test.client');
36+
try {
37+
$client = $kernel->getContainer()->get('test.client');
38+
} catch (ServiceNotFoundException $e) {
39+
throw new \LogicException('You cannot create the client used in functional tests if the BrowserKit component is not available. Try running "composer require symfony/browser-kit".');
40+
}
41+
3642
$client->setServerParameters($server);
3743

3844
return $client;

‎src/Symfony/Bundle/SecurityBundle/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SecurityBundle/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bundle/TwigBundle/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bundle/WebProfilerBundle/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebProfilerBundle/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Bundle/WebServerBundle/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/WebServerBundle/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Asset/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Asset/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/BrowserKit/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/BrowserKit/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Cache/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Cache/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2018 Fabien Potencier
1+
Copyright (c) 2016-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Config/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Config/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Console/Application.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Application.php
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class Application
7575
private $dispatcher;
7676
private $terminal;
7777
private $defaultCommand;
78-
private $singleCommand;
78+
private $singleCommand = false;
7979
private $initialized;
8080

8181
/**
@@ -1090,6 +1090,14 @@ public function setDefaultCommand($commandName, $isSingleCommand = false)
10901090
return $this;
10911091
}
10921092

1093+
/**
1094+
* @internal
1095+
*/
1096+
public function isSingleCommand()
1097+
{
1098+
return $this->singleCommand;
1099+
}
1100+
10931101
private function splitStringByWidth($string, $width)
10941102
{
10951103
// str_split is not suitable for multi-byte characters, we should use preg_split to get char array properly.

‎src/Symfony/Component/Console/Command/Command.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Command/Command.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,14 +525,15 @@ public function getHelp()
525525
public function getProcessedHelp()
526526
{
527527
$name = $this->name;
528+
$isSingleCommand = $this->application && $this->application->isSingleCommand();
528529

529530
$placeholders = array(
530531
'%command.name%',
531532
'%command.full_name%',
532533
);
533534
$replacements = array(
534535
$name,
535-
$_SERVER['PHP_SELF'].' '.$name,
536+
$isSingleCommand ? $_SERVER['PHP_SELF'] : $_SERVER['PHP_SELF'].' '.$name,
536537
);
537538

538539
return str_replace($placeholders, $replacements, $this->getHelp() ?: $this->getDescription());

‎src/Symfony/Component/Console/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Console/Tests/Command/CommandTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Console/Tests/Command/CommandTest.php
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,14 @@ public function testGetProcessedHelp()
166166
$command = new \TestCommand();
167167
$command->setHelp('');
168168
$this->assertContains('description', $command->getProcessedHelp(), '->getProcessedHelp() falls back to the description');
169+
170+
$command = new \TestCommand();
171+
$command->setHelp('The %command.name% command does... Example: php %command.full_name%.');
172+
$application = new Application();
173+
$application->add($command);
174+
$application->setDefaultCommand('namespace:name', true);
175+
$this->assertContains('The namespace:name command does...', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.name% correctly in single command applications');
176+
$this->assertNotContains('%command.full_name%', $command->getProcessedHelp(), '->getProcessedHelp() replaces %command.full_name% in single command applications');
169177
}
170178

171179
public function testGetSetAliases()

‎src/Symfony/Component/CssSelector/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/CssSelector/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/CssSelector/Tests/Parser/ParserTest.php
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ public function getParserTestData()
120120
array('a[name]', array('Attribute[Element[a][name]]')),
121121
array("a[ name\t]", array('Attribute[Element[a][name]]')),
122122
array('a [name]', array('CombinedSelector[Element[a] <followed> Attribute[Element[*][name]]]')),
123+
array('[name="foo"]', array("Attribute[Element[*][name = 'foo']]")),
124+
array("[name='foo[1]']", array("Attribute[Element[*][name = 'foo[1]']]")),
125+
array("[name='foo[0][bar]']", array("Attribute[Element[*][name = 'foo[0][bar]']]")),
123126
array('a[rel="include"]', array("Attribute[Element[a][rel = 'include']]")),
124127
array('a[rel = include]', array("Attribute[Element[a][rel = 'include']]")),
125128
array("a[hreflang |= 'en']", array("Attribute[Element[a][hreflang |= 'en']]")),

‎src/Symfony/Component/Debug/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Debug/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/DependencyInjection/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
556556
* @param string $id A service identifier
557557
* @param string $file A parsed file
558558
*
559-
* @throws InvalidArgumentException When errors are occuried
559+
* @throws InvalidArgumentException When errors occur
560560
*
561561
* @return string|array A parsed callable
562562
*/

‎src/Symfony/Component/DomCrawler/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/DomCrawler/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Dotenv/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Dotenv/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2016-2018 Fabien Potencier
1+
Copyright (c) 2016-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function getOrphanedEvents(): array
228228

229229
public function reset()
230230
{
231-
$this->callStack = array();
231+
$this->callStack = null;
232232
$this->orphanedEvents = array();
233233
}
234234

‎src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ interface EventDispatcherInterface
2323
/**
2424
* Dispatches an event to all registered listeners.
2525
*
26-
* @param string $eventName The name of the event to dispatch. The name of
27-
* the event is the name of the method that is
28-
* invoked on listeners.
29-
* @param Event $event The event to pass to the event handlers/listeners
30-
* If not supplied, an empty Event instance is created
26+
* @param string $eventName The name of the event to dispatch. The name of
27+
* the event is the name of the method that is
28+
* invoked on listeners.
29+
* @param Event|null $event The event to pass to the event handlers/listeners
30+
* If not supplied, an empty Event instance is created
3131
*
3232
* @return Event
3333
*/
@@ -64,7 +64,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber);
6464
/**
6565
* Gets the listeners of a specific event or all listeners sorted by descending priority.
6666
*
67-
* @param string $eventName The name of the event
67+
* @param string|null $eventName The name of the event
6868
*
6969
* @return array The event listeners for the specified event, or all event listeners by event name
7070
*/
@@ -85,7 +85,7 @@ public function getListenerPriority($eventName, $listener);
8585
/**
8686
* Checks whether an event has any registered listeners.
8787
*
88-
* @param string $eventName The name of the event
88+
* @param string|null $eventName The name of the event
8989
*
9090
* @return bool true if the specified event has any listeners, false otherwise
9191
*/

‎src/Symfony/Component/EventDispatcher/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/EventDispatcher/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+12Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,18 @@ public function testClearCalledListeners()
139139
$this->assertEquals(array(array('event' => 'foo', 'pretty' => 'closure', 'priority' => 5)), $listeners);
140140
}
141141

142+
public function testDispatchAfterReset()
143+
{
144+
$tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
145+
$tdispatcher->addListener('foo', function () {}, 5);
146+
147+
$tdispatcher->reset();
148+
$tdispatcher->dispatch('foo');
149+
150+
$listeners = $tdispatcher->getCalledListeners();
151+
$this->assertArrayHasKey('stub', $listeners[0]);
152+
}
153+
142154
public function testGetCalledListenersNested()
143155
{
144156
$tdispatcher = null;

‎src/Symfony/Component/ExpressionLanguage/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/ExpressionLanguage/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Filesystem/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Filesystem/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Finder/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Finder/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/Form/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/Form/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

‎src/Symfony/Component/HttpFoundation/LICENSE

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/LICENSE
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2018 Fabien Potencier
1+
Copyright (c) 2004-2019 Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.