-[Symfony][1] is a **PHP framework** for web applications and a set of reusable
+[Symfony][1] is a **PHP framework** for web and console applications and a set of reusable
**PHP components**. Symfony is used by thousands of web applications (including
BlaBlaCar.com and Spotify.com) and most of the [popular PHP projects][2] (including
Drupal and Magento).
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
index 8d41f32658c58..f970041949e5b 100644
--- a/UPGRADE-4.0.md
+++ b/UPGRADE-4.0.md
@@ -26,8 +26,8 @@ file and directory structure of your application:
Then, upgrade the contents of your console script and your front controller:
-* `bin/console`: https://github.com/symfony/recipes/blob/master/symfony/console/3.3/bin/console
-* `public/index.php`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/3.3/public/index.php
+* `bin/console`: https://github.com/symfony/recipes/blob/master/symfony/console/4.4/bin/console
+* `public/index.php`: https://github.com/symfony/recipes/blob/master/symfony/framework-bundle/4.4/public/index.php
Lastly, read the following article to add Symfony Flex to your application and
upgrade the configuration files: https://symfony.com/doc/current/setup/flex.html
diff --git a/composer.json b/composer.json
index 42397d75b851d..9ad5e39ad2ca5 100644
--- a/composer.json
+++ b/composer.json
@@ -103,6 +103,7 @@
"phpdocumentor/reflection-docblock": "^3.0|^4.0"
},
"conflict": {
+ "monolog/monolog": ">=2",
"phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
"phpdocumentor/type-resolver": "<0.3.0",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
diff --git a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
index 7ac1856114d7e..4e025dc194c93 100644
--- a/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
+++ b/src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterMappingsPass.php
@@ -222,10 +222,7 @@ private function getManagerName(ContainerBuilder $container)
}
}
- throw new InvalidArgumentException(sprintf(
- 'Could not find the manager name parameter in the container. Tried the following parameter names: "%s"',
- implode('", "', $this->managerParameters)
- ));
+ throw new InvalidArgumentException(sprintf('Could not find the manager name parameter in the container. Tried the following parameter names: "%s"', implode('", "', $this->managerParameters)));
}
/**
diff --git a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
index c27b0803e200e..c8e21b2f42622 100644
--- a/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
+++ b/src/Symfony/Bridge/Monolog/Handler/ChromePhpHandler.php
@@ -39,7 +39,7 @@ public function onKernelResponse(FilterResponseEvent $event)
}
if (!preg_match(static::USER_AGENT_REGEX, $event->getRequest()->headers->get('User-Agent'))) {
- $this->sendHeaders = false;
+ self::$sendHeaders = false;
$this->headers = [];
return;
@@ -57,7 +57,7 @@ public function onKernelResponse(FilterResponseEvent $event)
*/
protected function sendHeader($header, $content)
{
- if (!$this->sendHeaders) {
+ if (!self::$sendHeaders) {
return;
}
diff --git a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
index 82d72983657ba..28932d9449d6a 100644
--- a/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
+++ b/src/Symfony/Bridge/Twig/Tests/Translation/TwigExtractorTest.php
@@ -16,7 +16,6 @@
use Symfony\Bridge\Twig\Translation\TwigExtractor;
use Symfony\Component\Translation\MessageCatalogue;
use Twig\Environment;
-use Twig\Error\Error;
use Twig\Loader\ArrayLoader;
class TwigExtractorTest extends TestCase
@@ -78,23 +77,15 @@ public function getExtractData()
/**
* @dataProvider resourcesWithSyntaxErrorsProvider
*/
- public function testExtractSyntaxError($resources)
+ public function testExtractSyntaxError($resources, array $messages)
{
- $this->expectException('Twig\Error\Error');
$twig = new Environment($this->getMockBuilder('Twig\Loader\LoaderInterface')->getMock());
$twig->addExtension(new TranslationExtension($this->getMockBuilder('Symfony\Component\Translation\TranslatorInterface')->getMock()));
$extractor = new TwigExtractor($twig);
-
- try {
- $extractor->extract($resources, new MessageCatalogue('en'));
- } catch (Error $e) {
- $this->assertSame(\dirname(__DIR__).strtr('/Fixtures/extractor/syntax_error.twig', '/', \DIRECTORY_SEPARATOR), $e->getFile());
- $this->assertSame(1, $e->getLine());
- $this->assertSame('Unclosed "block".', $e->getMessage());
-
- throw $e;
- }
+ $catalogue = new MessageCatalogue('en');
+ $extractor->extract($resources, $catalogue);
+ $this->assertSame($messages, $catalogue->all());
}
/**
@@ -103,9 +94,9 @@ public function testExtractSyntaxError($resources)
public function resourcesWithSyntaxErrorsProvider()
{
return [
- [__DIR__.'/../Fixtures'],
- [__DIR__.'/../Fixtures/extractor/syntax_error.twig'],
- [new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig')],
+ [__DIR__.'/../Fixtures', ['messages' => ['Hi!' => 'Hi!']]],
+ [__DIR__.'/../Fixtures/extractor/syntax_error.twig', []],
+ [new \SplFileInfo(__DIR__.'/../Fixtures/extractor/syntax_error.twig'), []],
];
}
diff --git a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
index b7c787226656f..107d8cc4bff17 100644
--- a/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+++ b/src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
@@ -12,7 +12,6 @@
namespace Symfony\Bridge\Twig\Translation;
use Symfony\Component\Finder\Finder;
-use Symfony\Component\Finder\SplFileInfo;
use Symfony\Component\Translation\Extractor\AbstractFileExtractor;
use Symfony\Component\Translation\Extractor\ExtractorInterface;
use Symfony\Component\Translation\MessageCatalogue;
@@ -58,13 +57,7 @@ public function extract($resource, MessageCatalogue $catalogue)
try {
$this->extractTemplate(file_get_contents($file->getPathname()), $catalogue);
} catch (Error $e) {
- if ($file instanceof \SplFileInfo) {
- $path = $file->getRealPath() ?: $file->getPathname();
- $name = $file instanceof SplFileInfo ? $file->getRelativePathname() : $path;
- $e->setSourceContext(new Source('', $name, $path));
- }
-
- throw $e;
+ // ignore errors, these should be fixed by using the linter
}
}
}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
index ea5d0c7d0bffa..197db657f0015 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php
@@ -166,7 +166,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
*/
protected function describeCallable($callable, array $options = [])
{
- $this->writeData($this->getCallableData($callable, $options), $options);
+ $this->writeData($this->getCallableData($callable), $options);
}
/**
@@ -321,7 +321,7 @@ private function getEventDispatcherListenersData(EventDispatcherInterface $event
*
* @return array
*/
- private function getCallableData($callable, array $options = [])
+ private function getCallableData($callable)
{
$data = [];
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
index 34de3d6701470..8d419c0edd8f0 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/RememberMeFactory.php
@@ -81,7 +81,11 @@ public function create(ContainerBuilder $container, $id, $config, $userProvider,
throw new \RuntimeException('Each "security.remember_me_aware" tag must have a provider attribute.');
}
- $userProviders[] = new Reference($attribute['provider']);
+ // context listeners don't need a provider
+ if ('none' !== $attribute['provider']) {
+ $userProviders[] = new Reference($attribute['provider']);
+ }
+
$container
->getDefinition($serviceId)
->addMethodCall('setRememberMeServices', [new Reference($rememberMeServicesId)])
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 731ce42d39328..19e9beb1e37e6 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -374,6 +374,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
$listeners[] = new Reference('security.channel_listener');
$contextKey = null;
+ $contextListenerId = null;
// Context serializer listener
if (false === $firewall['stateless']) {
$contextKey = $id;
@@ -390,7 +391,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
}
$this->logoutOnUserChangeByContextKey[$contextKey] = [$id, $logoutOnUserChange];
- $listeners[] = new Reference($this->createContextListener($container, $contextKey, $logoutOnUserChange));
+ $listeners[] = new Reference($contextListenerId = $this->createContextListener($container, $contextKey, $logoutOnUserChange));
$sessionStrategyId = 'security.authentication.session_strategy';
} else {
$this->statelessFirewallKeys[] = $id;
@@ -463,7 +464,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
$configuredEntryPoint = isset($firewall['entry_point']) ? $firewall['entry_point'] : null;
// Authentication listeners
- list($authListeners, $defaultEntryPoint) = $this->createAuthenticationListeners($container, $id, $firewall, $authenticationProviders, $defaultProvider, $providerIds, $configuredEntryPoint);
+ list($authListeners, $defaultEntryPoint) = $this->createAuthenticationListeners($container, $id, $firewall, $authenticationProviders, $defaultProvider, $providerIds, $configuredEntryPoint, $contextListenerId);
$config->replaceArgument(7, $configuredEntryPoint ?: $defaultEntryPoint);
@@ -519,7 +520,7 @@ private function createContextListener($container, $contextKey, $logoutUserOnCha
return $this->contextListeners[$contextKey] = $listenerId;
}
- private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider = null, array $providerIds, $defaultEntryPoint)
+ private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider = null, array $providerIds, $defaultEntryPoint, $contextListenerId = null)
{
$listeners = [];
$hasListeners = false;
@@ -537,6 +538,9 @@ private function createAuthenticationListeners($container, $id, $firewall, &$aut
} elseif ('remember_me' === $key) {
// RememberMeFactory will use the firewall secret when created
$userProvider = null;
+ if ($contextListenerId) {
+ $container->getDefinition($contextListenerId)->addTag('security.remember_me_aware', ['id' => $id, 'provider' => 'none']);
+ }
} else {
$userProvider = $defaultProvider ?: $this->getFirstProvider($id, $key, $providerIds);
}
@@ -585,7 +589,7 @@ private function createEncoders($encoders, ContainerBuilder $container)
{
$encoderMap = [];
foreach ($encoders as $class => $encoder) {
- $encoderMap[$class] = $this->createEncoder($encoder, $container);
+ $encoderMap[$class] = $this->createEncoder($encoder);
}
$container
@@ -594,7 +598,7 @@ private function createEncoders($encoders, ContainerBuilder $container)
;
}
- private function createEncoder($config, ContainerBuilder $container)
+ private function createEncoder($config)
{
// a custom encoder service
if (isset($config['id'])) {
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/ClearRememberMeTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/ClearRememberMeTest.php
new file mode 100644
index 0000000000000..3a1046b0c4a17
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/ClearRememberMeTest.php
@@ -0,0 +1,77 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\SecurityBundle\Tests\Functional;
+
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\User\InMemoryUserProvider;
+use Symfony\Component\Security\Core\User\User;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+
+class ClearRememberMeTest extends AbstractWebTestCase
+{
+ public function testUserChangeClearsCookie()
+ {
+ $client = $this->createClient(['test_case' => 'ClearRememberMe', 'root_config' => 'config.yml']);
+
+ $client->request('POST', '/login', [
+ '_username' => 'johannes',
+ '_password' => 'test',
+ ]);
+
+ $this->assertSame(302, $client->getResponse()->getStatusCode());
+ $cookieJar = $client->getCookieJar();
+ $this->assertNotNull($cookieJar->get('REMEMBERME'));
+
+ $client->request('GET', '/foo');
+ $this->assertSame(200, $client->getResponse()->getStatusCode());
+ $this->assertNull($cookieJar->get('REMEMBERME'));
+ }
+}
+
+class RememberMeFooController
+{
+ public function __invoke(UserInterface $user)
+ {
+ return new Response($user->getUsername());
+ }
+}
+
+class RememberMeUserProvider implements UserProviderInterface
+{
+ private $inner;
+
+ public function __construct(InMemoryUserProvider $inner)
+ {
+ $this->inner = $inner;
+ }
+
+ public function loadUserByUsername($username)
+ {
+ return $this->inner->loadUserByUsername($username);
+ }
+
+ public function refreshUser(UserInterface $user)
+ {
+ $user = $this->inner->refreshUser($user);
+
+ $alterUser = \Closure::bind(function (User $user) { $user->password = 'foo'; }, null, User::class);
+ $alterUser($user);
+
+ return $user;
+ }
+
+ public function supportsClass($class)
+ {
+ return $this->inner->supportsClass($class);
+ }
+}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
index 31f99da2a08f2..722bef0f78628 100644
--- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/SwitchUserTest.php
@@ -25,6 +25,10 @@ public function testSwitchUser($originalUser, $targetUser, $expectedUser, $expec
$client->request('GET', '/profile?_switch_user='.$targetUser);
+ if ('user_does_not_exist' === $targetUser && 403 === $expectedStatus && 500 === $client->getResponse()->getStatusCode()) {
+ $expectedStatus = 500; // 403 is generated by Symfony >= 4.3.8
+ }
+
$this->assertEquals($expectedStatus, $client->getResponse()->getStatusCode());
$this->assertEquals($expectedUser, $client->getProfile()->getCollector('security')->getUser());
}
@@ -68,7 +72,7 @@ public function getTestParameters()
return [
'unauthorized_user_cannot_switch' => ['user_cannot_switch_1', 'user_cannot_switch_1', 'user_cannot_switch_1', 403],
'authorized_user_can_switch' => ['user_can_switch', 'user_cannot_switch_1', 'user_cannot_switch_1', 200],
- 'authorized_user_cannot_switch_to_non_existent' => ['user_can_switch', 'user_does_not_exist', 'user_can_switch', 500],
+ 'authorized_user_cannot_switch_to_non_existent' => ['user_can_switch', 'user_does_not_exist', 'user_can_switch', 403],
'authorized_user_can_switch_to_himself' => ['user_can_switch', 'user_can_switch', 'user_can_switch', 200],
];
}
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/bundles.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/bundles.php
new file mode 100644
index 0000000000000..9a26fb163a77d
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/bundles.php
@@ -0,0 +1,18 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
+use Symfony\Bundle\SecurityBundle\SecurityBundle;
+
+return [
+ new FrameworkBundle(),
+ new SecurityBundle(),
+];
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/config.yml
new file mode 100644
index 0000000000000..e5cefd37df76d
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/config.yml
@@ -0,0 +1,32 @@
+imports:
+ - { resource: ./../config/framework.yml }
+
+security:
+ encoders:
+ Symfony\Component\Security\Core\User\User: plaintext
+
+ providers:
+ in_memory:
+ memory:
+ users:
+ johannes: { password: test, roles: [ROLE_USER] }
+
+ firewalls:
+ default:
+ form_login:
+ check_path: login
+ remember_me: true
+ remember_me:
+ always_remember_me: true
+ secret: key
+ anonymous: ~
+ logout_on_user_change: true
+
+ access_control:
+ - { path: ^/foo, roles: ROLE_USER }
+
+services:
+ Symfony\Bundle\SecurityBundle\Tests\Functional\RememberMeUserProvider:
+ public: true
+ decorates: security.user.provider.concrete.in_memory
+ arguments: ['@Symfony\Bundle\SecurityBundle\Tests\Functional\RememberMeUserProvider.inner']
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/routing.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/routing.yml
new file mode 100644
index 0000000000000..08975bdcb3832
--- /dev/null
+++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/ClearRememberMe/routing.yml
@@ -0,0 +1,7 @@
+login:
+ path: /login
+
+foo:
+ path: /foo
+ defaults:
+ _controller: Symfony\Bundle\SecurityBundle\Tests\Functional\RememberMeFooController
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
index 1f0e56e6eedde..1a8057b6fbd08 100644
--- a/src/Symfony/Bundle/SecurityBundle/composer.json
+++ b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -19,7 +19,7 @@
"php": "^5.5.9|>=7.0.8",
"ext-xml": "*",
"symfony/config": "~3.4|~4.0",
- "symfony/security": "~3.4.15|~4.0.15|^4.1.4",
+ "symfony/security": "~3.4.36|~4.3.9|^4.4.1",
"symfony/dependency-injection": "^3.4.3|^4.0.3",
"symfony/http-kernel": "~3.4|~4.0",
"symfony/polyfill-php70": "~1.0"
diff --git a/src/Symfony/Bundle/WebProfilerBundle/composer.json b/src/Symfony/Bundle/WebProfilerBundle/composer.json
index 241a5e350b414..c82ef0fe0093d 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/composer.json
+++ b/src/Symfony/Bundle/WebProfilerBundle/composer.json
@@ -20,7 +20,7 @@
"symfony/http-kernel": "~3.4.25|^4.2.6",
"symfony/polyfill-php70": "~1.0",
"symfony/routing": "~2.8|~3.0|~4.0",
- "symfony/twig-bridge": "~2.8|~3.0|~4.0",
+ "symfony/twig-bundle": "~2.8|~3.0|~4.0",
"symfony/var-dumper": "~3.3|~4.0",
"twig/twig": "~1.34|~2.4"
},
diff --git a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
index 73c51cc8e09e4..5c9ce910ddf54 100644
--- a/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
+++ b/src/Symfony/Bundle/WebServerBundle/Command/ServerLogCommand.php
@@ -114,7 +114,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
continue;
}
- $this->displayLog($input, $output, $clientId, $record);
+ $this->displayLog($output, $clientId, $record);
}
}
@@ -141,7 +141,7 @@ private function getLogs($socket)
}
}
- private function displayLog(InputInterface $input, OutputInterface $output, $clientId, array $record)
+ private function displayLog(OutputInterface $output, $clientId, array $record)
{
if ($this->handler->isHandling($record)) {
if (isset($record['log_id'])) {
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
index 76673e0a03c7b..e03d37b94de41 100644
--- a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
+++ b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -271,7 +271,7 @@ private function generateItems(array $keys)
public static function throwOnRequiredClass($class)
{
$e = new \ReflectionException("Class $class does not exist");
- $trace = $e->getTrace();
+ $trace = debug_backtrace();
$autoloadFrame = [
'function' => 'spl_autoload_call',
'args' => [$class],
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
index 395a9b8051b4f..c4b12b64bb37b 100644
--- a/src/Symfony/Component/Cache/Traits/RedisTrait.php
+++ b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -179,7 +179,13 @@ protected function doFetch(array $ids)
}
});
} else {
- $values = array_combine($ids, $this->redis->mget($ids));
+ $values = $this->redis->mget($ids);
+
+ if (!\is_array($values) || \count($values) !== \count($ids)) {
+ return [];
+ }
+
+ $values = array_combine($ids, $values);
}
foreach ($values as $id => $v) {
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
index 1ba8e76248322..4e0d0d834e6ab 100644
--- a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
+++ b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -72,7 +72,7 @@ public function isFresh($timestamp)
spl_autoload_register(__CLASS__.'::throwOnRequiredClass');
}
$autoloadedClass = self::$autoloadedClass;
- self::$autoloadedClass = $this->resource;
+ self::$autoloadedClass = ltrim($this->resource, '\\');
try {
$exists = class_exists($this->resource) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
@@ -161,7 +161,7 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
throw $e;
}
- $trace = $e->getTrace();
+ $trace = debug_backtrace();
$autoloadFrame = [
'function' => 'spl_autoload_call',
'args' => [$class],
@@ -191,15 +191,17 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
}
$props = [
- 'file' => $trace[$i]['file'],
- 'line' => $trace[$i]['line'],
+ 'file' => isset($trace[$i]['file']) ? $trace[$i]['file'] : null,
+ 'line' => isset($trace[$i]['line']) ? $trace[$i]['line'] : null,
'trace' => \array_slice($trace, 1 + $i),
];
foreach ($props as $p => $v) {
- $r = new \ReflectionProperty('Exception', $p);
- $r->setAccessible(true);
- $r->setValue($e, $v);
+ if (null !== $v) {
+ $r = new \ReflectionProperty('Exception', $p);
+ $r->setAccessible(true);
+ $r->setValue($e, $v);
+ }
}
}
diff --git a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
index d5e6b829cfeca..4c8f89cd3f204 100644
--- a/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
+++ b/src/Symfony/Component/Config/Resource/ReflectionClassResource.php
@@ -151,12 +151,56 @@ private function generateSignature(\ReflectionClass $class)
}
} else {
foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) as $m) {
- yield preg_replace('/^ @@.*/m', '', $m);
-
$defaults = [];
+ $parametersWithUndefinedConstants = [];
foreach ($m->getParameters() as $p) {
- $defaults[$p->name] = $p->isDefaultValueAvailable() ? $p->getDefaultValue() : null;
+ if (!$p->isDefaultValueAvailable()) {
+ $defaults[$p->name] = null;
+
+ continue;
+ }
+
+ if (!$p->isDefaultValueConstant() || \defined($p->getDefaultValueConstantName())) {
+ $defaults[$p->name] = $p->getDefaultValue();
+
+ continue;
+ }
+
+ $defaults[$p->name] = $p->getDefaultValueConstantName();
+ $parametersWithUndefinedConstants[$p->name] = true;
+ }
+
+ if (!$parametersWithUndefinedConstants) {
+ yield preg_replace('/^ @@.*/m', '', $m);
+ } else {
+ $stack = [
+ $m->getDocComment(),
+ $m->getName(),
+ $m->isAbstract(),
+ $m->isFinal(),
+ $m->isStatic(),
+ $m->isPublic(),
+ $m->isPrivate(),
+ $m->isProtected(),
+ $m->returnsReference(),
+ \PHP_VERSION_ID >= 70000 && $m->hasReturnType() ? (\PHP_VERSION_ID >= 70100 ? $m->getReturnType()->getName() : (string) $m->getReturnType()) : '',
+ ];
+
+ foreach ($m->getParameters() as $p) {
+ if (!isset($parametersWithUndefinedConstants[$p->name])) {
+ $stack[] = (string) $p;
+ } else {
+ $stack[] = $p->isOptional();
+ $stack[] = \PHP_VERSION_ID >= 70000 && $p->hasType() ? (\PHP_VERSION_ID >= 70100 ? $p->getType()->getName() : (string) $p->getType()) : '';
+ $stack[] = $p->isPassedByReference();
+ $stack[] = \PHP_VERSION_ID >= 50600 ? $p->isVariadic() : '';
+ $stack[] = $p->getName();
+ }
+ }
+
+ yield implode(',', $stack);
}
+
yield print_r($defaults, true);
}
}
diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
index 76cad1433bb20..74ed6b3edc2a9 100644
--- a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
+++ b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php
@@ -63,8 +63,12 @@ public function testIsFreshForDeletedResources()
/**
* @dataProvider provideHashedSignature
*/
- public function testHashedSignature($changeExpected, $changedLine, $changedCode)
+ public function testHashedSignature($changeExpected, $changedLine, $changedCode, $setContext = null)
{
+ if ($setContext) {
+ $setContext();
+ }
+
$code = <<<'EOPHP'
/* 0*/
/* 1*/ class %s extends ErrorException
@@ -82,7 +86,9 @@ public function testHashedSignature($changeExpected, $changedLine, $changedCode)
/*13*/ protected function prot($a = []) {}
/*14*/
/*15*/ private function priv() {}
-/*16*/ }
+/*16*/
+/*17*/ public function ccc($bar = A_CONSTANT_THAT_FOR_SURE_WILL_NEVER_BE_DEFINED_CCCCCC) {}
+/*18*/ }
EOPHP;
static $expectedSignature, $generateSignature;
@@ -97,7 +103,9 @@ public function testHashedSignature($changeExpected, $changedLine, $changedCode)
}
$code = explode("\n", $code);
- $code[$changedLine] = $changedCode;
+ if (null !== $changedCode) {
+ $code[$changedLine] = $changedCode;
+ }
eval(sprintf(implode("\n", $code), $class = 'Foo'.str_replace('.', '_', uniqid('', true))));
$signature = implode("\n", iterator_to_array($generateSignature(new \ReflectionClass($class))));
@@ -145,6 +153,10 @@ public function provideHashedSignature()
yield [0, 7, 'protected int $prot;'];
yield [0, 9, 'private string $priv;'];
}
+
+ yield [1, 17, 'public function ccc($bar = 187) {}'];
+ yield [1, 17, 'public function ccc($bar = ANOTHER_ONE_THAT_WILL_NEVER_BE_DEFINED_CCCCCCCCC) {}'];
+ yield [1, 17, null, static function () { \define('A_CONSTANT_THAT_FOR_SURE_WILL_NEVER_BE_DEFINED_CCCCCC', 'foo'); }];
}
public function testEventSubscriber()
diff --git a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
index 442a569711c07..7e214712da6f3 100644
--- a/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
+++ b/src/Symfony/Component/Console/Descriptor/ApplicationDescription.php
@@ -129,23 +129,29 @@ private function sortCommands(array $commands)
{
$namespacedCommands = [];
$globalCommands = [];
+ $sortedCommands = [];
foreach ($commands as $name => $command) {
$key = $this->application->extractNamespace($name, 1);
- if (!$key) {
- $globalCommands['_global'][$name] = $command;
+ if (\in_array($key, ['', self::GLOBAL_NAMESPACE], true)) {
+ $globalCommands[$name] = $command;
} else {
$namespacedCommands[$key][$name] = $command;
}
}
- ksort($namespacedCommands);
- $namespacedCommands = array_merge($globalCommands, $namespacedCommands);
- foreach ($namespacedCommands as &$commandsSet) {
- ksort($commandsSet);
+ if ($globalCommands) {
+ ksort($globalCommands);
+ $sortedCommands[self::GLOBAL_NAMESPACE] = $globalCommands;
}
- // unset reference to keep scope clear
- unset($commandsSet);
- return $namespacedCommands;
+ if ($namespacedCommands) {
+ ksort($namespacedCommands);
+ foreach ($namespacedCommands as $key => $commandsSet) {
+ ksort($commandsSet);
+ $sortedCommands[$key] = $commandsSet;
+ }
+ }
+
+ return $sortedCommands;
}
}
diff --git a/src/Symfony/Component/Console/Helper/QuestionHelper.php b/src/Symfony/Component/Console/Helper/QuestionHelper.php
index af4d0b9cca459..1f93c06451630 100644
--- a/src/Symfony/Component/Console/Helper/QuestionHelper.php
+++ b/src/Symfony/Component/Console/Helper/QuestionHelper.php
@@ -264,7 +264,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
} elseif ("\177" === $c) { // Backspace Character
if (0 === $numMatches && 0 !== $i) {
--$i;
- $fullChoice = substr($fullChoice, 0, -1);
+ $fullChoice = self::substr($fullChoice, 0, $i);
// Move cursor backwards
$output->write("\033[1D");
}
@@ -278,7 +278,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
}
// Pop the last character off the end of our string
- $ret = substr($ret, 0, $i);
+ $ret = self::substr($ret, 0, $i);
} elseif ("\033" === $c) {
// Did we read an escape sequence?
$c .= fread($inputStream, 2);
@@ -304,7 +304,7 @@ private function autocomplete(OutputInterface $output, Question $question, $inpu
$remainingCharacters = substr($ret, \strlen(trim($this->mostRecentlyEnteredValue($fullChoice))));
$output->write($remainingCharacters);
$fullChoice .= $remainingCharacters;
- $i = \strlen($fullChoice);
+ $i = self::strlen($fullChoice);
}
if ("\n" === $c) {
diff --git a/src/Symfony/Component/Console/Input/ArrayInput.php b/src/Symfony/Component/Console/Input/ArrayInput.php
index a04b6b68ea0c8..b2ebc7c2258e2 100644
--- a/src/Symfony/Component/Console/Input/ArrayInput.php
+++ b/src/Symfony/Component/Console/Input/ArrayInput.php
@@ -39,8 +39,8 @@ public function __construct(array $parameters, InputDefinition $definition = nul
*/
public function getFirstArgument()
{
- foreach ($this->parameters as $key => $value) {
- if ($key && '-' === $key[0]) {
+ foreach ($this->parameters as $param => $value) {
+ if ($param && \is_string($param) && '-' === $param[0]) {
continue;
}
@@ -107,7 +107,7 @@ public function __toString()
{
$params = [];
foreach ($this->parameters as $param => $val) {
- if ($param && '-' === $param[0]) {
+ if ($param && \is_string($param) && '-' === $param[0]) {
if (\is_array($val)) {
foreach ($val as $v) {
$params[] = $param.('' != $v ? '='.$this->escapeToken($v) : '');
diff --git a/src/Symfony/Component/Console/Tests/Descriptor/ApplicationDescriptionTest.php b/src/Symfony/Component/Console/Tests/Descriptor/ApplicationDescriptionTest.php
new file mode 100644
index 0000000000000..33d5c3840f3e3
--- /dev/null
+++ b/src/Symfony/Component/Console/Tests/Descriptor/ApplicationDescriptionTest.php
@@ -0,0 +1,53 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Console\Tests\Descriptor;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Descriptor\ApplicationDescription;
+
+final class ApplicationDescriptionTest extends TestCase
+{
+ /**
+ * @dataProvider getNamespacesProvider
+ */
+ public function testGetNamespaces(array $expected, array $names)
+ {
+ $application = new TestApplication();
+ foreach ($names as $name) {
+ $application->add(new Command($name));
+ }
+
+ $this->assertSame($expected, array_keys((new ApplicationDescription($application))->getNamespaces()));
+ }
+
+ public function getNamespacesProvider()
+ {
+ return [
+ [['_global'], ['foobar']],
+ [['a', 'b'], ['b:foo', 'a:foo', 'b:bar']],
+ [['_global', 'b', 'z', 22, 33], ['z:foo', '1', '33:foo', 'b:foo', '22:foo:bar']],
+ ];
+ }
+}
+
+final class TestApplication extends Application
+{
+ /**
+ * {@inheritdoc}
+ */
+ protected function getDefaultCommands()
+ {
+ return [];
+ }
+}
diff --git a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
index 02cc6ce7e0249..d2afee42ffa26 100644
--- a/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
+++ b/src/Symfony/Component/Console/Tests/Helper/QuestionHelperTest.php
@@ -175,19 +175,20 @@ public function testAskWithAutocomplete()
// AcmNote: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: