', $response);
-
- $handler = new ExceptionHandler(true);
-
- ob_start();
- $handler->sendPhpResponse(new \RuntimeException('Foo'));
- $response = ob_get_clean();
-
- $this->assertStringContainsString('
', $response);
-
- // taken from https://www.owasp.org/index.php/Cross-site_Scripting_(XSS)
- $htmlWithXss = '
click me! )
';
- ob_start();
- $handler->sendPhpResponse(new \RuntimeException($htmlWithXss));
- $response = ob_get_clean();
-
- $this->assertStringContainsString(sprintf('
%s
', htmlspecialchars($htmlWithXss, ENT_COMPAT | ENT_SUBSTITUTE, 'UTF-8')), $response);
- }
-
- public function testStatusCode()
- {
- $handler = new ExceptionHandler(false, 'iso8859-1');
-
- ob_start();
- $handler->sendPhpResponse(new NotFoundHttpException('Foo'));
- $response = ob_get_clean();
-
- $this->assertStringContainsString('Sorry, the page you are looking for could not be found.', $response);
-
- $expectedHeaders = [
- ['HTTP/1.0 404', true, null],
- ['Content-Type: text/html; charset=iso8859-1', true, null],
- ];
-
- $this->assertSame($expectedHeaders, testHeader());
- }
-
- public function testHeaders()
- {
- $handler = new ExceptionHandler(false, 'iso8859-1');
-
- ob_start();
- $handler->sendPhpResponse(new MethodNotAllowedHttpException(['POST']));
- ob_get_clean();
-
- $expectedHeaders = [
- ['HTTP/1.0 405', true, null],
- ['Allow: POST', false, null],
- ['Content-Type: text/html; charset=iso8859-1', true, null],
- ];
-
- $this->assertSame($expectedHeaders, testHeader());
- }
-
- public function testNestedExceptions()
- {
- $handler = new ExceptionHandler(true);
- ob_start();
- $handler->sendPhpResponse(new \RuntimeException('Foo', 0, new \RuntimeException('Bar')));
- $response = ob_get_clean();
-
- $this->assertStringMatchesFormat('%A
Foo
%A
Bar
%A', $response);
- }
-
- public function testHandle()
- {
- $handler = new ExceptionHandler(true);
- ob_start();
-
- $handler->handle(new \Exception('foo'));
-
- $this->assertThatTheExceptionWasOutput(ob_get_clean(), \Exception::class, 'Exception', 'foo');
- }
-
- public function testHandleWithACustomHandlerThatOutputsSomething()
- {
- $handler = new ExceptionHandler(true);
- ob_start();
- $handler->setHandler(function () {
- echo 'ccc';
- });
-
- $handler->handle(new \Exception());
- ob_end_flush(); // Necessary because of this PHP bug : https://bugs.php.net/76563
- $this->assertSame('ccc', ob_get_clean());
- }
-
- public function testHandleWithACustomHandlerThatOutputsNothing()
- {
- $handler = new ExceptionHandler(true);
- $handler->setHandler(function () {});
-
- $handler->handle(new \Exception('ccc'));
-
- $this->assertThatTheExceptionWasOutput(ob_get_clean(), \Exception::class, 'Exception', 'ccc');
- }
-
- public function testHandleWithACustomHandlerThatFails()
- {
- $handler = new ExceptionHandler(true);
- $handler->setHandler(function () {
- throw new \RuntimeException();
- });
-
- $handler->handle(new \Exception('ccc'));
-
- $this->assertThatTheExceptionWasOutput(ob_get_clean(), \Exception::class, 'Exception', 'ccc');
- }
-
- public function testHandleOutOfMemoryException()
- {
- $handler = new ExceptionHandler(true);
- ob_start();
- $handler->setHandler(function () {
- $this->fail('OutOfMemoryException should bypass the handler');
- });
-
- $handler->handle(new OutOfMemoryException('foo', 0, E_ERROR, __FILE__, __LINE__));
-
- $this->assertThatTheExceptionWasOutput(ob_get_clean(), OutOfMemoryException::class, 'OutOfMemoryException', 'foo');
- }
-
- private function assertThatTheExceptionWasOutput($content, $expectedClass, $expectedTitle, $expectedMessage)
- {
- $this->assertStringContainsString(sprintf('
%s', $expectedClass, $expectedTitle), $content);
- $this->assertStringContainsString(sprintf('
%s
', $expectedMessage), $content);
- }
-}
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
deleted file mode 100644
index e71bc98ec6eed..0000000000000
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/ClassNotFoundFatalErrorHandlerTest.php
+++ /dev/null
@@ -1,187 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Debug\Tests\FatalErrorHandler;
-
-use Composer\Autoload\ClassLoader as ComposerClassLoader;
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\DebugClassLoader;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\FatalErrorHandler\ClassNotFoundFatalErrorHandler;
-
-/**
- * @group legacy
- */
-class ClassNotFoundFatalErrorHandlerTest extends TestCase
-{
- public static function setUpBeforeClass(): void
- {
- foreach (spl_autoload_functions() as $function) {
- if (!\is_array($function)) {
- continue;
- }
-
- // get class loaders wrapped by DebugClassLoader
- if ($function[0] instanceof DebugClassLoader) {
- $function = $function[0]->getClassLoader();
-
- if (!\is_array($function)) {
- continue;
- }
- }
-
- if ($function[0] instanceof ComposerClassLoader) {
- $function[0]->add('Symfony_Component_Debug_Tests_Fixtures', \dirname(__DIR__, 5));
- break;
- }
- }
- }
-
- /**
- * @dataProvider provideClassNotFoundData
- */
- public function testHandleClassNotFound($error, $translatedMessage, $autoloader = null)
- {
- if ($autoloader) {
- // Unregister all autoloaders to ensure the custom provided
- // autoloader is the only one to be used during the test run.
- $autoloaders = spl_autoload_functions();
- array_map('spl_autoload_unregister', $autoloaders);
- spl_autoload_register($autoloader);
- }
-
- $handler = new ClassNotFoundFatalErrorHandler();
-
- $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
-
- if ($autoloader) {
- spl_autoload_unregister($autoloader);
- array_map('spl_autoload_register', $autoloaders);
- }
-
- $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
- $this->assertSame($translatedMessage, $exception->getMessage());
- $this->assertSame($error['type'], $exception->getSeverity());
- $this->assertSame($error['file'], $exception->getFile());
- $this->assertSame($error['line'], $exception->getLine());
- }
-
- public function provideClassNotFoundData()
- {
- $autoloader = new ComposerClassLoader();
- $autoloader->add('Symfony\Component\Debug\Exception\\', realpath(__DIR__.'/../../Exception'));
- $autoloader->add('Symfony_Component_Debug_Tests_Fixtures', realpath(__DIR__.'/../../Tests/Fixtures'));
-
- $debugClassLoader = new DebugClassLoader([$autoloader, 'loadClass']);
-
- return [
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'WhizBangFactory\' not found',
- ],
- "Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'Foo\\Bar\\WhizBangFactory\' not found',
- ],
- "Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'UndefinedFunctionException\' not found',
- ],
- "Attempted to load class \"UndefinedFunctionException\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
- [$debugClassLoader, 'loadClass'],
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'PEARClass\' not found',
- ],
- "Attempted to load class \"PEARClass\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony_Component_Debug_Tests_Fixtures_PEARClass\"?",
- [$debugClassLoader, 'loadClass'],
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
- ],
- "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
- [$debugClassLoader, 'loadClass'],
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
- ],
- "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
- [$autoloader, 'loadClass'],
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
- ],
- "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\Bar\".\nDid you forget a \"use\" statement for \"Symfony\Component\Debug\Exception\UndefinedFunctionException\"?",
- [$debugClassLoader, 'loadClass'],
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'Foo\\Bar\\UndefinedFunctionException\' not found',
- ],
- "Attempted to load class \"UndefinedFunctionException\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
- function ($className) { /* do nothing here */ },
- ],
- ];
- }
-
- public function testCannotRedeclareClass()
- {
- if (!file_exists(__DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP')) {
- $this->markTestSkipped('Can only be run on case insensitive filesystems');
- }
-
- require_once __DIR__.'/../FIXTURES2/REQUIREDTWICE.PHP';
-
- $error = [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Class \'Foo\\Bar\\RequiredTwice\' not found',
- ];
-
- $handler = new ClassNotFoundFatalErrorHandler();
- $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
-
- $this->assertInstanceOf('Symfony\Component\Debug\Exception\ClassNotFoundException', $exception);
- }
-}
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
deleted file mode 100644
index b827c4c67aebb..0000000000000
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedFunctionFatalErrorHandlerTest.php
+++ /dev/null
@@ -1,84 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Debug\Tests\FatalErrorHandler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\FatalErrorHandler\UndefinedFunctionFatalErrorHandler;
-
-/**
- * @group legacy
- */
-class UndefinedFunctionFatalErrorHandlerTest extends TestCase
-{
- /**
- * @dataProvider provideUndefinedFunctionData
- */
- public function testUndefinedFunction($error, $translatedMessage)
- {
- $handler = new UndefinedFunctionFatalErrorHandler();
- $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
-
- $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedFunctionException', $exception);
- // class names are case insensitive and PHP do not return the same
- $this->assertSame(strtolower($translatedMessage), strtolower($exception->getMessage()));
- $this->assertSame($error['type'], $exception->getSeverity());
- $this->assertSame($error['file'], $exception->getFile());
- $this->assertSame($error['line'], $exception->getLine());
- }
-
- public function provideUndefinedFunctionData()
- {
- return [
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined function test_namespaced_function()',
- ],
- "Attempted to call function \"test_namespaced_function\" from the global namespace.\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined function Foo\\Bar\\Baz\\test_namespaced_function()',
- ],
- "Attempted to call function \"test_namespaced_function\" from namespace \"Foo\\Bar\\Baz\".\nDid you mean to call \"\\symfony\\component\\debug\\tests\\fatalerrorhandler\\test_namespaced_function\"?",
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined function foo()',
- ],
- 'Attempted to call function "foo" from the global namespace.',
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined function Foo\\Bar\\Baz\\foo()',
- ],
- 'Attempted to call function "foo" from namespace "Foo\Bar\Baz".',
- ],
- ];
- }
-}
-
-function test_namespaced_function()
-{
-}
diff --git a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php b/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
deleted file mode 100644
index 7ea1b1f95e786..0000000000000
--- a/src/Symfony/Component/Debug/Tests/FatalErrorHandler/UndefinedMethodFatalErrorHandlerTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Debug\Tests\FatalErrorHandler;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\Exception\FatalErrorException;
-use Symfony\Component\Debug\FatalErrorHandler\UndefinedMethodFatalErrorHandler;
-
-/**
- * @group legacy
- */
-class UndefinedMethodFatalErrorHandlerTest extends TestCase
-{
- /**
- * @dataProvider provideUndefinedMethodData
- */
- public function testUndefinedMethod($error, $translatedMessage)
- {
- $handler = new UndefinedMethodFatalErrorHandler();
- $exception = $handler->handleError($error, new FatalErrorException('', 0, $error['type'], $error['file'], $error['line']));
-
- $this->assertInstanceOf('Symfony\Component\Debug\Exception\UndefinedMethodException', $exception);
- $this->assertSame($translatedMessage, $exception->getMessage());
- $this->assertSame($error['type'], $exception->getSeverity());
- $this->assertSame($error['file'], $exception->getFile());
- $this->assertSame($error['line'], $exception->getLine());
- }
-
- public function provideUndefinedMethodData()
- {
- return [
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined method SplObjectStorage::what()',
- ],
- 'Attempted to call an undefined method named "what" of class "SplObjectStorage".',
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined method SplObjectStorage::walid()',
- ],
- "Attempted to call an undefined method named \"walid\" of class \"SplObjectStorage\".\nDid you mean to call \"valid\"?",
- ],
- [
- [
- 'type' => 1,
- 'line' => 12,
- 'file' => 'foo.php',
- 'message' => 'Call to undefined method SplObjectStorage::offsetFet()',
- ],
- "Attempted to call an undefined method named \"offsetFet\" of class \"SplObjectStorage\".\nDid you mean to call e.g. \"offsetGet\", \"offsetSet\" or \"offsetUnset\"?",
- ],
- [
- [
- 'type' => 1,
- 'message' => 'Call to undefined method class@anonymous::test()',
- 'file' => '/home/possum/work/symfony/test.php',
- 'line' => 11,
- ],
- 'Attempted to call an undefined method named "test" of class "class@anonymous".',
- ],
- ];
- }
-}
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/AnnotatedClass.php b/src/Symfony/Component/Debug/Tests/Fixtures/AnnotatedClass.php
deleted file mode 100644
index 4eecb6d3f1668..0000000000000
--- a/src/Symfony/Component/Debug/Tests/Fixtures/AnnotatedClass.php
+++ /dev/null
@@ -1,13 +0,0 @@
-exception = $e;
- }
-
- public function __toString()
- {
- try {
- throw $this->exception;
- } catch (\Exception $e) {
- // Using user_error() here is on purpose so we do not forget
- // that this alias also should work alongside with trigger_error().
- return trigger_error($e, E_USER_ERROR);
- }
- }
-}
diff --git a/src/Symfony/Component/Debug/Tests/Fixtures/TraitWithAnnotatedParameters.php b/src/Symfony/Component/Debug/Tests/Fixtures/TraitWithAnnotatedParameters.php
deleted file mode 100644
index 5eb5fbf84bc93..0000000000000
--- a/src/Symfony/Component/Debug/Tests/Fixtures/TraitWithAnnotatedParameters.php
+++ /dev/null
@@ -1,13 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Debug;
-
-function headers_sent()
-{
- return false;
-}
-
-function header($str, $replace = true, $status = null)
-{
- Tests\testHeader($str, $replace, $status);
-}
-
-namespace Symfony\Component\Debug\Tests;
-
-function testHeader()
-{
- static $headers = [];
-
- if (!$h = \func_get_args()) {
- $h = $headers;
- $headers = [];
-
- return $h;
- }
-
- $headers[] = \func_get_args();
-}
diff --git a/src/Symfony/Component/Debug/Tests/phpt/debug_class_loader.phpt b/src/Symfony/Component/Debug/Tests/phpt/debug_class_loader.phpt
deleted file mode 100644
index 041affc14df65..0000000000000
--- a/src/Symfony/Component/Debug/Tests/phpt/debug_class_loader.phpt
+++ /dev/null
@@ -1,28 +0,0 @@
---TEST--
-Test DebugClassLoader with previously loaded parents
---FILE--
-
---EXPECTF--
-%A
-The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
-The "Symfony\Component\Debug\Tests\Fixtures\FinalMethod::finalMethod2()" method is considered final. It may change without further notice as of its next major version. You should not extend it from "Symfony\Component\Debug\Tests\Fixtures\ExtendedFinalMethod".
diff --git a/src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt b/src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt
deleted file mode 100644
index 25167a2c6aaee..0000000000000
--- a/src/Symfony/Component/Debug/Tests/phpt/decorate_exception_hander.phpt
+++ /dev/null
@@ -1,48 +0,0 @@
---TEST--
-Test catching fatal errors when handlers are nested
---INI--
-display_errors=0
---FILE--
-
---EXPECTF--
-%A
-object(Symfony\Component\Debug\Exception\ClassNotFoundException)#%d (8) {
- ["message":protected]=>
- string(131) "Attempted to load class "missing" from namespace "Symfony\Component\Debug".
-Did you forget a "use" statement for another namespace?"
- ["string":"Exception":private]=>
- string(0) ""
- ["code":protected]=>
- int(0)
- ["file":protected]=>
- string(%d) "%s"
- ["line":protected]=>
- int(%d)
- ["trace":"Exception":private]=>
- array(%d) {%A}
- ["previous":"Exception":private]=>
- NULL
- ["severity":protected]=>
- int(1)
-}
diff --git a/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt b/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt
deleted file mode 100644
index b743d93ad7c80..0000000000000
--- a/src/Symfony/Component/Debug/Tests/phpt/exception_rethrown.phpt
+++ /dev/null
@@ -1,35 +0,0 @@
---TEST--
-Test rethrowing in custom exception handler
---FILE--
-setDefaultLogger(new TestLogger());
-ini_set('display_errors', 1);
-
-throw new \Exception('foo');
-?>
---EXPECTF--
-Uncaught Exception: foo
-123
-Fatal error: Uncaught %s:25
-Stack trace:
-%a
diff --git a/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt b/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt
deleted file mode 100644
index d0fa2411e6bd9..0000000000000
--- a/src/Symfony/Component/Debug/Tests/phpt/fatal_with_nested_handlers.phpt
+++ /dev/null
@@ -1,43 +0,0 @@
---TEST--
-Test catching fatal errors when handlers are nested
---FILE--
-setExceptionHandler('print_r');
-
-if (true) {
- class Broken implements \JsonSerializable
- {
- }
-}
-
-?>
---EXPECTF--
-array(1) {
- [0]=>
- string(37) "Error and exception handlers do match"
-}
-%A
-object(Symfony\Component\Debug\Exception\FatalErrorException)#%d (%d) {
- ["message":protected]=>
- string(179) "Error: Class Symfony\Component\Debug\Broken contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (JsonSerializable::jsonSerialize)"
-%a
-}
diff --git a/src/Symfony/Component/Debug/composer.json b/src/Symfony/Component/Debug/composer.json
deleted file mode 100644
index 96fe201bddc8f..0000000000000
--- a/src/Symfony/Component/Debug/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "name": "symfony/debug",
- "type": "library",
- "description": "Symfony Debug Component",
- "keywords": [],
- "homepage": "https://symfony.com",
- "license": "MIT",
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors"
- }
- ],
- "require": {
- "php": "^7.1.3",
- "psr/log": "~1.0"
- },
- "conflict": {
- "symfony/http-kernel": "<3.4"
- },
- "require-dev": {
- "symfony/http-kernel": "^3.4|^4.0|^5.0"
- },
- "autoload": {
- "psr-4": { "Symfony\\Component\\Debug\\": "" },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "minimum-stability": "dev",
- "extra": {
- "branch-alias": {
- "dev-master": "4.4-dev"
- }
- }
-}
diff --git a/src/Symfony/Component/Debug/phpunit.xml.dist b/src/Symfony/Component/Debug/phpunit.xml.dist
deleted file mode 100644
index a51bbff935861..0000000000000
--- a/src/Symfony/Component/Debug/phpunit.xml.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
- ./Tests/
-
-
- ./Resources/ext/tests/
-
-
-
-
-
- ./
-
- ./Tests
- ./vendor
-
-
-
-
diff --git a/src/Symfony/Component/DependencyInjection/Alias.php b/src/Symfony/Component/DependencyInjection/Alias.php
index 3e74fd92c8308..79e7e243471c8 100644
--- a/src/Symfony/Component/DependencyInjection/Alias.php
+++ b/src/Symfony/Component/DependencyInjection/Alias.php
@@ -44,13 +44,11 @@ public function isPublic()
/**
* Sets if this Alias is public.
*
- * @param bool $boolean If this Alias should be public
- *
* @return $this
*/
- public function setPublic($boolean)
+ public function setPublic(bool $boolean)
{
- $this->public = (bool) $boolean;
+ $this->public = $boolean;
$this->private = false;
return $this;
@@ -64,13 +62,11 @@ public function setPublic($boolean)
* but triggers a deprecation notice when accessed from the container,
* so that the alias can be made really private in 4.0.
*
- * @param bool $boolean
- *
* @return $this
*/
- public function setPrivate($boolean)
+ public function setPrivate(bool $boolean)
{
- $this->private = (bool) $boolean;
+ $this->private = $boolean;
return $this;
}
@@ -96,7 +92,7 @@ public function isPrivate()
*
* @throws InvalidArgumentException when the message template is invalid
*/
- public function setDeprecated($status = true, $template = null)
+ public function setDeprecated(bool $status = true, string $template = null)
{
if (null !== $template) {
if (preg_match('#[\r\n]|\*/#', $template)) {
@@ -110,7 +106,7 @@ public function setDeprecated($status = true, $template = null)
$this->deprecationTemplate = $template;
}
- $this->deprecated = (bool) $status;
+ $this->deprecated = $status;
return $this;
}
diff --git a/src/Symfony/Component/DependencyInjection/Argument/AbstractArgument.php b/src/Symfony/Component/DependencyInjection/Argument/AbstractArgument.php
new file mode 100644
index 0000000000000..8eb6d5b4243f2
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Argument/AbstractArgument.php
@@ -0,0 +1,44 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Argument;
+
+/**
+ * Represents an abstract service argument, which have to be set by a compiler pass or a DI extension.
+ */
+final class AbstractArgument
+{
+ private $serviceId;
+ private $argKey;
+ private $text;
+
+ public function __construct(string $serviceId, string $argKey, string $text = '')
+ {
+ $this->serviceId = $serviceId;
+ $this->argKey = $argKey;
+ $this->text = $text;
+ }
+
+ public function getServiceId(): string
+ {
+ return $this->serviceId;
+ }
+
+ public function getArgumentKey(): string
+ {
+ return $this->argKey;
+ }
+
+ public function getText(): string
+ {
+ return $this->text;
+ }
+}
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
index b514ce1c8367a..0bacf3d561da7 100644
--- a/src/Symfony/Component/DependencyInjection/CHANGELOG.md
+++ b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -1,6 +1,25 @@
CHANGELOG
=========
+5.1.0
+-----
+
+ * added support to autowire public typed properties in php 7.4
+ * added support for defining method calls, a configurator, and property setters in `InlineServiceConfigurator`
+ * added possibility to define abstract service arguments
+
+5.0.0
+-----
+
+ * removed support for auto-discovered extension configuration class which does not implement `ConfigurationInterface`
+ * removed support for non-string default env() parameters
+ * moved `ServiceSubscriberInterface` to the `Symfony\Contracts\Service` namespace
+ * removed `RepeatedPass` and `RepeatablePassInterface`
+ * removed support for short factory/configurator syntax from `YamlFileLoader`
+ * removed `ResettableContainerInterface`, use `ResetInterface` instead
+ * added argument `$returnsClone` to `Definition::addMethodCall()`
+ * removed `tagged`, use `tagged_iterator` instead
+
4.4.0
-----
diff --git a/src/Symfony/Component/DependencyInjection/ChildDefinition.php b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
index 7718f725b18bd..657a7fa826ea0 100644
--- a/src/Symfony/Component/DependencyInjection/ChildDefinition.php
+++ b/src/Symfony/Component/DependencyInjection/ChildDefinition.php
@@ -109,7 +109,7 @@ public function replaceArgument($index, $value)
/**
* @internal
*/
- public function setAutoconfigured($autoconfigured): self
+ public function setAutoconfigured(bool $autoconfigured): self
{
throw new BadMethodCallException('A ChildDefinition cannot be autoconfigured.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
index 02a18b6cf09ca..0d00d52dca3f1 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AbstractRecursivePass.php
@@ -68,11 +68,10 @@ protected function inExpression(bool $reset = true): bool
* Processes a value found in a definition tree.
*
* @param mixed $value
- * @param bool $isRoot
*
* @return mixed The processed value
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (\is_array($value)) {
foreach ($value as $k => $v) {
@@ -105,13 +104,11 @@ protected function processValue($value, $isRoot = false)
}
/**
- * @param bool $required
- *
* @return \ReflectionFunctionAbstract|null
*
* @throws RuntimeException
*/
- protected function getConstructor(Definition $definition, $required)
+ protected function getConstructor(Definition $definition, bool $required)
{
if ($definition->isSynthetic()) {
return null;
@@ -167,13 +164,11 @@ protected function getConstructor(Definition $definition, $required)
}
/**
- * @param string $method
- *
* @throws RuntimeException
*
* @return \ReflectionFunctionAbstract
*/
- protected function getReflectionMethod(Definition $definition, $method)
+ protected function getReflectionMethod(Definition $definition, string $method)
{
if ('__construct' === $method) {
return $this->getConstructor($definition, true);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
index 59a27aef83b71..beb488236c069 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -27,7 +27,7 @@
* @author Johannes M. Schmitt
* @author Nicolas Grekas
*/
-class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements RepeatablePassInterface
+class AnalyzeServiceReferencesPass extends AbstractRecursivePass
{
private $graph;
private $currentDefinition;
@@ -48,14 +48,6 @@ public function __construct(bool $onlyConstructorArguments = false, bool $hasPro
$this->enableExpressionProcessing();
}
- /**
- * {@inheritdoc}
- */
- public function setRepeatedPass(RepeatedPass $repeatedPass)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
- }
-
/**
* Processes a ContainerBuilder object to populate the service reference graph.
*/
@@ -81,7 +73,7 @@ public function process(ContainerBuilder $container)
}
}
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
$lazy = $this->lazy;
$inExpression = $this->inExpression();
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
index 8d46fd6311035..ba10e92b1e7c3 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -66,7 +66,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
try {
return $this->doProcessValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
index 20d31135a73ce..c46d71f2068a0 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredMethodsPass.php
@@ -23,7 +23,7 @@ class AutowireRequiredMethodsPass extends AbstractRecursivePass
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
$value = parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php
new file mode 100644
index 0000000000000..934bde8dd1fe8
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Compiler/AutowireRequiredPropertiesPass.php
@@ -0,0 +1,61 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\TypedReference;
+
+/**
+ * Looks for definitions with autowiring enabled and registers their corresponding "@required" properties.
+ *
+ * @author Sebastien Morel (Plopix)
+ * @author Nicolas Grekas
+ */
+class AutowireRequiredPropertiesPass extends AbstractRecursivePass
+{
+ /**
+ * {@inheritdoc}
+ */
+ protected function processValue($value, bool $isRoot = false)
+ {
+ if (\PHP_VERSION_ID < 70400) {
+ return $value;
+ }
+ $value = parent::processValue($value, $isRoot);
+
+ if (!$value instanceof Definition || !$value->isAutowired() || $value->isAbstract() || !$value->getClass()) {
+ return $value;
+ }
+ if (!$reflectionClass = $this->container->getReflectionClass($value->getClass(), false)) {
+ return $value;
+ }
+
+ $properties = $value->getProperties();
+ foreach ($reflectionClass->getProperties() as $reflectionProperty) {
+ if (false === $doc = $reflectionProperty->getDocComment()) {
+ continue;
+ }
+ if (false === stripos($doc, '@required') || !preg_match('#(?:^/\*\*|\n\s*+\*)\s*+@required(?:\s|\*/$)#i', $doc)) {
+ continue;
+ }
+ if (\array_key_exists($name = $reflectionProperty->getName(), $properties)) {
+ continue;
+ }
+
+ $type = $reflectionProperty->getType()->getName();
+ $value->setProperty($name, new TypedReference($type, $type, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, $name));
+ }
+
+ return $value;
+ }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
index d289c05b15c09..348498db269cf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckArgumentsValidityPass.php
@@ -32,7 +32,7 @@ public function __construct(bool $throwExceptions = true)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Definition) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
index eef71587cdd46..4ffe3540cee7a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
@@ -43,7 +43,7 @@ public function process(ContainerBuilder $container)
}
}
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Reference) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
index 8f2a3bdf706cf..0349ef7616b8a 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/CheckReferenceValidityPass.php
@@ -25,7 +25,7 @@
*/
class CheckReferenceValidityPass extends AbstractRecursivePass
{
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($isRoot && $value instanceof Definition && ($value->isSynthetic() || $value->isAbstract())) {
return $value;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
index 14dedf007b092..04ae8d51cb9df 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/Compiler.php
@@ -53,11 +53,8 @@ public function getServiceReferenceGraph()
/**
* Adds a pass to the PassConfig.
- *
- * @param string $type The type of the pass
- * @param int $priority Used to sort the passes
*/
- public function addPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
+ public function addPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
{
$this->passConfig->addPass($pass, $type, $priority);
}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
index 5ee0ff1f491cc..5e7ba3173e5b4 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/DefinitionErrorExceptionPass.php
@@ -26,7 +26,7 @@ class DefinitionErrorExceptionPass extends AbstractRecursivePass
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Definition || !$value->hasErrors()) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
index ac3b4fe352f2b..41af126947349 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -22,10 +22,9 @@
*
* @author Johannes M. Schmitt
*/
-class InlineServiceDefinitionsPass extends AbstractRecursivePass implements RepeatablePassInterface
+class InlineServiceDefinitionsPass extends AbstractRecursivePass
{
private $analyzingPass;
- private $repeatedPass;
private $cloningIds = [];
private $connectedIds = [];
private $notInlinedIds = [];
@@ -37,15 +36,6 @@ public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
$this->analyzingPass = $analyzingPass;
}
- /**
- * {@inheritdoc}
- */
- public function setRepeatedPass(RepeatedPass $repeatedPass)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
- $this->repeatedPass = $repeatedPass;
- }
-
public function process(ContainerBuilder $container)
{
$this->container = $container;
@@ -94,10 +84,6 @@ public function process(ContainerBuilder $container)
}
} while ($this->inlinedIds && $this->analyzingPass);
- if ($this->inlinedIds && $this->repeatedPass) {
- $this->repeatedPass->setRepeat();
- }
-
foreach ($remainingInlinedIds as $id) {
$definition = $container->getDefinition($id);
@@ -115,7 +101,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof ArgumentInterface) {
// Reference found in ArgumentInterface::getValues() are not inlineable
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
index 264dd8046c819..bfeb7b84b9baf 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/MergeExtensionConfigurationPass.php
@@ -167,7 +167,7 @@ public function __construct(ExtensionInterface $extension, ParameterBagInterface
/**
* {@inheritdoc}
*/
- public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): self
+ public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0): self
{
throw new LogicException(sprintf('You cannot add compiler pass "%s" from extension "%s". Compiler passes must be registered before the container is compiled.', \get_class($pass), $this->extensionClass));
}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
index 1683957fb96a4..b6d475c770ff6 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php
@@ -49,6 +49,7 @@ public function __construct()
];
$this->optimizationPasses = [[
+ new AutoAliasServicePass(),
new ValidateEnvPlaceholdersPass(),
new ResolveChildDefinitionsPass(),
new RegisterServiceSubscribersPass(),
@@ -56,6 +57,7 @@ public function __construct()
new ResolveFactoryClassPass(),
new ResolveNamedArgumentsPass(),
new AutowireRequiredMethodsPass(),
+ new AutowireRequiredPropertiesPass(),
new ResolveBindingsPass(),
new ServiceLocatorTagPass(),
new DecoratorServicePass(),
@@ -113,12 +115,9 @@ public function getPasses()
/**
* Adds a pass.
*
- * @param string $type The pass type
- * @param int $priority Used to sort the passes
- *
* @throws InvalidArgumentException when a pass type doesn't exist
*/
- public function addPass(CompilerPassInterface $pass, $type = self::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
+ public function addPass(CompilerPassInterface $pass, string $type = self::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
{
$property = $type.'Passes';
if (!isset($this->$property)) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php
index 14bf000863c9d..7d9c366da8895 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RegisterServiceSubscribersPass.php
@@ -28,7 +28,7 @@
*/
class RegisterServiceSubscribersPass extends AbstractRecursivePass
{
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Definition || $value->isAbstract() || $value->isSynthetic() || !$value->hasTag('container.service_subscriber')) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
index 287af23b77f02..cf1a3ddc7a7a8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -20,18 +20,10 @@
* @author Johannes M. Schmitt
* @author Nicolas Grekas
*/
-class RemoveUnusedDefinitionsPass extends AbstractRecursivePass implements RepeatablePassInterface
+class RemoveUnusedDefinitionsPass extends AbstractRecursivePass
{
private $connectedIds = [];
- /**
- * {@inheritdoc}
- */
- public function setRepeatedPass(RepeatedPass $repeatedPass)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
- }
-
/**
* Processes the ContainerBuilder to remove unused definitions.
*/
@@ -83,7 +75,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Reference) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php
deleted file mode 100644
index 11a5b0d54ffa9..0000000000000
--- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatablePassInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection\Compiler;
-
-/**
- * Interface that must be implemented by passes that are run as part of an
- * RepeatedPass.
- *
- * @author Johannes M. Schmitt
- *
- * @deprecated since Symfony 4.2.
- */
-interface RepeatablePassInterface extends CompilerPassInterface
-{
- public function setRepeatedPass(RepeatedPass $repeatedPass);
-}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
deleted file mode 100644
index b8add1b83d263..0000000000000
--- a/src/Symfony/Component/DependencyInjection/Compiler/RepeatedPass.php
+++ /dev/null
@@ -1,83 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection\Compiler;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.2.', RepeatedPass::class), E_USER_DEPRECATED);
-
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-
-/**
- * A pass that might be run repeatedly.
- *
- * @author Johannes M. Schmitt
- *
- * @deprecated since Symfony 4.2.
- */
-class RepeatedPass implements CompilerPassInterface
-{
- /**
- * @var bool
- */
- private $repeat = false;
-
- private $passes;
-
- /**
- * @param RepeatablePassInterface[] $passes An array of RepeatablePassInterface objects
- *
- * @throws InvalidArgumentException when the passes don't implement RepeatablePassInterface
- */
- public function __construct(array $passes)
- {
- foreach ($passes as $pass) {
- if (!$pass instanceof RepeatablePassInterface) {
- throw new InvalidArgumentException('$passes must be an array of RepeatablePassInterface.');
- }
-
- $pass->setRepeatedPass($this);
- }
-
- $this->passes = $passes;
- }
-
- /**
- * Process the repeatable passes that run more than once.
- */
- public function process(ContainerBuilder $container)
- {
- do {
- $this->repeat = false;
- foreach ($this->passes as $pass) {
- $pass->process($container);
- }
- } while ($this->repeat);
- }
-
- /**
- * Sets if the pass should repeat.
- */
- public function setRepeat()
- {
- $this->repeat = true;
- }
-
- /**
- * Returns the passes.
- *
- * @return RepeatablePassInterface[] An array of RepeatablePassInterface objects
- */
- public function getPasses()
- {
- return $this->passes;
- }
-}
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
index 99810963612d1..ca781f2801a93 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -80,7 +80,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof Reference && isset($this->replacements[$referenceId = (string) $value])) {
// Perform the replacement
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
index 4df81b1183b4c..761aa314faa05 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -92,7 +92,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof TypedReference && $value->getType() === (string) $value) {
// Already checked
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
index 453e3f63c3f2a..f180d2290b4ae 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveChildDefinitionsPass.php
@@ -29,7 +29,7 @@ class ResolveChildDefinitionsPass extends AbstractRecursivePass
{
private $currentPath;
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Definition) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php
index 9e1edd4d31568..ea52b1459247f 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveEnvPlaceholdersPass.php
@@ -18,7 +18,7 @@
*/
class ResolveEnvPlaceholdersPass extends AbstractRecursivePass
{
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (\is_string($value)) {
return $this->container->resolveEnvPlaceholders($value, true);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveFactoryClassPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveFactoryClassPass.php
index 848da7f2bd24b..23f535b71dbec 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveFactoryClassPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveFactoryClassPass.php
@@ -22,7 +22,7 @@ class ResolveFactoryClassPass extends AbstractRecursivePass
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof Definition && \is_array($factory = $value->getFactory()) && null === $factory[0]) {
if (null === $class = $value->getClass()) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
index bfdd91c417f97..0d01e2a6f7f0b 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveHotPathPass.php
@@ -47,7 +47,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof ArgumentInterface) {
return $value;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
index 6004cc3151489..8fa3868c5a1b8 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveNamedArgumentsPass.php
@@ -26,7 +26,7 @@ class ResolveNamedArgumentsPass extends AbstractRecursivePass
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Definition) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
index 32eb6a3a76f3e..b1c81ee3a1414 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -60,7 +60,7 @@ public function process(ContainerBuilder $container)
$this->bag = null;
}
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (\is_string($value)) {
try {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
index bf9ea2b21acc7..086bc8780aeed 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveReferencesToAliasesPass.php
@@ -42,7 +42,7 @@ public function process(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof Reference) {
return parent::processValue($value, $isRoot);
@@ -62,7 +62,7 @@ private function getDefinitionId(string $id, ContainerBuilder $container): strin
$alias = $container->getAlias($id);
if ($alias->isDeprecated()) {
- @trigger_error(sprintf('%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias'), E_USER_DEPRECATED);
+ trigger_deprecation('', '', '%s. It is being referenced by the "%s" %s.', rtrim($alias->getDeprecationMessage($id), '. '), $this->currentId, $container->hasDefinition($this->currentId) ? 'service' : 'alias');
}
$seen = [];
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveServiceSubscribersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveServiceSubscribersPass.php
index 399f349046a36..518c03d7e7ba7 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveServiceSubscribersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveServiceSubscribersPass.php
@@ -25,7 +25,7 @@ class ResolveServiceSubscribersPass extends AbstractRecursivePass
{
private $serviceLocator;
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof Reference && $this->serviceLocator && \in_array((string) $value, [ContainerInterface::class, ServiceProviderInterface::class], true)) {
return new Reference($this->serviceLocator);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
index a4305722f7cb5..48a034a847e00 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ResolveTaggedIteratorArgumentPass.php
@@ -25,7 +25,7 @@ class ResolveTaggedIteratorArgumentPass extends AbstractRecursivePass
/**
* {@inheritdoc}
*/
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if (!$value instanceof TaggedIteratorArgument) {
return parent::processValue($value, $isRoot);
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
index 5fdbe5686dbfa..5985451b34b63 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ServiceLocatorTagPass.php
@@ -29,7 +29,7 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
{
use PriorityTaggedServiceTrait;
- protected function processValue($value, $isRoot = false)
+ protected function processValue($value, bool $isRoot = false)
{
if ($value instanceof ServiceLocatorArgument) {
if ($value->getTaggedIteratorArgument()) {
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
index 8fd84fac00eeb..be0f1edd201fe 100644
--- a/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
+++ b/src/Symfony/Component/DependencyInjection/Compiler/ValidateEnvPlaceholdersPass.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\DependencyInjection\Compiler;
use Symfony\Component\Config\Definition\BaseNode;
-use Symfony\Component\Config\Definition\Exception\TreeWithoutRootNodeException;
use Symfony\Component\Config\Definition\Processor;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\ConfigurationExtensionInterface;
@@ -80,10 +79,7 @@ public function process(ContainerBuilder $container)
continue;
}
- try {
- $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
- } catch (TreeWithoutRootNodeException $e) {
- }
+ $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
}
} finally {
BaseNode::resetPlaceholders();
diff --git a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php
index e9a4fffe2ad1c..8ffb8dcac9f94 100644
--- a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php
+++ b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResource.php
@@ -18,7 +18,7 @@
*
* @author Maxime Steinhausser
*
- * @final since Symfony 4.3
+ * @final
*/
class ContainerParametersResource implements ResourceInterface
{
@@ -35,7 +35,7 @@ public function __construct(array $parameters)
/**
* {@inheritdoc}
*/
- public function __toString()
+ public function __toString(): string
{
return 'container_parameters_'.md5(serialize($this->parameters));
}
@@ -43,7 +43,7 @@ public function __toString()
/**
* @return array Tracked parameters
*/
- public function getParameters()
+ public function getParameters(): array
{
return $this->parameters;
}
diff --git a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php
index 6ed77e3fd2c48..2f2affaa5b6c2 100644
--- a/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php
+++ b/src/Symfony/Component/DependencyInjection/Config/ContainerParametersResourceChecker.php
@@ -39,7 +39,7 @@ public function supports(ResourceInterface $metadata)
/**
* {@inheritdoc}
*/
- public function isFresh(ResourceInterface $resource, $timestamp)
+ public function isFresh(ResourceInterface $resource, int $timestamp)
{
foreach ($resource->getParameters() as $key => $value) {
if (!$this->container->hasParameter($key) || $this->container->getParameter($key) !== $value) {
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 00bacd2ac6ded..53bebdfcc58da 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -39,7 +39,7 @@
* @author Fabien Potencier
* @author Johannes M. Schmitt
*/
-class Container implements ResettableContainerInterface
+class Container implements ContainerInterface, ResetInterface
{
protected $parameterBag;
protected $services = [];
@@ -107,7 +107,7 @@ public function getParameterBag()
*
* @throws InvalidArgumentException if the parameter is not defined
*/
- public function getParameter($name)
+ public function getParameter(string $name)
{
return $this->parameterBag->get($name);
}
@@ -119,7 +119,7 @@ public function getParameter($name)
*
* @return bool The presence of parameter in container
*/
- public function hasParameter($name)
+ public function hasParameter(string $name)
{
return $this->parameterBag->has($name);
}
@@ -130,7 +130,7 @@ public function hasParameter($name)
* @param string $name The parameter name
* @param mixed $value The parameter value
*/
- public function setParameter($name, $value)
+ public function setParameter(string $name, $value)
{
$this->parameterBag->set($name, $value);
}
@@ -140,11 +140,8 @@ public function setParameter($name, $value)
*
* Setting a synthetic service to null resets it: has() returns false and get()
* behaves in the same way as if the service was never created.
- *
- * @param string $id The service identifier
- * @param object|null $service The service instance
*/
- public function set($id, $service)
+ public function set(string $id, ?object $service)
{
// Runs the internal initializer; used by the dumped container to include always-needed files
if (isset($this->privates['service_container']) && $this->privates['service_container'] instanceof \Closure) {
@@ -218,17 +215,11 @@ public function has($id)
*
* @see Reference
*/
- public function get($id, $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERENCE */ 1)
+ public function get($id, int $invalidBehavior = /* self::EXCEPTION_ON_INVALID_REFERENCE */ 1)
{
- $service = $this->services[$id]
+ return $this->services[$id]
?? $this->services[$id = $this->aliases[$id] ?? $id]
?? ('service_container' === $id ? $this : ($this->factories[$id] ?? [$this, 'make'])($id, $invalidBehavior));
-
- if (!\is_object($service) && null !== $service) {
- @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), E_USER_DEPRECATED);
- }
-
- return $service;
}
/**
@@ -293,7 +284,7 @@ private function make(string $id, int $invalidBehavior)
*
* @return bool true if service has already been initialized, false otherwise
*/
- public function initialized($id)
+ public function initialized(string $id)
{
if (isset($this->aliases[$id])) {
$id = $this->aliases[$id];
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
index 247a021fd786e..ad89d4e87112e 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -20,6 +20,7 @@
use Symfony\Component\Config\Resource\GlobResource;
use Symfony\Component\Config\Resource\ReflectionClassResource;
use Symfony\Component\Config\Resource\ResourceInterface;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -160,12 +161,10 @@ public function __construct(ParameterBagInterface $parameterBag = null)
*
* If you are not using the loaders and therefore don't want
* to depend on the Config component, set this flag to false.
- *
- * @param bool $track True if you want to track resources, false otherwise
*/
- public function setResourceTracking($track)
+ public function setResourceTracking(bool $track)
{
- $this->trackResources = (bool) $track;
+ $this->trackResources = $track;
}
/**
@@ -198,13 +197,11 @@ public function registerExtension(ExtensionInterface $extension)
/**
* Returns an extension by alias or namespace.
*
- * @param string $name An alias or a namespace
- *
* @return ExtensionInterface An extension instance
*
* @throws LogicException if the extension is not registered
*/
- public function getExtension($name)
+ public function getExtension(string $name)
{
if (isset($this->extensions[$name])) {
return $this->extensions[$name];
@@ -230,11 +227,9 @@ public function getExtensions()
/**
* Checks if we have an extension.
*
- * @param string $name The name of the extension
- *
* @return bool If the extension exists
*/
- public function hasExtension($name)
+ public function hasExtension(string $name)
{
return isset($this->extensions[$name]) || isset($this->extensionsByNs[$name]);
}
@@ -423,7 +418,7 @@ public function fileExists(string $path, $trackContents = true): bool
* @throws BadMethodCallException When this ContainerBuilder is compiled
* @throws \LogicException if the extension is not registered
*/
- public function loadFromExtension($extension, array $values = null)
+ public function loadFromExtension(string $extension, array $values = null)
{
if ($this->isCompiled()) {
throw new BadMethodCallException('Cannot load from an extension on a compiled container.');
@@ -448,7 +443,7 @@ public function loadFromExtension($extension, array $values = null)
*
* @return $this
*/
- public function addCompilerPass(CompilerPassInterface $pass, $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
+ public function addCompilerPass(CompilerPassInterface $pass, string $type = PassConfig::TYPE_BEFORE_OPTIMIZATION, int $priority = 0)
{
$this->getCompiler()->addPass($pass, $type, $priority);
@@ -484,19 +479,10 @@ public function getCompiler()
/**
* Sets a service.
*
- * @param string $id The service identifier
- * @param object|null $service The service instance
- *
* @throws BadMethodCallException When this ContainerBuilder is compiled
*/
- public function set($id, $service)
+ public function set(string $id, ?object $service)
{
- if (!\is_object($service) && null !== $service) {
- @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, setting the "%s" service to a value of type "%s" should be avoided.', $id, \gettype($service)), E_USER_DEPRECATED);
- }
-
- $id = (string) $id;
-
if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
// setting a synthetic service on a compiled container is alright
throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
@@ -509,12 +495,10 @@ public function set($id, $service)
/**
* Removes a service definition.
- *
- * @param string $id The service identifier
*/
- public function removeDefinition($id)
+ public function removeDefinition(string $id)
{
- if (isset($this->definitions[$id = (string) $id])) {
+ if (isset($this->definitions[$id])) {
unset($this->definitions[$id]);
$this->removedIds[$id] = true;
}
@@ -549,19 +533,13 @@ public function has($id)
*
* @see Reference
*/
- public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
+ public function get($id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
{
if ($this->isCompiled() && isset($this->removedIds[$id = (string) $id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE >= $invalidBehavior) {
return parent::get($id);
}
- $service = $this->doGet($id, $invalidBehavior);
-
- if (!\is_object($service) && null !== $service) {
- @trigger_error(sprintf('Non-object services are deprecated since Symfony 4.4, please fix the "%s" service which is of type "%s" right now.', $id, \gettype($service)), E_USER_DEPRECATED);
- }
-
- return $service;
+ return $this->doGet($id, $invalidBehavior);
}
private function doGet(string $id, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, array &$inlineServices = null, bool $isConstructorArgument = false)
@@ -590,7 +568,7 @@ private function doGet(string $id, int $invalidBehavior = ContainerInterface::EX
$alias = $this->aliasDefinitions[$id];
if ($alias->isDeprecated()) {
- @trigger_error($alias->getDeprecationMessage($id), E_USER_DEPRECATED);
+ trigger_deprecation('', '', $alias->getDeprecationMessage($id));
}
return $this->doGet((string) $alias, $invalidBehavior, $inlineServices, $isConstructorArgument);
@@ -697,11 +675,9 @@ public function merge(self $container)
/**
* Returns the configuration array for the given extension.
*
- * @param string $name The name of the extension
- *
* @return array An array of configuration
*/
- public function getExtensionConfig($name)
+ public function getExtensionConfig(string $name)
{
if (!isset($this->extensionConfigs[$name])) {
$this->extensionConfigs[$name] = [];
@@ -712,11 +688,8 @@ public function getExtensionConfig($name)
/**
* Prepends a config array to the configs of the given extension.
- *
- * @param string $name The name of the extension
- * @param array $config The config to set
*/
- public function prependExtensionConfig($name, array $config)
+ public function prependExtensionConfig(string $name, array $config)
{
if (!isset($this->extensionConfigs[$name])) {
$this->extensionConfigs[$name] = [];
@@ -834,10 +807,8 @@ public function setAliases(array $aliases)
* @throws InvalidArgumentException if the id is not a string or an Alias
* @throws InvalidArgumentException if the alias is for itself
*/
- public function setAlias($alias, $id)
+ public function setAlias(string $alias, $id)
{
- $alias = (string) $alias;
-
if ('' === $alias || '\\' === $alias[-1] || \strlen($alias) !== strcspn($alias, "\0\r\n'")) {
throw new InvalidArgumentException(sprintf('Invalid alias id: "%s"', $alias));
}
@@ -862,9 +833,9 @@ public function setAlias($alias, $id)
*
* @param string $alias The alias to remove
*/
- public function removeAlias($alias)
+ public function removeAlias(string $alias)
{
- if (isset($this->aliasDefinitions[$alias = (string) $alias])) {
+ if (isset($this->aliasDefinitions[$alias])) {
unset($this->aliasDefinitions[$alias]);
$this->removedIds[$alias] = true;
}
@@ -873,13 +844,11 @@ public function removeAlias($alias)
/**
* Returns true if an alias exists under the given identifier.
*
- * @param string $id The service identifier
- *
* @return bool true if the alias exists, false otherwise
*/
- public function hasAlias($id)
+ public function hasAlias(string $id)
{
- return isset($this->aliasDefinitions[$id = (string) $id]);
+ return isset($this->aliasDefinitions[$id]);
}
/**
@@ -895,16 +864,12 @@ public function getAliases()
/**
* Gets an alias.
*
- * @param string $id The service identifier
- *
* @return Alias An Alias instance
*
* @throws InvalidArgumentException if the alias does not exist
*/
- public function getAlias($id)
+ public function getAlias(string $id)
{
- $id = (string) $id;
-
if (!isset($this->aliasDefinitions[$id])) {
throw new InvalidArgumentException(sprintf('The service alias "%s" does not exist.', $id));
}
@@ -918,12 +883,9 @@ public function getAlias($id)
* This methods allows for simple registration of service definition
* with a fluid interface.
*
- * @param string $id The service identifier
- * @param string|null $class The service class
- *
* @return Definition A Definition instance
*/
- public function register($id, $class = null)
+ public function register(string $id, string $class = null)
{
return $this->setDefinition($id, new Definition($class));
}
@@ -934,12 +896,9 @@ public function register($id, $class = null)
* This method implements a shortcut for using setDefinition() with
* an autowired definition.
*
- * @param string $id The service identifier
- * @param string|null $class The service class
- *
* @return Definition The created definition
*/
- public function autowire($id, $class = null)
+ public function autowire(string $id, string $class = null)
{
return $this->setDefinition($id, (new Definition($class))->setAutowired(true));
}
@@ -980,20 +939,16 @@ public function getDefinitions()
/**
* Sets a service definition.
*
- * @param string $id The service identifier
- *
* @return Definition the service definition
*
* @throws BadMethodCallException When this ContainerBuilder is compiled
*/
- public function setDefinition($id, Definition $definition)
+ public function setDefinition(string $id, Definition $definition)
{
if ($this->isCompiled()) {
throw new BadMethodCallException('Adding definition to a compiled container is not allowed');
}
- $id = (string) $id;
-
if ('' === $id || '\\' === $id[-1] || \strlen($id) !== strcspn($id, "\0\r\n'")) {
throw new InvalidArgumentException(sprintf('Invalid service id: "%s"', $id));
}
@@ -1006,28 +961,22 @@ public function setDefinition($id, Definition $definition)
/**
* Returns true if a service definition exists under the given identifier.
*
- * @param string $id The service identifier
- *
* @return bool true if the service definition exists, false otherwise
*/
- public function hasDefinition($id)
+ public function hasDefinition(string $id)
{
- return isset($this->definitions[(string) $id]);
+ return isset($this->definitions[$id]);
}
/**
* Gets a service definition.
*
- * @param string $id The service identifier
- *
* @return Definition A Definition instance
*
* @throws ServiceNotFoundException if the service definition does not exist
*/
- public function getDefinition($id)
+ public function getDefinition(string $id)
{
- $id = (string) $id;
-
if (!isset($this->definitions[$id])) {
throw new ServiceNotFoundException($id);
}
@@ -1040,16 +989,12 @@ public function getDefinition($id)
*
* The method "unaliases" recursively to return a Definition instance.
*
- * @param string $id The service identifier or alias
- *
* @return Definition A Definition instance
*
* @throws ServiceNotFoundException if the service definition does not exist
*/
- public function findDefinition($id)
+ public function findDefinition(string $id)
{
- $id = (string) $id;
-
$seen = [];
while (isset($this->aliasDefinitions[$id])) {
$id = (string) $this->aliasDefinitions[$id];
@@ -1092,7 +1037,7 @@ private function createService(Definition $definition, array &$inlineServices, b
}
if ($definition->isDeprecated()) {
- @trigger_error($definition->getDeprecationMessage($id), E_USER_DEPRECATED);
+ trigger_deprecation('', '', $definition->getDeprecationMessage($id));
}
if ($tryProxy && $definition->isLazy() && !$tryProxy = !($proxy = $this->proxyInstantiator) || $proxy instanceof RealServiceInstantiator) {
@@ -1135,7 +1080,7 @@ private function createService(Definition $definition, array &$inlineServices, b
$r = new \ReflectionClass($factory[0]);
if (0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
- @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name), E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" factory class. It should either be deprecated or its factory upgraded.', $id, $r->name);
}
}
} else {
@@ -1144,7 +1089,7 @@ private function createService(Definition $definition, array &$inlineServices, b
$service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
if (!$definition->isDeprecated() && 0 < strpos($r->getDocComment(), "\n * @deprecated ")) {
- @trigger_error(sprintf('The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name), E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "%s" service relies on the deprecated "%s" class. It should either be deprecated or its implementation upgraded.', $id, $r->name);
}
}
@@ -1271,6 +1216,8 @@ private function doResolveServices($value, array &$inlineServices = [], bool $is
$value = $this->getParameter((string) $value);
} elseif ($value instanceof Expression) {
$value = $this->getExpressionLanguage()->evaluate($value, ['container' => $this]);
+ } elseif ($value instanceof AbstractArgument) {
+ throw new RuntimeException(sprintf('Argument "%s" of service "%s" is abstract%s, did you forget to define it?', $value->getArgumentKey(), $value->getServiceId(), $value->getText() ? ' ('.$value->getText().')' : ''));
}
return $value;
@@ -1290,12 +1237,9 @@ private function doResolveServices($value, array &$inlineServices = [], bool $is
* }
* }
*
- * @param string $name
- * @param bool $throwOnAbstract
- *
* @return array An array of tags with the tagged service as key, holding a list of attribute arrays
*/
- public function findTaggedServiceIds($name, $throwOnAbstract = false)
+ public function findTaggedServiceIds(string $name, bool $throwOnAbstract = false)
{
$this->usedTags[] = $name;
$tags = [];
@@ -1352,11 +1296,9 @@ public function getExpressionLanguageProviders()
/**
* Returns a ChildDefinition that will be used for autoconfiguring the interface/class.
*
- * @param string $interface The class or interface to match
- *
* @return ChildDefinition
*/
- public function registerForAutoconfiguration($interface)
+ public function registerForAutoconfiguration(string $interface)
{
if (!isset($this->autoconfiguredInstanceof[$interface])) {
$this->autoconfiguredInstanceof[$interface] = new ChildDefinition('');
diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
index 0a7f018315f0f..616648f84cb96 100644
--- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php
@@ -32,11 +32,8 @@ interface ContainerInterface extends PsrContainerInterface
/**
* Sets a service.
- *
- * @param string $id The service identifier
- * @param object|null $service The service instance
*/
- public function set($id, $service);
+ public function set(string $id, ?object $service);
/**
* Gets a service.
@@ -51,7 +48,7 @@ public function set($id, $service);
*
* @see Reference
*/
- public function get($id, $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
+ public function get($id, int $invalidBehavior = self::EXCEPTION_ON_INVALID_REFERENCE);
/**
* Returns true if the given service is defined.
@@ -65,11 +62,9 @@ public function has($id);
/**
* Check for whether or not a service has been initialized.
*
- * @param string $id
- *
* @return bool true if the service has been initialized, false otherwise
*/
- public function initialized($id);
+ public function initialized(string $id);
/**
* Gets a parameter.
@@ -80,7 +75,7 @@ public function initialized($id);
*
* @throws InvalidArgumentException if the parameter is not defined
*/
- public function getParameter($name);
+ public function getParameter(string $name);
/**
* Checks if a parameter exists.
@@ -89,7 +84,7 @@ public function getParameter($name);
*
* @return bool The presence of parameter in container
*/
- public function hasParameter($name);
+ public function hasParameter(string $name);
/**
* Sets a parameter.
@@ -97,5 +92,5 @@ public function hasParameter($name);
* @param string $name The parameter name
* @param mixed $value The parameter value
*/
- public function setParameter($name, $value);
+ public function setParameter(string $name, $value);
}
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
index e2bc713a3a911..83b7cd2d7f852 100644
--- a/src/Symfony/Component/DependencyInjection/Definition.php
+++ b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -63,11 +63,7 @@ class Definition
*/
public $decorationOnInvalid;
- /**
- * @param string|null $class The service class
- * @param array $arguments An array of arguments to pass to the service constructor
- */
- public function __construct($class = null, array $arguments = [])
+ public function __construct(string $class = null, array $arguments = [])
{
if (null !== $class) {
$this->setClass($class);
@@ -134,23 +130,19 @@ public function getFactory()
/**
* Sets the service that this service is decorating.
*
- * @param string|null $id The decorated service id, use null to remove decoration
- * @param string|null $renamedId The new decorated service id
- * @param int $priority The priority of decoration
- * @param int $invalidBehavior The behavior to adopt when decorated is invalid
+ * @param string|null $id The decorated service id, use null to remove decoration
+ * @param string|null $renamedId The new decorated service id
*
* @return $this
*
* @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
*/
- public function setDecoratedService($id, $renamedId = null, $priority = 0/*, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE*/)
+ public function setDecoratedService(?string $id, ?string $renamedId = null, int $priority = 0, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
{
if ($renamedId && $id === $renamedId) {
throw new InvalidArgumentException(sprintf('The decorated service inner name for "%s" must be different than the service name itself.', $id));
}
- $invalidBehavior = 3 < \func_num_args() ? (int) func_get_arg(3) : ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
-
$this->changes['decorated_service'] = true;
if (null === $id) {
@@ -179,19 +171,10 @@ public function getDecoratedService()
/**
* Sets the service class.
*
- * @param string $class The service class
- *
* @return $this
*/
- public function setClass($class)
+ public function setClass(?string $class)
{
- if ($class instanceof Parameter) {
- @trigger_error(sprintf('Passing an instance of %s as class name to %s in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%%%s%%" instead.', Parameter::class, __CLASS__, (string) $class), E_USER_DEPRECATED);
- }
- if (null !== $class && !\is_string($class)) {
- @trigger_error(sprintf('The class name passed to %s is expected to be a string. Passing a %s is deprecated in Symfony 4.4 and will result in a TypeError in 5.0.', __CLASS__, \is_object($class) ? \get_class($class) : \gettype($class)), E_USER_DEPRECATED);
- }
-
$this->changes['class'] = true;
$this->class = $class;
@@ -246,12 +229,11 @@ public function getProperties()
/**
* Sets a specific property.
*
- * @param string $name
- * @param mixed $value
+ * @param mixed $value
*
* @return $this
*/
- public function setProperty($name, $value)
+ public function setProperty(string $name, $value)
{
$this->properties[$name] = $value;
@@ -370,12 +352,12 @@ public function setMethodCalls(array $calls = [])
*
* @throws InvalidArgumentException on empty $method param
*/
- public function addMethodCall($method, array $arguments = []/*, bool $returnsClone = false*/)
+ public function addMethodCall(string $method, array $arguments = [], bool $returnsClone = false)
{
if (empty($method)) {
throw new InvalidArgumentException('Method name cannot be empty.');
}
- $this->calls[] = 2 < \func_num_args() && func_get_arg(2) ? [$method, $arguments, true] : [$method, $arguments];
+ $this->calls[] = $returnsClone ? [$method, $arguments, true] : [$method, $arguments];
return $this;
}
@@ -383,11 +365,9 @@ public function addMethodCall($method, array $arguments = []/*, bool $returnsClo
/**
* Removes a method to call after service initialization.
*
- * @param string $method The method name to remove
- *
* @return $this
*/
- public function removeMethodCall($method)
+ public function removeMethodCall(string $method)
{
foreach ($this->calls as $i => $call) {
if ($call[0] === $method) {
@@ -402,11 +382,9 @@ public function removeMethodCall($method)
/**
* Check if the current definition has a given method to call after service initialization.
*
- * @param string $method The method name to search for
- *
* @return bool
*/
- public function hasMethodCall($method)
+ public function hasMethodCall(string $method)
{
foreach ($this->calls as $call) {
if ($call[0] === $method) {
@@ -454,11 +432,9 @@ public function getInstanceofConditionals()
/**
* Sets whether or not instanceof conditionals should be prepended with a global set.
*
- * @param bool $autoconfigured
- *
* @return $this
*/
- public function setAutoconfigured($autoconfigured)
+ public function setAutoconfigured(bool $autoconfigured)
{
$this->changes['autoconfigured'] = true;
@@ -500,11 +476,9 @@ public function getTags()
/**
* Gets a tag by name.
*
- * @param string $name The tag name
- *
* @return array An array of attributes
*/
- public function getTag($name)
+ public function getTag(string $name)
{
return isset($this->tags[$name]) ? $this->tags[$name] : [];
}
@@ -512,12 +486,9 @@ public function getTag($name)
/**
* Adds a tag for this definition.
*
- * @param string $name The tag name
- * @param array $attributes An array of attributes
- *
* @return $this
*/
- public function addTag($name, array $attributes = [])
+ public function addTag(string $name, array $attributes = [])
{
$this->tags[$name][] = $attributes;
@@ -527,11 +498,9 @@ public function addTag($name, array $attributes = [])
/**
* Whether this definition has a tag with the given name.
*
- * @param string $name
- *
* @return bool
*/
- public function hasTag($name)
+ public function hasTag(string $name)
{
return isset($this->tags[$name]);
}
@@ -539,11 +508,9 @@ public function hasTag($name)
/**
* Clears all tags for a given name.
*
- * @param string $name The tag name
- *
* @return $this
*/
- public function clearTag($name)
+ public function clearTag(string $name)
{
unset($this->tags[$name]);
@@ -565,11 +532,9 @@ public function clearTags()
/**
* Sets a file to require before creating the service.
*
- * @param string $file A full pathname to include
- *
* @return $this
*/
- public function setFile($file)
+ public function setFile(?string $file)
{
$this->changes['file'] = true;
@@ -591,15 +556,13 @@ public function getFile()
/**
* Sets if the service must be shared or not.
*
- * @param bool $shared Whether the service must be shared or not
- *
* @return $this
*/
- public function setShared($shared)
+ public function setShared(bool $shared)
{
$this->changes['shared'] = true;
- $this->shared = (bool) $shared;
+ $this->shared = $shared;
return $this;
}
@@ -617,15 +580,13 @@ public function isShared()
/**
* Sets the visibility of this service.
*
- * @param bool $boolean
- *
* @return $this
*/
- public function setPublic($boolean)
+ public function setPublic(bool $boolean)
{
$this->changes['public'] = true;
- $this->public = (bool) $boolean;
+ $this->public = $boolean;
$this->private = false;
return $this;
@@ -649,13 +610,11 @@ public function isPublic()
* but triggers a deprecation notice when accessed from the container,
* so that the service can be made really private in 4.0.
*
- * @param bool $boolean
- *
* @return $this
*/
- public function setPrivate($boolean)
+ public function setPrivate(bool $boolean)
{
- $this->private = (bool) $boolean;
+ $this->private = $boolean;
return $this;
}
@@ -673,15 +632,13 @@ public function isPrivate()
/**
* Sets the lazy flag of this service.
*
- * @param bool $lazy
- *
* @return $this
*/
- public function setLazy($lazy)
+ public function setLazy(bool $lazy)
{
$this->changes['lazy'] = true;
- $this->lazy = (bool) $lazy;
+ $this->lazy = $lazy;
return $this;
}
@@ -700,13 +657,11 @@ public function isLazy()
* Sets whether this definition is synthetic, that is not constructed by the
* container, but dynamically injected.
*
- * @param bool $boolean
- *
* @return $this
*/
- public function setSynthetic($boolean)
+ public function setSynthetic(bool $boolean)
{
- $this->synthetic = (bool) $boolean;
+ $this->synthetic = $boolean;
return $this;
}
@@ -726,13 +681,11 @@ public function isSynthetic()
* Whether this definition is abstract, that means it merely serves as a
* template for other definitions.
*
- * @param bool $boolean
- *
* @return $this
*/
- public function setAbstract($boolean)
+ public function setAbstract(bool $boolean)
{
- $this->abstract = (bool) $boolean;
+ $this->abstract = $boolean;
return $this;
}
@@ -752,14 +705,13 @@ public function isAbstract()
* Whether this definition is deprecated, that means it should not be called
* anymore.
*
- * @param bool $status
* @param string $template Template message to use if the definition is deprecated
*
* @return $this
*
* @throws InvalidArgumentException when the message template is invalid
*/
- public function setDeprecated($status = true, $template = null)
+ public function setDeprecated(bool $status = true, string $template = null)
{
if (null !== $template) {
if (preg_match('#[\r\n]|\*/#', $template)) {
@@ -775,7 +727,7 @@ public function setDeprecated($status = true, $template = null)
$this->changes['deprecated'] = true;
- $this->deprecated = (bool) $status;
+ $this->deprecated = $status;
return $this;
}
@@ -798,7 +750,7 @@ public function isDeprecated()
*
* @return string
*/
- public function getDeprecationMessage($id)
+ public function getDeprecationMessage(string $id)
{
return str_replace('%service_id%', $id, $this->deprecationTemplate ?: self::$defaultDeprecationTemplate);
}
@@ -848,15 +800,13 @@ public function isAutowired()
/**
* Enables/disables autowiring.
*
- * @param bool $autowired
- *
* @return $this
*/
- public function setAutowired($autowired)
+ public function setAutowired(bool $autowired)
{
$this->changes['autowired'] = true;
- $this->autowired = (bool) $autowired;
+ $this->autowired = $autowired;
return $this;
}
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 15d5c09f767ca..9f9ebbaa219b3 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -13,6 +13,7 @@
use Composer\Autoload\ClassLoader;
use Symfony\Component\Debug\DebugClassLoader as LegacyDebugClassLoader;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -20,6 +21,7 @@
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraphEdge;
use Symfony\Component\DependencyInjection\Compiler\ServiceReferenceGraphNode;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -150,8 +152,8 @@ public function dump(array $options = [])
$this->namespace = $options['namespace'];
$this->asFiles = $options['as_files'];
$this->hotPathTag = $options['hot_path_tag'];
- $this->inlineFactories = $this->asFiles && $options['inline_factories_parameter'] && $this->container->hasParameter($options['inline_factories_parameter']) && $this->container->getParameter($options['inline_factories_parameter']);
- $this->inlineRequires = $options['inline_class_loader_parameter'] && $this->container->hasParameter($options['inline_class_loader_parameter']) && $this->container->getParameter($options['inline_class_loader_parameter']);
+ $this->inlineFactories = $this->asFiles && $options['inline_factories_parameter'] && (!$this->container->hasParameter($options['inline_factories_parameter']) || $this->container->getParameter($options['inline_factories_parameter']));
+ $this->inlineRequires = $options['inline_class_loader_parameter'] && ($this->container->hasParameter($options['inline_class_loader_parameter']) ? $this->container->getParameter($options['inline_class_loader_parameter']) : (\PHP_VERSION_ID < 70400 || $options['debug']));
$this->serviceLocatorTag = $options['service_locator_tag'];
if (0 !== strpos($baseClass = $options['base_class'], '\\') && 'Container' !== $baseClass) {
@@ -393,6 +395,9 @@ private function getProxyDumper(): ProxyDumper
return $this->proxyDumper;
}
+ /**
+ * @param ServiceReferenceGraphEdge[] $edges
+ */
private function analyzeCircularReferences(string $sourceId, array $edges, array &$checkedNodes, array &$currentPath = [], bool $byConstructor = true)
{
$checkedNodes[$sourceId] = true;
@@ -798,7 +803,7 @@ protected function {$methodName}($lazyInitialization)
$this->inlinedDefinitions = $this->getDefinitionsFromArguments([$definition], null, $this->serviceCalls);
if ($definition->isDeprecated()) {
- $code .= sprintf(" @trigger_error(%s, E_USER_DEPRECATED);\n\n", $this->export($definition->getDeprecationMessage($id)));
+ $code .= sprintf(" trigger_deprecation('', '', %s);\n\n", $this->export($definition->getDeprecationMessage($id)));
}
if ($this->getProxyDumper()->isProxyCandidate($definition)) {
@@ -1307,7 +1312,7 @@ private function addDeprecatedAliases(): string
*/
protected function {$methodNameAlias}()
{
- @trigger_error($messageExported, E_USER_DEPRECATED);
+ trigger_deprecation('', '', $messageExported);
return \$this->get($idExported);
}
@@ -1381,14 +1386,13 @@ private function addDefaultParametersMethod(): string
$code = <<<'EOF'
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return $this->buildParameters[$name];
}
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -1398,17 +1402,16 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return true;
}
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
@@ -1431,7 +1434,7 @@ public function getParameterBag(): ParameterBagInterface
EOF;
if (!$this->asFiles) {
- $code = preg_replace('/^.*buildParameters.*\n.*\n.*\n/m', '', $code);
+ $code = preg_replace('/^.*buildParameters.*\n.*\n.*\n\n?/m', '', $code);
}
if ($dynamicPhp) {
@@ -1737,6 +1740,8 @@ private function dumpValue($value, bool $interpolate = true): string
return $code;
}
+ } elseif ($value instanceof AbstractArgument) {
+ throw new RuntimeException(sprintf('Argument "%s" of service "%s" is abstract%s, did you forget to define it?', $value->getArgumentKey(), $value->getServiceId(), $value->getText() ? ' ('.$value->getText().')' : ''));
} elseif (\is_object($value) || \is_resource($value)) {
throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
index fb5d827acdc0a..6f7d918d26af4 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\DependencyInjection\Dumper;
use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -312,6 +313,14 @@ private function convertParameters(array $parameters, string $type, \DOMElement
$element->setAttribute('type', 'binary');
$text = $this->document->createTextNode(self::phpToXml(base64_encode($value)));
$element->appendChild($text);
+ } elseif ($value instanceof AbstractArgument) {
+ $argKey = $value->getArgumentKey();
+ if (!is_numeric($argKey)) {
+ $element->setAttribute('key', $argKey);
+ }
+ $element->setAttribute('type', 'abstract');
+ $text = $this->document->createTextNode(self::phpToXml($value->getText()));
+ $element->appendChild($text);
} else {
if (\in_array($value, ['null', 'true', 'false'], true)) {
$element->setAttribute('type', 'string');
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
index ccb68ee8f1ee1..bba092c64e90d 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\DependencyInjection\Dumper;
use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -284,6 +285,8 @@ private function dumpValue($value)
return $this->getExpressionCall((string) $value);
} elseif ($value instanceof Definition) {
return new TaggedValue('service', (new Parser())->parse("_:\n".$this->addService('_', $value), Yaml::PARSE_CUSTOM_TAGS)['_']['_']);
+ } elseif ($value instanceof AbstractArgument) {
+ return new TaggedValue('abstract', $value->getText());
} elseif (\is_object($value) || \is_resource($value)) {
throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
}
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
index b7c828b124eb3..987605f98f25c 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessor.php
@@ -61,7 +61,7 @@ public static function getProvidedTypes()
/**
* {@inheritdoc}
*/
- public function getEnv($prefix, $name, \Closure $getEnv)
+ public function getEnv(string $prefix, string $name, \Closure $getEnv)
{
$i = strpos($name, ':');
diff --git a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
index 654fe55e982fc..d3275fe290e36 100644
--- a/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
+++ b/src/Symfony/Component/DependencyInjection/EnvVarProcessorInterface.php
@@ -31,7 +31,7 @@ interface EnvVarProcessorInterface
*
* @throws RuntimeException on error
*/
- public function getEnv($prefix, $name, \Closure $getEnv);
+ public function getEnv(string $prefix, string $name, \Closure $getEnv);
/**
* @return string[] The PHP-types managed by getEnv(), keyed by prefixes
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
index d2093761c76c7..81070c911fab9 100644
--- a/src/Symfony/Component/DependencyInjection/Extension/Extension.php
+++ b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -17,6 +17,7 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Exception\BadMethodCallException;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
/**
* Provides useful features shared by many extensions.
@@ -93,10 +94,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
}
if (!$class->implementsInterface(ConfigurationInterface::class)) {
- @trigger_error(sprintf('Not implementing "%s" in the extension configuration class "%s" is deprecated since Symfony 4.1.', ConfigurationInterface::class, $class->getName()), E_USER_DEPRECATED);
- //throw new LogicException(sprintf('The extension configuration class "%s" must implement "%s".', $class->getName(), ConfigurationInterface::class));
-
- return null;
+ throw new LogicException(sprintf('The extension configuration class "%s" must implement "%s".', $class->getName(), ConfigurationInterface::class));
}
if (!($constructor = $class->getConstructor()) || !$constructor->getNumberOfRequiredParameters()) {
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php
index 96104e4ad66af..a9d78115dd83c 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php
@@ -30,5 +30,5 @@ interface InstantiatorInterface
*
* @return object
*/
- public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator);
+ public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator);
}
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php
index 2e36704080e6d..1696e7a90482f 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php
@@ -26,7 +26,7 @@ class RealServiceInstantiator implements InstantiatorInterface
/**
* {@inheritdoc}
*/
- public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
+ public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator)
{
return $realInstantiator();
}
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
index f592e6cf196c2..351560d2926ad 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -30,12 +30,9 @@ public function isProxyCandidate(Definition $definition);
/**
* Generates the code to be used to instantiate a proxy in the dumped factory code.
*
- * @param string $id Service identifier
- * @param string $factoryCode The code to execute to create the service
- *
* @return string
*/
- public function getProxyFactoryCode(Definition $definition, $id, $factoryCode);
+ public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode);
/**
* Generates the code for the lazy proxy.
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php
index ebc6a5dc2bb5f..7e0f14c32bb1b 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php
@@ -33,7 +33,7 @@ public function isProxyCandidate(Definition $definition): bool
/**
* {@inheritdoc}
*/
- public function getProxyFactoryCode(Definition $definition, $id, $factoryCode = null): string
+ public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode): string
{
return '';
}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
index 939dd7cb7c4a0..57aa83d6a0a74 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
@@ -33,7 +33,7 @@ public function __construct(ContainerBuilder $container)
/**
* {@inheritdoc}
*/
- public function load($resource, $type = null)
+ public function load($resource, string $type = null)
{
$resource($this->container);
}
@@ -41,7 +41,7 @@ public function load($resource, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
return $resource instanceof \Closure;
}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
index a12fd1bed5758..d5554a76755cb 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/AbstractConfigurator.php
@@ -22,10 +22,15 @@ abstract class AbstractConfigurator
{
const FACTORY = 'unknown';
+ /**
+ * @var callable(mixed $value, bool $allowService)|null
+ */
+ public static $valuePreProcessor;
+
/** @internal */
protected $definition;
- public function __call($method, $args)
+ public function __call(string $method, array $args)
{
if (method_exists($this, 'set'.$method)) {
return $this->{'set'.$method}(...$args);
@@ -49,7 +54,11 @@ public static function processValue($value, $allowServices = false)
$value[$k] = static::processValue($v, $allowServices);
}
- return $value;
+ return self::$valuePreProcessor ? (self::$valuePreProcessor)($value, $allowServices) : $value;
+ }
+
+ if (self::$valuePreProcessor) {
+ $value = (self::$valuePreProcessor)($value, $allowServices);
}
if ($value instanceof ReferenceConfigurator) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
index 712d8c96439b6..f511f82f2a1ae 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -69,6 +69,17 @@ final public function services(): ServicesConfigurator
{
return new ServicesConfigurator($this->container, $this->loader, $this->instanceof, $this->path, $this->anonymousCount);
}
+
+ /**
+ * @return static
+ */
+ final public function withPath(string $path): self
+ {
+ $clone = clone $this;
+ $clone->path = $clone->file = $path;
+
+ return $clone;
+ }
}
/**
@@ -107,18 +118,6 @@ function iterator(array $values): IteratorArgument
return new IteratorArgument(AbstractConfigurator::processValue($values, true));
}
-/**
- * Creates a lazy iterator by tag name.
- *
- * @deprecated since Symfony 4.4, to be removed in 5.0, use "tagged_iterator" instead.
- */
-function tagged(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): TaggedIteratorArgument
-{
- @trigger_error(__NAMESPACE__.'\tagged() is deprecated since Symfony 4.4 and will be removed in 5.0, use '.__NAMESPACE__.'\tagged_iterator() instead.', E_USER_DEPRECATED);
-
- return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod);
-}
-
/**
* Creates a lazy iterator by tag name.
*/
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
index 362b374e55970..9802de884a205 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/InlineServiceConfigurator.php
@@ -23,10 +23,13 @@ class InlineServiceConfigurator extends AbstractConfigurator
use Traits\ArgumentTrait;
use Traits\AutowireTrait;
use Traits\BindTrait;
+ use Traits\CallTrait;
+ use Traits\ConfiguratorTrait;
use Traits\FactoryTrait;
use Traits\FileTrait;
use Traits\LazyTrait;
use Traits\ParentTrait;
+ use Traits\PropertyTrait;
use Traits\TagTrait;
public function __construct(Definition $definition)
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php
index 222cf758132e7..b3a1ae1b54793 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/Configurator/Traits/DecorateTrait.php
@@ -19,10 +19,7 @@ trait DecorateTrait
/**
* Sets the service that this service is decorating.
*
- * @param string|null $id The decorated service id, use null to remove decoration
- * @param string|null $renamedId The new decorated service id
- * @param int $priority The priority of decoration
- * @param int $invalidBehavior The behavior to adopt when decorated is invalid
+ * @param string|null $id The decorated service id, use null to remove decoration
*
* @return $this
*
diff --git a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
index a57cac3b5ee99..943986982e344 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
@@ -21,7 +21,7 @@ class DirectoryLoader extends FileLoader
/**
* {@inheritdoc}
*/
- public function load($file, $type = null)
+ public function load($file, string $type = null)
{
$file = rtrim($file, '/');
$path = $this->locator->locate($file);
@@ -43,7 +43,7 @@ public function load($file, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
if ('directory' === $type) {
return true;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
index b96cd416fd413..09290f9b68d52 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -48,18 +48,16 @@ public function __construct(ContainerBuilder $container, FileLocatorInterface $l
/**
* {@inheritdoc}
*
- * @param bool|string $ignoreErrors Whether errors should be ignored; pass "not_found" to ignore only when the loaded resource is not found
- * @param string|string[]|null $exclude Glob patterns to exclude from the import
+ * @param bool|string $ignoreErrors Whether errors should be ignored; pass "not_found" to ignore only when the loaded resource is not found
*/
- public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null/*, $exclude = null*/)
+ public function import($resource, $type = null, $ignoreErrors = false, $sourceResource = null, $exclude = null)
{
$args = \func_get_args();
if ($ignoreNotFound = 'not_found' === $ignoreErrors) {
$args[2] = false;
} elseif (!\is_bool($ignoreErrors)) {
- @trigger_error(sprintf('Invalid argument $ignoreErrors provided to %s::import(): boolean or "not_found" expected, %s given.', static::class, \gettype($ignoreErrors)), E_USER_DEPRECATED);
- $args[2] = (bool) $ignoreErrors;
+ throw new \TypeError(sprintf('Invalid argument $ignoreErrors provided to %s::import(): boolean or "not_found" expected, %s given.', static::class, \gettype($ignoreErrors)));
}
try {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php
index 4b25610efe48e..53af9cf2b8a18 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php
@@ -21,7 +21,7 @@ class GlobFileLoader extends FileLoader
/**
* {@inheritdoc}
*/
- public function load($resource, $type = null)
+ public function load($resource, string $type = null)
{
foreach ($this->glob($resource, false, $globResource) as $path => $info) {
$this->import($path);
@@ -33,7 +33,7 @@ public function load($resource, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
return 'glob' === $type;
}
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
index 40137b18fd7a3..e6384803c36ea 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -24,7 +24,7 @@ class IniFileLoader extends FileLoader
/**
* {@inheritdoc}
*/
- public function load($resource, $type = null)
+ public function load($resource, string $type = null)
{
$path = $this->locator->locate($resource);
@@ -49,7 +49,7 @@ public function load($resource, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
if (!\is_string($resource)) {
return false;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
index f1477ecfd712d..207fb83ec180f 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -58,7 +58,7 @@ public function load($resource, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
if (!\is_string($resource)) {
return false;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 41a9f0a3ac933..6cad9453048e7 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -13,6 +13,7 @@
use Symfony\Component\Config\Util\XmlUtils;
use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -41,7 +42,7 @@ class XmlFileLoader extends FileLoader
/**
* {@inheritdoc}
*/
- public function load($resource, $type = null)
+ public function load($resource, string $type = null)
{
$path = $this->locator->locate($resource);
@@ -75,7 +76,7 @@ public function load($resource, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
if (!\is_string($resource)) {
return false;
@@ -537,6 +538,10 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file
}
$arguments[$key] = $value;
break;
+ case 'abstract':
+ $serviceId = $node->getAttribute('id');
+ $arguments[$key] = new AbstractArgument($serviceId, (string) $key, $arg->nodeValue);
+ break;
case 'string':
$arguments[$key] = $arg->nodeValue;
break;
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
index ee8c1401513c0..1722f7ac73479 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\DependencyInjection\Loader;
use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
@@ -115,7 +116,7 @@ class YamlFileLoader extends FileLoader
/**
* {@inheritdoc}
*/
- public function load($resource, $type = null)
+ public function load($resource, string $type = null)
{
$path = $this->locator->locate($resource);
@@ -160,7 +161,7 @@ public function load($resource, $type = null)
/**
* {@inheritdoc}
*/
- public function supports($resource, $type = null)
+ public function supports($resource, string $type = null)
{
if (!\is_string($resource)) {
return false;
@@ -446,7 +447,7 @@ private function parseDefinition(string $id, $service, string $file, array $defa
}
if (isset($service['arguments'])) {
- $definition->setArguments($this->resolveServices($service['arguments'], $file));
+ $definition->setArguments($this->resolveServices($service['arguments'], $file, false, $id));
}
if (isset($service['properties'])) {
@@ -634,14 +635,6 @@ private function parseCallable($callable, string $parameter, string $id, string
throw new InvalidArgumentException(sprintf('The value of the "%s" option for the "%s" service must be the id of the service without the "@" prefix (replace "%s" with "%s" in "%s").', $parameter, $id, $callable, substr($callable, 1), $file));
}
- if (false !== strpos($callable, ':') && false === strpos($callable, '::')) {
- $parts = explode(':', $callable);
-
- @trigger_error(sprintf('Using short %s syntax for service "%s" is deprecated since Symfony 4.4, use "[\'@%s\', \'%s\']" instead.', $parameter, $id, ...$parts), E_USER_DEPRECATED);
-
- return [$this->resolveServices('@'.$parts[0], $file), $parts[1]];
- }
-
return $callable;
}
@@ -730,7 +723,7 @@ private function validate($content, string $file): ?array
*
* @return array|string|Reference|ArgumentInterface
*/
- private function resolveServices($value, string $file, bool $isParameter = false)
+ private function resolveServices($value, string $file, bool $isParameter = false, string $serviceId = '', string $argKey = '')
{
if ($value instanceof TaggedValue) {
$argument = $value->getValue();
@@ -803,13 +796,16 @@ private function resolveServices($value, string $file, bool $isParameter = false
return new Reference($id);
}
+ if ('abstract' === $value->getTag()) {
+ return new AbstractArgument($serviceId, $argKey, $value->getValue());
+ }
throw new InvalidArgumentException(sprintf('Unsupported tag "!%s".', $value->getTag()));
}
if (\is_array($value)) {
foreach ($value as $k => $v) {
- $value[$k] = $this->resolveServices($v, $file, $isParameter);
+ $value[$k] = $this->resolveServices($v, $file, $isParameter, $serviceId, $k);
}
} elseif (\is_string($value) && 0 === strpos($value, '@=')) {
if (!class_exists(Expression::class)) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
index 2f745c3326d49..d2c81bcf311c7 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
+++ b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -260,6 +260,7 @@
+
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
index 872408690b926..defedbbd28f53 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/EnvPlaceholderParameterBag.php
@@ -29,7 +29,7 @@ class EnvPlaceholderParameterBag extends ParameterBag
/**
* {@inheritdoc}
*/
- public function get($name)
+ public function get(string $name)
{
if (0 === strpos($name, 'env(') && ')' === substr($name, -1) && 'env()' !== $name) {
$env = substr($name, 4, -1);
@@ -44,23 +44,15 @@ public function get($name)
return $placeholder; // return first result
}
}
- if (!preg_match('/^(?:\w*+:)*+\w++$/', $env)) {
+ if (!preg_match('/^(?:[-.\w]*+:)*+\w++$/', $env)) {
throw new InvalidArgumentException(sprintf('Invalid %s name: only "word" characters are allowed.', $name));
}
-
- if ($this->has($name)) {
- $defaultValue = parent::get($name);
-
- if (null !== $defaultValue && !is_scalar($defaultValue)) { // !is_string in 5.0
- //throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
- throw new RuntimeException(sprintf('The default value of an env() parameter must be scalar or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
- } elseif (is_scalar($defaultValue) && !\is_string($defaultValue)) {
- @trigger_error(sprintf('A non-string default value of an env() parameter is deprecated since 4.3, cast "%s" to string instead.', $name), E_USER_DEPRECATED);
- }
+ if ($this->has($name) && null !== ($defaultValue = parent::get($name)) && !\is_string($defaultValue)) {
+ throw new RuntimeException(sprintf('The default value of an env() parameter must be a string or null, but "%s" given to "%s".', \gettype($defaultValue), $name));
}
$uniqueName = md5($name.'_'.self::$counter++);
- $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), str_replace(':', '_', $env), $uniqueName);
+ $placeholder = sprintf('%s_%s_%s', $this->getEnvPlaceholderUniquePrefix(), strtr($env, ':-.', '___'), $uniqueName);
$this->envPlaceholders[$env][$placeholder] = $placeholder;
return $placeholder;
@@ -154,19 +146,8 @@ public function resolve()
parent::resolve();
foreach ($this->envPlaceholders as $env => $placeholders) {
- if (!$this->has($name = "env($env)")) {
- continue;
- }
- if (is_numeric($default = $this->parameters[$name])) {
- if (!\is_string($default)) {
- @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), E_USER_DEPRECATED);
- }
- $this->parameters[$name] = (string) $default;
- } elseif (null !== $default && !is_scalar($default)) { // !is_string in 5.0
- //throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, %s given.', $env, \gettype($default)));
- throw new RuntimeException(sprintf('The default value of env parameter "%s" must be scalar or null, %s given.', $env, \gettype($default)));
- } elseif (is_scalar($default) && !\is_string($default)) {
- @trigger_error(sprintf('A non-string default value of env parameter "%s" is deprecated since 4.3, cast it to string instead.', $env), E_USER_DEPRECATED);
+ if ($this->has($name = "env($env)") && null !== ($default = $this->parameters[$name]) && !\is_string($default)) {
+ throw new RuntimeException(sprintf('The default value of env parameter "%s" must be a string or null, %s given.', $env, \gettype($default)));
}
}
}
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
index a5199937e233f..5a4aaf8b2a43d 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/FrozenParameterBag.php
@@ -53,7 +53,7 @@ public function add(array $parameters)
/**
* {@inheritdoc}
*/
- public function set($name, $value)
+ public function set(string $name, $value)
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
@@ -61,7 +61,7 @@ public function set($name, $value)
/**
* {@inheritdoc}
*/
- public function remove($name)
+ public function remove(string $name)
{
throw new LogicException('Impossible to call remove() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
index 48887c3756d26..643424ad55043 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBag.php
@@ -64,10 +64,8 @@ public function all()
/**
* {@inheritdoc}
*/
- public function get($name)
+ public function get(string $name)
{
- $name = (string) $name;
-
if (!\array_key_exists($name, $this->parameters)) {
if (!$name) {
throw new ParameterNotFoundException($name);
@@ -109,15 +107,15 @@ public function get($name)
* @param string $name The parameter name
* @param mixed $value The parameter value
*/
- public function set($name, $value)
+ public function set(string $name, $value)
{
- $this->parameters[(string) $name] = $value;
+ $this->parameters[$name] = $value;
}
/**
* {@inheritdoc}
*/
- public function has($name)
+ public function has(string $name)
{
return \array_key_exists((string) $name, $this->parameters);
}
@@ -127,9 +125,9 @@ public function has($name)
*
* @param string $name The parameter name
*/
- public function remove($name)
+ public function remove(string $name)
{
- unset($this->parameters[(string) $name]);
+ unset($this->parameters[$name]);
}
/**
@@ -190,8 +188,7 @@ public function resolveValue($value, array $resolving = [])
/**
* Resolves parameters inside a string.
*
- * @param string $value The string to resolve
- * @param array $resolving An array of keys that are being resolved (used internally to detect circular references)
+ * @param array $resolving An array of keys that are being resolved (used internally to detect circular references)
*
* @return mixed The resolved string
*
@@ -199,7 +196,7 @@ public function resolveValue($value, array $resolving = [])
* @throws ParameterCircularReferenceException if a circular reference if detected
* @throws RuntimeException when a given parameter has a type problem
*/
- public function resolveString($value, array $resolving = [])
+ public function resolveString(string $value, array $resolving = [])
{
// we do this to deal with non string values (Boolean, integer, ...)
// as the preg_replace_callback throw an exception when trying
diff --git a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
index 6a4e0fa4acc0a..f224216cc3d83 100644
--- a/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
+++ b/src/Symfony/Component/DependencyInjection/ParameterBag/ParameterBagInterface.php
@@ -47,39 +47,32 @@ public function all();
/**
* Gets a service container parameter.
*
- * @param string $name The parameter name
- *
* @return mixed The parameter value
*
* @throws ParameterNotFoundException if the parameter is not defined
*/
- public function get($name);
+ public function get(string $name);
/**
* Removes a parameter.
- *
- * @param string $name The parameter name
*/
- public function remove($name);
+ public function remove(string $name);
/**
* Sets a service container parameter.
*
- * @param string $name The parameter name
- * @param mixed $value The parameter value
+ * @param mixed $value The parameter value
*
* @throws LogicException if the parameter can not be set
*/
- public function set($name, $value);
+ public function set(string $name, $value);
/**
* Returns true if a parameter name is defined.
*
- * @param string $name The parameter name
- *
* @return bool true if the parameter name is defined, false otherwise
*/
- public function has($name);
+ public function has(string $name);
/**
* Replaces parameter placeholders (%name%) by their values for all parameters.
diff --git a/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php b/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php
deleted file mode 100644
index b9714d25098fe..0000000000000
--- a/src/Symfony/Component/DependencyInjection/ResettableContainerInterface.php
+++ /dev/null
@@ -1,35 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection;
-
-use Symfony\Contracts\Service\ResetInterface;
-
-/**
- * ResettableContainerInterface defines additional resetting functionality
- * for containers, allowing to release shared services when the container is
- * not needed anymore.
- *
- * @author Christophe Coevoet
- *
- * @deprecated since Symfony 4.2, use "Symfony\Contracts\Service\ResetInterface" instead.
- */
-interface ResettableContainerInterface extends ContainerInterface, ResetInterface
-{
- /**
- * Resets shared services from the container.
- *
- * The container is not intended to be used again after being reset in a normal workflow. This method is
- * meant as a way to release references for ref-counting.
- * A subsequent call to ContainerInterface::get will recreate a new instance of the shared service.
- */
- public function reset();
-}
diff --git a/src/Symfony/Component/DependencyInjection/ReverseContainer.php b/src/Symfony/Component/DependencyInjection/ReverseContainer.php
index 076e624c2e5ce..280e9e2dd5a63 100644
--- a/src/Symfony/Component/DependencyInjection/ReverseContainer.php
+++ b/src/Symfony/Component/DependencyInjection/ReverseContainer.php
@@ -31,7 +31,7 @@ public function __construct(Container $serviceContainer, ContainerInterface $rev
$this->serviceContainer = $serviceContainer;
$this->reversibleLocator = $reversibleLocator;
$this->tagName = $tagName;
- $this->getServiceId = \Closure::bind(function ($service): ?string {
+ $this->getServiceId = \Closure::bind(function (object $service): ?string {
return array_search($service, $this->services, true) ?: array_search($service, $this->privates, true) ?: null;
}, $serviceContainer, Container::class);
}
@@ -40,10 +40,8 @@ public function __construct(Container $serviceContainer, ContainerInterface $rev
* Returns the id of the passed object when it exists as a service.
*
* To be reversible, services need to be either public or be tagged with "container.reversible".
- *
- * @param object $service
*/
- public function getId($service): ?string
+ public function getId(object $service): ?string
{
if ($this->serviceContainer === $service) {
return 'service_container';
@@ -61,11 +59,9 @@ public function getId($service): ?string
}
/**
- * @return object
- *
* @throws ServiceNotFoundException When the service is not reversible
*/
- public function getService(string $id)
+ public function getService(string $id): object
{
if ($this->serviceContainer->has($id)) {
return $this->serviceContainer->get($id);
diff --git a/src/Symfony/Component/DependencyInjection/ServiceLocator.php b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
index e379f3b607cbb..dd97e39d138d3 100644
--- a/src/Symfony/Component/DependencyInjection/ServiceLocator.php
+++ b/src/Symfony/Component/DependencyInjection/ServiceLocator.php
@@ -57,7 +57,7 @@ public function get($id)
}
}
- public function __invoke($id)
+ public function __invoke(string $id)
{
return isset($this->factories[$id]) ? $this->get($id) : null;
}
@@ -67,7 +67,7 @@ public function __invoke($id)
*
* @return static
*/
- public function withContext(string $externalId, Container $container)
+ public function withContext(string $externalId, Container $container): self
{
$locator = clone $this;
$locator->externalId = $externalId;
diff --git a/src/Symfony/Component/DependencyInjection/ServiceSubscriberInterface.php b/src/Symfony/Component/DependencyInjection/ServiceSubscriberInterface.php
deleted file mode 100644
index a3b6ba790718e..0000000000000
--- a/src/Symfony/Component/DependencyInjection/ServiceSubscriberInterface.php
+++ /dev/null
@@ -1,23 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\DependencyInjection;
-
-use Symfony\Contracts\Service\ServiceSubscriberInterface as BaseServiceSubscriberInterface;
-
-/**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.2, use Symfony\Contracts\Service\ServiceSubscriberInterface instead.
- */
-interface ServiceSubscriberInterface extends BaseServiceSubscriberInterface
-{
-}
diff --git a/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php b/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php
index 90b297fff2f37..2e32cd5977a38 100644
--- a/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php
+++ b/src/Symfony/Component/DependencyInjection/TaggedContainerInterface.php
@@ -25,5 +25,5 @@ interface TaggedContainerInterface extends ContainerInterface
*
* @return array An array of tags
*/
- public function findTaggedServiceIds($name);
+ public function findTaggedServiceIds(string $name);
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Argument/AbstractArgumentTest.php b/src/Symfony/Component/DependencyInjection/Tests/Argument/AbstractArgumentTest.php
new file mode 100644
index 0000000000000..91b1a5665b7de
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Argument/AbstractArgumentTest.php
@@ -0,0 +1,26 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Argument;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
+
+class AbstractArgumentTest extends TestCase
+{
+ public function testAbstractArgumentGetters()
+ {
+ $argument = new AbstractArgument('foo', '$bar', 'should be defined by Pass');
+ $this->assertSame('foo', $argument->getServiceId());
+ $this->assertSame('$bar', $argument->getArgumentKey());
+ $this->assertSame('should be defined by Pass', $argument->getText());
+ }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
new file mode 100644
index 0000000000000..241daaaff3358
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireRequiredPropertiesPassTest.php
@@ -0,0 +1,46 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Compiler;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredPropertiesPass;
+use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+require_once __DIR__.'/../Fixtures/includes/autowiring_classes.php';
+
+if (\PHP_VERSION_ID >= 70400) {
+ require_once __DIR__.'/../Fixtures/includes/autowiring_classes_74.php';
+}
+
+/**
+ * @requires PHP 7.4
+ */
+class AutowireRequiredPropertiesPassTest extends TestCase
+{
+ public function testInjection()
+ {
+ $container = new ContainerBuilder();
+ $container->register(Bar::class);
+ $container->register(A::class);
+ $container->register(B::class);
+ $container->register(PropertiesInjection::class)->setAutowired(true);
+
+ (new ResolveClassPass())->process($container);
+ (new AutowireRequiredPropertiesPass())->process($container);
+
+ $properties = $container->getDefinition(PropertiesInjection::class)->getProperties();
+
+ $this->assertArrayHasKey('plop', $properties);
+ $this->assertEquals(Bar::class, (string) $properties['plop']);
+ }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
index 3402bbd0c5f96..ed111d6d2c0de 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/DecoratorServicePassTest.php
@@ -244,7 +244,7 @@ public function testProcessLeavesServiceLocatorTagOnOriginalDefinition()
protected function process(ContainerBuilder $container)
{
- $repeatedPass = new DecoratorServicePass();
- $repeatedPass->process($container);
+ $pass = new DecoratorServicePass();
+ $pass->process($container);
}
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
index 26e50f484b0e1..f6c255484adc6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/IntegrationTest.php
@@ -20,12 +20,12 @@
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
use Symfony\Component\DependencyInjection\Tests\Fixtures\BarTagClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\FooBarTaggedForDefaultPriorityClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\FooTagClass;
use Symfony\Contracts\Service\ServiceProviderInterface;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
/**
* This class tests the integration of the different compiler passes.
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
index 4686f483a7d61..902fe4eaa9730 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterEnvVarProcessorsPassTest.php
@@ -73,7 +73,7 @@ public function testBadProcessor()
class SimpleProcessor implements EnvVarProcessorInterface
{
- public function getEnv($prefix, $name, \Closure $getEnv)
+ public function getEnv(string $prefix, string $name, \Closure $getEnv)
{
return $getEnv($name);
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
index 77b1969f60b1c..6046f79639e99 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/RegisterServiceSubscribersPassTest.php
@@ -22,7 +22,6 @@
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ServiceLocator;
-use Symfony\Component\DependencyInjection\ServiceSubscriberInterface;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition1;
use Symfony\Component\DependencyInjection\Tests\Fixtures\TestDefinition2;
@@ -31,6 +30,7 @@
use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriberChild;
use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriberParent;
use Symfony\Component\DependencyInjection\TypedReference;
+use Symfony\Contracts\Service\ServiceSubscriberInterface;
use Symfony\Contracts\Service\ServiceSubscriberTrait;
require_once __DIR__.'/../Fixtures/includes/classes.php';
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
index 3a89b11c8c8ae..f44890c6e662e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ValidateEnvPlaceholdersPassTest.php
@@ -14,7 +14,6 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\Config\Definition\Exception\TreeWithoutRootNodeException;
use Symfony\Component\DependencyInjection\Compiler\MergeExtensionConfigurationPass;
use Symfony\Component\DependencyInjection\Compiler\RegisterEnvVarProcessorsPass;
use Symfony\Component\DependencyInjection\Compiler\ValidateEnvPlaceholdersPass;
@@ -56,12 +55,11 @@ public function testDefaultEnvIsValidatedInConfig()
$this->doProcess($container);
}
- /**
- * @group legacy
- * @expectedDeprecation A non-string default value of an env() parameter is deprecated since 4.3, cast "env(FLOATISH)" to string instead.
- */
public function testDefaultEnvWithoutPrefixIsValidatedInConfig()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The default value of an env() parameter must be a string or null, but "double" given to "env(FLOATISH)".');
+
$container = new ContainerBuilder();
$container->setParameter('env(FLOATISH)', 3.2);
$container->registerExtension($ext = new EnvExtension());
@@ -70,8 +68,6 @@ public function testDefaultEnvWithoutPrefixIsValidatedInConfig()
]);
$this->doProcess($container);
-
- $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
}
public function testEnvsAreValidatedInConfigWithInvalidPlaceholder()
@@ -219,14 +215,11 @@ public function testEmptyEnvWhichCannotBeEmptyForScalarNode(): void
$this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
}
- /**
- * NOT LEGACY (test exception in 5.0).
- *
- * @group legacy
- * @expectedDeprecation Setting path "env_extension.scalar_node_not_empty_validated" to an environment variable is deprecated since Symfony 4.3. Remove "cannotBeEmpty()", "validate()" or include a prefix/suffix value instead.
- */
public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation(): void
{
+ $this->expectException('Symfony\Component\Config\Definition\Exception\InvalidConfigurationException');
+ $this->expectExceptionMessage('The path "env_extension.scalar_node_not_empty_validated" cannot contain an environment variable when empty values are not allowed by definition and are validated.');
+
$container = new ContainerBuilder();
$container->registerExtension($ext = new EnvExtension());
$container->prependExtensionConfig('env_extension', $expected = [
@@ -234,8 +227,6 @@ public function testEmptyEnvWhichCannotBeEmptyForScalarNodeWithValidation(): voi
]);
$this->doProcess($container);
-
- $this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
}
public function testPartialEnvWhichCannotBeEmptyForScalarNode(): void
@@ -264,19 +255,6 @@ public function testEnvWithVariableNode(): void
$this->assertSame($expected, $container->resolveEnvPlaceholders($ext->getConfig()));
}
- /**
- * @group legacy
- * @expectedDeprecation A tree builder without a root node is deprecated since Symfony 4.2 and will not be supported anymore in 5.0.
- */
- public function testConfigurationWithoutRootNode(): void
- {
- $container = new ContainerBuilder();
- $container->registerExtension(new EnvExtension(new EnvConfigurationWithoutRootNode()));
- $container->loadFromExtension('env_extension', ['foo' => 'bar']);
-
- (new ValidateEnvPlaceholdersPass())->process($container);
- }
-
public function testEmptyConfigFromMoreThanOneSource()
{
$container = new ContainerBuilder();
@@ -374,14 +352,6 @@ public function getConfigTreeBuilder(): TreeBuilder
}
}
-class EnvConfigurationWithoutRootNode implements ConfigurationInterface
-{
- public function getConfigTreeBuilder(): TreeBuilder
- {
- return new TreeBuilder();
- }
-}
-
class ConfigurationWithArrayNodeRequiringOneElement implements ConfigurationInterface
{
public function getConfigTreeBuilder(): TreeBuilder
@@ -426,11 +396,7 @@ public function load(array $configs, ContainerBuilder $container)
return;
}
- try {
- $this->config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
- } catch (TreeWithoutRootNodeException $e) {
- $this->config = null;
- }
+ $this->config = $this->processConfiguration($this->getConfiguration($configs, $container), $configs);
}
public function getConfig()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
index 5a3cd6c7e4d0f..5763b1d4f56c5 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
@@ -22,6 +22,7 @@
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Config\Resource\ResourceInterface;
use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -41,6 +42,7 @@
use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
use Symfony\Component\DependencyInjection\Tests\Fixtures\SimilarArgumentsDummy;
use Symfony\Component\DependencyInjection\TypedReference;
@@ -542,6 +544,18 @@ public function testCreateServiceWithExpression()
$this->assertEquals('foobar', $builder->get('foo')->arguments['foo']);
}
+ public function testCreateServiceWithAbstractArgument()
+ {
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('Argument "$baz" of service "foo" is abstract (should be defined by Pass), did you forget to define it?');
+
+ $builder = new ContainerBuilder();
+ $builder->register('foo', FooWithAbstractArgument::class)
+ ->addArgument(new AbstractArgument('foo', '$baz', 'should be defined by Pass'));
+
+ $builder->get('foo');
+ }
+
public function testResolveServices()
{
$builder = new ContainerBuilder();
@@ -1601,6 +1615,24 @@ public function testWither()
$wither = $container->get('wither');
$this->assertInstanceOf(Foo::class, $wither->foo);
}
+
+ public function testAutoAliasing()
+ {
+ $container = new ContainerBuilder();
+ $container->register(C::class);
+ $container->register(D::class);
+
+ $container->setParameter('foo', D::class);
+
+ $definition = new Definition(X::class);
+ $definition->setPublic(true);
+ $definition->addTag('auto_alias', ['format' => '%foo%']);
+ $container->setDefinition(X::class, $definition);
+
+ $container->compile();
+
+ $this->assertInstanceOf(D::class, $container->get(X::class));
+ }
}
class FooClass
@@ -1617,3 +1649,15 @@ public function __construct(A $a)
{
}
}
+
+interface X
+{
+}
+
+class C implements X
+{
+}
+
+class D implements X
+{
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
index 9015bf6b4f666..7050c6a22b820 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php
@@ -184,7 +184,7 @@ public function testSetWithNullOnUninitializedPredefinedService()
{
$sc = new Container();
$sc->set('foo', new \stdClass());
- $sc->get('foo', null);
+ $sc->get('foo');
$sc->set('foo', null);
$this->assertFalse($sc->has('foo'), '->set() with null service resets the service');
@@ -288,19 +288,6 @@ public function testHas()
$this->assertTrue($sc->has('foo.baz'), '->has() returns true if a get*Method() is defined');
}
- /**
- * @group legacy
- */
- public function testScalarService()
- {
- $c = new Container();
-
- $c->set('foo', 'some value');
-
- $this->assertTrue($c->has('foo'));
- $this->assertSame('some value', $c->get('foo'));
- }
-
public function testInitialized()
{
$sc = new ProjectServiceContainer();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
index f67cdd520e709..aad4fdf51432d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
@@ -14,7 +14,6 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Parameter;
use Symfony\Component\DependencyInjection\Reference;
class DefinitionTest extends TestCase
@@ -29,18 +28,6 @@ public function testConstructor()
$this->assertEquals(['foo'], $def->getArguments(), '__construct() takes an optional array of arguments as its second argument');
}
- /**
- * @group legacy
- * @expectedDeprecation Passing an instance of Symfony\Component\DependencyInjection\Parameter as class name to Symfony\Component\DependencyInjection\Definition in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%parameter%" instead.
- */
- public function testConstructorWithParameter()
- {
- $parameter = new Parameter('parameter');
-
- $def = new Definition($parameter);
- $this->assertSame($parameter, $def->getClass(), '__construct() accepts Parameter instances');
- }
-
public function testSetGetFactory()
{
$def = new Definition();
@@ -63,28 +50,6 @@ public function testSetGetClass()
$this->assertEquals('foo', $def->getClass(), '->getClass() returns the class name');
}
- /**
- * @group legacy
- * @expectedDeprecation Passing an instance of Symfony\Component\DependencyInjection\Parameter as class name to Symfony\Component\DependencyInjection\Definition in deprecated in Symfony 4.4 and will result in a TypeError in 5.0. Please pass the string "%parameter%" instead.
- */
- public function testSetGetClassWithParameter()
- {
- $def = new Definition();
- $parameter = new Parameter('parameter');
- $this->assertSame($parameter, $def->setClass($parameter)->getClass(), '->getClass() returns the parameterized class name');
- }
-
- /**
- * @group legacy
- * @expectedDeprecation The class name passed to Symfony\Component\DependencyInjection\Definition is expected to be a string. Passing a stdClass is deprecated in Symfony 4.4 and will result in a TypeError in 5.0.
- */
- public function testSetGetClassWithObject()
- {
- $def = new Definition();
- $classObject = new \stdClass();
- $this->assertSame($classObject, $def->setClass($classObject)->getClass(), '->getClass() returns the parameterized class name');
- }
-
public function testSetGetDecoratedService()
{
$def = new Definition('stdClass');
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
index 60f1ab1d4f070..0fbd9f08eadd7 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -15,6 +15,7 @@
use Psr\Container\ContainerInterface;
use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper;
use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -33,6 +34,7 @@
use Symfony\Component\DependencyInjection\Tests\Compiler\Foo;
use Symfony\Component\DependencyInjection\Tests\Compiler\Wither;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CustomDefinition;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
use Symfony\Component\DependencyInjection\Tests\Fixtures\ScalarFactory;
use Symfony\Component\DependencyInjection\Tests\Fixtures\StubbedTranslator;
use Symfony\Component\DependencyInjection\Tests\Fixtures\TestServiceSubscriber;
@@ -227,7 +229,7 @@ public function testDumpAsFiles()
->addError('No-no-no-no');
$container->compile();
$dumper = new PhpDumper($container);
- $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot']), true);
+ $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'hot_path_tag' => 'hot', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);
if ('\\' === \DIRECTORY_SEPARATOR) {
$dump = str_replace('\\\\Fixtures\\\\includes\\\\foo.php', '/Fixtures/includes/foo.php', $dump);
}
@@ -297,7 +299,7 @@ public function testNonSharedLazyDumpAsFiles()
->setLazy(true);
$container->compile();
$dumper = new PhpDumper($container);
- $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__]), true);
+ $dump = print_r($dumper->dump(['as_files' => true, 'file' => __DIR__, 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]), true);
if ('\\' === \DIRECTORY_SEPARATOR) {
$dump = str_replace('\\\\Fixtures\\\\includes\\\\foo_lazy.php', '/Fixtures/includes/foo_lazy.php', $dump);
@@ -478,7 +480,7 @@ public function testEnvParameter()
$container->compile();
$dumper = new PhpDumper($container);
- $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php']));
+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services26.php', $dumper->dump(['class' => 'Symfony_DI_PhpDumper_Test_EnvParameters', 'file' => self::$fixturesPath.'/php/services26.php', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false]));
require self::$fixturesPath.'/php/services26.php';
$container = new \Symfony_DI_PhpDumper_Test_EnvParameters();
@@ -944,7 +946,7 @@ public function testArrayParameters()
$dumper = new PhpDumper($container);
- $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php'])));
+ $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_array_params.php', str_replace('\\\\Dumper', '/Dumper', $dumper->dump(['file' => self::$fixturesPath.'/php/services_array_params.php', 'inline_factories_parameter' => false, 'inline_class_loader_parameter' => false])));
}
public function testExpressionReferencingPrivateService()
@@ -1363,11 +1365,29 @@ public function testMultipleDeprecatedAliasesWorking()
$this->assertInstanceOf(\stdClass::class, $container->get('deprecated1'));
$this->assertInstanceOf(\stdClass::class, $container->get('deprecated2'));
}
+
+ public function testDumpServiceWithAbstractArgument()
+ {
+ $this->expectException(RuntimeException::class);
+ $this->expectExceptionMessage('Argument "$baz" of service "Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument" is abstract (should be defined by Pass), did you forget to define it?');
+
+ $container = new ContainerBuilder();
+
+ $container->register(FooWithAbstractArgument::class, FooWithAbstractArgument::class)
+ ->setArgument('$baz', new AbstractArgument(FooWithAbstractArgument::class, '$baz', 'should be defined by Pass'))
+ ->setArgument('$bar', 'test')
+ ->setPublic(true);
+
+ $container->compile();
+
+ $dumper = new PhpDumper($container);
+ $dumper->dump();
+ }
}
class Rot13EnvVarProcessor implements EnvVarProcessorInterface
{
- public function getEnv($prefix, $name, \Closure $getEnv)
+ public function getEnv(string $prefix, string $name, \Closure $getEnv)
{
return str_rot13($getEnv($name));
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
index 447278282056a..ced09157617c3 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/XmlDumperTest.php
@@ -13,6 +13,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -20,6 +21,7 @@
use Symfony\Component\DependencyInjection\Dumper\XmlDumper;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
class XmlDumperTest extends TestCase
{
@@ -237,4 +239,15 @@ public function testDumpAbstractServices()
$this->assertEquals(file_get_contents(self::$fixturesPath.'/xml/services_abstract.xml'), $dumper->dump());
}
+
+ public function testDumpServiceWithAbstractArgument()
+ {
+ $container = new ContainerBuilder();
+ $container->register(FooWithAbstractArgument::class, FooWithAbstractArgument::class)
+ ->setArgument('$baz', new AbstractArgument(FooWithAbstractArgument::class, '$baz', 'should be defined by Pass'))
+ ->setArgument('$bar', 'test');
+
+ $dumper = new XmlDumper($container);
+ $this->assertStringEqualsFile(self::$fixturesPath.'/xml/services_with_abstract_argument.xml', $dumper->dump());
+ }
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
index 7a83b2e6a1b8d..d7896ae436619 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Dumper/YamlDumperTest.php
@@ -13,6 +13,7 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -21,6 +22,7 @@
use Symfony\Component\DependencyInjection\Dumper\YamlDumper;
use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
use Symfony\Component\Yaml\Parser;
use Symfony\Component\Yaml\Yaml;
@@ -117,6 +119,17 @@ public function testTaggedArguments()
$this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services_with_tagged_argument.yml', $dumper->dump());
}
+ public function testDumpServiceWithAbstractArgument()
+ {
+ $container = new ContainerBuilder();
+ $container->register(FooWithAbstractArgument::class, FooWithAbstractArgument::class)
+ ->setArgument('$baz', new AbstractArgument(FooWithAbstractArgument::class, '$baz', 'should be defined by Pass'))
+ ->setArgument('$bar', 'test');
+
+ $dumper = new YamlDumper($container);
+ $this->assertStringEqualsFile(self::$fixturesPath.'/yaml/services_with_abstract_argument.yml', $dumper->dump());
+ }
+
private function assertEqualYamlStructure(string $expected, string $yaml, string $message = '')
{
$parser = new Parser();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php b/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
index 16a1d39e2940f..452fb79727637 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Extension/ExtensionTest.php
@@ -14,6 +14,10 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Extension\InvalidConfig\InvalidConfigExtension;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Extension\SemiValidConfig\SemiValidConfigExtension;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Extension\ValidConfig\Configuration;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\Extension\ValidConfig\ValidConfigExtension;
class ExtensionTest extends TestCase
{
@@ -42,6 +46,37 @@ public function testIsConfigEnabledOnNonEnableableConfig()
$extension->isConfigEnabled(new ContainerBuilder(), []);
}
+
+ public function testNoConfiguration()
+ {
+ $extension = new EnableableExtension();
+
+ $this->assertNull($extension->getConfiguration([], new ContainerBuilder()));
+ }
+
+ public function testValidConfiguration()
+ {
+ $extension = new ValidConfigExtension();
+
+ $this->assertInstanceOf(Configuration::class, $extension->getConfiguration([], new ContainerBuilder()));
+ }
+
+ public function testSemiValidConfiguration()
+ {
+ $extension = new SemiValidConfigExtension();
+
+ $this->assertNull($extension->getConfiguration([], new ContainerBuilder()));
+ }
+
+ public function testInvalidConfiguration()
+ {
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\LogicException');
+ $this->expectExceptionMessage('The extension configuration class "Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\Extension\\InvalidConfig\\Configuration" must implement "Symfony\\Component\\Config\\Definition\\ConfigurationInterface".');
+
+ $extension = new InvalidConfigExtension();
+
+ $extension->getConfiguration([], new ContainerBuilder());
+ }
}
class EnableableExtension extends Extension
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/DeprecatedClass.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/DeprecatedClass.php
index 33f37a0304f92..78e891eaafe46 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/DeprecatedClass.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/DeprecatedClass.php
@@ -11,7 +11,7 @@
namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
-@trigger_error('deprecated', E_USER_DEPRECATED);
+trigger_deprecation('', '', 'deprecated');
class DeprecatedClass
{
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/Configuration.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/Configuration.php
new file mode 100644
index 0000000000000..bcb2995f17758
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Extension/InvalidConfig/Configuration.php
@@ -0,0 +1,7 @@
+baz = $baz;
+ $this->bar = $bar;
+ }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
index b88e0d73565e8..2a2c19d1adc35 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php
@@ -279,7 +279,7 @@ public function setFoo(Foo $foo)
* @required
* @return static
*/
- public function withFoo1(Foo $foo)
+ public function withFoo1(Foo $foo): self
{
return $this->withFoo2($foo);
}
@@ -288,7 +288,7 @@ public function withFoo1(Foo $foo)
* @required
* @return static
*/
- public function withFoo2(Foo $foo)
+ public function withFoo2(Foo $foo): self
{
$new = clone $this;
$new->foo = $foo;
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php
new file mode 100644
index 0000000000000..f1d76f2f0c788
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes_74.php
@@ -0,0 +1,15 @@
+isLazy();
}
- public function getProxyFactoryCode(Definition $definition, $id, $factoryCall = null): string
+ public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode): string
{
return " // lazy factory for {$definition->getClass()}\n\n";
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/container_alias_deprecation.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/container_alias_deprecation.php
index 3434cfc61847f..a7cf90e1a57b1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/container_alias_deprecation.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/container_alias_deprecation.php
@@ -66,7 +66,7 @@ protected function getFooService()
*/
protected function getAliasForFooDeprecatedService()
{
- @trigger_error('The "alias_for_foo_deprecated" service alias is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "alias_for_foo_deprecated" service alias is deprecated. You should stop using it, as it will be removed in the future.');
return $this->get('foo');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
index bc5a096746a8a..d54782c7c6b3a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -59,11 +59,9 @@ protected function getTestService()
return $this->services['test'] = new \stdClass(['only dot' => '.', 'concatenation as value' => '.\'\'.', 'concatenation from the start value' => '\'\'.', '.' => 'dot as a key', '.\'\'.' => 'concatenation as a key', '\'\'.' => 'concatenation from the start key', 'optimize concatenation' => 'string1-string2', 'optimize concatenation with empty string' => 'string1string2', 'optimize concatenation from the start' => 'start', 'optimize concatenation at the end' => 'end', 'new line' => 'string with '."\n".'new line']);
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -73,14 +71,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
index 3dfa8bdd6d0ef..ffab1abb1deba 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.php
@@ -59,11 +59,9 @@ protected function getTestService()
return $this->services['test'] = new \stdClass(('wiz'.\dirname(__DIR__, 1)), [('wiz'.\dirname(__DIR__, 1)) => (\dirname(__DIR__, 2).'/')]);
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -73,14 +71,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
index b5ff25acb81a7..2c74240ac36d0 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
@@ -74,11 +74,9 @@ protected function getServiceWithMethodCallAndFactoryService()
return $instance;
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -88,14 +86,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
index 063ebfd14d47e..29b3627def9c6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services26.php
@@ -70,11 +70,9 @@ protected function getTestService()
return $this->services['test'] = new ${($_ = $this->getEnv('FOO')) && false ?: "_"}($this->getEnv('Bar'), 'foo'.$this->getEnv('string:FOO').'baz', $this->getEnv('int:Baz'));
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -84,14 +82,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
index aefde3a4734ac..d4dae984b68e2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
index 2bbf46c906b95..286d0bf8ae966 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_as_files.txt
@@ -124,7 +124,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
// Returns the public 'deprecated_service' shared service.
-@trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+trigger_deprecation('', '', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
return $this->services['deprecated_service'] = new \stdClass();
@@ -156,7 +156,7 @@ use Symfony\Component\DependencyInjection\Exception\RuntimeException;
// This file has been auto-generated by the Symfony Dependency Injection Component for internal use.
// Returns the private 'factory_simple' shared service.
-@trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+trigger_deprecation('', '', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
return new \SimpleFactoryClass('foo');
@@ -460,14 +460,13 @@ class ProjectServiceContainer extends Container
return $instance;
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return $this->buildParameters[$name];
}
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -477,17 +476,16 @@ class ProjectServiceContainer extends Container
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return true;
}
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
index 512994ef1210b..d448e7d5bcf8a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -210,7 +210,7 @@ protected function getDecoratorServiceWithNameService()
*/
protected function getDeprecatedServiceService()
{
- @trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
return $this->services['deprecated_service'] = new \stdClass();
}
@@ -404,16 +404,14 @@ protected function getTaggedIteratorService()
*/
protected function getFactorySimpleService()
{
- @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
return new \SimpleFactoryClass('foo');
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -423,14 +421,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
index 808a1c5d07ad9..218f7ea131c78 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_inlined_factories.txt
@@ -231,7 +231,7 @@ class ProjectServiceContainer extends Container
*/
protected function getDeprecatedServiceService()
{
- @trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
return $this->services['deprecated_service'] = new \stdClass();
}
@@ -453,19 +453,18 @@ class ProjectServiceContainer extends Container
*/
protected function getFactorySimpleService()
{
- @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
return new \SimpleFactoryClass('foo');
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return $this->buildParameters[$name];
}
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -475,17 +474,16 @@ class ProjectServiceContainer extends Container
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return true;
}
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
index 2b5409a39fef1..65c9113674000 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_lazy_inlined_factories.txt
@@ -94,14 +94,13 @@ class ProjectServiceContainer extends Container
return new \Bar\FooClass(new \Bar\FooLazyClass());
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return $this->buildParameters[$name];
}
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -111,17 +110,16 @@ class ProjectServiceContainer extends Container
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
if (isset($this->buildParameters[$name])) {
return true;
}
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
index 4e704e469ccb4..71cb9be712a9d 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_array_params.php
@@ -63,11 +63,9 @@ protected function getBarService()
return $instance;
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -77,14 +75,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
index fe5a60a0dfa11..5514ceb61f912 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_base64_env.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
index 4fbb83188507a..152933f61ebd4 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_csv_env.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
index 582ac453af187..a5a29f678fe7a 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_default_env.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
index 3d381cabd14e8..2ba429b2eaef1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_env_in_id.php
@@ -72,11 +72,9 @@ protected function getFooService()
return $this->services['foo'] = new \stdClass(($this->privates['bar_%env(BAR)%'] ?? ($this->privates['bar_%env(BAR)%'] = new \stdClass())), ['baz_'.$this->getEnv('string:BAR') => new \stdClass()]);
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -86,14 +84,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
index 3e84e304a762e..1e7ce2f2c95c8 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_errored_definition.php
@@ -210,7 +210,7 @@ protected function getDecoratorServiceWithNameService()
*/
protected function getDeprecatedServiceService()
{
- @trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "deprecated_service" service is deprecated. You should stop using it, as it will be removed in the future.');
return $this->services['deprecated_service'] = new \stdClass();
}
@@ -404,16 +404,14 @@ protected function getTaggedIteratorService()
*/
protected function getFactorySimpleService()
{
- @trigger_error('The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.', E_USER_DEPRECATED);
+ trigger_deprecation('', '', 'The "factory_simple" service is deprecated. You should stop using it, as it will be removed in the future.');
return new \SimpleFactoryClass('foo');
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -423,14 +421,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
index 14bbc1ff31090..a5b2846202df2 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_inline_requires.php
@@ -92,11 +92,9 @@ protected function getC2Service()
return $this->services['Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\includes\\HotPath\\C2'] = new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C2(new \Symfony\Component\DependencyInjection\Tests\Fixtures\includes\HotPath\C3());
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -106,14 +104,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
index 18b525309258e..1d7f3686bb108 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_json_env.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
index be3d8dcadbd9c..1aa1c51c9ddb1 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_query_string_env.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
index 5dcfa4159e14c..b18eeaaaf8315 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_rot13_env.php
@@ -77,11 +77,9 @@ protected function getContainer_EnvVarProcessorsLocatorService()
]);
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -91,14 +89,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
index e184fad7bdf0c..4f9074e9aaf7f 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_subscriber.php
@@ -45,8 +45,8 @@ public function isCompiled(): bool
public function getRemovedIds(): array
{
return [
- '.service_locator.bPEFRiK' => true,
- '.service_locator.bPEFRiK.foo_service' => true,
+ '.service_locator.2Wk0Efb' => true,
+ '.service_locator.2Wk0Efb.foo_service' => true,
'Psr\\Container\\ContainerInterface' => true,
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => true,
'Symfony\\Component\\DependencyInjection\\Tests\\Fixtures\\CustomDefinition' => true,
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
index a958e8ee05557..0b2540cdb8d9e 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_unsupported_characters.php
@@ -81,11 +81,9 @@ protected function getFooohnoService()
return $this->services['foo*/oh-no'] = new \FooClass();
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -95,14 +93,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
index 1ef02e372c97e..df4648dd3d258 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_url_env.php
@@ -46,11 +46,9 @@ public function getRemovedIds(): array
];
}
- public function getParameter($name)
+ public function getParameter(string $name)
{
- $name = (string) $name;
-
- if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
+ if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
if (isset($this->loadedDynamicParameters[$name])) {
@@ -60,14 +58,12 @@ public function getParameter($name)
return $this->parameters[$name];
}
- public function hasParameter($name): bool
+ public function hasParameter(string $name): bool
{
- $name = (string) $name;
-
- return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);
+ return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || \array_key_exists($name, $this->parameters);
}
- public function setParameter($name, $value): void
+ public function setParameter(string $name, $value): void
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/service_with_abstract_argument.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/service_with_abstract_argument.xml
new file mode 100644
index 0000000000000..c7ba1950761d4
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/service_with_abstract_argument.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ should be defined by FooCompilerPass
+ test
+
+
+
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_abstract_argument.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_abstract_argument.xml
new file mode 100644
index 0000000000000..8a05525f555aa
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_with_abstract_argument.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+ should be defined by Pass
+ test
+
+
+
+
+
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_abstract_argument.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_abstract_argument.yml
new file mode 100644
index 0000000000000..02889228c03cf
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_with_abstract_argument.yml
@@ -0,0 +1,15 @@
+
+services:
+ service_container:
+ class: Symfony\Component\DependencyInjection\ContainerInterface
+ public: true
+ synthetic: true
+ Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument:
+ class: Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument
+ arguments: { $baz: !abstract 'should be defined by Pass', $bar: test }
+ Psr\Container\ContainerInterface:
+ alias: service_container
+ public: false
+ Symfony\Component\DependencyInjection\ContainerInterface:
+ alias: service_container
+ public: false
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
index 57ea37e6f4964..9c368e23aba5c 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/FileLoaderTest.php
@@ -244,12 +244,12 @@ class TestFileLoader extends FileLoader
{
public $autoRegisterAliasesForSinglyImplementedInterfaces = true;
- public function load($resource, $type = null)
+ public function load($resource, string $type = null)
{
return $resource;
}
- public function supports($resource, $type = null): bool
+ public function supports($resource, string $type = null): bool
{
return false;
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
index 14ba4c7f6e567..55831540aa8d6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -16,6 +16,7 @@
use Symfony\Component\Config\Loader\LoaderResolver;
use Symfony\Component\Config\Resource\FileResource;
use Symfony\Component\Config\Resource\GlobResource;
+use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
use Symfony\Component\DependencyInjection\Argument\BoundArgument;
use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
@@ -31,6 +32,7 @@
use Symfony\Component\DependencyInjection\Tests\Fixtures\Bar;
use Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface;
use Symfony\Component\DependencyInjection\Tests\Fixtures\CaseSensitiveClass;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\FooWithAbstractArgument;
use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
use Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype;
use Symfony\Component\ExpressionLanguage\Expression;
@@ -992,4 +994,15 @@ public function testNotSinglyImplementedInterfacesInMultipleResourcesWithPreviou
$this->assertSame(Prototype\SinglyImplementedInterface\Adapter\Adapter::class, (string) $alias);
}
+
+ public function testLoadServiceWithAbstractArgument()
+ {
+ $container = new ContainerBuilder();
+ $loader = new XmlFileLoader($container, new FileLocator(self::$fixturesPath.'/xml'));
+ $loader->load('service_with_abstract_argument.xml');
+
+ $this->assertTrue($container->hasDefinition(FooWithAbstractArgument::class));
+ $arguments = $container->getDefinition(FooWithAbstractArgument::class)->getArguments();
+ $this->assertInstanceOf(AbstractArgument::class, $arguments['$baz']);
+ }
}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
index fc827df18cd4f..d2e81db377313 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -216,21 +216,6 @@ public function testDeprecatedAliases()
$this->assertSame($message, $container->getAlias('alias_for_foobar')->getDeprecationMessage('alias_for_foobar'));
}
- /**
- * @group legacy
- */
- public function testLoadFactoryShortSyntax()
- {
- $container = new ContainerBuilder();
- $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
- $loader->load('services14.yml');
- $services = $container->getDefinitions();
-
- $this->assertEquals([new Reference('baz'), 'getClass'], $services['factory']->getFactory(), '->load() parses the factory tag with service:method');
- $this->assertEquals(['FooBacFactory', 'createFooBar'], $services['factory_with_static_call']->getFactory(), '->load() parses the factory tag with Class::method');
- $this->assertEquals([new Reference('factory'), '__invoke'], $services['invokable_factory']->getFactory(), '->load() parses string service reference');
- }
-
public function testFactorySyntaxError()
{
$container = new ContainerBuilder();
@@ -240,20 +225,6 @@ public function testFactorySyntaxError()
$loader->load('bad_factory_syntax.yml');
}
- /**
- * @group legacy
- */
- public function testLoadConfiguratorShortSyntax()
- {
- $container = new ContainerBuilder();
- $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
- $loader->load('services_configurator_short_syntax.yml');
- $services = $container->getDefinitions();
-
- $this->assertEquals([new Reference('foo_bar_configurator'), 'configure'], $services['foo_bar']->getConfigurator(), '->load() parses the configurator tag with service:method');
- $this->assertEquals(['FooBarConfigurator', 'configureFooBar'], $services['foo_bar_with_static_call']->getConfigurator(), '->load() parses the configurator tag with Class::method');
- }
-
public function testExtensions()
{
$container = new ContainerBuilder();
@@ -341,11 +312,8 @@ public function testTaggedArgumentsWithIndex()
$taggedIterator = new TaggedIteratorArgument('foo', 'barfoo', 'foobar', true, 'getPriority');
$this->assertEquals(new ServiceLocatorArgument($taggedIterator), $container->getDefinition('foo_service_tagged_locator')->getArgument(0));
- if (is_subclass_of('Symfony\Component\Yaml\Exception\ExceptionInterface', 'Throwable')) {
- // this test is not compatible with Yaml v3
- $taggedIterator = new TaggedIteratorArgument('foo', null, null, true);
- $this->assertEquals(new ServiceLocatorArgument($taggedIterator), $container->getDefinition('bar_service_tagged_locator')->getArgument(0));
- }
+ $taggedIterator = new TaggedIteratorArgument('foo', null, null, true);
+ $this->assertEquals(new ServiceLocatorArgument($taggedIterator), $container->getDefinition('bar_service_tagged_locator')->getArgument(0));
}
public function testNameOnlyTagsAreAllowedAsString()
diff --git a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
index 25fd61cca2a2a..ea6e3814af1d6 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/ParameterBag/EnvPlaceholderParameterBagTest.php
@@ -109,33 +109,25 @@ public function testMergeWithDifferentIdentifiersForPlaceholders()
$this->assertCount(2, $merged[$envName]);
}
- /**
- * @group legacy
- * @expectedDeprecation A non-string default value of env parameter "INT_VAR" is deprecated since 4.3, cast it to string instead.
- */
- public function testResolveEnvCastsIntToString()
+ public function testResolveEnvRequiresStrings()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The default value of env parameter "INT_VAR" must be a string or null, integer given.');
+
$bag = new EnvPlaceholderParameterBag();
$bag->get('env(INT_VAR)');
$bag->set('env(INT_VAR)', 2);
$bag->resolve();
- $this->assertSame('2', $bag->all()['env(INT_VAR)']);
}
- /**
- * @group legacy
- * @expectedDeprecation A non-string default value of an env() parameter is deprecated since 4.3, cast "env(INT_VAR)" to string instead.
- * @expectedDeprecation A non-string default value of env parameter "INT_VAR" is deprecated since 4.3, cast it to string instead.
- */
public function testGetDefaultScalarEnv()
{
+ $this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
+ $this->expectExceptionMessage('The default value of an env() parameter must be a string or null, but "integer" given to "env(INT_VAR)".');
+
$bag = new EnvPlaceholderParameterBag();
$bag->set('env(INT_VAR)', 2);
- $this->assertStringMatchesFormat('env_%s_INT_VAR_%s', $bag->get('env(INT_VAR)'));
- $this->assertSame(2, $bag->all()['env(INT_VAR)']);
- $bag->resolve();
- $this->assertStringMatchesFormat('env_%s_INT_VAR_%s', $bag->get('env(INT_VAR)'));
- $this->assertSame('2', $bag->all()['env(INT_VAR)']);
+ $bag->get('env(INT_VAR)');
}
public function testGetDefaultEnv()
@@ -162,7 +154,7 @@ public function testResolveEnvAllowsNull()
public function testResolveThrowsOnBadDefaultValue()
{
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
- $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be scalar or null, array given.');
+ $this->expectExceptionMessage('The default value of env parameter "ARRAY_VAR" must be a string or null, array given.');
$bag = new EnvPlaceholderParameterBag();
$bag->get('env(ARRAY_VAR)');
$bag->set('env(ARRAY_VAR)', []);
@@ -182,7 +174,7 @@ public function testGetEnvAllowsNull()
public function testGetThrowsOnBadDefaultValue()
{
$this->expectException('Symfony\Component\DependencyInjection\Exception\RuntimeException');
- $this->expectExceptionMessage('The default value of an env() parameter must be scalar or null, but "array" given to "env(ARRAY_VAR)".');
+ $this->expectExceptionMessage('The default value of an env() parameter must be a string or null, but "array" given to "env(ARRAY_VAR)".');
$bag = new EnvPlaceholderParameterBag();
$bag->set('env(ARRAY_VAR)', []);
$bag->get('env(ARRAY_VAR)');
@@ -195,4 +187,11 @@ public function testDefaultToNullAllowed()
$bag->resolve();
$this->assertNotNull($bag->get('env(default::BAR)'));
}
+
+ public function testExtraCharsInProcessor()
+ {
+ $bag = new EnvPlaceholderParameterBag();
+ $bag->resolve();
+ $this->assertStringMatchesFormat('env_%s_key_a_b_c_FOO_%s', $bag->get('env(key:a.b-c:FOO)'));
+ }
}
diff --git a/src/Symfony/Component/DependencyInjection/TypedReference.php b/src/Symfony/Component/DependencyInjection/TypedReference.php
index 15b2b706c169c..78d8edf0b03f6 100644
--- a/src/Symfony/Component/DependencyInjection/TypedReference.php
+++ b/src/Symfony/Component/DependencyInjection/TypedReference.php
@@ -20,7 +20,6 @@ class TypedReference extends Reference
{
private $type;
private $name;
- private $requiringClass;
/**
* @param string $id The service identifier
@@ -28,16 +27,9 @@ class TypedReference extends Reference
* @param int $invalidBehavior The behavior when the service does not exist
* @param string $name The name of the argument targeting the service
*/
- public function __construct(string $id, string $type, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, $name = null)
+ public function __construct(string $id, string $type, int $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, string $name = null)
{
- if (\is_string($invalidBehavior ?? '') || \is_int($name)) {
- @trigger_error(sprintf('Passing the $requiringClass as 3rd argument for "%s()" is deprecated since Symfony 4.1. It should be removed, moving all following arguments 1 to the left.', __METHOD__), E_USER_DEPRECATED);
-
- $this->requiringClass = $invalidBehavior;
- $invalidBehavior = 3 < \func_num_args() ? func_get_arg(3) : ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE;
- } else {
- $this->name = $type === $id ? $name : null;
- }
+ $this->name = $type === $id ? $name : null;
parent::__construct($id, $invalidBehavior);
$this->type = $type;
}
@@ -51,24 +43,4 @@ public function getName(): ?string
{
return $this->name;
}
-
- /**
- * @deprecated since Symfony 4.1
- */
- public function getRequiringClass()
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->requiringClass ?? '';
- }
-
- /**
- * @deprecated since Symfony 4.1
- */
- public function canBeAutoregistered()
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED);
-
- return $this->requiringClass && (false !== $i = strpos($this->type, '\\')) && 0 === strncasecmp($this->type, $this->requiringClass, 1 + $i);
- }
}
diff --git a/src/Symfony/Component/DependencyInjection/composer.json b/src/Symfony/Component/DependencyInjection/composer.json
index df1727b9d08e5..12d6febe95034 100644
--- a/src/Symfony/Component/DependencyInjection/composer.json
+++ b/src/Symfony/Component/DependencyInjection/composer.json
@@ -16,14 +16,15 @@
}
],
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.5",
"psr/container": "^1.0",
+ "symfony/deprecation-contracts": "^2.1",
"symfony/service-contracts": "^1.1.6|^2"
},
"require-dev": {
- "symfony/yaml": "^3.4|^4.0|^5.0",
- "symfony/config": "^4.3",
- "symfony/expression-language": "^3.4|^4.0|^5.0"
+ "symfony/yaml": "^4.4|^5.0",
+ "symfony/config": "^5.0",
+ "symfony/expression-language": "^4.4|^5.0"
},
"suggest": {
"symfony/yaml": "",
@@ -33,10 +34,10 @@
"symfony/proxy-manager-bridge": "Generate service proxies to lazy load them"
},
"conflict": {
- "symfony/config": "<4.3|>=5.0",
- "symfony/finder": "<3.4",
- "symfony/proxy-manager-bridge": "<3.4",
- "symfony/yaml": "<3.4"
+ "symfony/config": "<5.0",
+ "symfony/finder": "<4.4",
+ "symfony/proxy-manager-bridge": "<4.4",
+ "symfony/yaml": "<4.4"
},
"provide": {
"psr/container-implementation": "1.0",
@@ -51,7 +52,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.1-dev"
}
}
}
diff --git a/src/Symfony/Component/DomCrawler/AbstractUriElement.php b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
index ead9dca25bacb..2afc822c57d25 100644
--- a/src/Symfony/Component/DomCrawler/AbstractUriElement.php
+++ b/src/Symfony/Component/DomCrawler/AbstractUriElement.php
@@ -80,46 +80,7 @@ public function getMethod()
*/
public function getUri()
{
- $uri = trim($this->getRawUri());
-
- // absolute URL?
- if (null !== parse_url($uri, PHP_URL_SCHEME)) {
- return $uri;
- }
-
- // empty URI
- if (!$uri) {
- return $this->currentUri;
- }
-
- // an anchor
- if ('#' === $uri[0]) {
- return $this->cleanupAnchor($this->currentUri).$uri;
- }
-
- $baseUri = $this->cleanupUri($this->currentUri);
-
- if ('?' === $uri[0]) {
- return $baseUri.$uri;
- }
-
- // absolute URL with relative schema
- if (0 === strpos($uri, '//')) {
- return preg_replace('#^([^/]*)//.*$#', '$1', $baseUri).$uri;
- }
-
- $baseUri = preg_replace('#^(.*?//[^/]*)(?:\/.*)?$#', '$1', $baseUri);
-
- // absolute path
- if ('/' === $uri[0]) {
- return $baseUri.$uri;
- }
-
- // relative path
- $path = parse_url(substr($this->currentUri, \strlen($baseUri)), PHP_URL_PATH);
- $path = $this->canonicalizePath(substr($path, 0, strrpos($path, '/')).'/'.$uri);
-
- return $baseUri.('' === $path || '/' !== $path[0] ? '/' : '').$path;
+ return UriResolver::resolve($this->getRawUri(), $this->currentUri);
}
/**
@@ -136,7 +97,7 @@ abstract protected function getRawUri();
*
* @return string
*/
- protected function canonicalizePath($path)
+ protected function canonicalizePath(string $path)
{
if ('' === $path || '/' === $path) {
return $path;
@@ -167,36 +128,4 @@ protected function canonicalizePath($path)
* @throws \LogicException If given node is not an anchor
*/
abstract protected function setNode(\DOMElement $node);
-
- /**
- * Removes the query string and the anchor from the given uri.
- */
- private function cleanupUri(string $uri): string
- {
- return $this->cleanupQuery($this->cleanupAnchor($uri));
- }
-
- /**
- * Remove the query string from the uri.
- */
- private function cleanupQuery(string $uri): string
- {
- if (false !== $pos = strpos($uri, '?')) {
- return substr($uri, 0, $pos);
- }
-
- return $uri;
- }
-
- /**
- * Remove the anchor from the uri.
- */
- private function cleanupAnchor(string $uri): string
- {
- if (false !== $pos = strpos($uri, '#')) {
- return substr($uri, 0, $pos);
- }
-
- return $uri;
- }
}
diff --git a/src/Symfony/Component/DomCrawler/CHANGELOG.md b/src/Symfony/Component/DomCrawler/CHANGELOG.md
index 56863b7c73735..49d585f83ed6b 100644
--- a/src/Symfony/Component/DomCrawler/CHANGELOG.md
+++ b/src/Symfony/Component/DomCrawler/CHANGELOG.md
@@ -1,6 +1,18 @@
CHANGELOG
=========
+5.1.0
+-----
+
+* Added an internal cache layer on top of the CssSelectorConverter
+* Added `UriResolver` to resolve an URI according to a base URI
+
+5.0.0
+-----
+
+* Added argument `$selector` to ``Crawler::children()`
+* Added argument `$default` to ``Crawler::text()` and `html()`
+
4.4.0
-----
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
index e89476f1229dc..cf5a9ea7427d9 100644
--- a/src/Symfony/Component/DomCrawler/Crawler.php
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -132,11 +132,8 @@ public function add($node)
* If the charset is not set via the content type, it is assumed to be UTF-8,
* or ISO-8859-1 as a fallback, which is the default charset defined by the
* HTTP 1.1 specification.
- *
- * @param string $content A string to parse as HTML/XML
- * @param string|null $type The content type of the string
*/
- public function addContent($content, $type = null)
+ public function addContent(string $content, string $type = null)
{
if (empty($type)) {
$type = 0 === strpos($content, 'html5Parser && strspn($content, " \t\r\n") === stripos($content, '') ? $this->parseHtml5($content, $charset) : $this->parseXhtml($content, $charset);
@@ -217,13 +211,11 @@ public function addHtmlContent($content, $charset = 'UTF-8')
* and then, get the errors via libxml_get_errors(). Be
* sure to clear errors with libxml_clear_errors() afterward.
*
- * @param string $content The XML content
- * @param string $charset The charset
- * @param int $options Bitwise OR of the libxml option constants
- * LIBXML_PARSEHUGE is dangerous, see
- * http://symfony.com/blog/security-release-symfony-2-0-17-released
+ * @param int $options Bitwise OR of the libxml option constants
+ * LIBXML_PARSEHUGE is dangerous, see
+ * http://symfony.com/blog/security-release-symfony-2-0-17-released
*/
- public function addXmlContent($content, $charset = 'UTF-8', $options = LIBXML_NONET)
+ public function addXmlContent(string $content, string $charset = 'UTF-8', int $options = LIBXML_NONET)
{
// remove the default namespace if it's the only namespace to make XPath expressions simpler
if (!preg_match('/xmlns:/', $content)) {
@@ -316,11 +308,9 @@ public function addNode(\DOMNode $node)
/**
* Returns a node given its position in the node list.
*
- * @param int $position The position
- *
* @return static
*/
- public function eq($position)
+ public function eq(int $position)
{
if (isset($this->nodes[$position])) {
return $this->createSubCrawler($this->nodes[$position]);
@@ -358,12 +348,9 @@ public function each(\Closure $closure)
/**
* Slices the list of nodes by $offset and $length.
*
- * @param int $offset
- * @param int $length
- *
* @return static
*/
- public function slice($offset = 0, $length = null)
+ public function slice(int $offset = 0, int $length = null)
{
return $this->createSubCrawler(\array_slice($this->nodes, $offset, $length));
}
@@ -524,20 +511,13 @@ public function parents()
/**
* Returns the children nodes of the current selection.
*
- * @param string|null $selector An optional CSS selector to filter children
- *
* @return static
*
* @throws \InvalidArgumentException When current node is empty
* @throws \RuntimeException If the CssSelector Component is not available and $selector is provided
*/
- public function children(/* string $selector = null */)
+ public function children(string $selector = null)
{
- if (\func_num_args() < 1 && __CLASS__ !== static::class && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
- @trigger_error(sprintf('The "%s()" method will have a new "string $selector = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
- }
- $selector = 0 < \func_num_args() ? func_get_arg(0) : null;
-
if (!$this->nodes) {
throw new \InvalidArgumentException('The current node list is empty.');
}
@@ -557,13 +537,11 @@ public function children(/* string $selector = null */)
/**
* Returns the attribute value of the first node of the list.
*
- * @param string $attribute The attribute name
- *
* @return string|null The attribute value or null if the attribute does not exist
*
* @throws \InvalidArgumentException When current node is empty
*/
- public function attr($attribute)
+ public function attr(string $attribute)
{
if (!$this->nodes) {
throw new \InvalidArgumentException('The current node list is empty.');
@@ -602,11 +580,11 @@ public function nodeName()
*
* @throws \InvalidArgumentException When current node is empty
*/
- public function text(/* string $default = null, bool $normalizeWhitespace = true */)
+ public function text(string $default = null, bool $normalizeWhitespace = true)
{
if (!$this->nodes) {
- if (0 < \func_num_args() && null !== func_get_arg(0)) {
- return (string) func_get_arg(0);
+ if (null !== $default) {
+ return $default;
}
throw new \InvalidArgumentException('The current node list is empty.');
@@ -614,15 +592,7 @@ public function text(/* string $default = null, bool $normalizeWhitespace = true
$text = $this->getNode(0)->nodeValue;
- if (\func_num_args() <= 1) {
- if (trim(preg_replace('/(?:\s{2,}+|[^\S ])/', ' ', $text)) !== $text) {
- @trigger_error(sprintf('"%s()" will normalize whitespaces by default in Symfony 5.0, set the second "$normalizeWhitespace" argument to false to retrieve the non-normalized version of the text.', __METHOD__), E_USER_DEPRECATED);
- }
-
- return $text;
- }
-
- if (\func_num_args() > 1 && func_get_arg(1)) {
+ if ($normalizeWhitespace) {
return trim(preg_replace('/(?:\s{2,}+|[^\S ])/', ' ', $text));
}
@@ -638,11 +608,11 @@ public function text(/* string $default = null, bool $normalizeWhitespace = true
*
* @throws \InvalidArgumentException When current node is empty
*/
- public function html(/* string $default = null */)
+ public function html(string $default = null)
{
if (!$this->nodes) {
- if (0 < \func_num_args() && null !== func_get_arg(0)) {
- return (string) func_get_arg(0);
+ if (null !== $default) {
+ return $default;
}
throw new \InvalidArgumentException('The current node list is empty.');
@@ -685,11 +655,9 @@ public function outerHtml(): string
* Since an XPath expression might evaluate to either a simple type or a \DOMNodeList,
* this method will return either an array of simple types or a new Crawler instance.
*
- * @param string $xpath An XPath expression
- *
* @return array|Crawler An array of evaluation results or a new Crawler instance
*/
- public function evaluate($xpath)
+ public function evaluate(string $xpath)
{
if (null === $this->document) {
throw new \LogicException('Cannot evaluate the expression on an uninitialized crawler.');
@@ -718,13 +686,10 @@ public function evaluate($xpath)
*
* $crawler->filter('h1 a')->extract(['_text', 'href']);
*
- * @param array $attributes An array of attributes
- *
* @return array An array of extracted values
*/
- public function extract($attributes)
+ public function extract(array $attributes)
{
- $attributes = (array) $attributes;
$count = \count($attributes);
$data = [];
@@ -754,11 +719,9 @@ public function extract($attributes)
* This means that a child selector "div" or "./div" will match only
* the div elements of the current crawler, not their children.
*
- * @param string $xpath An XPath expression
- *
* @return static
*/
- public function filterXPath($xpath)
+ public function filterXPath(string $xpath)
{
$xpath = $this->relativize($xpath);
@@ -775,13 +738,11 @@ public function filterXPath($xpath)
*
* This method only works if you have installed the CssSelector Symfony Component.
*
- * @param string $selector A CSS selector
- *
* @return static
*
* @throws \RuntimeException if the CssSelector Component is not available
*/
- public function filter($selector)
+ public function filter(string $selector)
{
$converter = $this->createCssSelectorConverter();
@@ -792,11 +753,9 @@ public function filter($selector)
/**
* Selects links by name or alt value for clickable images.
*
- * @param string $value The link text
- *
* @return static
*/
- public function selectLink($value)
+ public function selectLink(string $value)
{
return $this->filterRelativeXPath(
sprintf('descendant-or-self::a[contains(concat(\' \', normalize-space(string(.)), \' \'), %1$s) or ./img[contains(concat(\' \', normalize-space(string(@alt)), \' \'), %1$s)]]', static::xpathLiteral(' '.$value.' '))
@@ -806,11 +765,9 @@ public function selectLink($value)
/**
* Selects images by alt value.
*
- * @param string $value The image alt
- *
* @return static A new instance of Crawler with the filtered list of nodes
*/
- public function selectImage($value)
+ public function selectImage(string $value)
{
$xpath = sprintf('descendant-or-self::img[contains(normalize-space(string(@alt)), %s)]', static::xpathLiteral($value));
@@ -820,11 +777,9 @@ public function selectImage($value)
/**
* Selects a button by name or alt value for images.
*
- * @param string $value The button text
- *
* @return static
*/
- public function selectButton($value)
+ public function selectButton(string $value)
{
return $this->filterRelativeXPath(
sprintf('descendant-or-self::input[((contains(%1$s, "submit") or contains(%1$s, "button")) and contains(concat(\' \', normalize-space(string(@value)), \' \'), %2$s)) or (contains(%1$s, "image") and contains(concat(\' \', normalize-space(string(@alt)), \' \'), %2$s)) or @id=%3$s or @name=%3$s] | descendant-or-self::button[contains(concat(\' \', normalize-space(string(.)), \' \'), %2$s) or @id=%3$s or @name=%3$s]', 'translate(@type, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")', static::xpathLiteral(' '.$value.' '), static::xpathLiteral($value))
@@ -834,13 +789,11 @@ public function selectButton($value)
/**
* Returns a Link object for the first node in the list.
*
- * @param string $method The method for the link (get by default)
- *
* @return Link A Link instance
*
* @throws \InvalidArgumentException If the current node list is empty or the selected node is not instance of DOMElement
*/
- public function link($method = 'get')
+ public function link(string $method = 'get')
{
if (!$this->nodes) {
throw new \InvalidArgumentException('The current node list is empty.');
@@ -920,14 +873,11 @@ public function images()
/**
* Returns a Form object for the first node in the list.
*
- * @param array $values An array of values for the form fields
- * @param string $method The method for the form
- *
* @return Form A Form instance
*
* @throws \InvalidArgumentException If the current node list is empty or the selected node is not instance of DOMElement
*/
- public function form(array $values = null, $method = null)
+ public function form(array $values = null, string $method = null)
{
if (!$this->nodes) {
throw new \InvalidArgumentException('The current node list is empty.');
@@ -950,19 +900,13 @@ public function form(array $values = null, $method = null)
/**
* Overloads a default namespace prefix to be used with XPath and CSS expressions.
- *
- * @param string $prefix
*/
- public function setDefaultNamespacePrefix($prefix)
+ public function setDefaultNamespacePrefix(string $prefix)
{
$this->defaultNamespacePrefix = $prefix;
}
- /**
- * @param string $prefix
- * @param string $namespace
- */
- public function registerNamespace($prefix, $namespace)
+ public function registerNamespace(string $prefix, string $namespace)
{
$this->namespaces[$prefix] = $namespace;
}
@@ -983,11 +927,9 @@ public function registerNamespace($prefix, $namespace)
* echo Crawler::xpathLiteral('a\'b"c');
* //prints concat('a', "'", 'b"c')
*
- * @param string $s String to be escaped
- *
* @return string Converted string
*/
- public static function xpathLiteral($s)
+ public static function xpathLiteral(string $s)
{
if (false === strpos($s, "'")) {
return sprintf("'%s'", $s);
@@ -1020,7 +962,7 @@ public static function xpathLiteral($s)
*
* @return static
*/
- private function filterRelativeXPath(string $xpath)
+ private function filterRelativeXPath(string $xpath): object
{
$prefixes = $this->findNamespacePrefixes($xpath);
@@ -1125,11 +1067,9 @@ private function relativize(string $xpath): string
}
/**
- * @param int $position
- *
* @return \DOMNode|null
*/
- public function getNode($position)
+ public function getNode(int $position)
{
return isset($this->nodes[$position]) ? $this->nodes[$position] : null;
}
@@ -1152,11 +1092,10 @@ public function getIterator()
/**
* @param \DOMElement $node
- * @param string $siblingDir
*
* @return array
*/
- protected function sibling($node, $siblingDir = 'nextSibling')
+ protected function sibling($node, string $siblingDir = 'nextSibling')
{
$nodes = [];
@@ -1265,7 +1204,7 @@ private function findNamespacePrefixes(string $xpath): array
*
* @return static
*/
- private function createSubCrawler($nodes)
+ private function createSubCrawler($nodes): object
{
$crawler = new static($nodes, $this->uri, $this->baseHref);
$crawler->isHtml = $this->isHtml;
diff --git a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
index 8b437630d089f..c4b08c88b9abb 100644
--- a/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/ChoiceFormField.php
@@ -113,7 +113,7 @@ public function untick()
/**
* Sets the value of the field.
*
- * @param string|array|bool $value The value of the field
+ * @param string|array|bool|null $value The value of the field
*
* @throws \InvalidArgumentException When value type provided is not correct
*/
@@ -268,12 +268,9 @@ private function buildOptionValue(\DOMElement $node): array
/**
* Checks whether given value is in the existing options.
*
- * @param string $optionValue
- * @param array $options
- *
* @return bool
*/
- public function containsOption($optionValue, $options)
+ public function containsOption(string $optionValue, array $options)
{
if ($this->validationDisabled) {
return true;
diff --git a/src/Symfony/Component/DomCrawler/Field/FileFormField.php b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
index 9abdca8827ef5..f38aca3f4ee4a 100644
--- a/src/Symfony/Component/DomCrawler/Field/FileFormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FileFormField.php
@@ -25,7 +25,7 @@ class FileFormField extends FormField
*
* @throws \InvalidArgumentException When error code doesn't exist
*/
- public function setErrorCode($error)
+ public function setErrorCode(int $error)
{
$codes = [UPLOAD_ERR_INI_SIZE, UPLOAD_ERR_FORM_SIZE, UPLOAD_ERR_PARTIAL, UPLOAD_ERR_NO_FILE, UPLOAD_ERR_NO_TMP_DIR, UPLOAD_ERR_CANT_WRITE, UPLOAD_ERR_EXTENSION];
if (!\in_array($error, $codes)) {
@@ -37,20 +37,16 @@ public function setErrorCode($error)
/**
* Sets the value of the field.
- *
- * @param string $value The value of the field
*/
- public function upload($value)
+ public function upload(?string $value)
{
$this->setValue($value);
}
/**
* Sets the value of the field.
- *
- * @param string|null $value The value of the field
*/
- public function setValue($value)
+ public function setValue(?string $value)
{
if (null !== $value && is_readable($value)) {
$error = UPLOAD_ERR_OK;
@@ -80,10 +76,8 @@ public function setValue($value)
/**
* Sets path to the file as string for simulating HTTP request.
- *
- * @param string $path The path to the file
*/
- public function setFilePath($path)
+ public function setFilePath(string $path)
{
parent::setValue($path);
}
diff --git a/src/Symfony/Component/DomCrawler/Field/FormField.php b/src/Symfony/Component/DomCrawler/Field/FormField.php
index 0bc4f54479f3b..3e71edef40da1 100644
--- a/src/Symfony/Component/DomCrawler/Field/FormField.php
+++ b/src/Symfony/Component/DomCrawler/Field/FormField.php
@@ -98,12 +98,10 @@ public function getValue()
/**
* Sets the value of the field.
- *
- * @param string|array|bool|null $value The value of the field
*/
- public function setValue($value)
+ public function setValue(?string $value)
{
- $this->value = (string) $value;
+ $this->value = $value ?? '';
}
/**
diff --git a/src/Symfony/Component/DomCrawler/Form.php b/src/Symfony/Component/DomCrawler/Form.php
index edde960a381f8..56d10108c1a98 100644
--- a/src/Symfony/Component/DomCrawler/Form.php
+++ b/src/Symfony/Component/DomCrawler/Form.php
@@ -255,21 +255,17 @@ public function getName(): string
/**
* Returns true if the named field exists.
*
- * @param string $name The field name
- *
* @return bool true if the field exists, false otherwise
*/
- public function has($name)
+ public function has(string $name)
{
return $this->fields->has($name);
}
/**
* Removes a field from the form.
- *
- * @param string $name The field name
*/
- public function remove($name)
+ public function remove(string $name)
{
$this->fields->remove($name);
}
@@ -277,13 +273,11 @@ public function remove($name)
/**
* Gets a named field.
*
- * @param string $name The field name
- *
* @return FormField|FormField[]|FormField[][] The value of the field
*
* @throws \InvalidArgumentException When field is not present in this form
*/
- public function get($name)
+ public function get(string $name)
{
return $this->fields->get($name);
}
diff --git a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
index 266b4be6f513f..19c7e678acacd 100644
--- a/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/AbstractCrawlerTest.php
@@ -260,15 +260,6 @@ public function testNormalizeWhiteSpace()
$this->assertNotSame('Elsa <3', $crawler->text(null, false));
}
- /**
- * @group legacy
- */
- public function testLegacyNormalizeWhiteSpace()
- {
- $crawler = $this->createTestCrawler()->filterXPath('//p');
- $this->assertNotSame('Elsa <3', $crawler->text());
- }
-
public function testEach()
{
$data = $this->createTestCrawler()->filterXPath('//ul[1]/li')->each(function ($node, $i) {
@@ -376,11 +367,11 @@ public function testExtract()
{
$crawler = $this->createTestCrawler()->filterXPath('//ul[1]/li');
- $this->assertEquals(['One', 'Two', 'Three'], $crawler->extract('_text'), '->extract() returns an array of extracted data from the node list');
+ $this->assertEquals(['One', 'Two', 'Three'], $crawler->extract(['_text']), '->extract() returns an array of extracted data from the node list');
$this->assertEquals([['One', 'first'], ['Two', ''], ['Three', '']], $crawler->extract(['_text', 'class']), '->extract() returns an array of extracted data from the node list');
$this->assertEquals([[], [], []], $crawler->extract([]), '->extract() returns empty arrays if the attribute list is empty');
- $this->assertEquals([], $this->createTestCrawler()->filterXPath('//ol')->extract('_text'), '->extract() returns an empty array if the node list is empty');
+ $this->assertEquals([], $this->createTestCrawler()->filterXPath('//ol')->extract(['_text']), '->extract() returns an empty array if the node list is empty');
$this->assertEquals([['One', 'li'], ['Two', 'li'], ['Three', 'li']], $crawler->extract(['_text', '_name']), '->extract() returns an array of extracted data from the node list');
}
@@ -1203,62 +1194,6 @@ public function testEvaluateThrowsAnExceptionIfDocumentIsEmpty()
$this->createCrawler()->evaluate('//form/input[1]');
}
- /**
- * @group legacy
- * @expectedDeprecation The "Symfony\Component\DomCrawler\Crawler::children()" method will have a new "string $selector = null" argument in version 5.0, not defining it is deprecated since Symfony 4.2.
- */
- public function testInheritedClassCallChildrenWithoutArgument()
- {
- $dom = new \DOMDocument();
- $dom->loadHTML($this->getDoctype().'
-
-
- Foo
- Fabien\'s Foo
- Fabien"s Foo
- \' Fabien"s Foo
-
- ![Bar]()
- ![Fabien\'s Bar]()
- ![Fabien"s Bar]()
- ![\' Fabien"s Bar]()
-
- GetLink
-
- Klausi|Claudiu
-
-
-
-
-
-
-
-
- - One Bis
- - Two Bis
- - Three Bis
-
-
- ![]()
diff --git a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
index 66212a81ad84d..5783de38bcc39 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Exception/FlattenExceptionTest.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\ErrorHandler\Tests\Exception;
use PHPUnit\Framework\TestCase;
-use Symfony\Component\Debug\Exception\FatalThrowableError;
use Symfony\Component\ErrorHandler\Exception\FlattenException;
use Symfony\Component\HttpFoundation\Exception\SuspiciousOperationException;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -130,19 +129,6 @@ public function testFlattenHttpException(\Throwable $exception)
$this->assertInstanceOf($flattened->getClass(), $exception, 'The class is set to the class of the original exception');
}
- /**
- * @group legacy
- */
- public function testWrappedThrowable()
- {
- $exception = new FatalThrowableError(new \DivisionByZeroError('Ouch', 42));
- $flattened = FlattenException::create($exception);
-
- $this->assertSame('Ouch', $flattened->getMessage(), 'The message is copied from the original error.');
- $this->assertSame(42, $flattened->getCode(), 'The code is copied from the original error.');
- $this->assertSame('DivisionByZeroError', $flattened->getClass(), 'The class is set to the class of the original error');
- }
-
public function testThrowable()
{
$error = new \DivisionByZeroError('Ouch', 42);
@@ -301,7 +287,7 @@ function () {},
// assertEquals() does not like NAN values.
$this->assertEquals($array[$i][0], 'float');
- $this->assertNan($array[$i++][1]);
+ $this->assertNan($array[$i][1]);
}
public function testRecursionInArguments()
diff --git a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/VirtualClassMagicCall.php b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/VirtualClassMagicCall.php
index 77059e3e72c4e..405b553562450 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/Fixtures/VirtualClassMagicCall.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/Fixtures/VirtualClassMagicCall.php
@@ -8,11 +8,11 @@
*/
class VirtualClassMagicCall
{
- public static function __callStatic($name, $arguments)
+ public static function __callStatic(string $name, array $arguments)
{
}
- public function __call($name, $arguments)
+ public function __call(string $name, array $arguments)
{
}
}
diff --git a/src/Symfony/Component/ErrorHandler/composer.json b/src/Symfony/Component/ErrorHandler/composer.json
index 614bd4f5ac1f3..e36794b065c8f 100644
--- a/src/Symfony/Component/ErrorHandler/composer.json
+++ b/src/Symfony/Component/ErrorHandler/composer.json
@@ -16,9 +16,8 @@
}
],
"require": {
- "php": "^7.1.3",
- "psr/log": "~1.0",
- "symfony/debug": "^4.4.5",
+ "php": "^7.2.5",
+ "psr/log": "^1.0",
"symfony/var-dumper": "^4.4|^5.0"
},
"require-dev": {
@@ -34,7 +33,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.1-dev"
}
}
}
diff --git a/src/Symfony/Component/EventDispatcher/CHANGELOG.md b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
index 54fd04227b36c..f4bddd3b54160 100644
--- a/src/Symfony/Component/EventDispatcher/CHANGELOG.md
+++ b/src/Symfony/Component/EventDispatcher/CHANGELOG.md
@@ -1,6 +1,19 @@
CHANGELOG
=========
+5.1.0
+-----
+
+ * The `LegacyEventDispatcherProxy` class has been deprecated.
+
+5.0.0
+-----
+
+ * The signature of the `EventDispatcherInterface::dispatch()` method has been changed to `dispatch($event, string $eventName = null): object`.
+ * The `Event` class has been removed in favor of `Symfony\Contracts\EventDispatcher\Event`.
+ * The `TraceableEventDispatcherInterface` has been removed.
+ * The `WrappedListener` class is now final.
+
4.4.0
-----
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
index fdc65fd31280b..11dce4897bc65 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcher.php
@@ -13,15 +13,12 @@
use Psr\EventDispatcher\StoppableEventInterface;
use Psr\Log\LoggerInterface;
-use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
-use Symfony\Component\EventDispatcher\LegacyEventProxy;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\Stopwatch\Stopwatch;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
+use Symfony\Contracts\Service\ResetInterface;
/**
* Collects some data about event listeners.
@@ -30,7 +27,7 @@
*
* @author Fabien Potencier
*/
-class TraceableEventDispatcher implements TraceableEventDispatcherInterface
+class TraceableEventDispatcher implements EventDispatcherInterface, ResetInterface
{
protected $logger;
protected $stopwatch;
@@ -44,7 +41,7 @@ class TraceableEventDispatcher implements TraceableEventDispatcherInterface
public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $stopwatch, LoggerInterface $logger = null, RequestStack $requestStack = null)
{
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ $this->dispatcher = $dispatcher;
$this->stopwatch = $stopwatch;
$this->logger = $logger;
$this->wrappedListeners = [];
@@ -55,7 +52,7 @@ public function __construct(EventDispatcherInterface $dispatcher, Stopwatch $sto
/**
* {@inheritdoc}
*/
- public function addListener($eventName, $listener, $priority = 0)
+ public function addListener(string $eventName, $listener, int $priority = 0)
{
$this->dispatcher->addListener($eventName, $listener, $priority);
}
@@ -71,7 +68,7 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function removeListener($eventName, $listener)
+ public function removeListener(string $eventName, $listener)
{
if (isset($this->wrappedListeners[$eventName])) {
foreach ($this->wrappedListeners[$eventName] as $index => $wrappedListener) {
@@ -97,7 +94,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function getListeners($eventName = null)
+ public function getListeners(string $eventName = null)
{
return $this->dispatcher->getListeners($eventName);
}
@@ -105,7 +102,7 @@ public function getListeners($eventName = null)
/**
* {@inheritdoc}
*/
- public function getListenerPriority($eventName, $listener)
+ public function getListenerPriority(string $eventName, $listener)
{
// we might have wrapped listeners for the event (if called while dispatching)
// in that case get the priority by wrapper
@@ -123,39 +120,25 @@ public function getListenerPriority($eventName, $listener)
/**
* {@inheritdoc}
*/
- public function hasListeners($eventName = null)
+ public function hasListeners(string $eventName = null)
{
return $this->dispatcher->hasListeners($eventName);
}
/**
* {@inheritdoc}
- *
- * @param string|null $eventName
*/
- public function dispatch($event/*, string $eventName = null*/)
+ public function dispatch(object $event, string $eventName = null): object
{
+ $eventName = $eventName ?? \get_class($event);
+
if (null === $this->callStack) {
$this->callStack = new \SplObjectStorage();
}
$currentRequestHash = $this->currentRequestHash = $this->requestStack && ($request = $this->requestStack->getCurrentRequest()) ? spl_object_hash($request) : '';
- $eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
-
- if (\is_object($event)) {
- $eventName = $eventName ?? \get_class($event);
- } else {
- @trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as first argument is deprecated since Symfony 4.3, pass it second and provide the event object first instead.', EventDispatcherInterface::class), E_USER_DEPRECATED);
- $swap = $event;
- $event = $eventName ?? new Event();
- $eventName = $swap;
-
- if (!$event instanceof Event) {
- throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an instance of %s, %s given.', EventDispatcherInterface::class, Event::class, \is_object($event) ? \get_class($event) : \gettype($event)));
- }
- }
- if (null !== $this->logger && ($event instanceof Event || $event instanceof ContractsEvent || $event instanceof StoppableEventInterface) && $event->isPropagationStopped()) {
+ if (null !== $this->logger && $event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
$this->logger->debug(sprintf('The "%s" event is already stopped. No listeners have been called.', $eventName));
}
@@ -183,17 +166,15 @@ public function dispatch($event/*, string $eventName = null*/)
}
/**
- * {@inheritdoc}
- *
- * @param Request|null $request The request to get listeners for
+ * @return array
*/
- public function getCalledListeners(/* Request $request = null */)
+ public function getCalledListeners(Request $request = null)
{
if (null === $this->callStack) {
return [];
}
- $hash = 1 <= \func_num_args() && null !== ($request = func_get_arg(0)) ? spl_object_hash($request) : null;
+ $hash = $request ? spl_object_hash($request) : null;
$called = [];
foreach ($this->callStack as $listener) {
list($eventName, $requestHash) = $this->callStack->getInfo();
@@ -206,11 +187,9 @@ public function getCalledListeners(/* Request $request = null */)
}
/**
- * {@inheritdoc}
- *
- * @param Request|null $request The request to get listeners for
+ * @return array
*/
- public function getNotCalledListeners(/* Request $request = null */)
+ public function getNotCalledListeners(Request $request = null)
{
try {
$allListeners = $this->getListeners();
@@ -223,7 +202,7 @@ public function getNotCalledListeners(/* Request $request = null */)
return [];
}
- $hash = 1 <= \func_num_args() && null !== ($request = func_get_arg(0)) ? spl_object_hash($request) : null;
+ $hash = $request ? spl_object_hash($request) : null;
$calledListeners = [];
if (null !== $this->callStack) {
@@ -253,12 +232,9 @@ public function getNotCalledListeners(/* Request $request = null */)
return $notCalled;
}
- /**
- * @param Request|null $request The request to get orphaned events for
- */
- public function getOrphanedEvents(/* Request $request = null */): array
+ public function getOrphanedEvents(Request $request = null): array
{
- if (1 <= \func_num_args() && null !== $request = func_get_arg(0)) {
+ if ($request) {
return $this->orphanedEvents[spl_object_hash($request)] ?? [];
}
@@ -284,46 +260,26 @@ public function reset()
*
* @return mixed
*/
- public function __call($method, $arguments)
+ public function __call(string $method, array $arguments)
{
return $this->dispatcher->{$method}(...$arguments);
}
/**
* Called before dispatching the event.
- *
- * @param object $event
*/
- protected function beforeDispatch(string $eventName, $event)
+ protected function beforeDispatch(string $eventName, object $event)
{
- $this->preDispatch($eventName, $event instanceof Event ? $event : new LegacyEventProxy($event));
}
/**
* Called after dispatching the event.
- *
- * @param object $event
- */
- protected function afterDispatch(string $eventName, $event)
- {
- $this->postDispatch($eventName, $event instanceof Event ? $event : new LegacyEventProxy($event));
- }
-
- /**
- * @deprecated since Symfony 4.3, will be removed in 5.0, use beforeDispatch instead
- */
- protected function preDispatch($eventName, Event $event)
- {
- }
-
- /**
- * @deprecated since Symfony 4.3, will be removed in 5.0, use afterDispatch instead
*/
- protected function postDispatch($eventName, Event $event)
+ protected function afterDispatch(string $eventName, object $event)
{
}
- private function preProcess(string $eventName)
+ private function preProcess(string $eventName): void
{
if (!$this->dispatcher->hasListeners($eventName)) {
$this->orphanedEvents[$this->currentRequestHash][] = $eventName;
@@ -341,7 +297,7 @@ private function preProcess(string $eventName)
}
}
- private function postProcess(string $eventName)
+ private function postProcess(string $eventName): void
{
unset($this->wrappedListeners[$eventName]);
$skipped = false;
diff --git a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
deleted file mode 100644
index 4fedb9a413a3b..0000000000000
--- a/src/Symfony/Component/EventDispatcher/Debug/TraceableEventDispatcherInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\EventDispatcher\Debug;
-
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Contracts\Service\ResetInterface;
-
-/**
- * @deprecated since Symfony 4.1
- *
- * @author Fabien Potencier
- */
-interface TraceableEventDispatcherInterface extends EventDispatcherInterface, ResetInterface
-{
- /**
- * Gets the called listeners.
- *
- * @param Request|null $request The request to get listeners for
- *
- * @return array An array of called listeners
- */
- public function getCalledListeners(/* Request $request = null */);
-
- /**
- * Gets the not called listeners.
- *
- * @param Request|null $request The request to get listeners for
- *
- * @return array An array of not called listeners
- */
- public function getNotCalledListeners(/* Request $request = null */);
-}
diff --git a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
index e047639081c78..295bcae88a734 100644
--- a/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
+++ b/src/Symfony/Component/EventDispatcher/Debug/WrappedListener.php
@@ -12,19 +12,14 @@
namespace Symfony\Component\EventDispatcher\Debug;
use Psr\EventDispatcher\StoppableEventInterface;
-use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\EventDispatcher\LegacyEventProxy;
use Symfony\Component\Stopwatch\Stopwatch;
use Symfony\Component\VarDumper\Caster\ClassStub;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
/**
* @author Fabien Potencier
- *
- * @final since Symfony 4.3: the "Event" type-hint on __invoke() will be replaced by "object" in 5.0
*/
-class WrappedListener
+final class WrappedListener
{
private $listener;
private $optimizedListener;
@@ -81,22 +76,22 @@ public function getWrappedListener()
return $this->listener;
}
- public function wasCalled()
+ public function wasCalled(): bool
{
return $this->called;
}
- public function stoppedPropagation()
+ public function stoppedPropagation(): bool
{
return $this->stoppedPropagation;
}
- public function getPretty()
+ public function getPretty(): string
{
return $this->pretty;
}
- public function getInfo($eventName)
+ public function getInfo(string $eventName): array
{
if (null === $this->stub) {
$this->stub = self::$hasClassStub ? new ClassStub($this->pretty.'()', $this->listener) : $this->pretty.'()';
@@ -110,12 +105,8 @@ public function getInfo($eventName)
];
}
- public function __invoke(Event $event, $eventName, EventDispatcherInterface $dispatcher)
+ public function __invoke(object $event, string $eventName, EventDispatcherInterface $dispatcher): void
{
- if ($event instanceof LegacyEventProxy) {
- $event = $event->getEvent();
- }
-
$dispatcher = $this->dispatcher ?: $dispatcher;
$this->called = true;
@@ -129,7 +120,7 @@ public function __invoke(Event $event, $eventName, EventDispatcherInterface $dis
$e->stop();
}
- if (($event instanceof Event || $event instanceof ContractsEvent || $event instanceof StoppableEventInterface) && $event->isPropagationStopped()) {
+ if ($event instanceof StoppableEventInterface && $event->isPropagationStopped()) {
$this->stoppedPropagation = true;
}
}
diff --git a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
index 9c88809de059b..2bbebb7d6f794 100644
--- a/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
+++ b/src/Symfony/Component/EventDispatcher/DependencyInjection/RegisterListenersPass.php
@@ -16,7 +16,6 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\EventDispatcher\Event as LegacyEvent;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Contracts\EventDispatcher\Event;
@@ -141,7 +140,6 @@ private function getEventFromTypeDeclaration(ContainerBuilder $container, string
|| !($type = $m->getParameters()[0]->getType())
|| $type->isBuiltin()
|| Event::class === ($name = $type->getName())
- || LegacyEvent::class === $name
) {
throw new InvalidArgumentException(sprintf('Service "%s" must define the "event" attribute on "%s" tags.', $id, $this->listenerTag));
}
@@ -160,7 +158,7 @@ class ExtractingEventDispatcher extends EventDispatcher implements EventSubscrib
public static $aliases = [];
public static $subscriber;
- public function addListener($eventName, $listener, $priority = 0)
+ public function addListener(string $eventName, $listener, int $priority = 0)
{
$this->listeners[] = [$eventName, $listener[1], $priority];
}
diff --git a/src/Symfony/Component/EventDispatcher/Event.php b/src/Symfony/Component/EventDispatcher/Event.php
deleted file mode 100644
index 307c4be5de0c2..0000000000000
--- a/src/Symfony/Component/EventDispatcher/Event.php
+++ /dev/null
@@ -1,38 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\EventDispatcher;
-
-/**
- * @deprecated since Symfony 4.3, use "Symfony\Contracts\EventDispatcher\Event" instead
- */
-class Event
-{
- private $propagationStopped = false;
-
- /**
- * @return bool Whether propagation was already stopped for this event
- *
- * @deprecated since Symfony 4.3, use "Symfony\Contracts\EventDispatcher\Event" instead
- */
- public function isPropagationStopped()
- {
- return $this->propagationStopped;
- }
-
- /**
- * @deprecated since Symfony 4.3, use "Symfony\Contracts\EventDispatcher\Event" instead
- */
- public function stopPropagation()
- {
- $this->propagationStopped = true;
- }
-}
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
index bd2874ba6c484..8dba33d0d5278 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -13,7 +13,6 @@
use Psr\EventDispatcher\StoppableEventInterface;
use Symfony\Component\EventDispatcher\Debug\WrappedListener;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
/**
* The EventDispatcherInterface is the central point of Symfony's event listener system.
@@ -45,23 +44,10 @@ public function __construct()
/**
* {@inheritdoc}
- *
- * @param string|null $eventName
*/
- public function dispatch($event/*, string $eventName = null*/)
+ public function dispatch(object $event, string $eventName = null): object
{
- $eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
-
- if (\is_object($event)) {
- $eventName = $eventName ?? \get_class($event);
- } elseif (\is_string($event) && (null === $eventName || $eventName instanceof ContractsEvent || $eventName instanceof Event)) {
- @trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.', EventDispatcherInterface::class), E_USER_DEPRECATED);
- $swap = $event;
- $event = $eventName ?? new Event();
- $eventName = $swap;
- } else {
- throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, %s given.', EventDispatcherInterface::class, \is_object($event) ? \get_class($event) : \gettype($event)));
- }
+ $eventName = $eventName ?? \get_class($event);
if (null !== $this->optimized && null !== $eventName) {
$listeners = $this->optimized[$eventName] ?? (empty($this->listeners[$eventName]) ? [] : $this->optimizeListeners($eventName));
@@ -79,7 +65,7 @@ public function dispatch($event/*, string $eventName = null*/)
/**
* {@inheritdoc}
*/
- public function getListeners($eventName = null)
+ public function getListeners(string $eventName = null)
{
if (null !== $eventName) {
if (empty($this->listeners[$eventName])) {
@@ -105,7 +91,7 @@ public function getListeners($eventName = null)
/**
* {@inheritdoc}
*/
- public function getListenerPriority($eventName, $listener)
+ public function getListenerPriority(string $eventName, $listener)
{
if (empty($this->listeners[$eventName])) {
return null;
@@ -134,7 +120,7 @@ public function getListenerPriority($eventName, $listener)
/**
* {@inheritdoc}
*/
- public function hasListeners($eventName = null)
+ public function hasListeners(string $eventName = null)
{
if (null !== $eventName) {
return !empty($this->listeners[$eventName]);
@@ -152,7 +138,7 @@ public function hasListeners($eventName = null)
/**
* {@inheritdoc}
*/
- public function addListener($eventName, $listener, $priority = 0)
+ public function addListener(string $eventName, $listener, int $priority = 0)
{
$this->listeners[$eventName][$priority][] = $listener;
unset($this->sorted[$eventName], $this->optimized[$eventName]);
@@ -161,7 +147,7 @@ public function addListener($eventName, $listener, $priority = 0)
/**
* {@inheritdoc}
*/
- public function removeListener($eventName, $listener)
+ public function removeListener(string $eventName, $listener)
{
if (empty($this->listeners[$eventName])) {
return;
@@ -233,34 +219,14 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
* @param string $eventName The name of the event to dispatch
* @param object $event The event object to pass to the event handlers/listeners
*/
- protected function callListeners(iterable $listeners, string $eventName, $event)
+ protected function callListeners(iterable $listeners, string $eventName, object $event)
{
- if ($event instanceof Event) {
- $this->doDispatch($listeners, $eventName, $event);
-
- return;
- }
-
- $stoppable = $event instanceof ContractsEvent || $event instanceof StoppableEventInterface;
+ $stoppable = $event instanceof StoppableEventInterface;
foreach ($listeners as $listener) {
if ($stoppable && $event->isPropagationStopped()) {
break;
}
- // @deprecated: the ternary operator is part of a BC layer and should be removed in 5.0
- $listener($listener instanceof WrappedListener ? new LegacyEventProxy($event) : $event, $eventName, $this);
- }
- }
-
- /**
- * @deprecated since Symfony 4.3, use callListeners() instead
- */
- protected function doDispatch($listeners, $eventName, Event $event)
- {
- foreach ($listeners as $listener) {
- if ($event->isPropagationStopped()) {
- break;
- }
$listener($event, $eventName, $this);
}
}
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
index ceaa62aeb0472..88c707c9a360b 100644
--- a/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
+++ b/src/Symfony/Component/EventDispatcher/EventDispatcherInterface.php
@@ -25,12 +25,11 @@ interface EventDispatcherInterface extends ContractsEventDispatcherInterface
/**
* Adds an event listener that listens on the specified events.
*
- * @param string $eventName The event to listen on
- * @param callable $listener The listener
- * @param int $priority The higher this value, the earlier an event
- * listener will be triggered in the chain (defaults to 0)
+ * @param callable $listener The listener
+ * @param int $priority The higher this value, the earlier an event
+ * listener will be triggered in the chain (defaults to 0)
*/
- public function addListener($eventName, $listener, $priority = 0);
+ public function addListener(string $eventName, $listener, int $priority = 0);
/**
* Adds an event subscriber.
@@ -43,40 +42,34 @@ public function addSubscriber(EventSubscriberInterface $subscriber);
/**
* Removes an event listener from the specified events.
*
- * @param string $eventName The event to remove a listener from
- * @param callable $listener The listener to remove
+ * @param callable $listener The listener to remove
*/
- public function removeListener($eventName, $listener);
+ public function removeListener(string $eventName, $listener);
public function removeSubscriber(EventSubscriberInterface $subscriber);
/**
* Gets the listeners of a specific event or all listeners sorted by descending priority.
*
- * @param string|null $eventName The name of the event
- *
* @return array The event listeners for the specified event, or all event listeners by event name
*/
- public function getListeners($eventName = null);
+ public function getListeners(string $eventName = null);
/**
* Gets the listener priority for a specific event.
*
* Returns null if the event or the listener does not exist.
*
- * @param string $eventName The name of the event
- * @param callable $listener The listener
+ * @param callable $listener The listener
*
* @return int|null The event listener priority
*/
- public function getListenerPriority($eventName, $listener);
+ public function getListenerPriority(string $eventName, $listener);
/**
* Checks whether an event has any registered listeners.
*
- * @param string|null $eventName The name of the event
- *
* @return bool true if the specified event has any listeners, false otherwise
*/
- public function hasListeners($eventName = null);
+ public function hasListeners(string $eventName = null);
}
diff --git a/src/Symfony/Component/EventDispatcher/GenericEvent.php b/src/Symfony/Component/EventDispatcher/GenericEvent.php
index f005e3a3db076..34b95cedee817 100644
--- a/src/Symfony/Component/EventDispatcher/GenericEvent.php
+++ b/src/Symfony/Component/EventDispatcher/GenericEvent.php
@@ -11,6 +11,8 @@
namespace Symfony\Component\EventDispatcher;
+use Symfony\Contracts\EventDispatcher\Event;
+
/**
* Event encapsulation class.
*
@@ -48,13 +50,11 @@ public function getSubject()
/**
* Get argument by key.
*
- * @param string $key Key
- *
* @return mixed Contents of array key
*
* @throws \InvalidArgumentException if key is not found
*/
- public function getArgument($key)
+ public function getArgument(string $key)
{
if ($this->hasArgument($key)) {
return $this->arguments[$key];
@@ -66,12 +66,11 @@ public function getArgument($key)
/**
* Add argument to event.
*
- * @param string $key Argument name
- * @param mixed $value Value
+ * @param mixed $value Value
*
* @return $this
*/
- public function setArgument($key, $value)
+ public function setArgument(string $key, $value)
{
$this->arguments[$key] = $value;
@@ -91,8 +90,6 @@ public function getArguments()
/**
* Set args property.
*
- * @param array $args Arguments
- *
* @return $this
*/
public function setArguments(array $args = [])
@@ -105,11 +102,9 @@ public function setArguments(array $args = [])
/**
* Has argument.
*
- * @param string $key Key of arguments array
- *
* @return bool
*/
- public function hasArgument($key)
+ public function hasArgument(string $key)
{
return \array_key_exists($key, $this->arguments);
}
diff --git a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
index 75a7d7318187b..568d79c3a2916 100644
--- a/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
+++ b/src/Symfony/Component/EventDispatcher/ImmutableEventDispatcher.php
@@ -22,32 +22,21 @@ class ImmutableEventDispatcher implements EventDispatcherInterface
public function __construct(EventDispatcherInterface $dispatcher)
{
- $this->dispatcher = LegacyEventDispatcherProxy::decorate($dispatcher);
+ $this->dispatcher = $dispatcher;
}
/**
* {@inheritdoc}
- *
- * @param string|null $eventName
*/
- public function dispatch($event/*, string $eventName = null*/)
+ public function dispatch(object $event, string $eventName = null): object
{
- $eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
-
- if (is_scalar($event)) {
- // deprecated
- $swap = $event;
- $event = $eventName ?? new Event();
- $eventName = $swap;
- }
-
return $this->dispatcher->dispatch($event, $eventName);
}
/**
* {@inheritdoc}
*/
- public function addListener($eventName, $listener, $priority = 0)
+ public function addListener(string $eventName, $listener, int $priority = 0)
{
throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
}
@@ -63,7 +52,7 @@ public function addSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function removeListener($eventName, $listener)
+ public function removeListener(string $eventName, $listener)
{
throw new \BadMethodCallException('Unmodifiable event dispatchers must not be modified.');
}
@@ -79,7 +68,7 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function getListeners($eventName = null)
+ public function getListeners(string $eventName = null)
{
return $this->dispatcher->getListeners($eventName);
}
@@ -87,7 +76,7 @@ public function getListeners($eventName = null)
/**
* {@inheritdoc}
*/
- public function getListenerPriority($eventName, $listener)
+ public function getListenerPriority(string $eventName, $listener)
{
return $this->dispatcher->getListenerPriority($eventName, $listener);
}
@@ -95,7 +84,7 @@ public function getListenerPriority($eventName, $listener)
/**
* {@inheritdoc}
*/
- public function hasListeners($eventName = null)
+ public function hasListeners(string $eventName = null)
{
return $this->dispatcher->hasListeners($eventName);
}
diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php
index 513e260e98106..ae681fe1e7dc5 100644
--- a/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php
+++ b/src/Symfony/Component/EventDispatcher/LegacyEventDispatcherProxy.php
@@ -11,137 +11,21 @@
namespace Symfony\Component\EventDispatcher;
-use Psr\EventDispatcher\StoppableEventInterface;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface as ContractsEventDispatcherInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+
+trigger_deprecation('symfony/event-dispatcher', '5.1', '%s is deprecated, use the event dispatcher without the proxy.', LegacyEventDispatcherProxy::class);
/**
* A helper class to provide BC/FC with the legacy signature of EventDispatcherInterface::dispatch().
*
- * This class should be deprecated in Symfony 5.1
- *
* @author Nicolas Grekas
+ *
+ * @deprecated since Symfony 5.1.
*/
-final class LegacyEventDispatcherProxy implements EventDispatcherInterface
+final class LegacyEventDispatcherProxy
{
- private $dispatcher;
-
- public static function decorate(?ContractsEventDispatcherInterface $dispatcher): ?ContractsEventDispatcherInterface
- {
- if (null === $dispatcher) {
- return null;
- }
- $r = new \ReflectionMethod($dispatcher, 'dispatch');
- $param2 = $r->getParameters()[1] ?? null;
-
- if (!$param2 || !$param2->hasType() || $param2->getType()->isBuiltin()) {
- return $dispatcher;
- }
-
- @trigger_error(sprintf('The signature of the "%s::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.', $r->class), E_USER_DEPRECATED);
-
- $self = new self();
- $self->dispatcher = $dispatcher;
-
- return $self;
- }
-
- /**
- * {@inheritdoc}
- *
- * @param string|null $eventName
- *
- * @return object
- */
- public function dispatch($event/*, string $eventName = null*/)
- {
- $eventName = 1 < \func_num_args() ? func_get_arg(1) : null;
-
- if (\is_object($event)) {
- $eventName = $eventName ?? \get_class($event);
- } elseif (\is_string($event) && (null === $eventName || $eventName instanceof ContractsEvent || $eventName instanceof Event)) {
- @trigger_error(sprintf('Calling the "%s::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.', ContractsEventDispatcherInterface::class), E_USER_DEPRECATED);
- $swap = $event;
- $event = $eventName ?? new Event();
- $eventName = $swap;
- } else {
- throw new \TypeError(sprintf('Argument 1 passed to "%s::dispatch()" must be an object, %s given.', ContractsEventDispatcherInterface::class, \is_object($event) ? \get_class($event) : \gettype($event)));
- }
-
- $listeners = $this->getListeners($eventName);
- $stoppable = $event instanceof Event || $event instanceof ContractsEvent || $event instanceof StoppableEventInterface;
-
- foreach ($listeners as $listener) {
- if ($stoppable && $event->isPropagationStopped()) {
- break;
- }
- $listener($event, $eventName, $this);
- }
-
- return $event;
- }
-
- /**
- * {@inheritdoc}
- */
- public function addListener($eventName, $listener, $priority = 0)
- {
- return $this->dispatcher->addListener($eventName, $listener, $priority);
- }
-
- /**
- * {@inheritdoc}
- */
- public function addSubscriber(EventSubscriberInterface $subscriber)
- {
- return $this->dispatcher->addSubscriber($subscriber);
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeListener($eventName, $listener)
- {
- return $this->dispatcher->removeListener($eventName, $listener);
- }
-
- /**
- * {@inheritdoc}
- */
- public function removeSubscriber(EventSubscriberInterface $subscriber)
- {
- return $this->dispatcher->removeSubscriber($subscriber);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getListeners($eventName = null): array
- {
- return $this->dispatcher->getListeners($eventName);
- }
-
- /**
- * {@inheritdoc}
- */
- public function getListenerPriority($eventName, $listener): ?int
- {
- return $this->dispatcher->getListenerPriority($eventName, $listener);
- }
-
- /**
- * {@inheritdoc}
- */
- public function hasListeners($eventName = null): bool
- {
- return $this->dispatcher->hasListeners($eventName);
- }
-
- /**
- * Proxies all method calls to the original event dispatcher.
- */
- public function __call($method, $arguments)
+ public static function decorate(?EventDispatcherInterface $dispatcher): ?EventDispatcherInterface
{
- return $this->dispatcher->{$method}(...$arguments);
+ return $dispatcher;
}
}
diff --git a/src/Symfony/Component/EventDispatcher/LegacyEventProxy.php b/src/Symfony/Component/EventDispatcher/LegacyEventProxy.php
deleted file mode 100644
index 45ee251d6a98d..0000000000000
--- a/src/Symfony/Component/EventDispatcher/LegacyEventProxy.php
+++ /dev/null
@@ -1,62 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\EventDispatcher;
-
-use Psr\EventDispatcher\StoppableEventInterface;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
-
-/**
- * @internal to be removed in 5.0.
- */
-final class LegacyEventProxy extends Event
-{
- private $event;
-
- /**
- * @param object $event
- */
- public function __construct($event)
- {
- $this->event = $event;
- }
-
- /**
- * @return object $event
- */
- public function getEvent()
- {
- return $this->event;
- }
-
- public function isPropagationStopped(): bool
- {
- if (!$this->event instanceof ContractsEvent && !$this->event instanceof StoppableEventInterface) {
- return false;
- }
-
- return $this->event->isPropagationStopped();
- }
-
- public function stopPropagation()
- {
- if (!$this->event instanceof ContractsEvent) {
- return;
- }
-
- $this->event->stopPropagation();
- }
-
- public function __call($name, $args)
- {
- return $this->event->{$name}(...$args);
- }
-}
diff --git a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
index 6a208a6662512..288168e410257 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/Debug/TraceableEventDispatcherTest.php
@@ -13,12 +13,11 @@
use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
-use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\Stopwatch\Stopwatch;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
+use Symfony\Contracts\EventDispatcher\Event;
class TraceableEventDispatcherTest extends TestCase
{
@@ -140,19 +139,6 @@ public function testClearCalledListeners()
$this->assertEquals([['event' => 'foo', 'pretty' => 'closure', 'priority' => 5]], $listeners);
}
- public function testDispatchContractsEvent()
- {
- $expectedEvent = new ContractsEvent();
- $tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
- $tdispatcher->addListener('foo', function ($event) use ($expectedEvent) {
- $this->assertSame($event, $expectedEvent);
- }, 5);
- $tdispatcher->dispatch($expectedEvent, 'foo');
-
- $listeners = $tdispatcher->getCalledListeners();
- $this->assertArrayHasKey('stub', $listeners[0]);
- }
-
public function testDispatchAfterReset()
{
$tdispatcher = new TraceableEventDispatcher(new EventDispatcher(), new Stopwatch());
diff --git a/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
index 7c8b5dc9b20fe..ea9fe8c1b6cdc 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
@@ -12,10 +12,9 @@
namespace Symfony\Component\EventDispatcher\Tests;
use PHPUnit\Framework\TestCase;
-use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
+use Symfony\Contracts\EventDispatcher\Event;
class EventDispatcherTest extends TestCase
{
@@ -135,22 +134,8 @@ public function testDispatch()
$this->dispatcher->dispatch(new Event(), self::preFoo);
$this->assertTrue($this->listener->preFooInvoked);
$this->assertFalse($this->listener->postFooInvoked);
- $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(new Event(), 'noevent'));
- $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(new Event(), self::preFoo));
- $event = new Event();
- $return = $this->dispatcher->dispatch($event, self::preFoo);
- $this->assertSame($event, $return);
- }
-
- public function testDispatchContractsEvent()
- {
- $this->dispatcher->addListener('pre.foo', [$this->listener, 'preFoo']);
- $this->dispatcher->addListener('post.foo', [$this->listener, 'postFoo']);
- $this->dispatcher->dispatch(new ContractsEvent(), self::preFoo);
- $this->assertTrue($this->listener->preFooInvoked);
- $this->assertFalse($this->listener->postFooInvoked);
- $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(new Event(), 'noevent'));
- $this->assertInstanceOf('Symfony\Component\EventDispatcher\Event', $this->dispatcher->dispatch(new Event(), self::preFoo));
+ $this->assertInstanceOf('Symfony\Contracts\EventDispatcher\Event', $this->dispatcher->dispatch(new Event(), 'noevent'));
+ $this->assertInstanceOf('Symfony\Contracts\EventDispatcher\Event', $this->dispatcher->dispatch(new Event(), self::preFoo));
$event = new Event();
$return = $this->dispatcher->dispatch($event, self::preFoo);
$this->assertSame($event, $return);
@@ -421,33 +406,6 @@ public function testMutatingWhilePropagationIsStopped()
$this->assertTrue($testLoaded);
}
-
- /**
- * @group legacy
- * @expectedDeprecation Calling the "Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.
- */
- public function testLegacySignatureWithoutEvent()
- {
- $this->dispatcher->dispatch('foo');
- }
-
- /**
- * @group legacy
- * @expectedDeprecation Calling the "Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.
- */
- public function testLegacySignatureWithEvent()
- {
- $this->dispatcher->dispatch('foo', new Event());
- }
-
- /**
- * @group legacy
- * @expectedDeprecation Calling the "Symfony\Component\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.
- */
- public function testLegacySignatureWithNewEventObject()
- {
- $this->dispatcher->dispatch('foo', new ContractsEvent());
- }
}
class CallableClass
diff --git a/src/Symfony/Component/EventDispatcher/Tests/EventTest.php b/src/Symfony/Component/EventDispatcher/Tests/EventTest.php
deleted file mode 100644
index 34ed3ba70ec4a..0000000000000
--- a/src/Symfony/Component/EventDispatcher/Tests/EventTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\EventDispatcher\Tests;
-
-use PHPUnit\Framework\TestCase;
-use Symfony\Component\EventDispatcher\Event;
-
-/**
- * @group legacy
- */
-class EventTest extends TestCase
-{
- /**
- * @var \Symfony\Component\EventDispatcher\Event
- */
- protected $event;
-
- /**
- * Sets up the fixture, for example, opens a network connection.
- * This method is called before a test is executed.
- */
- protected function setUp(): void
- {
- $this->event = new Event();
- }
-
- /**
- * Tears down the fixture, for example, closes a network connection.
- * This method is called after a test is executed.
- */
- protected function tearDown(): void
- {
- $this->event = null;
- }
-
- public function testIsPropagationStopped()
- {
- $this->assertFalse($this->event->isPropagationStopped());
- }
-
- public function testStopPropagationAndIsPropagationStopped()
- {
- $this->event->stopPropagation();
- $this->assertTrue($this->event->isPropagationStopped());
- }
-}
diff --git a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
index 1a33c19b15f6f..7cef3e6558208 100644
--- a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
+++ b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
@@ -13,8 +13,8 @@
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
-use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
+use Symfony\Contracts\EventDispatcher\Event;
/**
* @author Bernhard Schussek
diff --git a/src/Symfony/Component/EventDispatcher/Tests/LegacyEventDispatcherProxyTest.php b/src/Symfony/Component/EventDispatcher/Tests/LegacyEventDispatcherProxyTest.php
deleted file mode 100644
index f0469f9538471..0000000000000
--- a/src/Symfony/Component/EventDispatcher/Tests/LegacyEventDispatcherProxyTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\EventDispatcher\Tests;
-
-use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\EventDispatcher\EventDispatcher;
-use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
-use Symfony\Contracts\EventDispatcher\Event as ContractsEvent;
-
-/**
- * @group legacy
- */
-class LegacyEventDispatcherProxyTest extends EventDispatcherTest
-{
- /**
- * @group legacy
- * @expectedDeprecation The signature of the "Symfony\Component\EventDispatcher\Tests\TestLegacyEventDispatcher::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.
- * @expectedDeprecation Calling the "Symfony\Contracts\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.
- */
- public function testLegacySignatureWithoutEvent()
- {
- $this->createEventDispatcher()->dispatch('foo');
- }
-
- /**
- * @group legacy
- * @expectedDeprecation The signature of the "Symfony\Component\EventDispatcher\Tests\TestLegacyEventDispatcher::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.
- * @expectedDeprecation Calling the "Symfony\Contracts\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.
- */
- public function testLegacySignatureWithEvent()
- {
- $this->createEventDispatcher()->dispatch('foo', new Event());
- }
-
- /**
- * @group legacy
- * @expectedDeprecation The signature of the "Symfony\Component\EventDispatcher\Tests\TestLegacyEventDispatcher::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.
- * @expectedDeprecation The signature of the "Symfony\Component\EventDispatcher\Tests\TestLegacyEventDispatcher::dispatch()" method should be updated to "dispatch($event, string $eventName = null)", not doing so is deprecated since Symfony 4.3.
- * @expectedDeprecation Calling the "Symfony\Contracts\EventDispatcher\EventDispatcherInterface::dispatch()" method with the event name as the first argument is deprecated since Symfony 4.3, pass it as the second argument and provide the event object as the first argument instead.
- */
- public function testLegacySignatureWithNewEventObject()
- {
- $this->createEventDispatcher()->dispatch('foo', new ContractsEvent());
- }
-
- protected function createEventDispatcher()
- {
- return LegacyEventDispatcherProxy::decorate(new TestLegacyEventDispatcher());
- }
-}
-
-class TestLegacyEventDispatcher extends EventDispatcher
-{
- public function dispatch($eventName, Event $event = null): Event
- {
- return parent::dispatch($event, $eventName);
- }
-}
diff --git a/src/Symfony/Component/EventDispatcher/composer.json b/src/Symfony/Component/EventDispatcher/composer.json
index ef36e455326de..5e4a83363ad56 100644
--- a/src/Symfony/Component/EventDispatcher/composer.json
+++ b/src/Symfony/Component/EventDispatcher/composer.json
@@ -16,24 +16,25 @@
}
],
"require": {
- "php": "^7.1.3",
- "symfony/event-dispatcher-contracts": "^1.1"
+ "php": "^7.2.5",
+ "symfony/deprecation-contracts": "^2.1",
+ "symfony/event-dispatcher-contracts": "^2"
},
"require-dev": {
- "symfony/dependency-injection": "^3.4|^4.0|^5.0",
- "symfony/expression-language": "^3.4|^4.0|^5.0",
- "symfony/config": "^3.4|^4.0|^5.0",
- "symfony/http-foundation": "^3.4|^4.0|^5.0",
+ "symfony/dependency-injection": "^4.4|^5.0",
+ "symfony/expression-language": "^4.4|^5.0",
+ "symfony/config": "^4.4|^5.0",
+ "symfony/http-foundation": "^4.4|^5.0",
"symfony/service-contracts": "^1.1|^2",
- "symfony/stopwatch": "^3.4|^4.0|^5.0",
+ "symfony/stopwatch": "^4.4|^5.0",
"psr/log": "~1.0"
},
"conflict": {
- "symfony/dependency-injection": "<3.4"
+ "symfony/dependency-injection": "<4.4"
},
"provide": {
"psr/event-dispatcher-implementation": "1.0",
- "symfony/event-dispatcher-implementation": "1.1"
+ "symfony/event-dispatcher-implementation": "2.0"
},
"suggest": {
"symfony/dependency-injection": "",
@@ -48,7 +49,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.1-dev"
}
}
}
diff --git a/src/Symfony/Component/ExpressionLanguage/Compiler.php b/src/Symfony/Component/ExpressionLanguage/Compiler.php
index 604f04c6f0be1..e040e8c4bf264 100644
--- a/src/Symfony/Component/ExpressionLanguage/Compiler.php
+++ b/src/Symfony/Component/ExpressionLanguage/Compiler.php
@@ -28,7 +28,7 @@ public function __construct(array $functions)
$this->functions = $functions;
}
- public function getFunction($name)
+ public function getFunction(string $name)
{
return $this->functions[$name];
}
@@ -78,11 +78,9 @@ public function subcompile(Node\Node $node)
/**
* Adds a raw string to the compiled code.
*
- * @param string $string The string
- *
* @return $this
*/
- public function raw($string)
+ public function raw(string $string)
{
$this->source .= $string;
@@ -92,11 +90,9 @@ public function raw($string)
/**
* Adds a quoted string to the compiled code.
*
- * @param string $value The string
- *
* @return $this
*/
- public function string($value)
+ public function string(string $value)
{
$this->source .= sprintf('"%s"', addcslashes($value, "\0\t\"\$\\"));
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
index 2bc91e8d038e0..7408ff2fcf3bf 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionFunction.php
@@ -64,7 +64,6 @@ public function getEvaluator()
/**
* Creates an ExpressionFunction from a PHP function name.
*
- * @param string $phpFunctionName The PHP function name
* @param string|null $expressionFunctionName The expression function name (default: same than the PHP function name)
*
* @return self
@@ -73,7 +72,7 @@ public function getEvaluator()
* @throws \InvalidArgumentException if given PHP function name is in namespace
* and expression function name is not defined
*/
- public static function fromPhp($phpFunctionName, $expressionFunctionName = null)
+ public static function fromPhp(string $phpFunctionName, string $expressionFunctionName = null)
{
$phpFunctionName = ltrim($phpFunctionName, '\\');
if (!\function_exists($phpFunctionName)) {
diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
index a257ec7969692..e9e36e9f6452b 100644
--- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
+++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
@@ -44,11 +44,10 @@ public function __construct(CacheItemPoolInterface $cache = null, array $provide
* Compiles an expression source code.
*
* @param Expression|string $expression The expression to compile
- * @param array $names An array of valid names
*
* @return string The compiled PHP source code
*/
- public function compile($expression, $names = [])
+ public function compile($expression, array $names = [])
{
return $this->getCompiler()->compile($this->parse($expression, $names)->getNodes())->getSource();
}
@@ -57,11 +56,10 @@ public function compile($expression, $names = [])
* Evaluate an expression.
*
* @param Expression|string $expression The expression to compile
- * @param array $values An array of values
*
* @return mixed The result of the evaluation of the expression
*/
- public function evaluate($expression, $values = [])
+ public function evaluate($expression, array $values = [])
{
return $this->parse($expression, array_keys($values))->getNodes()->evaluate($this->functions, $values);
}
@@ -70,11 +68,10 @@ public function evaluate($expression, $values = [])
* Parses an expression.
*
* @param Expression|string $expression The expression to parse
- * @param array $names An array of valid names
*
* @return ParsedExpression A ParsedExpression instance
*/
- public function parse($expression, $names)
+ public function parse($expression, array $names)
{
if ($expression instanceof ParsedExpression) {
return $expression;
@@ -103,7 +100,6 @@ public function parse($expression, $names)
/**
* Registers a function.
*
- * @param string $name The function name
* @param callable $compiler A callable able to compile the function
* @param callable $evaluator A callable able to evaluate the function
*
@@ -111,7 +107,7 @@ public function parse($expression, $names)
*
* @see ExpressionFunction
*/
- public function register($name, callable $compiler, callable $evaluator)
+ public function register(string $name, callable $compiler, callable $evaluator)
{
if (null !== $this->parser) {
throw new \LogicException('Registering functions after calling evaluate(), compile() or parse() is not supported.');
diff --git a/src/Symfony/Component/ExpressionLanguage/Lexer.php b/src/Symfony/Component/ExpressionLanguage/Lexer.php
index 011057eef4e18..9dd695bf170d9 100644
--- a/src/Symfony/Component/ExpressionLanguage/Lexer.php
+++ b/src/Symfony/Component/ExpressionLanguage/Lexer.php
@@ -21,13 +21,11 @@ class Lexer
/**
* Tokenizes an expression.
*
- * @param string $expression The expression to tokenize
- *
* @return TokenStream A token stream instance
*
* @throws SyntaxError
*/
- public function tokenize($expression)
+ public function tokenize(string $expression)
{
$expression = str_replace(["\r", "\n", "\t", "\v", "\f"], ' ', $expression);
$cursor = 0;
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
index 921319a74474d..1644b2e2a8339 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ArrayNode.php
@@ -46,7 +46,7 @@ public function compile(Compiler $compiler)
$compiler->raw(']');
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
$result = [];
foreach ($this->getKeyValuePairs() as $pair) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
index 11245f9a86e2a..c9dcdf34e4f46 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/BinaryNode.php
@@ -84,7 +84,7 @@ public function compile(Compiler $compiler)
;
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
$operator = $this->attributes['operator'];
$left = $this->nodes['left']->evaluate($functions, $values);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
index ca1b484bc08c2..ba78a2848eeab 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConditionalNode.php
@@ -40,7 +40,7 @@ public function compile(Compiler $compiler)
;
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
if ($this->nodes['expr1']->evaluate($functions, $values)) {
return $this->nodes['expr2']->evaluate($functions, $values);
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
index 0353f78510b70..b86abd43a5ebc 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/ConstantNode.php
@@ -36,7 +36,7 @@ public function compile(Compiler $compiler)
$compiler->repr($this->attributes['value']);
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
return $this->attributes['value'];
}
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
index 2a46191061d19..37b5982091ad3 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/FunctionNode.php
@@ -40,7 +40,7 @@ public function compile(Compiler $compiler)
$compiler->raw($function['compiler'](...$arguments));
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
$arguments = [$values];
foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
index a28b59611363b..7d86b53bc2ece 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/GetAttrNode.php
@@ -64,7 +64,7 @@ public function compile(Compiler $compiler)
}
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
switch ($this->attributes['type']) {
case self::PROPERTY_CALL:
@@ -80,7 +80,7 @@ public function evaluate($functions, $values)
case self::METHOD_CALL:
$obj = $this->nodes['node']->evaluate($functions, $values);
if (!\is_object($obj)) {
- throw new \RuntimeException('Unable to get a property on a non-object.');
+ throw new \RuntimeException('Unable to call method of a non-object.');
}
if (!\is_callable($toCall = [$obj, $this->nodes['attribute']->attributes['value']])) {
throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], \get_class($obj)));
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
index 1a3d994148f8c..e017e967a1d08 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/NameNode.php
@@ -33,7 +33,7 @@ public function compile(Compiler $compiler)
$compiler->raw('$'.$this->attributes['name']);
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
return $values[$this->attributes['name']];
}
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/Node.php b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
index decb06d1bb781..dc76de00bf0b5 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/Node.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/Node.php
@@ -67,7 +67,7 @@ public function compile(Compiler $compiler)
}
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
$results = [];
foreach ($this->nodes as $node) {
@@ -93,7 +93,7 @@ public function dump()
return $dump;
}
- protected function dumpString($value)
+ protected function dumpString(string $value)
{
return sprintf('"%s"', addcslashes($value, "\0\t\"\\"));
}
diff --git a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
index abf2cc6bac908..1cd21c579bdcd 100644
--- a/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
+++ b/src/Symfony/Component/ExpressionLanguage/Node/UnaryNode.php
@@ -45,7 +45,7 @@ public function compile(Compiler $compiler)
;
}
- public function evaluate($functions, $values)
+ public function evaluate(array $functions, array $values)
{
$value = $this->nodes['node']->evaluate($functions, $values);
switch ($this->attributes['operator']) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Parser.php b/src/Symfony/Component/ExpressionLanguage/Parser.php
index 59c4d67d781c6..521cd73ceac8a 100644
--- a/src/Symfony/Component/ExpressionLanguage/Parser.php
+++ b/src/Symfony/Component/ExpressionLanguage/Parser.php
@@ -85,13 +85,11 @@ public function __construct(array $functions)
* variable 'container' can be used in the expression
* but the compiled code will use 'this'.
*
- * @param array $names An array of valid names
- *
* @return Node\Node A node tree
*
* @throws SyntaxError
*/
- public function parse(TokenStream $stream, $names = [])
+ public function parse(TokenStream $stream, array $names = [])
{
$this->stream = $stream;
$this->names = $names;
@@ -104,7 +102,7 @@ public function parse(TokenStream $stream, $names = [])
return $node;
}
- public function parseExpression($precedence = 0)
+ public function parseExpression(int $precedence = 0)
{
$expr = $this->getPrimary();
$token = $this->stream->current;
@@ -148,7 +146,7 @@ protected function getPrimary()
return $this->parsePrimaryExpression();
}
- protected function parseConditionalExpression($expr)
+ protected function parseConditionalExpression(Node\Node $expr)
{
while ($this->stream->current->test(Token::PUNCTUATION_TYPE, '?')) {
$this->stream->next();
@@ -301,7 +299,7 @@ public function parseHashExpression()
return $node;
}
- public function parsePostfixExpression($node)
+ public function parsePostfixExpression(Node\Node $node)
{
$token = $this->stream->current;
while (Token::PUNCTUATION_TYPE == $token->type) {
diff --git a/src/Symfony/Component/ExpressionLanguage/Token.php b/src/Symfony/Component/ExpressionLanguage/Token.php
index 40bb75587ec96..38aac0a055e6b 100644
--- a/src/Symfony/Component/ExpressionLanguage/Token.php
+++ b/src/Symfony/Component/ExpressionLanguage/Token.php
@@ -54,12 +54,11 @@ public function __toString()
/**
* Tests the current token for a type and/or a value.
*
- * @param array|int $type The type to test
- * @param string|null $value The token value
+ * @param array|int $type The type to test
*
* @return bool
*/
- public function test($type, $value = null)
+ public function test($type, string $value = null)
{
return $this->type === $type && (null === $value || $this->value == $value);
}
diff --git a/src/Symfony/Component/ExpressionLanguage/TokenStream.php b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
index 01277dc445529..a85e5853be2ca 100644
--- a/src/Symfony/Component/ExpressionLanguage/TokenStream.php
+++ b/src/Symfony/Component/ExpressionLanguage/TokenStream.php
@@ -59,10 +59,9 @@ public function next()
* Tests a token.
*
* @param array|int $type The type to test
- * @param string|null $value The token value
* @param string|null $message The syntax error message
*/
- public function expect($type, $value = null, $message = null)
+ public function expect($type, string $value = null, string $message = null)
{
$token = $this->current;
if (!$token->test($type, $value)) {
diff --git a/src/Symfony/Component/ExpressionLanguage/composer.json b/src/Symfony/Component/ExpressionLanguage/composer.json
index 6843975675ef2..0742a3ef7b416 100644
--- a/src/Symfony/Component/ExpressionLanguage/composer.json
+++ b/src/Symfony/Component/ExpressionLanguage/composer.json
@@ -16,8 +16,8 @@
}
],
"require": {
- "php": "^7.1.3",
- "symfony/cache": "^3.4|^4.0|^5.0",
+ "php": "^7.2.5",
+ "symfony/cache": "^4.4|^5.0",
"symfony/service-contracts": "^1.1|^2"
},
"autoload": {
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.1-dev"
}
}
}
diff --git a/src/Symfony/Component/Filesystem/CHANGELOG.md b/src/Symfony/Component/Filesystem/CHANGELOG.md
index 0b633ef2a7726..4a0755bfe0a83 100644
--- a/src/Symfony/Component/Filesystem/CHANGELOG.md
+++ b/src/Symfony/Component/Filesystem/CHANGELOG.md
@@ -1,10 +1,16 @@
CHANGELOG
=========
+5.0.0
+-----
+
+ * `Filesystem::dumpFile()` and `appendToFile()` don't accept arrays anymore
+
4.4.0
-----
* support for passing a `null` value to `Filesystem::isAbsolutePath()` is deprecated and will be removed in 5.0
+ * `tempnam()` now accepts a third argument `$suffix`.
4.3.0
-----
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
index a8c3bd4f7f24f..c8d3344fde3f3 100644
--- a/src/Symfony/Component/Filesystem/Filesystem.php
+++ b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -31,14 +31,10 @@ class Filesystem
* If the target file is newer, it is overwritten only when the
* $overwriteNewerFiles option is set to true.
*
- * @param string $originFile The original filename
- * @param string $targetFile The target filename
- * @param bool $overwriteNewerFiles If true, target files newer than origin files are overwritten
- *
* @throws FileNotFoundException When originFile doesn't exist
* @throws IOException When copy fails
*/
- public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
+ public function copy(string $originFile, string $targetFile, bool $overwriteNewerFiles = false)
{
$originIsLocal = stream_is_local($originFile) || 0 === stripos($originFile, 'file://');
if ($originIsLocal && !is_file($originFile)) {
@@ -87,11 +83,10 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
* Creates a directory recursively.
*
* @param string|iterable $dirs The directory path
- * @param int $mode The directory mode
*
* @throws IOException On any directory creation failure
*/
- public function mkdir($dirs, $mode = 0777)
+ public function mkdir($dirs, int $mode = 0777)
{
foreach ($this->toIterable($dirs) as $dir) {
if (is_dir($dir)) {
@@ -143,7 +138,7 @@ public function exists($files)
*
* @throws IOException When touch fails
*/
- public function touch($files, $time = null, $atime = null)
+ public function touch($files, int $time = null, int $atime = null)
{
foreach ($this->toIterable($files) as $file) {
$touch = $time ? @touch($file, $time, $atime) : @touch($file);
@@ -196,7 +191,7 @@ public function remove($files)
*
* @throws IOException When the change fails
*/
- public function chmod($files, $mode, $umask = 0000, $recursive = false)
+ public function chmod($files, int $mode, int $umask = 0000, bool $recursive = false)
{
foreach ($this->toIterable($files) as $file) {
if (true !== @chmod($file, $mode & ~$umask)) {
@@ -217,7 +212,7 @@ public function chmod($files, $mode, $umask = 0000, $recursive = false)
*
* @throws IOException When the change fails
*/
- public function chown($files, $user, $recursive = false)
+ public function chown($files, $user, bool $recursive = false)
{
foreach ($this->toIterable($files) as $file) {
if ($recursive && is_dir($file) && !is_link($file)) {
@@ -244,7 +239,7 @@ public function chown($files, $user, $recursive = false)
*
* @throws IOException When the change fails
*/
- public function chgrp($files, $group, $recursive = false)
+ public function chgrp($files, $group, bool $recursive = false)
{
foreach ($this->toIterable($files) as $file) {
if ($recursive && is_dir($file) && !is_link($file)) {
@@ -265,14 +260,10 @@ public function chgrp($files, $group, $recursive = false)
/**
* Renames a file or a directory.
*
- * @param string $origin The origin filename or directory
- * @param string $target The new filename or directory
- * @param bool $overwrite Whether to overwrite the target if it already exists
- *
* @throws IOException When target file or directory already exists
* @throws IOException When origin cannot be renamed
*/
- public function rename($origin, $target, $overwrite = false)
+ public function rename(string $origin, string $target, bool $overwrite = false)
{
// we check that target does not exist
if (!$overwrite && $this->isReadable($target)) {
@@ -310,13 +301,9 @@ private function isReadable(string $filename): bool
/**
* Creates a symbolic link or copy a directory.
*
- * @param string $originDir The origin directory path
- * @param string $targetDir The symbolic link name
- * @param bool $copyOnWindows Whether to copy files if on Windows
- *
* @throws IOException When symlink fails
*/
- public function symlink($originDir, $targetDir, $copyOnWindows = false)
+ public function symlink(string $originDir, string $targetDir, bool $copyOnWindows = false)
{
if ('\\' === \DIRECTORY_SEPARATOR) {
$originDir = strtr($originDir, '/', '\\');
@@ -346,13 +333,12 @@ public function symlink($originDir, $targetDir, $copyOnWindows = false)
/**
* Creates a hard link, or several hard links to a file.
*
- * @param string $originFile The original file
* @param string|string[] $targetFiles The target file(s)
*
* @throws FileNotFoundException When original file is missing or not a file
* @throws IOException When link fails, including if link already exists
*/
- public function hardlink($originFile, $targetFiles)
+ public function hardlink(string $originFile, $targetFiles)
{
if (!$this->exists($originFile)) {
throw new FileNotFoundException(null, 0, null, $originFile);
@@ -400,12 +386,9 @@ private function linkException(string $origin, string $target, string $linkType)
* - if $path does not exist, returns null
* - if $path exists, returns its absolute fully resolved final version
*
- * @param string $path A filesystem path
- * @param bool $canonicalize Whether or not to return a canonicalized path
- *
* @return string|null
*/
- public function readlink($path, $canonicalize = false)
+ public function readlink(string $path, bool $canonicalize = false)
{
if (!$canonicalize && !is_link($path)) {
return null;
@@ -433,12 +416,9 @@ public function readlink($path, $canonicalize = false)
/**
* Given an existing path, convert it to a path relative to a given starting path.
*
- * @param string $endPath Absolute path of target
- * @param string $startPath Absolute path where traversal begins
- *
* @return string Path of target relative to starting path
*/
- public function makePathRelative($endPath, $startPath)
+ public function makePathRelative(string $endPath, string $startPath)
{
if (!$this->isAbsolutePath($startPath)) {
throw new InvalidArgumentException(sprintf('The start path "%s" is not absolute.', $startPath));
@@ -518,18 +498,16 @@ public function makePathRelative($endPath, $startPath)
* - existing files in the target directory will be overwritten, except if they are newer (see the `override` option)
* - files in the target directory that do not exist in the source directory will not be deleted (see the `delete` option)
*
- * @param string $originDir The origin directory
- * @param string $targetDir The target directory
- * @param \Traversable|null $iterator Iterator that filters which files and directories to copy, if null a recursive iterator is created
- * @param array $options An array of boolean options
- * Valid options are:
- * - $options['override'] If true, target files newer than origin files are overwritten (see copy(), defaults to false)
- * - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink(), defaults to false)
- * - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
+ * @param \Traversable|null $iterator Iterator that filters which files and directories to copy, if null a recursive iterator is created
+ * @param array $options An array of boolean options
+ * Valid options are:
+ * - $options['override'] If true, target files newer than origin files are overwritten (see copy(), defaults to false)
+ * - $options['copy_on_windows'] Whether to copy files instead of links on Windows (see symlink(), defaults to false)
+ * - $options['delete'] Whether to delete files that are not in the source directory (defaults to false)
*
* @throws IOException When file type is unknown
*/
- public function mirror($originDir, $targetDir, \Traversable $iterator = null, $options = [])
+ public function mirror(string $originDir, string $targetDir, \Traversable $iterator = null, array $options = [])
{
$targetDir = rtrim($targetDir, '/\\');
$originDir = rtrim($originDir, '/\\');
@@ -588,16 +566,10 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
/**
* Returns whether the file path is an absolute path.
*
- * @param string $file A file path
- *
* @return bool
*/
- public function isAbsolutePath($file)
+ public function isAbsolutePath(string $file)
{
- if (null === $file) {
- @trigger_error(sprintf('Calling "%s()" with a null in the $file argument is deprecated since Symfony 4.4.', __METHOD__), E_USER_DEPRECATED);
- }
-
return strspn($file, '/\\', 0, 1)
|| (\strlen($file) > 3 && ctype_alpha($file[0])
&& ':' === $file[1]
@@ -610,18 +582,19 @@ public function isAbsolutePath($file)
/**
* Creates a temporary file with support for custom stream wrappers.
*
- * @param string $dir The directory where the temporary filename will be created
* @param string $prefix The prefix of the generated temporary filename
* Note: Windows uses only the first three characters of prefix
+ * @param string $suffix The suffix of the generated temporary filename
*
* @return string The new temporary filename (with path), or throw an exception on failure
*/
- public function tempnam($dir, $prefix)
+ public function tempnam(string $dir, string $prefix/*, string $suffix = ''*/)
{
+ $suffix = \func_num_args() > 2 ? func_get_arg(2) : '';
list($scheme, $hierarchy) = $this->getSchemeAndHierarchy($dir);
// If no scheme or scheme is "file" or "gs" (Google Cloud) create temp file in local filesystem
- if (null === $scheme || 'file' === $scheme || 'gs' === $scheme) {
+ if ((null === $scheme || 'file' === $scheme || 'gs' === $scheme) && '' === $suffix) {
$tmpFile = @tempnam($hierarchy, $prefix);
// If tempnam failed or no scheme return the filename otherwise prepend the scheme
@@ -639,7 +612,7 @@ public function tempnam($dir, $prefix)
// Loop until we create a valid temp file or have reached 10 attempts
for ($i = 0; $i < 10; ++$i) {
// Create a unique filename
- $tmpFile = $dir.'/'.$prefix.uniqid(mt_rand(), true);
+ $tmpFile = $dir.'/'.$prefix.uniqid(mt_rand(), true).$suffix;
// Use fopen instead of file_exists as some streams do not support stat
// Use mode 'x+' to atomically check existence and create to avoid a TOCTOU vulnerability
@@ -662,15 +635,14 @@ public function tempnam($dir, $prefix)
/**
* Atomically dumps content into a file.
*
- * @param string $filename The file to be written to
- * @param string|resource $content The data to write into the file
+ * @param string|resource $content The data to write into the file
*
* @throws IOException if the file cannot be written to
*/
- public function dumpFile($filename, $content)
+ public function dumpFile(string $filename, $content)
{
if (\is_array($content)) {
- @trigger_error(sprintf('Calling "%s()" with an array in the $content argument is deprecated since Symfony 4.3.', __METHOD__), E_USER_DEPRECATED);
+ throw new \TypeError(sprintf('Argument 2 passed to %s() must be string or resource, array given.', __METHOD__));
}
$dir = \dirname($filename);
@@ -699,15 +671,14 @@ public function dumpFile($filename, $content)
/**
* Appends content to an existing file.
*
- * @param string $filename The file to which to append content
- * @param string|resource $content The content to append
+ * @param string|resource $content The content to append
*
* @throws IOException If the file is not writable
*/
- public function appendToFile($filename, $content)
+ public function appendToFile(string $filename, $content)
{
if (\is_array($content)) {
- @trigger_error(sprintf('Calling "%s()" with an array in the $content argument is deprecated since Symfony 4.3.', __METHOD__), E_USER_DEPRECATED);
+ throw new \TypeError(sprintf('Argument 2 passed to %s() must be string or resource, array given.', __METHOD__));
}
$dir = \dirname($filename);
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
index c85860be7f0f0..79b2f61d0c9c0 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -444,20 +444,6 @@ public function testChmodChangesFileMode()
$this->assertFilePermissions(400, $file);
}
- public function testChmodWithWrongModLeavesPreviousPermissionsUntouched()
- {
- $this->markAsSkippedIfChmodIsMissing();
-
- $dir = $this->workspace.\DIRECTORY_SEPARATOR.'file';
- touch($dir);
-
- $permissions = fileperms($dir);
-
- $this->filesystem->chmod($dir, 'Wrongmode');
-
- $this->assertSame($permissions, fileperms($dir));
- }
-
public function testChmodRecursive()
{
$this->markAsSkippedIfChmodIsMissing();
@@ -535,7 +521,7 @@ public function testChmodChangesZeroModeOnSubdirectoriesOnRecursive()
$this->assertFilePermissions(753, $subdirectory);
}
- public function testChown()
+ public function testChownByName()
{
$this->markAsSkippedIfPosixIsMissing();
@@ -548,7 +534,20 @@ public function testChown()
$this->assertSame($owner, $this->getFileOwner($dir));
}
- public function testChownRecursive()
+ public function testChownById()
+ {
+ $this->markAsSkippedIfPosixIsMissing();
+
+ $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+ mkdir($dir);
+
+ $ownerId = $this->getFileOwnerId($dir);
+ $this->filesystem->chown($dir, $ownerId);
+
+ $this->assertSame($ownerId, $this->getFileOwnerId($dir));
+ }
+
+ public function testChownRecursiveByName()
{
$this->markAsSkippedIfPosixIsMissing();
@@ -563,6 +562,21 @@ public function testChownRecursive()
$this->assertSame($owner, $this->getFileOwner($file));
}
+ public function testChownRecursiveById()
+ {
+ $this->markAsSkippedIfPosixIsMissing();
+
+ $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+ mkdir($dir);
+ $file = $dir.\DIRECTORY_SEPARATOR.'file';
+ touch($file);
+
+ $ownerId = $this->getFileOwnerId($dir);
+ $this->filesystem->chown($dir, $ownerId, true);
+
+ $this->assertSame($ownerId, $this->getFileOwnerId($file));
+ }
+
public function testChownSymlink()
{
$this->markAsSkippedIfSymlinkIsMissing();
@@ -638,7 +652,7 @@ public function testChownFail()
$this->filesystem->chown($dir, 'user'.time().mt_rand(1000, 9999));
}
- public function testChgrp()
+ public function testChgrpByName()
{
$this->markAsSkippedIfPosixIsMissing();
@@ -651,6 +665,19 @@ public function testChgrp()
$this->assertSame($group, $this->getFileGroup($dir));
}
+ public function testChgrpById()
+ {
+ $this->markAsSkippedIfPosixIsMissing();
+
+ $dir = $this->workspace.\DIRECTORY_SEPARATOR.'dir';
+ mkdir($dir);
+
+ $groupId = $this->getFileGroupId($dir);
+ $this->filesystem->chgrp($dir, $groupId);
+
+ $this->assertSame($groupId, $this->getFileGroupId($dir));
+ }
+
public function testChgrpRecursive()
{
$this->markAsSkippedIfPosixIsMissing();
@@ -666,7 +693,7 @@ public function testChgrpRecursive()
$this->assertSame($group, $this->getFileGroup($file));
}
- public function testChgrpSymlink()
+ public function testChgrpSymlinkByName()
{
$this->markAsSkippedIfSymlinkIsMissing();
@@ -683,6 +710,23 @@ public function testChgrpSymlink()
$this->assertSame($group, $this->getFileGroup($link));
}
+ public function testChgrpSymlinkById()
+ {
+ $this->markAsSkippedIfSymlinkIsMissing();
+
+ $file = $this->workspace.\DIRECTORY_SEPARATOR.'file';
+ $link = $this->workspace.\DIRECTORY_SEPARATOR.'link';
+
+ touch($file);
+
+ $this->filesystem->symlink($file, $link);
+
+ $groupId = $this->getFileGroupId($link);
+ $this->filesystem->chgrp($link, $groupId);
+
+ $this->assertSame($groupId, $this->getFileGroupId($link));
+ }
+
public function testChgrpLink()
{
$this->markAsSkippedIfLinkIsMissing();
@@ -1368,15 +1412,6 @@ public function providePathsForIsAbsolutePath()
];
}
- /**
- * @group legacy
- * @expectedDeprecation Calling "Symfony\Component\Filesystem\Filesystem::isAbsolutePath()" with a null in the $file argument is deprecated since Symfony 4.4.
- */
- public function testIsAbsolutePathWithNull()
- {
- $this->assertFalse($this->filesystem->isAbsolutePath(null));
- }
-
public function testTempnam()
{
$dirname = $this->workspace;
@@ -1474,6 +1509,22 @@ public function testTempnamOnUnwritableFallsBackToSysTmp()
@unlink($filename);
}
+ public function testTempnamWithSuffix()
+ {
+ $dirname = $this->workspace;
+ $filename = $this->filesystem->tempnam($dirname, 'foo', '.bar');
+ $this->assertStringEndsWith('.bar', $filename);
+ $this->assertFileExists($filename);
+ }
+
+ public function testTempnamWithSuffix0()
+ {
+ $dirname = $this->workspace;
+ $filename = $this->filesystem->tempnam($dirname, 'foo', '0');
+ $this->assertStringEndsWith('0', $filename);
+ $this->assertFileExists($filename);
+ }
+
public function testDumpFile()
{
$filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
@@ -1494,20 +1545,6 @@ public function testDumpFile()
}
}
- /**
- * @group legacy
- * @expectedDeprecation Calling "Symfony\Component\Filesystem\Filesystem::dumpFile()" with an array in the $content argument is deprecated since Symfony 4.3.
- */
- public function testDumpFileWithArray()
- {
- $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
-
- $this->filesystem->dumpFile($filename, ['bar']);
-
- $this->assertFileExists($filename);
- $this->assertStringEqualsFile($filename, 'bar');
- }
-
public function testDumpFileWithResource()
{
$filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'baz.txt';
@@ -1580,33 +1617,6 @@ public function testAppendToFile()
}
}
- /**
- * @group legacy
- * @expectedDeprecation Calling "Symfony\Component\Filesystem\Filesystem::appendToFile()" with an array in the $content argument is deprecated since Symfony 4.3.
- */
- public function testAppendToFileWithArray()
- {
- $filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'bar.txt';
-
- // skip mode check on Windows
- if ('\\' !== \DIRECTORY_SEPARATOR) {
- $oldMask = umask(0002);
- }
-
- $this->filesystem->dumpFile($filename, 'foo');
-
- $this->filesystem->appendToFile($filename, ['bar']);
-
- $this->assertFileExists($filename);
- $this->assertStringEqualsFile($filename, 'foobar');
-
- // skip mode check on Windows
- if ('\\' !== \DIRECTORY_SEPARATOR) {
- $this->assertFilePermissions(664, $filename);
- umask($oldMask);
- }
- }
-
public function testAppendToFileWithResource()
{
$filename = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR.'bar.txt';
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
index 08afefbb24eff..396a3ab2e8634 100644
--- a/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
+++ b/src/Symfony/Component/Filesystem/Tests/FilesystemTestCase.php
@@ -105,21 +105,36 @@ protected function assertFilePermissions($expectedFilePerms, $filePath)
);
}
+ protected function getFileOwnerId($filepath)
+ {
+ $this->markAsSkippedIfPosixIsMissing();
+
+ $infos = stat($filepath);
+
+ return $infos['uid'];
+ }
+
protected function getFileOwner($filepath)
{
$this->markAsSkippedIfPosixIsMissing();
+ return ($datas = posix_getpwuid($this->getFileOwnerId($filepath))) ? $datas['name'] : null;
+ }
+
+ protected function getFileGroupId($filepath)
+ {
+ $this->markAsSkippedIfPosixIsMissing();
+
$infos = stat($filepath);
- return ($datas = posix_getpwuid($infos['uid'])) ? $datas['name'] : null;
+ return $infos['gid'];
}
protected function getFileGroup($filepath)
{
$this->markAsSkippedIfPosixIsMissing();
- $infos = stat($filepath);
- if ($datas = posix_getgrgid($infos['gid'])) {
+ if ($datas = posix_getgrgid($this->getFileGroupId($filepath))) {
return $datas['name'];
}
diff --git a/src/Symfony/Component/Filesystem/composer.json b/src/Symfony/Component/Filesystem/composer.json
index 9e0373d2f6662..9b5bfa9d266e4 100644
--- a/src/Symfony/Component/Filesystem/composer.json
+++ b/src/Symfony/Component/Filesystem/composer.json
@@ -16,7 +16,7 @@
}
],
"require": {
- "php": "^7.1.3",
+ "php": "^7.2.5",
"symfony/polyfill-ctype": "~1.8"
},
"autoload": {
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.1-dev"
}
}
}
diff --git a/src/Symfony/Component/Finder/CHANGELOG.md b/src/Symfony/Component/Finder/CHANGELOG.md
index 2045184e83331..33f5bd589eb7b 100644
--- a/src/Symfony/Component/Finder/CHANGELOG.md
+++ b/src/Symfony/Component/Finder/CHANGELOG.md
@@ -1,6 +1,11 @@
CHANGELOG
=========
+5.0.0
+-----
+
+ * added `$useNaturalSort` argument to `Finder::sortByName()`
+
4.3.0
-----
diff --git a/src/Symfony/Component/Finder/Comparator/Comparator.php b/src/Symfony/Component/Finder/Comparator/Comparator.php
index 6aee21cf09290..cfe3965fac98f 100644
--- a/src/Symfony/Component/Finder/Comparator/Comparator.php
+++ b/src/Symfony/Component/Finder/Comparator/Comparator.php
@@ -31,12 +31,7 @@ public function getTarget()
return $this->target;
}
- /**
- * Sets the target value.
- *
- * @param string $target The target value
- */
- public function setTarget($target)
+ public function setTarget(string $target)
{
$this->target = $target;
}
@@ -54,13 +49,11 @@ public function getOperator()
/**
* Sets the comparison operator.
*
- * @param string $operator A valid operator
- *
* @throws \InvalidArgumentException
*/
- public function setOperator($operator)
+ public function setOperator(string $operator)
{
- if (!$operator) {
+ if ('' === $operator) {
$operator = '==';
}
diff --git a/src/Symfony/Component/Finder/Finder.php b/src/Symfony/Component/Finder/Finder.php
index e1f27a8e2ef74..e1bcea35d2656 100644
--- a/src/Symfony/Component/Finder/Finder.php
+++ b/src/Symfony/Component/Finder/Finder.php
@@ -336,13 +336,11 @@ public function exclude($dirs)
*
* This option is enabled by default.
*
- * @param bool $ignoreDotFiles Whether to exclude "hidden" files or not
- *
* @return $this
*
* @see ExcludeDirectoryFilterIterator
*/
- public function ignoreDotFiles($ignoreDotFiles)
+ public function ignoreDotFiles(bool $ignoreDotFiles)
{
if ($ignoreDotFiles) {
$this->ignore |= static::IGNORE_DOT_FILES;
@@ -358,13 +356,11 @@ public function ignoreDotFiles($ignoreDotFiles)
*
* This option is enabled by default.
*
- * @param bool $ignoreVCS Whether to exclude VCS files or not
- *
* @return $this
*
* @see ExcludeDirectoryFilterIterator
*/
- public function ignoreVCS($ignoreVCS)
+ public function ignoreVCS(bool $ignoreVCS)
{
if ($ignoreVCS) {
$this->ignore |= static::IGNORE_VCS_FILES;
@@ -432,19 +428,12 @@ public function sort(\Closure $closure)
*
* This can be slow as all the matching files and directories must be retrieved for comparison.
*
- * @param bool $useNaturalSort Whether to use natural sort or not, disabled by default
- *
* @return $this
*
* @see SortableIterator
*/
- public function sortByName(/* bool $useNaturalSort = false */)
+ public function sortByName(bool $useNaturalSort = false)
{
- if (\func_num_args() < 1 && __CLASS__ !== static::class && __CLASS__ !== (new \ReflectionMethod($this, __FUNCTION__))->getDeclaringClass()->getName() && !$this instanceof \PHPUnit\Framework\MockObject\MockObject && !$this instanceof \Prophecy\Prophecy\ProphecySubjectInterface) {
- @trigger_error(sprintf('The "%s()" method will have a new "bool $useNaturalSort = false" argument in version 5.0, not defining it is deprecated since Symfony 4.2.', __METHOD__), E_USER_DEPRECATED);
- }
- $useNaturalSort = 0 < \func_num_args() && func_get_arg(0);
-
$this->sort = $useNaturalSort ? Iterator\SortableIterator::SORT_BY_NAME_NATURAL : Iterator\SortableIterator::SORT_BY_NAME;
return $this;
@@ -568,13 +557,11 @@ public function followLinks()
*
* By default, scanning unreadable directories content throws an AccessDeniedException.
*
- * @param bool $ignore
- *
* @return $this
*/
- public function ignoreUnreadableDirs($ignore = true)
+ public function ignoreUnreadableDirs(bool $ignore = true)
{
- $this->ignoreUnreadableDirs = (bool) $ignore;
+ $this->ignoreUnreadableDirs = $ignore;
return $this;
}
@@ -644,13 +631,11 @@ public function getIterator()
*
* The set can be another Finder, an Iterator, an IteratorAggregate, or even a plain array.
*
- * @param iterable $iterator
- *
* @return $this
*
* @throws \InvalidArgumentException when the given argument is not iterable
*/
- public function append($iterator)
+ public function append(iterable $iterator)
{
if ($iterator instanceof \IteratorAggregate) {
$this->iterators[] = $iterator->getIterator();
diff --git a/src/Symfony/Component/Finder/Glob.php b/src/Symfony/Component/Finder/Glob.php
index ea76d51ae0f9f..8447932e57a72 100644
--- a/src/Symfony/Component/Finder/Glob.php
+++ b/src/Symfony/Component/Finder/Glob.php
@@ -38,14 +38,9 @@ class Glob
/**
* Returns a regexp which is the equivalent of the glob pattern.
*
- * @param string $glob The glob pattern
- * @param bool $strictLeadingDot
- * @param bool $strictWildcardSlash
- * @param string $delimiter Optional delimiter
- *
- * @return string regex The regexp
+ * @return string
*/
- public static function toRegex($glob, $strictLeadingDot = true, $strictWildcardSlash = true, $delimiter = '#')
+ public static function toRegex(string $glob, bool $strictLeadingDot = true, bool $strictWildcardSlash = true, string $delimiter = '#')
{
$firstByte = true;
$escaping = false;
diff --git a/src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
index 81594b8774048..b26a368483261 100644
--- a/src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/FilecontentFilterIterator.php
@@ -51,7 +51,7 @@ public function accept()
*
* @return string regexp corresponding to a given string or regexp
*/
- protected function toRegex($str)
+ protected function toRegex(string $str)
{
return $this->isRegex($str) ? $str : '/'.preg_quote($str, '/').'/';
}
diff --git a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php
index e168cd8ffa798..dedd1ca55e878 100644
--- a/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/FilenameFilterIterator.php
@@ -40,7 +40,7 @@ public function accept()
*
* @return string regexp corresponding to a given glob or regexp
*/
- protected function toRegex($str)
+ protected function toRegex(string $str)
{
return $this->isRegex($str) ? $str : Glob::toRegex($str);
}
diff --git a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
index 18b082ec0b10b..78a34abef8877 100644
--- a/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/MultiplePcreFilterIterator.php
@@ -23,8 +23,8 @@ abstract class MultiplePcreFilterIterator extends \FilterIterator
/**
* @param \Iterator $iterator The Iterator to filter
- * @param array $matchPatterns An array of patterns that need to match
- * @param array $noMatchPatterns An array of patterns that need to not match
+ * @param string[] $matchPatterns An array of patterns that need to match
+ * @param string[] $noMatchPatterns An array of patterns that need to not match
*/
public function __construct(\Iterator $iterator, array $matchPatterns, array $noMatchPatterns)
{
@@ -46,11 +46,9 @@ public function __construct(\Iterator $iterator, array $matchPatterns, array $no
* Such case can be handled by child classes before calling the method if they want to
* apply a different behavior.
*
- * @param string $string The string to be matched against filters
- *
* @return bool
*/
- protected function isAccepted($string)
+ protected function isAccepted(string $string)
{
// should at least not match one rule to exclude
foreach ($this->noMatchRegexps as $regex) {
@@ -77,11 +75,9 @@ protected function isAccepted($string)
/**
* Checks whether the string is a regex.
*
- * @param string $str
- *
- * @return bool Whether the given string is a regex
+ * @return bool
*/
- protected function isRegex($str)
+ protected function isRegex(string $str)
{
if (preg_match('/^(.{3,}?)[imsxuADU]*$/', $str, $m)) {
$start = substr($m[1], 0, 1);
@@ -104,9 +100,7 @@ protected function isRegex($str)
/**
* Converts string into regexp.
*
- * @param string $str Pattern
- *
- * @return string regexp corresponding to a given string
+ * @return string
*/
- abstract protected function toRegex($str);
+ abstract protected function toRegex(string $str);
}
diff --git a/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php b/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php
index 3fda557be366b..67b71f46d7724 100644
--- a/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/PathFilterIterator.php
@@ -49,7 +49,7 @@ public function accept()
*
* @return string regexp corresponding to a given string or regexp
*/
- protected function toRegex($str)
+ protected function toRegex(string $str)
{
return $this->isRegex($str) ? $str : '/'.preg_quote($str, '/').'/';
}
diff --git a/src/Symfony/Component/Finder/Iterator/SortableIterator.php b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
index 8f0090c746dfe..2aca397e8807b 100644
--- a/src/Symfony/Component/Finder/Iterator/SortableIterator.php
+++ b/src/Symfony/Component/Finder/Iterator/SortableIterator.php
@@ -41,15 +41,15 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder =
$order = $reverseOrder ? -1 : 1;
if (self::SORT_BY_NAME === $sort) {
- $this->sort = static function ($a, $b) use ($order) {
+ $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
return $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_NAME_NATURAL === $sort) {
- $this->sort = static function ($a, $b) use ($order) {
+ $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
return $order * strnatcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_TYPE === $sort) {
- $this->sort = static function ($a, $b) use ($order) {
+ $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
if ($a->isDir() && $b->isFile()) {
return -$order;
} elseif ($a->isFile() && $b->isDir()) {
@@ -59,21 +59,21 @@ public function __construct(\Traversable $iterator, $sort, bool $reverseOrder =
return $order * strcmp($a->getRealPath() ?: $a->getPathname(), $b->getRealPath() ?: $b->getPathname());
};
} elseif (self::SORT_BY_ACCESSED_TIME === $sort) {
- $this->sort = static function ($a, $b) use ($order) {
+ $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
return $order * ($a->getATime() - $b->getATime());
};
} elseif (self::SORT_BY_CHANGED_TIME === $sort) {
- $this->sort = static function ($a, $b) use ($order) {
+ $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
return $order * ($a->getCTime() - $b->getCTime());
};
} elseif (self::SORT_BY_MODIFIED_TIME === $sort) {
- $this->sort = static function ($a, $b) use ($order) {
+ $this->sort = static function (\SplFileInfo $a, \SplFileInfo $b) use ($order) {
return $order * ($a->getMTime() - $b->getMTime());
};
} elseif (self::SORT_BY_NONE === $sort) {
$this->sort = $order;
} elseif (\is_callable($sort)) {
- $this->sort = $reverseOrder ? static function ($a, $b) use ($sort) { return -$sort($a, $b); } : $sort;
+ $this->sort = $reverseOrder ? static function (\SplFileInfo $a, \SplFileInfo $b) use ($sort) { return -$sort($a, $b); } : $sort;
} else {
throw new \InvalidArgumentException('The SortableIterator takes a PHP callable or a valid built-in sort algorithm as an argument.');
}
diff --git a/src/Symfony/Component/Finder/Tests/ClassThatInheritFinder.php b/src/Symfony/Component/Finder/Tests/ClassThatInheritFinder.php
deleted file mode 100644
index f937f6247c446..0000000000000
--- a/src/Symfony/Component/Finder/Tests/ClassThatInheritFinder.php
+++ /dev/null
@@ -1,25 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Finder\Tests;
-
-use Symfony\Component\Finder\Finder;
-
-class ClassThatInheritFinder extends Finder
-{
- /**
- * @return $this
- */
- public function sortByName()
- {
- parent::sortByName();
- }
-}
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
index 16a5b2a2f211d..e26aef16663f9 100644
--- a/src/Symfony/Component/Finder/Tests/FinderTest.php
+++ b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -873,7 +873,6 @@ public function testIn()
$expected = [
self::$tmpDir.\DIRECTORY_SEPARATOR.'test.php',
- __DIR__.\DIRECTORY_SEPARATOR.'ClassThatInheritFinder.php',
__DIR__.\DIRECTORY_SEPARATOR.'GitignoreTest.php',
__DIR__.\DIRECTORY_SEPARATOR.'FinderTest.php',
__DIR__.\DIRECTORY_SEPARATOR.'GlobTest.php',
@@ -1421,16 +1420,6 @@ public function testIgnoredAccessDeniedException()
}
}
- /**
- * @group legacy
- * @expectedDeprecation The "Symfony\Component\Finder\Finder::sortByName()" method will have a new "bool $useNaturalSort = false" argument in version 5.0, not defining it is deprecated since Symfony 4.2.
- */
- public function testInheritedClassCallSortByNameWithNoArguments()
- {
- $finderChild = new ClassThatInheritFinder();
- $finderChild->sortByName();
- }
-
protected function buildFinder()
{
return Finder::create();
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php b/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
index 15e069b9f81c1..69f020e9ec0e5 100644
--- a/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
+++ b/src/Symfony/Component/Finder/Tests/Iterator/MultiplePcreFilterIteratorTest.php
@@ -59,12 +59,12 @@ public function accept()
throw new \BadFunctionCallException('Not implemented');
}
- public function isRegex($str): bool
+ public function isRegex(string $str): bool
{
return parent::isRegex($str);
}
- public function toRegex($str): string
+ public function toRegex(string $str): string
{
throw new \BadFunctionCallException('Not implemented');
}
diff --git a/src/Symfony/Component/Finder/composer.json b/src/Symfony/Component/Finder/composer.json
index 0b1408c0dfd41..37f84c7b3aa64 100644
--- a/src/Symfony/Component/Finder/composer.json
+++ b/src/Symfony/Component/Finder/composer.json
@@ -16,7 +16,7 @@
}
],
"require": {
- "php": "^7.1.3"
+ "php": "^7.2.5"
},
"autoload": {
"psr-4": { "Symfony\\Component\\Finder\\": "" },
@@ -27,7 +27,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.4-dev"
+ "dev-master": "5.1-dev"
}
}
}
diff --git a/src/Symfony/Component/Form/AbstractExtension.php b/src/Symfony/Component/Form/AbstractExtension.php
index bda7ef129ee3e..02fcea9e53e1b 100644
--- a/src/Symfony/Component/Form/AbstractExtension.php
+++ b/src/Symfony/Component/Form/AbstractExtension.php
@@ -50,7 +50,7 @@ abstract class AbstractExtension implements FormExtensionInterface
/**
* {@inheritdoc}
*/
- public function getType($name)
+ public function getType(string $name)
{
if (null === $this->types) {
$this->initTypes();
@@ -66,7 +66,7 @@ public function getType($name)
/**
* {@inheritdoc}
*/
- public function hasType($name)
+ public function hasType(string $name)
{
if (null === $this->types) {
$this->initTypes();
@@ -78,7 +78,7 @@ public function hasType($name)
/**
* {@inheritdoc}
*/
- public function getTypeExtensions($name)
+ public function getTypeExtensions(string $name)
{
if (null === $this->typeExtensions) {
$this->initTypeExtensions();
@@ -92,7 +92,7 @@ public function getTypeExtensions($name)
/**
* {@inheritdoc}
*/
- public function hasTypeExtensions($name)
+ public function hasTypeExtensions(string $name)
{
if (null === $this->typeExtensions) {
$this->initTypeExtensions();
@@ -176,19 +176,7 @@ private function initTypeExtensions()
throw new UnexpectedTypeException($extension, 'Symfony\Component\Form\FormTypeExtensionInterface');
}
- if (method_exists($extension, 'getExtendedTypes')) {
- $extendedTypes = [];
-
- foreach ($extension::getExtendedTypes() as $extendedType) {
- $extendedTypes[] = $extendedType;
- }
- } else {
- @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, \get_class($extension)), E_USER_DEPRECATED);
-
- $extendedTypes = [$extension->getExtendedType()];
- }
-
- foreach ($extendedTypes as $extendedType) {
+ foreach ($extension::getExtendedTypes() as $extendedType) {
$this->typeExtensions[$extendedType][] = $extension;
}
}
diff --git a/src/Symfony/Component/Form/AbstractRendererEngine.php b/src/Symfony/Component/Form/AbstractRendererEngine.php
index cd2e764b8ec4a..370f74e3a896a 100644
--- a/src/Symfony/Component/Form/AbstractRendererEngine.php
+++ b/src/Symfony/Component/Form/AbstractRendererEngine.php
@@ -44,7 +44,7 @@ public function __construct(array $defaultThemes = [])
/**
* {@inheritdoc}
*/
- public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
+ public function setTheme(FormView $view, $themes, bool $useDefaultThemes = true)
{
$cacheKey = $view->vars[self::CACHE_KEY_VAR];
@@ -61,7 +61,7 @@ public function setTheme(FormView $view, $themes, $useDefaultThemes = true)
/**
* {@inheritdoc}
*/
- public function getResourceForBlockName(FormView $view, $blockName)
+ public function getResourceForBlockName(FormView $view, string $blockName)
{
$cacheKey = $view->vars[self::CACHE_KEY_VAR];
@@ -75,7 +75,7 @@ public function getResourceForBlockName(FormView $view, $blockName)
/**
* {@inheritdoc}
*/
- public function getResourceForBlockNameHierarchy(FormView $view, array $blockNameHierarchy, $hierarchyLevel)
+ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNameHierarchy, int $hierarchyLevel)
{
$cacheKey = $view->vars[self::CACHE_KEY_VAR];
$blockName = $blockNameHierarchy[$hierarchyLevel];
@@ -90,7 +90,7 @@ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNam
/**
* {@inheritdoc}
*/
- public function getResourceHierarchyLevel(FormView $view, array $blockNameHierarchy, $hierarchyLevel)
+ public function getResourceHierarchyLevel(FormView $view, array $blockNameHierarchy, int $hierarchyLevel)
{
$cacheKey = $view->vars[self::CACHE_KEY_VAR];
$blockName = $blockNameHierarchy[$hierarchyLevel];
@@ -114,20 +114,16 @@ public function getResourceHierarchyLevel(FormView $view, array $blockNameHierar
*
* @see getResourceForBlock()
*
- * @param string $cacheKey The cache key of the form view
- * @param FormView $view The form view for finding the applying themes
- * @param string $blockName The name of the block to load
- *
* @return bool True if the resource could be loaded, false otherwise
*/
- abstract protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName);
+ abstract protected function loadResourceForBlockName(string $cacheKey, FormView $view, string $blockName);
/**
* Loads the cache with the resource for a specific level of a block hierarchy.
*
* @see getResourceForBlockHierarchy()
*/
- private function loadResourceForBlockNameHierarchy(string $cacheKey, FormView $view, array $blockNameHierarchy, $hierarchyLevel): bool
+ private function loadResourceForBlockNameHierarchy(string $cacheKey, FormView $view, array $blockNameHierarchy, int $hierarchyLevel): bool
{
$blockName = $blockNameHierarchy[$hierarchyLevel];
diff --git a/src/Symfony/Component/Form/AbstractTypeExtension.php b/src/Symfony/Component/Form/AbstractTypeExtension.php
index 0388f7c012919..9d369bf294e96 100644
--- a/src/Symfony/Component/Form/AbstractTypeExtension.php
+++ b/src/Symfony/Component/Form/AbstractTypeExtension.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\Form;
-use Symfony\Component\Form\Exception\LogicException;
use Symfony\Component\OptionsResolver\OptionsResolver;
/**
@@ -46,22 +45,4 @@ public function finishView(FormView $view, FormInterface $form, array $options)
public function configureOptions(OptionsResolver $resolver)
{
}
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.2, use getExtendedTypes() instead.
- */
- public function getExtendedType()
- {
- if (!method_exists($this, 'getExtendedTypes')) {
- throw new LogicException(sprintf('You need to implement the static getExtendedTypes() method when implementing the %s in %s.', FormTypeExtensionInterface::class, static::class));
- }
-
- @trigger_error(sprintf('The %s::getExtendedType() method is deprecated since Symfony 4.2 and will be removed in 5.0. Use getExtendedTypes() instead.', static::class), E_USER_DEPRECATED);
-
- foreach (static::getExtendedTypes() as $extendedType) {
- return $extendedType;
- }
- }
}
diff --git a/src/Symfony/Component/Form/Button.php b/src/Symfony/Component/Form/Button.php
index 50acb8db0c6e8..4188ef3e2c731 100644
--- a/src/Symfony/Component/Form/Button.php
+++ b/src/Symfony/Component/Form/Button.php
@@ -128,7 +128,7 @@ public function getParent()
*
* @throws BadMethodCallException
*/
- public function add($child, $type = null, array $options = [])
+ public function add($child, string $type = null, array $options = [])
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -138,11 +138,9 @@ public function add($child, $type = null, array $options = [])
*
* This method should not be invoked.
*
- * @param string $name
- *
* @throws BadMethodCallException
*/
- public function get($name)
+ public function get(string $name)
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -150,11 +148,9 @@ public function get($name)
/**
* Unsupported method.
*
- * @param string $name
- *
* @return bool Always returns false
*/
- public function has($name)
+ public function has(string $name)
{
return false;
}
@@ -164,11 +160,9 @@ public function has($name)
*
* This method should not be invoked.
*
- * @param string $name
- *
* @throws BadMethodCallException
*/
- public function remove($name)
+ public function remove(string $name)
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -184,7 +178,7 @@ public function all()
/**
* {@inheritdoc}
*/
- public function getErrors($deep = false, $flatten = true)
+ public function getErrors(bool $deep = false, bool $flatten = true)
{
return new FormErrorIterator($this, []);
}
@@ -378,7 +372,7 @@ public function handleRequest($request = null)
*
* @throws Exception\AlreadySubmittedException if the button has already been submitted
*/
- public function submit($submittedData, $clearMissing = true)
+ public function submit($submittedData, bool $clearMissing = true)
{
if ($this->submitted) {
throw new AlreadySubmittedException('A form can only be submitted once');
diff --git a/src/Symfony/Component/Form/ButtonBuilder.php b/src/Symfony/Component/Form/ButtonBuilder.php
index 2af869c66d0d4..87adc69475dc5 100644
--- a/src/Symfony/Component/Form/ButtonBuilder.php
+++ b/src/Symfony/Component/Form/ButtonBuilder.php
@@ -61,17 +61,7 @@ public function __construct(?string $name, array $options = [])
$this->name = $name;
$this->options = $options;
- if (preg_match('/^([^a-zA-Z0-9_].*)?(.*[^a-zA-Z0-9_\-:].*)?$/D', $name, $matches)) {
- if (isset($matches[1])) {
- @trigger_error(sprintf('Using names for buttons that do not start with a letter, a digit, or an underscore is deprecated since Symfony 4.3 and will throw an exception in 5.0 ("%s" given).', $name), E_USER_DEPRECATED);
- }
- if (isset($matches[2])) {
- @trigger_error(sprintf('Using names for buttons that do not contain only letters, digits, underscores ("_"), hyphens ("-") and colons (":") ("%s" given) is deprecated since Symfony 4.3 and will throw an exception in 5.0.', $name), E_USER_DEPRECATED);
- }
- }
-
- // to be added in 5.0
- // FormConfigBuilder::validateName($name);
+ FormConfigBuilder::validateName($name);
}
/**
@@ -81,7 +71,7 @@ public function __construct(?string $name, array $options = [])
*
* @throws BadMethodCallException
*/
- public function add($child, $type = null, array $options = [])
+ public function add($child, string $type = null, array $options = [])
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -93,7 +83,7 @@ public function add($child, $type = null, array $options = [])
*
* @throws BadMethodCallException
*/
- public function create($name, $type = null, array $options = [])
+ public function create(string $name, string $type = null, array $options = [])
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -103,11 +93,9 @@ public function create($name, $type = null, array $options = [])
*
* This method should not be invoked.
*
- * @param string $name
- *
* @throws BadMethodCallException
*/
- public function get($name)
+ public function get(string $name)
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -117,11 +105,9 @@ public function get($name)
*
* This method should not be invoked.
*
- * @param string $name
- *
* @throws BadMethodCallException
*/
- public function remove($name)
+ public function remove(string $name)
{
throw new BadMethodCallException('Buttons cannot have children.');
}
@@ -129,11 +115,9 @@ public function remove($name)
/**
* Unsupported method.
*
- * @param string $name
- *
* @return bool Always returns false
*/
- public function has($name)
+ public function has(string $name)
{
return false;
}
@@ -163,13 +147,9 @@ public function getForm()
*
* This method should not be invoked.
*
- * @param string $eventName
- * @param callable $listener
- * @param int $priority
- *
* @throws BadMethodCallException
*/
- public function addEventListener($eventName, $listener, $priority = 0)
+ public function addEventListener(string $eventName, callable $listener, int $priority = 0)
{
throw new BadMethodCallException('Buttons do not support event listeners.');
}
@@ -191,11 +171,9 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber)
*
* This method should not be invoked.
*
- * @param bool $forcePrepend
- *
* @throws BadMethodCallException
*/
- public function addViewTransformer(DataTransformerInterface $viewTransformer, $forcePrepend = false)
+ public function addViewTransformer(DataTransformerInterface $viewTransformer, bool $forcePrepend = false)
{
throw new BadMethodCallException('Buttons do not support data transformers.');
}
@@ -217,11 +195,9 @@ public function resetViewTransformers()
*
* This method should not be invoked.
*
- * @param bool $forceAppend
- *
* @throws BadMethodCallException
*/
- public function addModelTransformer(DataTransformerInterface $modelTransformer, $forceAppend = false)
+ public function addModelTransformer(DataTransformerInterface $modelTransformer, bool $forceAppend = false)
{
throw new BadMethodCallException('Buttons do not support data transformers.');
}
@@ -241,7 +217,7 @@ public function resetModelTransformers()
/**
* {@inheritdoc}
*/
- public function setAttribute($name, $value)
+ public function setAttribute(string $name, $value)
{
$this->attributes[$name] = $value;
@@ -273,11 +249,9 @@ public function setDataMapper(DataMapperInterface $dataMapper = null)
/**
* Set whether the button is disabled.
*
- * @param bool $disabled Whether the button is disabled
- *
* @return $this
*/
- public function setDisabled($disabled)
+ public function setDisabled(bool $disabled)
{
$this->disabled = $disabled;
@@ -303,11 +277,9 @@ public function setEmptyData($emptyData)
*
* This method should not be invoked.
*
- * @param bool $errorBubbling
- *
* @throws BadMethodCallException
*/
- public function setErrorBubbling($errorBubbling)
+ public function setErrorBubbling(bool $errorBubbling)
{
throw new BadMethodCallException('Buttons do not support error bubbling.');
}
@@ -317,11 +289,9 @@ public function setErrorBubbling($errorBubbling)
*
* This method should not be invoked.
*
- * @param bool $required
- *
* @throws BadMethodCallException
*/
- public function setRequired($required)
+ public function setRequired(bool $required)
{
throw new BadMethodCallException('Buttons cannot be required.');
}
@@ -345,11 +315,9 @@ public function setPropertyPath($propertyPath)
*
* This method should not be invoked.
*
- * @param bool $mapped
- *
* @throws BadMethodCallException
*/
- public function setMapped($mapped)
+ public function setMapped(bool $mapped)
{
throw new BadMethodCallException('Buttons do not support data mapping.');
}
@@ -359,11 +327,9 @@ public function setMapped($mapped)
*
* This method should not be invoked.
*
- * @param bool $byReference
- *
* @throws BadMethodCallException
*/
- public function setByReference($byReference)
+ public function setByReference(bool $byReference)
{
throw new BadMethodCallException('Buttons do not support data mapping.');
}
@@ -373,11 +339,9 @@ public function setByReference($byReference)
*
* This method should not be invoked.
*
- * @param bool $compound
- *
* @throws BadMethodCallException
*/
- public function setCompound($compound)
+ public function setCompound(bool $compound)
{
throw new BadMethodCallException('Buttons cannot be compound.');
}
@@ -413,11 +377,9 @@ public function setData($data)
*
* This method should not be invoked.
*
- * @param bool $locked
- *
* @throws BadMethodCallException
*/
- public function setDataLocked($locked)
+ public function setDataLocked(bool $locked)
{
throw new BadMethodCallException('Buttons do not support data locking.');
}
@@ -437,11 +399,9 @@ public function setFormFactory(FormFactoryInterface $formFactory)
/**
* Unsupported method.
*
- * @param string $action
- *
* @throws BadMethodCallException
*/
- public function setAction($action)
+ public function setAction(string $action)
{
throw new BadMethodCallException('Buttons do not support actions.');
}
@@ -449,11 +409,9 @@ public function setAction($action)
/**
* Unsupported method.
*
- * @param string $method
- *
* @throws BadMethodCallException
*/
- public function setMethod($method)
+ public function setMethod(string $method)
{
throw new BadMethodCallException('Buttons do not support methods.');
}
@@ -471,13 +429,11 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler)
/**
* Unsupported method.
*
- * @param bool $initialize
- *
* @return $this
*
* @throws BadMethodCallException
*/
- public function setAutoInitialize($initialize)
+ public function setAutoInitialize(bool $initialize)
{
if (true === $initialize) {
throw new BadMethodCallException('Buttons do not support automatic initialization.');
@@ -489,11 +445,9 @@ public function setAutoInitialize($initialize)
/**
* Unsupported method.
*
- * @param bool $inheritData
- *
* @throws BadMethodCallException
*/
- public function setInheritData($inheritData)
+ public function setInheritData(bool $inheritData)
{
throw new BadMethodCallException('Buttons do not support data inheritance.');
}
@@ -512,6 +466,16 @@ public function getFormConfig()
return $config;
}
+ /**
+ * Unsupported method.
+ *
+ * @throws BadMethodCallException
+ */
+ public function setIsEmptyCallback(?callable $isEmptyCallback)
+ {
+ throw new BadMethodCallException('Buttons do not support "is empty" callback.');
+ }
+
/**
* Unsupported method.
*/
@@ -655,11 +619,9 @@ public function getAttributes()
/**
* Returns whether the attribute with the given name exists.
*
- * @param string $name The attribute name
- *
* @return bool Whether the attribute exists
*/
- public function hasAttribute($name)
+ public function hasAttribute(string $name)
{
return \array_key_exists($name, $this->attributes);
}
@@ -667,12 +629,11 @@ public function hasAttribute($name)
/**
* Returns the value of the given attribute.
*
- * @param string $name The attribute name
- * @param mixed $default The value returned if the attribute does not exist
+ * @param mixed $default The value returned if the attribute does not exist
*
* @return mixed The attribute value
*/
- public function getAttribute($name, $default = null)
+ public function getAttribute(string $name, $default = null)
{
return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
}
@@ -768,11 +729,9 @@ public function getOptions()
/**
* Returns whether a specific option exists.
*
- * @param string $name The option name,
- *
* @return bool Whether the option exists
*/
- public function hasOption($name)
+ public function hasOption(string $name)
{
return \array_key_exists($name, $this->options);
}
@@ -780,16 +739,25 @@ public function hasOption($name)
/**
* Returns the value of a specific option.
*
- * @param string $name The option name
- * @param mixed $default The value returned if the option does not exist
+ * @param mixed $default The value returned if the option does not exist
*
* @return mixed The option value
*/
- public function getOption($name, $default = null)
+ public function getOption(string $name, $default = null)
{
return \array_key_exists($name, $this->options) ? $this->options[$name] : $default;
}
+ /**
+ * Unsupported method.
+ *
+ * @throws BadMethodCallException
+ */
+ public function getIsEmptyCallback(): ?callable
+ {
+ throw new BadMethodCallException('Buttons do not support "is empty" callback.');
+ }
+
/**
* Unsupported method.
*
diff --git a/src/Symfony/Component/Form/CHANGELOG.md b/src/Symfony/Component/Form/CHANGELOG.md
index 6d35f6fe5fa07..95a3d435b23c0 100644
--- a/src/Symfony/Component/Form/CHANGELOG.md
+++ b/src/Symfony/Component/Form/CHANGELOG.md
@@ -1,6 +1,39 @@
CHANGELOG
=========
+5.1.0
+-----
+
+ * Added a `ChoiceList` facade to leverage explicit choice list caching based on options
+ * Added an `AbstractChoiceLoader` to simplify implementations and handle global optimizations
+ * The `view_timezone` option defaults to the `model_timezone` if no `reference_date` is configured.
+ * Added default `inputmode` attribute to Search, Email and Tel form types.
+ * Implementing the `FormConfigInterface` without implementing the `getIsEmptyCallback()` method
+ is deprecated. The method will be added to the interface in 6.0.
+ * Implementing the `FormConfigBuilderInterface` without implementing the `setIsEmptyCallback()` method
+ is deprecated. The method will be added to the interface in 6.0.
+
+5.0.0
+-----
+
+ * Removed support for using different values for the "model_timezone" and "view_timezone" options of the `TimeType`
+ without configuring a reference date.
+ * Removed the `scale` option of the `IntegerType`.
+ * Using the `date_format`, `date_widget`, and `time_widget` options of the `DateTimeType` when the `widget` option is
+ set to `single_text` is not supported anymore.
+ * The `format` option of `DateType` and `DateTimeType` cannot be used when the `html5` option is enabled.
+ * Using names for buttons that do not start with a letter, a digit, or an underscore throw an exception
+ * Using names for buttons that do not contain only letters, digits, underscores, hyphens, and colons throw an exception.
+ * removed the `ChoiceLoaderInterface` implementation in `CountryType`, `LanguageType`, `LocaleType` and `CurrencyType`
+ * removed `getExtendedType()` method of the `FormTypeExtensionInterface`
+ * added static `getExtendedTypes()` method to the `FormTypeExtensionInterface`
+ * calling to `FormRenderer::searchAndRenderBlock()` method for fields which were already rendered throw a `BadMethodCallException`
+ * removed the `regions` option of the `TimezoneType`
+ * removed the `$scale` argument of the `IntegerToLocalizedStringTransformer`
+ * removed `TemplatingExtension` and `TemplatingRendererEngine` classes, use Twig instead
+ * passing a null message when instantiating a `Symfony\Component\Form\FormError` is not allowed
+ * removed support for using `int` or `float` as data for the `NumberType` when the `input` option is set to `string`
+
4.4.0
-----
diff --git a/src/Symfony/Component/Form/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ChoiceList.php
new file mode 100644
index 0000000000000..d386f88eba671
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/ChoiceList.php
@@ -0,0 +1,135 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList;
+
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceAttr;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceFieldName;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceLabel;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceLoader;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceValue;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\GroupBy;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\PreferredChoice;
+use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A set of convenient static methods to create cacheable choice list options.
+ *
+ * @author Jules Pietri
+ */
+final class ChoiceList
+{
+ /**
+ * Creates a cacheable loader from any callable providing iterable choices.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable $choices A callable that must return iterable choices or grouped choices
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the loader
+ */
+ public static function lazy($formType, callable $choices, $vary = null): ChoiceLoader
+ {
+ return self::loader($formType, new CallbackChoiceLoader($choices), $vary);
+ }
+
+ /**
+ * Decorates a loader to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param ChoiceLoaderInterface $loader A loader responsible for creating loading choices or grouped choices
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the loader
+ */
+ public static function loader($formType, ChoiceLoaderInterface $loader, $vary = null): ChoiceLoader
+ {
+ return new ChoiceLoader($formType, $loader, $vary);
+ }
+
+ /**
+ * Decorates a "choice_value" callback to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable $value Any pseudo callable to create a unique string value from a choice
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the callback
+ */
+ public static function value($formType, $value, $vary = null): ChoiceValue
+ {
+ return new ChoiceValue($formType, $value, $vary);
+ }
+
+ /**
+ * Decorates a "choice_label" option to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable|false $label Any pseudo callable to create a label from a choice or false to discard it
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the option
+ */
+ public static function label($formType, $label, $vary = null): ChoiceLabel
+ {
+ return new ChoiceLabel($formType, $label, $vary);
+ }
+
+ /**
+ * Decorates a "choice_name" callback to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable $fieldName Any pseudo callable to create a field name from a choice
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the callback
+ */
+ public static function fieldName($formType, $fieldName, $vary = null): ChoiceFieldName
+ {
+ return new ChoiceFieldName($formType, $fieldName, $vary);
+ }
+
+ /**
+ * Decorates a "choice_attr" option to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable|array $attr Any pseudo callable or array to create html attributes from a choice
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the option
+ */
+ public static function attr($formType, $attr, $vary = null): ChoiceAttr
+ {
+ return new ChoiceAttr($formType, $attr, $vary);
+ }
+
+ /**
+ * Decorates a "group_by" callback to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable $groupBy Any pseudo callable to return a group name from a choice
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the callback
+ */
+ public static function groupBy($formType, $groupBy, $vary = null): GroupBy
+ {
+ return new GroupBy($formType, $groupBy, $vary);
+ }
+
+ /**
+ * Decorates a "preferred_choices" option to make it cacheable.
+ *
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param callable|array $preferred Any pseudo callable or array to return a group name from a choice
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the option
+ */
+ public static function preferred($formType, $preferred, $vary = null): PreferredChoice
+ {
+ return new PreferredChoice($formType, $preferred, $vary);
+ }
+
+ /**
+ * Should not be instantiated.
+ */
+ private function __construct()
+ {
+ }
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/AbstractStaticOption.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/AbstractStaticOption.php
new file mode 100644
index 0000000000000..2f8ac98078ffb
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/AbstractStaticOption.php
@@ -0,0 +1,64 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A template decorator for static {@see ChoiceType} options.
+ *
+ * Used as fly weight for {@see CachingFactoryDecorator}.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+abstract class AbstractStaticOption
+{
+ private static $options = [];
+
+ /** @var bool|callable|string|array|\Closure|ChoiceLoaderInterface */
+ private $option;
+
+ /**
+ * @param FormTypeInterface|FormTypeExtensionInterface $formType A form type or type extension configuring a cacheable choice list
+ * @param mixed $option Any pseudo callable, array, string or bool to define a choice list option
+ * @param mixed|null $vary Dynamic data used to compute a unique hash when caching the option
+ */
+ final public function __construct($formType, $option, $vary = null)
+ {
+ if (!$formType instanceof FormTypeInterface && !$formType instanceof FormTypeExtensionInterface) {
+ throw new \TypeError(sprintf('Expected an instance of "%s" or "%s", but got "%s".', FormTypeInterface::class, FormTypeExtensionInterface::class, \is_object($formType) ? \get_class($formType) : \gettype($formType)));
+ }
+
+ $hash = CachingFactoryDecorator::generateHash([static::class, $formType, $vary]);
+
+ $this->option = self::$options[$hash] ?? self::$options[$hash] = $option;
+ }
+
+ /**
+ * @return mixed
+ */
+ final public function getOption()
+ {
+ return $this->option;
+ }
+
+ final public static function reset(): void
+ {
+ self::$options = [];
+ }
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceAttr.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceAttr.php
new file mode 100644
index 0000000000000..8de6956d16705
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceAttr.php
@@ -0,0 +1,27 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for any {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "choice_attr" option.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class ChoiceAttr extends AbstractStaticOption
+{
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceFieldName.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceFieldName.php
new file mode 100644
index 0000000000000..0c71e20506d7a
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceFieldName.php
@@ -0,0 +1,27 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for any {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "choice_name" callback.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class ChoiceFieldName extends AbstractStaticOption
+{
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLabel.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLabel.php
new file mode 100644
index 0000000000000..664a09081f36a
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLabel.php
@@ -0,0 +1,27 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for any {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "choice_label" option.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class ChoiceLabel extends AbstractStaticOption
+{
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php
new file mode 100644
index 0000000000000..d8630dd854dbe
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceLoader.php
@@ -0,0 +1,51 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "choice_loader" option.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class ChoiceLoader extends AbstractStaticOption implements ChoiceLoaderInterface
+{
+ /**
+ * {@inheritdoc}
+ */
+ public function loadChoiceList(callable $value = null)
+ {
+ return $this->getOption()->loadChoiceList($value);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function loadChoicesForValues(array $values, callable $value = null)
+ {
+ return $this->getOption()->loadChoicesForValues($values, $value);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function loadValuesForChoices(array $choices, callable $value = null)
+ {
+ $this->getOption()->loadValuesForChoices($choices, $value);
+ }
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceValue.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceValue.php
new file mode 100644
index 0000000000000..d96f1e9e83b80
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/ChoiceValue.php
@@ -0,0 +1,27 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for any {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "choice_value" callback.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class ChoiceValue extends AbstractStaticOption
+{
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/GroupBy.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/GroupBy.php
new file mode 100644
index 0000000000000..2ad492caf3923
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/GroupBy.php
@@ -0,0 +1,27 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for any {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "group_by" callback.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class GroupBy extends AbstractStaticOption
+{
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/Cache/PreferredChoice.php b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/PreferredChoice.php
new file mode 100644
index 0000000000000..4aefd69ab3e8f
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/Cache/PreferredChoice.php
@@ -0,0 +1,27 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Factory\Cache;
+
+use Symfony\Component\Form\FormTypeExtensionInterface;
+use Symfony\Component\Form\FormTypeInterface;
+
+/**
+ * A cacheable wrapper for any {@see FormTypeInterface} or {@see FormTypeExtensionInterface}
+ * which configures a "preferred_choices" option.
+ *
+ * @internal
+ *
+ * @author Jules Pietri
+ */
+final class PreferredChoice extends AbstractStaticOption
+{
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
index 6fad79c094328..f7fe8c2465ff1 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -20,6 +20,7 @@
* Caches the choice lists created by the decorated factory.
*
* @author Bernhard Schussek
+ * @author Jules Pietri
*/
class CachingFactoryDecorator implements ChoiceListFactoryInterface, ResetInterface
{
@@ -80,14 +81,19 @@ public function getDecoratedFactory()
/**
* {@inheritdoc}
*/
- public function createListFromChoices($choices, $value = null)
+ public function createListFromChoices(iterable $choices, $value = null)
{
if ($choices instanceof \Traversable) {
$choices = iterator_to_array($choices);
}
- // The value is not validated on purpose. The decorated factory may
- // decide which values to accept and which not.
+ // Only cache per value when needed. The value is not validated on purpose.
+ // The decorated factory may decide which values to accept and which not.
+ if ($value instanceof Cache\ChoiceValue) {
+ $value = $value->getOption();
+ } elseif ($value) {
+ return $this->decoratedFactory->createListFromChoices($choices, $value);
+ }
$hash = self::generateHash([$choices, $value], 'fromChoices');
@@ -103,6 +109,24 @@ public function createListFromChoices($choices, $value = null)
*/
public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null)
{
+ $cache = true;
+
+ if ($loader instanceof Cache\ChoiceLoader) {
+ $loader = $loader->getOption();
+ } else {
+ $cache = false;
+ }
+
+ if ($value instanceof Cache\ChoiceValue) {
+ $value = $value->getOption();
+ } elseif ($value) {
+ $cache = false;
+ }
+
+ if (!$cache) {
+ return $this->decoratedFactory->createListFromLoader($loader, $value);
+ }
+
$hash = self::generateHash([$loader, $value], 'fromLoader');
if (!isset($this->lists[$hash])) {
@@ -117,8 +141,42 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
*/
public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
{
- // The input is not validated on purpose. This way, the decorated
- // factory may decide which input to accept and which not.
+ $cache = true;
+
+ if ($preferredChoices instanceof Cache\PreferredChoice) {
+ $preferredChoices = $preferredChoices->getOption();
+ } elseif ($preferredChoices) {
+ $cache = false;
+ }
+
+ if ($label instanceof Cache\ChoiceLabel) {
+ $label = $label->getOption();
+ } elseif (null !== $label) {
+ $cache = false;
+ }
+
+ if ($index instanceof Cache\ChoiceFieldName) {
+ $index = $index->getOption();
+ } elseif ($index) {
+ $cache = false;
+ }
+
+ if ($groupBy instanceof Cache\GroupBy) {
+ $groupBy = $groupBy->getOption();
+ } elseif ($groupBy) {
+ $cache = false;
+ }
+
+ if ($attr instanceof Cache\ChoiceAttr) {
+ $attr = $attr->getOption();
+ } elseif ($attr) {
+ $cache = false;
+ }
+
+ if (!$cache) {
+ return $this->decoratedFactory->createView($list, $preferredChoices, $label, $index, $groupBy, $attr);
+ }
+
$hash = self::generateHash([$list, $preferredChoices, $label, $index, $groupBy, $attr]);
if (!isset($this->views[$hash])) {
@@ -139,5 +197,6 @@ public function reset()
{
$this->lists = [];
$this->views = [];
+ Cache\AbstractStaticOption::reset();
}
}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php
index 04e414df5a079..7cb37e1a82c65 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php
@@ -31,12 +31,9 @@ interface ChoiceListFactoryInterface
* The callable receives the choice as only argument.
* Null may be passed when the choice list contains the empty value.
*
- * @param iterable $choices The choices
- * @param callable|null $value The callable generating the choice values
- *
* @return ChoiceListInterface The choice list
*/
- public function createListFromChoices($choices, $value = null);
+ public function createListFromChoices(iterable $choices, callable $value = null);
/**
* Creates a choice list that is loaded with the given loader.
@@ -45,11 +42,9 @@ public function createListFromChoices($choices, $value = null);
* The callable receives the choice as only argument.
* Null may be passed when the choice list contains the empty value.
*
- * @param callable|null $value The callable generating the choice values
- *
* @return ChoiceListInterface The choice list
*/
- public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null);
+ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null);
/**
* Creates a view for the given choice list.
@@ -80,11 +75,9 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
* @param array|callable|null $preferredChoices The preferred choices
* @param callable|false|null $label The callable generating the choice labels;
* pass false to discard the label
- * @param callable|null $index The callable generating the view indices
- * @param callable|null $groupBy The callable generating the group names
* @param array|callable|null $attr The callable generating the HTML attributes
*
* @return ChoiceListView The choice list view
*/
- public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null);
+ public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, callable $index = null, callable $groupBy = null, $attr = null);
}
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
index e401351660c1f..1b184b6ab4ccf 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/DefaultChoiceListFactory.php
@@ -29,7 +29,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
/**
* {@inheritdoc}
*/
- public function createListFromChoices($choices, $value = null)
+ public function createListFromChoices(iterable $choices, callable $value = null)
{
return new ArrayChoiceList($choices, $value);
}
@@ -37,7 +37,7 @@ public function createListFromChoices($choices, $value = null)
/**
* {@inheritdoc}
*/
- public function createListFromLoader(ChoiceLoaderInterface $loader, $value = null)
+ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null)
{
return new LazyChoiceList($loader, $value);
}
@@ -45,7 +45,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, $value = nul
/**
* {@inheritdoc}
*/
- public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, $index = null, $groupBy = null, $attr = null)
+ public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, callable $index = null, callable $groupBy = null, $attr = null)
{
$preferredViews = [];
$preferredViewsOrder = [];
diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
index 4ce1d849a010a..42b8a022c41f4 100644
--- a/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
+++ b/src/Symfony/Component/Form/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -59,13 +59,12 @@ public function getDecoratedFactory()
/**
* {@inheritdoc}
*
- * @param iterable $choices The choices
- * @param callable|string|PropertyPath|null $value The callable or path for
- * generating the choice values
+ * @param callable|string|PropertyPath|null $value The callable or path for
+ * generating the choice values
*
* @return ChoiceListInterface The choice list
*/
- public function createListFromChoices($choices, $value = null)
+ public function createListFromChoices(iterable $choices, $value = null)
{
if (\is_string($value)) {
$value = new PropertyPath($value);
diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php
new file mode 100644
index 0000000000000..ea736a52c683f
--- /dev/null
+++ b/src/Symfony/Component/Form/ChoiceList/Loader/AbstractChoiceLoader.php
@@ -0,0 +1,86 @@
+
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\ChoiceList\Loader;
+
+use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+
+/**
+ * @author Jules Pietri
+ */
+abstract class AbstractChoiceLoader implements ChoiceLoaderInterface
+{
+ /**
+ * The loaded choice list.
+ *
+ * @var ArrayChoiceList
+ */
+ private $choiceList;
+
+ /**
+ * @final
+ *
+ * {@inheritdoc}
+ */
+ public function loadChoiceList(callable $value = null)
+ {
+ return $this->choiceList ?? ($this->choiceList = new ArrayChoiceList($this->loadChoices(), $value));
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function loadChoicesForValues(array $values, callable $value = null)
+ {
+ if (!$values) {
+ return [];
+ }
+
+ if ($this->choiceList) {
+ return $this->choiceList->getChoicesForValues($values);
+ }
+
+ return $this->doLoadChoicesForValues($values, $value);
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function loadValuesForChoices(array $choices, callable $value = null)
+ {
+ if (!$choices) {
+ return [];
+ }
+
+ if ($value) {
+ // if a value callback exists, use it
+ return array_map($value, $choices);
+ }
+
+ if ($this->choiceList) {
+ return $this->choiceList->getValuesForChoices($choices);
+ }
+
+ return $this->doLoadValuesForChoices($choices);
+ }
+
+ abstract protected function loadChoices(): iterable;
+
+ protected function doLoadChoicesForValues(array $values, ?callable $value): array
+ {
+ return $this->loadChoiceList($value)->getChoicesForValues($values);
+ }
+
+ protected function doLoadValuesForChoices(array $choices): array
+ {
+ return $this->loadChoiceList()->getValuesForChoices($choices);
+ }
+}
diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php
index 2d6782f558aea..1811d434e8f26 100644
--- a/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php
+++ b/src/Symfony/Component/Form/ChoiceList/Loader/CallbackChoiceLoader.php
@@ -11,67 +11,25 @@
namespace Symfony\Component\Form\ChoiceList\Loader;
-use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
-
/**
- * Loads an {@link ArrayChoiceList} instance from a callable returning an array of choices.
+ * Loads an {@link ArrayChoiceList} instance from a callable returning iterable choices.
*
* @author Jules Pietri
*/
-class CallbackChoiceLoader implements ChoiceLoaderInterface
+class CallbackChoiceLoader extends AbstractChoiceLoader
{
private $callback;
/**
- * The loaded choice list.
- *
- * @var ArrayChoiceList
- */
- private $choiceList;
-
- /**
- * @param callable $callback The callable returning an array of choices
+ * @param callable $callback The callable returning iterable choices
*/
public function __construct(callable $callback)
{
$this->callback = $callback;
}
- /**
- * {@inheritdoc}
- */
- public function loadChoiceList($value = null)
+ protected function loadChoices(): iterable
{
- if (null !== $this->choiceList) {
- return $this->choiceList;
- }
-
- return $this->choiceList = new ArrayChoiceList(($this->callback)(), $value);
- }
-
- /**
- * {@inheritdoc}
- */
- public function loadChoicesForValues(array $values, $value = null)
- {
- // Optimize
- if (empty($values)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getChoicesForValues($values);
- }
-
- /**
- * {@inheritdoc}
- */
- public function loadValuesForChoices(array $choices, $value = null)
- {
- // Optimize
- if (empty($choices)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getValuesForChoices($choices);
+ return ($this->callback)();
}
}
diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php b/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php
index 31d47d539cfb5..507735d1b3aa2 100644
--- a/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php
+++ b/src/Symfony/Component/Form/ChoiceList/Loader/ChoiceLoaderInterface.php
@@ -36,7 +36,7 @@ interface ChoiceLoaderInterface
*
* @return ChoiceListInterface The loaded choice list
*/
- public function loadChoiceList($value = null);
+ public function loadChoiceList(callable $value = null);
/**
* Loads the choices corresponding to the given values.
@@ -54,7 +54,7 @@ public function loadChoiceList($value = null);
*
* @return array An array of choices
*/
- public function loadChoicesForValues(array $values, $value = null);
+ public function loadChoicesForValues(array $values, callable $value = null);
/**
* Loads the values corresponding to the given choices.
@@ -72,5 +72,5 @@ public function loadChoicesForValues(array $values, $value = null);
*
* @return string[] An array of choice values
*/
- public function loadValuesForChoices(array $choices, $value = null);
+ public function loadValuesForChoices(array $choices, callable $value = null);
}
diff --git a/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php b/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php
index 1a119bb96cdcf..546937b900c0c 100644
--- a/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php
+++ b/src/Symfony/Component/Form/ChoiceList/Loader/IntlCallbackChoiceLoader.php
@@ -22,33 +22,23 @@ class IntlCallbackChoiceLoader extends CallbackChoiceLoader
/**
* {@inheritdoc}
*/
- public function loadChoicesForValues(array $values, $value = null)
+ public function loadChoicesForValues(array $values, callable $value = null)
{
- // Optimize
- $values = array_filter($values);
- if (empty($values)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getChoicesForValues($values);
+ return parent::loadChoicesForValues(array_filter($values), $value);
}
/**
* {@inheritdoc}
*/
- public function loadValuesForChoices(array $choices, $value = null)
+ public function loadValuesForChoices(array $choices, callable $value = null)
{
- // Optimize
$choices = array_filter($choices);
- if (empty($choices)) {
- return [];
- }
// If no callable is set, choices are the same as values
if (null === $value) {
return $choices;
}
- return $this->loadChoiceList($value)->getValuesForChoices($choices);
+ return parent::loadValuesForChoices($choices, $value);
}
}
diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
index dd80486c9acea..0c0654ed9f4e2 100644
--- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
+++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceGroupView.php
@@ -24,10 +24,9 @@ class ChoiceGroupView implements \IteratorAggregate
/**
* Creates a new choice group view.
*
- * @param string $label The label of the group
* @param ChoiceGroupView[]|ChoiceView[] $choices the choice views in the group
*/
- public function __construct($label, array $choices = [])
+ public function __construct(string $label, array $choices = [])
{
$this->label = $label;
$this->choices = $choices;
diff --git a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
index 17828344c46f1..e085795bb51c0 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/Descriptor.php
@@ -106,9 +106,17 @@ protected function collectOptions(ResolvedFormTypeInterface $type)
$this->extensions = array_keys($this->extensions);
}
- protected function getOptionDefinition(OptionsResolver $optionsResolver, $option)
+ protected function getOptionDefinition(OptionsResolver $optionsResolver, string $option)
{
- $definition = [
+ $definition = [];
+
+ if ($info = $optionsResolver->getInfo($option)) {
+ $definition = [
+ 'info' => $info,
+ ];
+ }
+
+ $definition += [
'required' => $optionsResolver->isRequired($option),
'deprecated' => $optionsResolver->isDeprecated($option),
];
diff --git a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
index 4ef4b4a3257b3..20f827bed319a 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/JsonDescriptor.php
@@ -73,6 +73,7 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
}
}
$map += [
+ 'info' => 'info',
'required' => 'required',
'default' => 'default',
'allowed_types' => 'allowedTypes',
diff --git a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
index 6dc9ac48ac1c5..17df85f0fa5b2 100644
--- a/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
+++ b/src/Symfony/Component/Form/Console/Descriptor/TextDescriptor.php
@@ -114,6 +114,7 @@ protected function describeOption(OptionsResolver $optionsResolver, array $optio
];
}
$map += [
+ 'Info' => 'info',
'Required' => 'required',
'Default' => 'default',
'Allowed types' => 'allowedTypes',
diff --git a/src/Symfony/Component/Form/DataMapperInterface.php b/src/Symfony/Component/Form/DataMapperInterface.php
index dee8f784910ea..1e0583aa08fff 100644
--- a/src/Symfony/Component/Form/DataMapperInterface.php
+++ b/src/Symfony/Component/Form/DataMapperInterface.php
@@ -22,12 +22,12 @@ interface DataMapperInterface
* The method is responsible for calling {@link FormInterface::setData()}
* on the children of compound forms, defining their underlying model data.
*
- * @param mixed $viewData View data of the compound form being initialized
- * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
+ * @param mixed $viewData View data of the compound form being initialized
+ * @param FormInterface[]|iterable $forms A list of {@link FormInterface} instances
*
* @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
*/
- public function mapDataToForms($viewData, $forms);
+ public function mapDataToForms($viewData, iterable $forms);
/**
* Maps the model data of a list of children forms into the view data of their parent.
@@ -52,11 +52,11 @@ public function mapDataToForms($viewData, $forms);
* The model data can be an array or an object, so this second argument is always passed
* by reference.
*
- * @param FormInterface[]|\Traversable $forms A list of {@link FormInterface} instances
- * @param mixed $viewData The compound form's view data that get mapped
- * its children model data
+ * @param FormInterface[]|iterable $forms A list of {@link FormInterface} instances
+ * @param mixed $viewData The compound form's view data that get mapped
+ * its children model data
*
* @throws Exception\UnexpectedTypeException if the type of the data parameter is not supported
*/
- public function mapFormsToData($forms, &$viewData);
+ public function mapFormsToData(iterable $forms, &$viewData);
}
diff --git a/src/Symfony/Component/Form/DependencyInjection/FormPass.php b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
index 2be2a59d60297..38fe8eec157be 100644
--- a/src/Symfony/Component/Form/DependencyInjection/FormPass.php
+++ b/src/Symfony/Component/Form/DependencyInjection/FormPass.php
@@ -19,7 +19,6 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Reference;
-use Symfony\Component\Form\FormTypeExtensionInterface;
/**
* Adds all services with the tags "form.type", "form.type_extension" and
@@ -96,13 +95,9 @@ private function processFormTypeExtensions(ContainerBuilder $container): array
$typeExtensionClass = $container->getParameterBag()->resolveValue($serviceDefinition->getClass());
if (isset($tag[0]['extended_type'])) {
- if (!method_exists($typeExtensionClass, 'getExtendedTypes')) {
- @trigger_error(sprintf('Not implementing the "%s::getExtendedTypes()" method in "%s" is deprecated since Symfony 4.2.', FormTypeExtensionInterface::class, $typeExtensionClass), E_USER_DEPRECATED);
- }
-
$typeExtensions[$tag[0]['extended_type']][] = new Reference($serviceId);
$typeExtensionsClasses[] = $typeExtensionClass;
- } elseif (method_exists($typeExtensionClass, 'getExtendedTypes')) {
+ } else {
$extendsTypes = false;
$typeExtensionsClasses[] = $typeExtensionClass;
@@ -114,8 +109,6 @@ private function processFormTypeExtensions(ContainerBuilder $container): array
if (!$extendsTypes) {
throw new InvalidArgumentException(sprintf('The getExtendedTypes() method for service "%s" does not return any extended types.', $serviceId));
}
- } else {
- throw new InvalidArgumentException(sprintf('"%s" tagged services have to implement the static getExtendedTypes() method. Class "%s" for service "%s" does not implement it.', $this->formTypeExtensionTag, $typeExtensionClass, $serviceId));
}
}
diff --git a/src/Symfony/Component/Form/Event/PostSetDataEvent.php b/src/Symfony/Component/Form/Event/PostSetDataEvent.php
index 442f60d13d6a8..eef537452acd9 100644
--- a/src/Symfony/Component/Form/Event/PostSetDataEvent.php
+++ b/src/Symfony/Component/Form/Event/PostSetDataEvent.php
@@ -17,9 +17,7 @@
* This event is dispatched at the end of the Form::setData() method.
*
* This event is mostly here for reading data after having pre-populated the form.
- *
- * @final since Symfony 4.4
*/
-class PostSetDataEvent extends FormEvent
+final class PostSetDataEvent extends FormEvent
{
}
diff --git a/src/Symfony/Component/Form/Event/PostSubmitEvent.php b/src/Symfony/Component/Form/Event/PostSubmitEvent.php
index 9ddb2f8b0e42a..aa3775f5c1748 100644
--- a/src/Symfony/Component/Form/Event/PostSubmitEvent.php
+++ b/src/Symfony/Component/Form/Event/PostSubmitEvent.php
@@ -18,9 +18,7 @@
* once the model and view data have been denormalized.
*
* It can be used to fetch data after denormalization.
- *
- * @final since Symfony 4.4
*/
-class PostSubmitEvent extends FormEvent
+final class PostSubmitEvent extends FormEvent
{
}
diff --git a/src/Symfony/Component/Form/Event/PreSetDataEvent.php b/src/Symfony/Component/Form/Event/PreSetDataEvent.php
index 678a62918e411..5450400e06820 100644
--- a/src/Symfony/Component/Form/Event/PreSetDataEvent.php
+++ b/src/Symfony/Component/Form/Event/PreSetDataEvent.php
@@ -19,9 +19,7 @@
* It can be used to:
* - Modify the data given during pre-population;
* - Modify a form depending on the pre-populated data (adding or removing fields dynamically).
- *
- * @final since Symfony 4.4
*/
-class PreSetDataEvent extends FormEvent
+final class PreSetDataEvent extends FormEvent
{
}
diff --git a/src/Symfony/Component/Form/Event/PreSubmitEvent.php b/src/Symfony/Component/Form/Event/PreSubmitEvent.php
index 5f34a2feebf19..a72ac5d16028a 100644
--- a/src/Symfony/Component/Form/Event/PreSubmitEvent.php
+++ b/src/Symfony/Component/Form/Event/PreSubmitEvent.php
@@ -19,9 +19,7 @@
* It can be used to:
* - Change data from the request, before submitting the data to the form.
* - Add or remove form fields, before submitting the data to the form.
- *
- * @final since Symfony 4.4
*/
-class PreSubmitEvent extends FormEvent
+final class PreSubmitEvent extends FormEvent
{
}
diff --git a/src/Symfony/Component/Form/Event/SubmitEvent.php b/src/Symfony/Component/Form/Event/SubmitEvent.php
index b3f16fc8fd446..71d3b06d47457 100644
--- a/src/Symfony/Component/Form/Event/SubmitEvent.php
+++ b/src/Symfony/Component/Form/Event/SubmitEvent.php
@@ -18,9 +18,7 @@
* transforms back the normalized data to the model and view data.
*
* It can be used to change data from the normalized representation of the data.
- *
- * @final since Symfony 4.4
*/
-class SubmitEvent extends FormEvent
+final class SubmitEvent extends FormEvent
{
}
diff --git a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
index 1f3431cb49ea7..e3eae88b33543 100644
--- a/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
+++ b/src/Symfony/Component/Form/Extension/Core/CoreExtension.php
@@ -19,7 +19,6 @@
use Symfony\Component\Form\Extension\Core\Type\TransformationFailureExtension;
use Symfony\Component\PropertyAccess\PropertyAccess;
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -33,14 +32,8 @@ class CoreExtension extends AbstractExtension
private $choiceListFactory;
private $translator;
- /**
- * @param TranslatorInterface|null $translator
- */
- public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, $translator = null)
+ public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 3 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();
$this->choiceListFactory = $choiceListFactory ?: new CachingFactoryDecorator(new PropertyAccessDecorator(new DefaultChoiceListFactory(), $this->propertyAccessor));
$this->translator = $translator;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
index ddc771fe25ae8..f03d1ad86a006 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/CheckboxListMapper.php
@@ -28,7 +28,7 @@ class CheckboxListMapper implements DataMapperInterface
/**
* {@inheritdoc}
*/
- public function mapDataToForms($choices, $checkboxes)
+ public function mapDataToForms($choices, iterable $checkboxes)
{
if (null === $choices) {
$choices = [];
@@ -47,7 +47,7 @@ public function mapDataToForms($choices, $checkboxes)
/**
* {@inheritdoc}
*/
- public function mapFormsToData($checkboxes, &$choices)
+ public function mapFormsToData(iterable $checkboxes, &$choices)
{
if (!\is_array($choices)) {
throw new UnexpectedTypeException($choices, 'array');
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
index 657d9d63bec26..7a3d8db6a4ecc 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
@@ -33,7 +33,7 @@ public function __construct(PropertyAccessorInterface $propertyAccessor = null)
/**
* {@inheritdoc}
*/
- public function mapDataToForms($data, $forms)
+ public function mapDataToForms($data, iterable $forms)
{
$empty = null === $data || [] === $data;
@@ -56,7 +56,7 @@ public function mapDataToForms($data, $forms)
/**
* {@inheritdoc}
*/
- public function mapFormsToData($forms, &$data)
+ public function mapFormsToData(iterable $forms, &$data)
{
if (null === $data) {
return;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
index d2ec810f70c4d..bb34c912a2ebe 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataMapper/RadioListMapper.php
@@ -28,7 +28,7 @@ class RadioListMapper implements DataMapperInterface
/**
* {@inheritdoc}
*/
- public function mapDataToForms($choice, $radios)
+ public function mapDataToForms($choice, iterable $radios)
{
if (!\is_string($choice)) {
throw new UnexpectedTypeException($choice, 'string');
@@ -43,7 +43,7 @@ public function mapDataToForms($choice, $radios)
/**
* {@inheritdoc}
*/
- public function mapFormsToData($radios, &$choice)
+ public function mapFormsToData(iterable $radios, &$choice)
{
if (null !== $choice && !\is_string($choice)) {
throw new UnexpectedTypeException($choice, 'null or string');
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeImmutableToDateTimeTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeImmutableToDateTimeTransformer.php
index 376a00c11f5f8..6eb40af9d8e68 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeImmutableToDateTimeTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeImmutableToDateTimeTransformer.php
@@ -26,8 +26,6 @@ final class DateTimeImmutableToDateTimeTransformer implements DataTransformerInt
*
* @param \DateTimeImmutable|null $value A DateTimeImmutable object
*
- * @return \DateTime|null A \DateTime object
- *
* @throws TransformationFailedException If the given value is not a \DateTimeImmutable
*/
public function transform($value): ?\DateTime
@@ -52,8 +50,6 @@ public function transform($value): ?\DateTime
*
* @param \DateTime|null $value A DateTime object
*
- * @return \DateTimeImmutable|null A DateTimeImmutable object
- *
* @throws TransformationFailedException If the given value is not a \DateTime
*/
public function reverseTransform($value): ?\DateTimeImmutable
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
index 325f61f11232e..2dfbbf17d60d1 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -158,7 +158,7 @@ public function reverseTransform($value)
*
* @throws TransformationFailedException in case the date formatter can not be constructed
*/
- protected function getIntlDateFormatter($ignoreTimezone = false)
+ protected function getIntlDateFormatter(bool $ignoreTimezone = false)
{
$dateFormat = $this->dateFormat;
$timeFormat = $this->timeFormat;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
index 392aa49e51a19..68ba2c0227da4 100644
--- a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
+++ b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
@@ -27,15 +27,8 @@ class IntegerToLocalizedStringTransformer extends NumberToLocalizedStringTransfo
* @param bool $grouping Whether thousands should be grouped
* @param int $roundingMode One of the ROUND_ constants in this class
*/
- public function __construct($grouping = false, $roundingMode = self::ROUND_DOWN)
+ public function __construct(?bool $grouping = false, ?int $roundingMode = self::ROUND_DOWN)
{
- if (\is_int($grouping) || \is_bool($roundingMode) || 2 < \func_num_args()) {
- @trigger_error(sprintf('Passing a precision as the first value to %s::__construct() is deprecated since Symfony 4.2 and support for it will be dropped in 5.0.', __CLASS__), E_USER_DEPRECATED);
-
- $grouping = $roundingMode;
- $roundingMode = 2 < \func_num_args() ? func_get_arg(2) : self::ROUND_DOWN;
- }
-
parent::__construct(0, $grouping, $roundingMode);
}
diff --git a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
index f5e73849b3700..95763c26c7422 100644
--- a/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
+++ b/src/Symfony/Component/Form/Extension/Core/EventListener/TransformationFailureListener.php
@@ -15,7 +15,6 @@
use Symfony\Component\Form\FormError;
use Symfony\Component\Form\FormEvent;
use Symfony\Component\Form\FormEvents;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -25,14 +24,8 @@ class TransformationFailureListener implements EventSubscriberInterface
{
private $translator;
- /**
- * @param TranslatorInterface|null $translator
- */
- public function __construct($translator = null)
+ public function __construct(TranslatorInterface $translator = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->translator = $translator;
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
index 2b29c5ad9bf16..2741a9afd4171 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -60,6 +60,9 @@ public function configureOptions(OptionsResolver $resolver)
'empty_data' => $emptyData,
'compound' => false,
'false_values' => [null],
+ 'is_empty_callback' => static function ($modelData): bool {
+ return false === $modelData;
+ },
]);
$resolver->setAllowedTypes('false_values', 'array');
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
index 4be88149770f8..90e973fb7a0bd 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -13,6 +13,13 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceAttr;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceFieldName;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceLabel;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceLoader;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\ChoiceValue;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\GroupBy;
+use Symfony\Component\Form\ChoiceList\Factory\Cache\PreferredChoice;
use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
@@ -324,13 +331,13 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setAllowedTypes('choices', ['null', 'array', '\Traversable']);
$resolver->setAllowedTypes('choice_translation_domain', ['null', 'bool', 'string']);
- $resolver->setAllowedTypes('choice_loader', ['null', 'Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface']);
- $resolver->setAllowedTypes('choice_label', ['null', 'bool', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath']);
- $resolver->setAllowedTypes('choice_name', ['null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath']);
- $resolver->setAllowedTypes('choice_value', ['null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath']);
- $resolver->setAllowedTypes('choice_attr', ['null', 'array', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath']);
- $resolver->setAllowedTypes('preferred_choices', ['array', '\Traversable', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath']);
- $resolver->setAllowedTypes('group_by', ['null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath']);
+ $resolver->setAllowedTypes('choice_loader', ['null', 'Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface', ChoiceLoader::class]);
+ $resolver->setAllowedTypes('choice_label', ['null', 'bool', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath', ChoiceLabel::class]);
+ $resolver->setAllowedTypes('choice_name', ['null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath', ChoiceFieldName::class]);
+ $resolver->setAllowedTypes('choice_value', ['null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath', ChoiceValue::class]);
+ $resolver->setAllowedTypes('choice_attr', ['null', 'array', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath', ChoiceAttr::class]);
+ $resolver->setAllowedTypes('preferred_choices', ['array', '\Traversable', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath', PreferredChoice::class]);
+ $resolver->setAllowedTypes('group_by', ['null', 'callable', 'string', 'Symfony\Component\PropertyAccess\PropertyPath', GroupBy::class]);
}
/**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
index be941d2d55e75..d2d3aee80aab7 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CountryType.php
@@ -12,28 +12,14 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\ChoiceList;
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
use Symfony\Component\Intl\Countries;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
-class CountryType extends AbstractType implements ChoiceLoaderInterface
+class CountryType extends AbstractType
{
- /**
- * Country loaded choice list.
- *
- * The choices are lazy loaded and generated from the Intl component.
- *
- * {@link \Symfony\Component\Intl\Intl::getRegionBundle()}.
- *
- * @var ArrayChoiceList
- *
- * @deprecated since Symfony 4.1
- */
- private $choiceList;
-
/**
* {@inheritdoc}
*/
@@ -44,9 +30,9 @@ public function configureOptions(OptionsResolver $resolver)
$choiceTranslationLocale = $options['choice_translation_locale'];
$alpha3 = $options['alpha3'];
- return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $alpha3) {
+ return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $alpha3) {
return array_flip($alpha3 ? Countries::getAlpha3Names($choiceTranslationLocale) : Countries::getNames($choiceTranslationLocale));
- });
+ }), [$choiceTranslationLocale, $alpha3]);
},
'choice_translation_domain' => false,
'choice_translation_locale' => null,
@@ -72,61 +58,4 @@ public function getBlockPrefix()
{
return 'country';
}
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoiceList($value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- if (null !== $this->choiceList) {
- return $this->choiceList;
- }
-
- return $this->choiceList = new ArrayChoiceList(array_flip(Countries::getNames()), $value);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoicesForValues(array $values, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $values = array_filter($values);
- if (empty($values)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getChoicesForValues($values);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadValuesForChoices(array $choices, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $choices = array_filter($choices);
- if (empty($choices)) {
- return [];
- }
-
- // If no callable is set, choices are the same as values
- if (null === $value) {
- return $choices;
- }
-
- return $this->loadChoiceList($value)->getValuesForChoices($choices);
- }
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
index d1d71c32a7ce3..4506bf488f981 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/CurrencyType.php
@@ -12,28 +12,14 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\ChoiceList;
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
use Symfony\Component\Intl\Currencies;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
-class CurrencyType extends AbstractType implements ChoiceLoaderInterface
+class CurrencyType extends AbstractType
{
- /**
- * Currency loaded choice list.
- *
- * The choices are lazy loaded and generated from the Intl component.
- *
- * {@link \Symfony\Component\Intl\Intl::getCurrencyBundle()}.
- *
- * @var ArrayChoiceList
- *
- * @deprecated since Symfony 4.1
- */
- private $choiceList;
-
/**
* {@inheritdoc}
*/
@@ -43,9 +29,9 @@ public function configureOptions(OptionsResolver $resolver)
'choice_loader' => function (Options $options) {
$choiceTranslationLocale = $options['choice_translation_locale'];
- return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
+ return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
return array_flip(Currencies::getNames($choiceTranslationLocale));
- });
+ }), $choiceTranslationLocale);
},
'choice_translation_domain' => false,
'choice_translation_locale' => null,
@@ -69,61 +55,4 @@ public function getBlockPrefix()
{
return 'currency';
}
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoiceList($value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- if (null !== $this->choiceList) {
- return $this->choiceList;
- }
-
- return $this->choiceList = new ArrayChoiceList(array_flip(Currencies::getNames()), $value);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoicesForValues(array $values, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $values = array_filter($values);
- if (empty($values)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getChoicesForValues($values);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadValuesForChoices(array $choices, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $choices = array_filter($choices);
- if (empty($choices)) {
- return [];
- }
-
- // If no callable is set, choices are the same as values
- if (null === $value) {
- return $choices;
- }
-
- return $this->loadChoiceList($value)->getValuesForChoices($choices);
- }
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
index 0959ee7d321f3..d26d0fd5752bb 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Exception\LogicException;
use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DataTransformerChain;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeImmutableToDateTimeTransformer;
@@ -171,10 +172,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
$dateOptions['input'] = $timeOptions['input'] = 'array';
$dateOptions['error_bubbling'] = $timeOptions['error_bubbling'] = true;
- if (isset($dateOptions['format']) && DateType::HTML5_FORMAT !== $dateOptions['format']) {
- $dateOptions['html5'] = false;
- }
-
$builder
->addViewTransformer(new DataTransformerChain([
new DateTimeToArrayTransformer($options['model_timezone'], $options['view_timezone'], $parts),
@@ -312,37 +309,33 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setAllowedTypes('input_format', 'string');
- $resolver->setDeprecated('date_format', function (Options $options, $dateFormat) {
+ $resolver->setNormalizer('date_format', function (Options $options, $dateFormat) {
if (null !== $dateFormat && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
- return sprintf('Using the "date_format" option of %s with an HTML5 date widget is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
- //throw new LogicException(sprintf('Cannot use the "date_format" option of the %s with an HTML5 date.', self::class));
+ throw new LogicException(sprintf('Cannot use the "date_format" option of the %s with an HTML5 date.', self::class));
}
- return '';
+ return $dateFormat;
});
- $resolver->setDeprecated('date_widget', function (Options $options, $dateWidget) {
+ $resolver->setNormalizer('date_widget', function (Options $options, $dateWidget) {
if (null !== $dateWidget && 'single_text' === $options['widget']) {
- return sprintf('Using the "date_widget" option of %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
- //throw new LogicException(sprintf('Cannot use the "date_widget" option of the %s when the "widget" option is set to "single_text".', self::class));
+ throw new LogicException(sprintf('Cannot use the "date_widget" option of the %s when the "widget" option is set to "single_text".', self::class));
}
- return '';
+ return $dateWidget;
});
- $resolver->setDeprecated('time_widget', function (Options $options, $timeWidget) {
+ $resolver->setNormalizer('time_widget', function (Options $options, $timeWidget) {
if (null !== $timeWidget && 'single_text' === $options['widget']) {
- return sprintf('Using the "time_widget" option of %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
- //throw new LogicException(sprintf('Cannot use the "time_widget" option of the %s when the "widget" option is set to "single_text".', self::class));
+ throw new LogicException(sprintf('Cannot use the "time_widget" option of the %s when the "widget" option is set to "single_text".', self::class));
}
- return '';
+ return $timeWidget;
});
- $resolver->setDeprecated('html5', function (Options $options, $html5) {
+ $resolver->setNormalizer('html5', function (Options $options, $html5) {
if ($html5 && self::HTML5_FORMAT !== $options['format']) {
- return sprintf('Using a custom format when the "html5" option of %s is enabled is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
- //throw new LogicException(sprintf('Cannot use the "format" option of %s when the "html5" option is disabled.', self::class));
+ throw new LogicException(sprintf('Cannot use the "format" option of %s when the "html5" option is enabled.', self::class));
}
- return '';
+ return $html5;
});
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
index 58c4bbcf339d9..a187798cdbd97 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Exception\LogicException;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeImmutableToDateTimeTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToLocalizedStringTransformer;
@@ -322,13 +323,12 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setAllowedTypes('days', 'array');
$resolver->setAllowedTypes('input_format', 'string');
- $resolver->setDeprecated('html5', function (Options $options, $html5) {
+ $resolver->setNormalizer('html5', function (Options $options, $html5) {
if ($html5 && 'single_text' === $options['widget'] && self::HTML5_FORMAT !== $options['format']) {
- return sprintf('Using a custom format when the "html5" option of %s is enabled is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
- //throw new LogicException(sprintf('Cannot use the "format" option of %s when the "html5" option is disabled.', self::class));
+ throw new LogicException(sprintf('Cannot use the "format" option of %s when the "html5" option is enabled.', self::class));
}
- return '';
+ return $html5;
});
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
index 1bc1019ab9f26..b5e7a6de36aaa 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/EmailType.php
@@ -12,6 +12,8 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
class EmailType extends AbstractType
{
@@ -23,6 +25,14 @@ public function getParent()
return TextType::class;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ $view->vars['attr']['inputmode'] = $options['attr']['inputmode'] ?? 'email';
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
index 52368293f45d1..ce535394d9938 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FileType.php
@@ -20,7 +20,6 @@
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
class FileType extends AbstractType
@@ -36,14 +35,8 @@ class FileType extends AbstractType
private $translator;
- /**
- * @param TranslatorInterface|null $translator
- */
- public function __construct($translator = null)
+ public function __construct(TranslatorInterface $translator = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->translator = $translator;
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
index 14302617454da..da592985f9041 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/FormType.php
@@ -15,6 +15,7 @@
use Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper;
use Symfony\Component\Form\Extension\Core\EventListener\TrimListener;
use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormConfigBuilderInterface;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\Options;
@@ -58,6 +59,14 @@ public function buildForm(FormBuilderInterface $builder, array $options)
if ($options['trim']) {
$builder->addEventSubscriber(new TrimListener());
}
+
+ if (!method_exists($builder, 'setIsEmptyCallback')) {
+ trigger_deprecation('symfony/form', '5.1', 'Not implementing the "%s::setIsEmptyCallback()" method in "%s" is deprecated.', FormConfigBuilderInterface::class, \get_class($builder));
+
+ return;
+ }
+
+ $builder->setIsEmptyCallback($options['is_empty_callback']);
}
/**
@@ -190,6 +199,7 @@ public function configureOptions(OptionsResolver $resolver)
'help_attr' => [],
'help_html' => false,
'help_translation_parameters' => [],
+ 'is_empty_callback' => null,
]);
$resolver->setAllowedTypes('label_attr', 'array');
@@ -197,6 +207,7 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setAllowedTypes('help', ['string', 'null']);
$resolver->setAllowedTypes('help_attr', 'array');
$resolver->setAllowedTypes('help_html', 'bool');
+ $resolver->setAllowedTypes('is_empty_callback', ['null', 'callable']);
}
/**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
index 540cdb6f79db3..7555bf41b2566 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/IntegerType.php
@@ -59,10 +59,6 @@ public function configureOptions(OptionsResolver $resolver)
IntegerToLocalizedStringTransformer::ROUND_UP,
IntegerToLocalizedStringTransformer::ROUND_CEILING,
]);
-
- $resolver->setDefined('scale');
- $resolver->setAllowedTypes('scale', ['null', 'int']);
- $resolver->setDeprecated('scale');
}
/**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
index b4b382b85ddf8..c5d1ac097740c 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LanguageType.php
@@ -12,28 +12,16 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\ChoiceList;
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
+use Symfony\Component\Form\Exception\LogicException;
+use Symfony\Component\Intl\Exception\MissingResourceException;
use Symfony\Component\Intl\Languages;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
-class LanguageType extends AbstractType implements ChoiceLoaderInterface
+class LanguageType extends AbstractType
{
- /**
- * Language loaded choice list.
- *
- * The choices are lazy loaded and generated from the Intl component.
- *
- * {@link \Symfony\Component\Intl\Intl::getLanguageBundle()}.
- *
- * @var ArrayChoiceList
- *
- * @deprecated since Symfony 4.1
- */
- private $choiceList;
-
/**
* {@inheritdoc}
*/
@@ -42,19 +30,43 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setDefaults([
'choice_loader' => function (Options $options) {
$choiceTranslationLocale = $options['choice_translation_locale'];
- $alpha3 = $options['alpha3'];
-
- return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $alpha3) {
- return array_flip($alpha3 ? Languages::getAlpha3Names($choiceTranslationLocale) : Languages::getNames($choiceTranslationLocale));
- });
+ $useAlpha3Codes = $options['alpha3'];
+ $choiceSelfTranslation = $options['choice_self_translation'];
+
+ return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale, $useAlpha3Codes, $choiceSelfTranslation) {
+ if (true === $choiceSelfTranslation) {
+ foreach (Languages::getLanguageCodes() as $alpha2Code) {
+ try {
+ $languageCode = $useAlpha3Codes ? Languages::getAlpha3Code($alpha2Code) : $alpha2Code;
+ $languagesList[$languageCode] = Languages::getName($alpha2Code, $alpha2Code);
+ } catch (MissingResourceException $e) {
+ // ignore errors like "Couldn't read the indices for the locale 'meta'"
+ }
+ }
+ } else {
+ $languagesList = $useAlpha3Codes ? Languages::getAlpha3Names($choiceTranslationLocale) : Languages::getNames($choiceTranslationLocale);
+ }
+
+ return array_flip($languagesList);
+ }), [$choiceTranslationLocale, $useAlpha3Codes, $choiceSelfTranslation]);
},
'choice_translation_domain' => false,
'choice_translation_locale' => null,
'alpha3' => false,
+ 'choice_self_translation' => false,
]);
+ $resolver->setAllowedTypes('choice_self_translation', ['bool']);
$resolver->setAllowedTypes('choice_translation_locale', ['null', 'string']);
$resolver->setAllowedTypes('alpha3', 'bool');
+
+ $resolver->setNormalizer('choice_self_translation', function (Options $options, $value) {
+ if (true === $value && $options['choice_translation_locale']) {
+ throw new LogicException('Cannot use the "choice_self_translation" and "choice_translation_locale" options at the same time. Remove one of them.');
+ }
+
+ return $value;
+ });
}
/**
@@ -72,61 +84,4 @@ public function getBlockPrefix()
{
return 'language';
}
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoiceList($value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- if (null !== $this->choiceList) {
- return $this->choiceList;
- }
-
- return $this->choiceList = new ArrayChoiceList(array_flip(Languages::getNames()), $value);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoicesForValues(array $values, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $values = array_filter($values);
- if (empty($values)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getChoicesForValues($values);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadValuesForChoices(array $choices, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $choices = array_filter($choices);
- if (empty($choices)) {
- return [];
- }
-
- // If no callable is set, choices are the same as values
- if (null === $value) {
- return $choices;
- }
-
- return $this->loadChoiceList($value)->getValuesForChoices($choices);
- }
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
index 5ce654bb231f7..8c1c2890a0f2e 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/LocaleType.php
@@ -12,28 +12,14 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
-use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
+use Symfony\Component\Form\ChoiceList\ChoiceList;
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
use Symfony\Component\Intl\Locales;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
-class LocaleType extends AbstractType implements ChoiceLoaderInterface
+class LocaleType extends AbstractType
{
- /**
- * Locale loaded choice list.
- *
- * The choices are lazy loaded and generated from the Intl component.
- *
- * {@link \Symfony\Component\Intl\Intl::getLocaleBundle()}.
- *
- * @var ArrayChoiceList
- *
- * @deprecated since Symfony 4.1
- */
- private $choiceList;
-
/**
* {@inheritdoc}
*/
@@ -43,9 +29,9 @@ public function configureOptions(OptionsResolver $resolver)
'choice_loader' => function (Options $options) {
$choiceTranslationLocale = $options['choice_translation_locale'];
- return new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
+ return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($choiceTranslationLocale) {
return array_flip(Locales::getNames($choiceTranslationLocale));
- });
+ }), $choiceTranslationLocale);
},
'choice_translation_domain' => false,
'choice_translation_locale' => null,
@@ -69,61 +55,4 @@ public function getBlockPrefix()
{
return 'locale';
}
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoiceList($value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- if (null !== $this->choiceList) {
- return $this->choiceList;
- }
-
- return $this->choiceList = new ArrayChoiceList(array_flip(Locales::getNames()), $value);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadChoicesForValues(array $values, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $values = array_filter($values);
- if (empty($values)) {
- return [];
- }
-
- return $this->loadChoiceList($value)->getChoicesForValues($values);
- }
-
- /**
- * {@inheritdoc}
- *
- * @deprecated since Symfony 4.1
- */
- public function loadValuesForChoices(array $choices, $value = null)
- {
- @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.1, use the "choice_loader" option instead.', __METHOD__), E_USER_DEPRECATED);
-
- // Optimize
- $choices = array_filter($choices);
- if (empty($choices)) {
- return [];
- }
-
- // If no callable is set, choices are the same as values
- if (null === $value) {
- return $choices;
- }
-
- return $this->loadChoiceList($value)->getValuesForChoices($choices);
- }
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
index 09a7383c23029..d402d311372b6 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/MoneyType.php
@@ -87,7 +87,7 @@ public function getBlockPrefix()
* The pattern contains the placeholder "{{ widget }}" where the HTML tag should
* be inserted
*/
- protected static function getPattern($currency)
+ protected static function getPattern(?string $currency)
{
if (!$currency) {
return '{{ widget }}';
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
index 0ee965d8c458f..4c1f1fd71f16b 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/NumberType.php
@@ -12,7 +12,6 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
use Symfony\Component\Form\Exception\LogicException;
use Symfony\Component\Form\Extension\Core\DataTransformer\NumberToLocalizedStringTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\StringToFloatTransformer;
@@ -38,19 +37,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
if ('string' === $options['input']) {
$builder->addModelTransformer(new StringToFloatTransformer($options['scale']));
- $builder->addModelTransformer(new CallbackTransformer(
- function ($value) {
- if (\is_float($value) || \is_int($value)) {
- @trigger_error(sprintf('Using the %s with float or int data when the "input" option is set to "string" is deprecated since Symfony 4.4 and will throw an exception in 5.0.', self::class), E_USER_DEPRECATED);
- $value = (string) $value;
- }
-
- return $value;
- },
- function ($value) {
- return $value;
- }
- ));
}
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
index c817a26d025b6..94ffffa5e6676 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/SearchType.php
@@ -12,6 +12,8 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
class SearchType extends AbstractType
{
@@ -23,6 +25,14 @@ public function getParent()
return TextType::class;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ $view->vars['attr']['inputmode'] = $options['attr']['inputmode'] ?? 'search';
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
index de74a3ed3721d..535dba8e1093d 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TelType.php
@@ -12,6 +12,8 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormView;
class TelType extends AbstractType
{
@@ -23,6 +25,14 @@ public function getParent()
return TextType::class;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function buildView(FormView $view, FormInterface $form, array $options)
+ {
+ $view->vars['attr']['inputmode'] = $options['attr']['inputmode'] ?? 'tel';
+ }
+
/**
* {@inheritdoc}
*/
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
index 7475b09b2e451..cae3ae9350749 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -13,6 +13,7 @@
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Exception\InvalidConfigurationException;
+use Symfony\Component\Form\Exception\LogicException;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeImmutableToDateTimeTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToArrayTransformer;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToStringTransformer;
@@ -293,6 +294,18 @@ public function configureOptions(OptionsResolver $resolver)
return null;
};
+ $viewTimezone = static function (Options $options, $value): ?string {
+ if (null !== $value) {
+ return $value;
+ }
+
+ if (null !== $options['model_timezone'] && null === $options['reference_date']) {
+ return $options['model_timezone'];
+ }
+
+ return null;
+ };
+
$resolver->setDefaults([
'hours' => range(0, 23),
'minutes' => range(0, 59),
@@ -303,7 +316,7 @@ public function configureOptions(OptionsResolver $resolver)
'with_minutes' => true,
'with_seconds' => false,
'model_timezone' => $modelTimezone,
- 'view_timezone' => null,
+ 'view_timezone' => $viewTimezone,
'reference_date' => null,
'placeholder' => $placeholderDefault,
'html5' => true,
@@ -323,12 +336,12 @@ public function configureOptions(OptionsResolver $resolver)
'choice_translation_domain' => false,
]);
- $resolver->setDeprecated('model_timezone', function (Options $options, $modelTimezone): string {
- if (null !== $modelTimezone && $options['view_timezone'] !== $modelTimezone && null === $options['reference_date']) {
- return sprintf('Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is deprecated since Symfony 4.4.');
+ $resolver->setNormalizer('view_timezone', function (Options $options, $viewTimezone): ?string {
+ if (null !== $options['model_timezone'] && $viewTimezone !== $options['model_timezone'] && null === $options['reference_date']) {
+ throw new LogicException(sprintf('Using different values for the "model_timezone" and "view_timezone" options without configuring a reference date is not supported.'));
}
- return '';
+ return $viewTimezone;
});
$resolver->setNormalizer('placeholder', $placeholderNormalizer);
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
index 53347946a0652..1aba449665a39 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TimezoneType.php
@@ -12,7 +12,7 @@
namespace Symfony\Component\Form\Extension\Core\Type;
use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
+use Symfony\Component\Form\ChoiceList\ChoiceList;
use Symfony\Component\Form\ChoiceList\Loader\IntlCallbackChoiceLoader;
use Symfony\Component\Form\Exception\LogicException;
use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeZoneToStringTransformer;
@@ -49,21 +49,18 @@ public function configureOptions(OptionsResolver $resolver)
if ($options['intl']) {
$choiceTranslationLocale = $options['choice_translation_locale'];
- return new IntlCallbackChoiceLoader(function () use ($input, $choiceTranslationLocale) {
+ return ChoiceList::loader($this, new IntlCallbackChoiceLoader(function () use ($input, $choiceTranslationLocale) {
return self::getIntlTimezones($input, $choiceTranslationLocale);
- });
+ }), [$input, $choiceTranslationLocale]);
}
- $regions = $options->offsetGet('regions', false);
-
- return new CallbackChoiceLoader(function () use ($regions, $input) {
- return self::getPhpTimezones($regions, $input);
- });
+ return ChoiceList::lazy($this, function () use ($input) {
+ return self::getPhpTimezones($input);
+ }, $input);
},
'choice_translation_domain' => false,
'choice_translation_locale' => null,
'input' => 'string',
- 'regions' => \DateTimeZone::ALL,
]);
$resolver->setAllowedTypes('intl', ['bool']);
@@ -85,16 +82,6 @@ public function configureOptions(OptionsResolver $resolver)
return $value;
});
-
- $resolver->setAllowedTypes('regions', 'int');
- $resolver->setDeprecated('regions', 'The option "%name%" is deprecated since Symfony 4.2.');
- $resolver->setNormalizer('regions', function (Options $options, $value) {
- if ($options['intl'] && \DateTimeZone::ALL !== (\DateTimeZone::ALL & $value)) {
- throw new LogicException('The "regions" option can only be used if the "intl" option is set to false.');
- }
-
- return $value;
- });
}
/**
@@ -113,11 +100,11 @@ public function getBlockPrefix()
return 'timezone';
}
- private static function getPhpTimezones(int $regions, string $input): array
+ private static function getPhpTimezones(string $input): array
{
$timezones = [];
- foreach (\DateTimeZone::listIdentifiers($regions) as $timezone) {
+ foreach (\DateTimeZone::listIdentifiers(\DateTimeZone::ALL) as $timezone) {
if ('intltimezone' === $input && 'Etc/Unknown' === \IntlTimeZone::createTimeZone($timezone)->getID()) {
continue;
}
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
index 8cdca71b65ba1..f93586ef735ab 100644
--- a/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
+++ b/src/Symfony/Component/Form/Extension/Core/Type/TransformationFailureExtension.php
@@ -14,7 +14,6 @@
use Symfony\Component\Form\AbstractTypeExtension;
use Symfony\Component\Form\Extension\Core\EventListener\TransformationFailureListener;
use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -24,14 +23,8 @@ class TransformationFailureExtension extends AbstractTypeExtension
{
private $translator;
- /**
- * @param TranslatorInterface|null $translator
- */
- public function __construct($translator = null)
+ public function __construct(TranslatorInterface $translator = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->translator = $translator;
}
diff --git a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
index efd403ca9f689..609a371ea05d9 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/CsrfExtension.php
@@ -13,7 +13,6 @@
use Symfony\Component\Form\AbstractExtension;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -27,15 +26,8 @@ class CsrfExtension extends AbstractExtension
private $translator;
private $translationDomain;
- /**
- * @param TranslatorInterface|null $translator The translator for translating error messages
- * @param string|null $translationDomain The translation domain for translating
- */
- public function __construct(CsrfTokenManagerInterface $tokenManager, $translator = null, string $translationDomain = null)
+ public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorInterface $translator = null, string $translationDomain = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 2 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->tokenManager = $tokenManager;
$this->translator = $translator;
$this->translationDomain = $translationDomain;
diff --git a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
index 7c5181e17d9b8..d30bdef61e8e3 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -18,7 +18,6 @@
use Symfony\Component\Form\Util\ServerParams;
use Symfony\Component\Security\Csrf\CsrfToken;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -41,14 +40,8 @@ public static function getSubscribedEvents()
];
}
- /**
- * @param TranslatorInterface|null $translator
- */
- public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenManager, string $tokenId, string $errorMessage, $translator = null, string $translationDomain = null, ServerParams $serverParams = null)
+ public function __construct(string $fieldName, CsrfTokenManagerInterface $tokenManager, string $tokenId, string $errorMessage, TranslatorInterface $translator = null, string $translationDomain = null, ServerParams $serverParams = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 5 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->fieldName = $fieldName;
$this->tokenManager = $tokenManager;
$this->tokenId = $tokenId;
diff --git a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
index 2f3fa437f6dda..5d991e616414d 100644
--- a/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
+++ b/src/Symfony/Component/Form/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -20,7 +20,6 @@
use Symfony\Component\Form\Util\ServerParams;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -35,14 +34,8 @@ class FormTypeCsrfExtension extends AbstractTypeExtension
private $translationDomain;
private $serverParams;
- /**
- * @param TranslatorInterface|null $translator
- */
- public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', $translator = null, string $translationDomain = null, ServerParams $serverParams = null)
+ public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', TranslatorInterface $translator = null, string $translationDomain = null, ServerParams $serverParams = null)
{
- if (null !== $translator && !$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 4 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->defaultTokenManager = $defaultTokenManager;
$this->defaultEnabled = $defaultEnabled;
$this->defaultFieldName = $defaultFieldName;
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
index 4d4a7b125189a..969fcd066f764 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/FormDataCollector.php
@@ -28,7 +28,7 @@
* @author Robert Schönthal
* @author Bernhard Schussek
*
- * @final since Symfony 4.3
+ * @final
*/
class FormDataCollector extends DataCollector implements FormDataCollectorInterface
{
@@ -80,12 +80,8 @@ public function __construct(FormDataExtractorInterface $dataExtractor)
/**
* Does nothing. The data is collected during the form event listeners.
- *
- * {@inheritdoc}
- *
- * @param \Throwable|null $exception
*/
- public function collect(Request $request, Response $response/*, \Throwable $exception = null*/)
+ public function collect(Request $request, Response $response, \Throwable $exception = null)
{
}
@@ -223,7 +219,7 @@ public function buildFinalFormTree(FormInterface $form, FormView $view)
/**
* {@inheritdoc}
*/
- public function getName()
+ public function getName(): string
{
return 'form';
}
@@ -255,7 +251,7 @@ public function __sleep(): array
/**
* {@inheritdoc}
*/
- protected function getCasters()
+ protected function getCasters(): array
{
return parent::getCasters() + [
\Exception::class => function (\Exception $e, array $a, Stub $s) {
diff --git a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
index 53a76c8490d79..54358d5d49aa1 100644
--- a/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
+++ b/src/Symfony/Component/Form/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -69,7 +69,7 @@ public function getTypeExtensions()
/**
* {@inheritdoc}
*/
- public function createBuilder(FormFactoryInterface $factory, $name, array $options = [])
+ public function createBuilder(FormFactoryInterface $factory, string $name, array $options = [])
{
$builder = $this->proxiedType->createBuilder($factory, $name, $options);
diff --git a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
index e4314648df8d4..94e6bd01686f6 100644
--- a/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
+++ b/src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
@@ -34,7 +34,10 @@ public function __construct(ContainerInterface $typeContainer, array $typeExtens
$this->guesserServices = $guesserServices;
}
- public function getType($name)
+ /**
+ * {@inheritdoc}
+ */
+ public function getType(string $name)
{
if (!$this->typeContainer->has($name)) {
throw new InvalidArgumentException(sprintf('The field type "%s" is not registered in the service container.', $name));
@@ -43,12 +46,18 @@ public function getType($name)
return $this->typeContainer->get($name);
}
- public function hasType($name)
+ /**
+ * {@inheritdoc}
+ */
+ public function hasType(string $name)
{
return $this->typeContainer->has($name);
}
- public function getTypeExtensions($name)
+ /**
+ * {@inheritdoc}
+ */
+ public function getTypeExtensions(string $name)
{
$extensions = [];
@@ -56,17 +65,12 @@ public function getTypeExtensions($name)
foreach ($this->typeExtensionServices[$name] as $serviceId => $extension) {
$extensions[] = $extension;
- if (method_exists($extension, 'getExtendedTypes')) {
- $extendedTypes = [];
-
- foreach ($extension::getExtendedTypes() as $extendedType) {
- $extendedTypes[] = $extendedType;
- }
- } else {
- $extendedTypes = [$extension->getExtendedType()];
+ $extendedTypes = [];
+ foreach ($extension::getExtendedTypes() as $extendedType) {
+ $extendedTypes[] = $extendedType;
}
- // validate the result of getExtendedTypes()/getExtendedType() to ensure it is consistent with the service definition
+ // validate the result of getExtendedTypes() to ensure it is consistent with the service definition
if (!\in_array($name, $extendedTypes, true)) {
throw new InvalidArgumentException(sprintf('The extended type specified for the service "%s" does not match the actual extended type. Expected "%s", given "%s".', $serviceId, $name, implode(', ', $extendedTypes)));
}
@@ -76,11 +80,17 @@ public function getTypeExtensions($name)
return $extensions;
}
- public function hasTypeExtensions($name)
+ /**
+ * {@inheritdoc}
+ */
+ public function hasTypeExtensions(string $name)
{
return isset($this->typeExtensionServices[$name]);
}
+ /**
+ * {@inheritdoc}
+ */
public function getTypeGuesser()
{
if (!$this->guesserLoaded) {
diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
deleted file mode 100644
index a510752e11914..0000000000000
--- a/src/Symfony/Component/Form/Extension/Templating/TemplatingExtension.php
+++ /dev/null
@@ -1,37 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\Extension\Templating;
-
-@trigger_error('The '.TemplatingExtension::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.', E_USER_DEPRECATED);
-
-use Symfony\Bundle\FrameworkBundle\Templating\Helper\FormHelper;
-use Symfony\Component\Form\AbstractExtension;
-use Symfony\Component\Form\FormRenderer;
-use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
-use Symfony\Component\Templating\PhpEngine;
-
-/**
- * Integrates the Templating component with the Form library.
- *
- * @author Bernhard Schussek
- *
- * @deprecated since version 4.3, to be removed in 5.0; use Twig instead.
- */
-class TemplatingExtension extends AbstractExtension
-{
- public function __construct(PhpEngine $engine, CsrfTokenManagerInterface $csrfTokenManager = null, array $defaultThemes = [])
- {
- $engine->addHelpers([
- new FormHelper(new FormRenderer(new TemplatingRendererEngine($engine, $defaultThemes), $csrfTokenManager)),
- ]);
- }
-}
diff --git a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php b/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
deleted file mode 100644
index 1316e6a165a6d..0000000000000
--- a/src/Symfony/Component/Form/Extension/Templating/TemplatingRendererEngine.php
+++ /dev/null
@@ -1,128 +0,0 @@
-
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Form\Extension\Templating;
-
-@trigger_error('The '.TemplatingRendererEngine::class.' class is deprecated since version 4.3 and will be removed in 5.0; use Twig instead.', E_USER_DEPRECATED);
-
-use Symfony\Component\Form\AbstractRendererEngine;
-use Symfony\Component\Form\FormView;
-use Symfony\Component\Templating\EngineInterface;
-
-/**
- * @author Bernhard Schussek
- *
- * @deprecated since version 4.3, to be removed in 5.0; use Twig instead.
- */
-class TemplatingRendererEngine extends AbstractRendererEngine
-{
- private $engine;
-
- public function __construct(EngineInterface $engine, array $defaultThemes = [])
- {
- parent::__construct($defaultThemes);
-
- $this->engine = $engine;
- }
-
- /**
- * {@inheritdoc}
- */
- public function renderBlock(FormView $view, $resource, $blockName, array $variables = [])
- {
- return trim($this->engine->render($resource, $variables));
- }
-
- /**
- * Loads the cache with the resource for a given block name.
- *
- * This implementation tries to load as few blocks as possible, since each block
- * is represented by a template on the file system.
- *
- * @see getResourceForBlock()
- *
- * @param string $cacheKey The cache key of the form view
- * @param FormView $view The form view for finding the applying themes
- * @param string $blockName The name of the block to load
- *
- * @return bool True if the resource could be loaded, false otherwise
- */
- protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName)
- {
- // Recursively try to find the block in the themes assigned to $view,
- // then of its parent form, then of the parent form of the parent and so on.
- // When the root form is reached in this recursion, also the default
- // themes are taken into account.
-
- // Check each theme whether it contains the searched block
- if (isset($this->themes[$cacheKey])) {
- for ($i = \count($this->themes[$cacheKey]) - 1; $i >= 0; --$i) {
- if ($this->loadResourceFromTheme($cacheKey, $blockName, $this->themes[$cacheKey][$i])) {
- return true;
- }
- }
- }
-
- // Check the default themes once we reach the root form without success
- if (!$view->parent) {
- if (!isset($this->useDefaultThemes[$cacheKey]) || $this->useDefaultThemes[$cacheKey]) {
- for ($i = \count($this->defaultThemes) - 1; $i >= 0; --$i) {
- if ($this->loadResourceFromTheme($cacheKey, $blockName, $this->defaultThemes[$i])) {
- return true;
- }
- }
- }
- }
-
- // If we did not find anything in the themes of the current view, proceed
- // with the themes of the parent view
- if ($view->parent) {
- $parentCacheKey = $view->parent->vars[self::CACHE_KEY_VAR];
-
- if (!isset($this->resources[$parentCacheKey][$blockName])) {
- $this->loadResourceForBlockName($parentCacheKey, $view->parent, $blockName);
- }
-
- // If a template exists in the parent themes, cache that template
- // for the current theme as well to speed up further accesses
- if ($this->resources[$parentCacheKey][$blockName]) {
- $this->resources[$cacheKey][$blockName] = $this->resources[$parentCacheKey][$blockName];
-
- return true;
- }
- }
-
- // Cache that we didn't find anything to speed up further accesses
- $this->resources[$cacheKey][$blockName] = false;
-
- return false;
- }
-
- /**
- * Tries to load the resource for a block from a theme.
- *
- * @param string $cacheKey The cache key for storing the resource
- * @param string $blockName The name of the block to load a resource for
- * @param mixed $theme The theme to load the block from
- *
- * @return bool True if the resource could be loaded, false otherwise
- */
- protected function loadResourceFromTheme($cacheKey, $blockName, $theme)
- {
- if ($this->engine->exists($templateName = $theme.':'.$blockName.'.html.php')) {
- $this->resources[$cacheKey][$blockName] = $templateName;
-
- return true;
- }
-
- return false;
- }
-}
diff --git a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
index c5b71f903c16d..21e4fe20eaf69 100644
--- a/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
+++ b/src/Symfony/Component/Form/Extension/Validator/Type/UploadValidatorExtension.php
@@ -15,7 +15,6 @@
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\OptionsResolver\Options;
use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Translation\TranslatorInterface as LegacyTranslatorInterface;
use Symfony\Contracts\Translation\TranslatorInterface;
/**
@@ -27,14 +26,8 @@ class UploadValidatorExtension extends AbstractTypeExtension
private $translator;
private $translationDomain;
- /**
- * @param TranslatorInterface $translator
- */
- public function __construct($translator, string $translationDomain = null)
+ public function __construct(TranslatorInterface $translator, string $translationDomain = null)
{
- if (!$translator instanceof LegacyTranslatorInterface && !$translator instanceof TranslatorInterface) {
- throw new \TypeError(sprintf('Argument 1 passed to %s() must be an instance of %s, %s given.', __METHOD__, TranslatorInterface::class, \is_object($translator) ? \get_class($translator) : \gettype($translator)));
- }
$this->translator = $translator;
$this->translationDomain = $translationDomain;
}
diff --git a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
index 4e0443dd3b680..2dbe47851d6b8 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ValidatorTypeGuesser.php
@@ -31,7 +31,7 @@ public function __construct(MetadataFactoryInterface $metadataFactory)
/**
* {@inheritdoc}
*/
- public function guessType($class, $property)
+ public function guessType(string $class, string $property)
{
return $this->guess($class, $property, function (Constraint $constraint) {
return $this->guessTypeForConstraint($constraint);
@@ -41,7 +41,7 @@ public function guessType($class, $property)
/**
* {@inheritdoc}
*/
- public function guessRequired($class, $property)
+ public function guessRequired(string $class, string $property)
{
return $this->guess($class, $property, function (Constraint $constraint) {
return $this->guessRequiredForConstraint($constraint);
@@ -53,7 +53,7 @@ public function guessRequired($class, $property)
/**
* {@inheritdoc}
*/
- public function guessMaxLength($class, $property)
+ public function guessMaxLength(string $class, string $property)
{
return $this->guess($class, $property, function (Constraint $constraint) {
return $this->guessMaxLengthForConstraint($constraint);
@@ -63,7 +63,7 @@ public function guessMaxLength($class, $property)
/**
* {@inheritdoc}
*/
- public function guessPattern($class, $property)
+ public function guessPattern(string $class, string $property)
{
return $this->guess($class, $property, function (Constraint $constraint) {
return $this->guessPatternForConstraint($constraint);
@@ -251,8 +251,6 @@ public function guessPatternForConstraint(Constraint $constraint)
* Iterates over the constraints of a property, executes a constraints on
* them and returns the best guess.
*
- * @param string $class The class to read the constraints from
- * @param string $property The property for which to find constraints
* @param \Closure $closure The closure that returns a guess
* for a given constraint
* @param mixed $defaultValue The default value assumed if no other value
@@ -260,7 +258,7 @@ public function guessPatternForConstraint(Constraint $constraint)
*
* @return Guess|null The guessed value with the highest confidence
*/
- protected function guess($class, $property, \Closure $closure, $defaultValue = null)
+ protected function guess(string $class, string $property, \Closure $closure, $defaultValue = null)
{
$guesses = [];
$classMetadata = $this->metadataFactory->getMetadataFor($class);
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
index 78be91c8b8ba3..1891be0c441e6 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/MappingRule.php
@@ -44,11 +44,9 @@ public function getOrigin()
* If the rule matches, the form mapped by the rule is returned.
* Otherwise this method returns false.
*
- * @param string $propertyPath The property path to match against the rule
- *
* @return FormInterface|null The mapped form or null
*/
- public function match($propertyPath)
+ public function match(string $propertyPath)
{
return $propertyPath === $this->propertyPath ? $this->getTarget() : null;
}
@@ -56,11 +54,9 @@ public function match($propertyPath)
/**
* Matches a property path against a prefix of the rule path.
*
- * @param string $propertyPath The property path to match against the rule
- *
* @return bool Whether the property path is a prefix of the rule or not
*/
- public function isPrefix($propertyPath)
+ public function isPrefix(string $propertyPath)
{
$length = \strlen($propertyPath);
$prefix = substr($this->propertyPath, 0, $length);
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
index 15fd049372002..22ec19c9945eb 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapper.php
@@ -32,7 +32,7 @@ class ViolationMapper implements ViolationMapperInterface
/**
* {@inheritdoc}
*/
- public function mapViolation(ConstraintViolation $violation, FormInterface $form, $allowNonSynchronized = false)
+ public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false)
{
$this->allowNonSynchronized = $allowNonSynchronized;
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
index b17abc2cc183e..57ed1c84ce909 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationMapperInterface.php
@@ -25,5 +25,5 @@ interface ViolationMapperInterface
*
* @param bool $allowNonSynchronized Whether to allow mapping to non-synchronized forms
*/
- public function mapViolation(ConstraintViolation $violation, FormInterface $form, $allowNonSynchronized = false);
+ public function mapViolation(ConstraintViolation $violation, FormInterface $form, bool $allowNonSynchronized = false);
}
diff --git a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
index 343cd6dae6bfd..7c0f1631ddcee 100644
--- a/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
+++ b/src/Symfony/Component/Form/Extension/Validator/ViolationMapper/ViolationPath.php
@@ -160,7 +160,7 @@ public function getElements()
/**
* {@inheritdoc}
*/
- public function getElement($index)
+ public function getElement(int $index)
{
if (!isset($this->elements[$index])) {
throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index));
@@ -172,7 +172,7 @@ public function getElement($index)
/**
* {@inheritdoc}
*/
- public function isProperty($index)
+ public function isProperty(int $index)
{
if (!isset($this->isIndex[$index])) {
throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index));
@@ -184,7 +184,7 @@ public function isProperty($index)
/**
* {@inheritdoc}
*/
- public function isIndex($index)
+ public function isIndex(int $index)
{
if (!isset($this->isIndex[$index])) {
throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index));
@@ -203,13 +203,11 @@ public function isIndex($index)
* In this example, "address" and "office" map to forms, while
* "street does not.
*
- * @param int $index The element index
- *
* @return bool Whether the element maps to a form
*
* @throws OutOfBoundsException if the offset is invalid
*/
- public function mapsForm($index)
+ public function mapsForm(int $index)
{
if (!isset($this->mapsForm[$index])) {
throw new OutOfBoundsException(sprintf('The index %s is not within the violation path', $index));
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
index c4f0413dd350c..c933214ccf91f 100644
--- a/src/Symfony/Component/Form/Form.php
+++ b/src/Symfony/Component/Form/Form.php
@@ -11,7 +11,6 @@
namespace Symfony\Component\Form;
-use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
use Symfony\Component\Form\Event\PostSetDataEvent;
use Symfony\Component\Form\Event\PostSubmitEvent;
use Symfony\Component\Form\Event\PreSetDataEvent;
@@ -334,7 +333,7 @@ public function setData($modelData)
}
$this->lockSetData = true;
- $dispatcher = LegacyEventDispatcherProxy::decorate($this->config->getEventDispatcher());
+ $dispatcher = $this->config->getEventDispatcher();
// Hook to change content of the model data before transformation and mapping children
if ($dispatcher->hasListeners(FormEvents::PRE_SET_DATA)) {
@@ -498,7 +497,7 @@ public function handleRequest($request = null)
/**
* {@inheritdoc}
*/
- public function submit($submittedData, $clearMissing = true)
+ public function submit($submittedData, bool $clearMissing = true)
{
if ($this->submitted) {
throw new AlreadySubmittedException('A form can only be submitted once');
@@ -541,7 +540,7 @@ public function submit($submittedData, $clearMissing = true)
$this->transformationFailure = new TransformationFailedException('Submitted data was expected to be text or number, array given.');
}
- $dispatcher = LegacyEventDispatcherProxy::decorate($this->config->getEventDispatcher());
+ $dispatcher = $this->config->getEventDispatcher();
$modelData = null;
$normData = null;
@@ -727,6 +726,18 @@ public function isEmpty()
}
}
+ if (!method_exists($this->config, 'getIsEmptyCallback')) {
+ trigger_deprecation('symfony/form', '5.1', 'Not implementing the "%s::getIsEmptyCallback()" method in "%s" is deprecated.', FormConfigInterface::class, \get_class($this->config));
+
+ $isEmptyCallback = null;
+ } else {
+ $isEmptyCallback = $this->config->getIsEmptyCallback();
+ }
+
+ if (null !== $isEmptyCallback) {
+ return $isEmptyCallback($this->modelData);
+ }
+
return FormUtil::isEmpty($this->modelData) ||
// arrays, countables
((\is_array($this->modelData) || $this->modelData instanceof \Countable) && 0 === \count($this->modelData)) ||
@@ -767,7 +778,7 @@ public function getClickedButton()
/**
* {@inheritdoc}
*/
- public function getErrors($deep = false, $flatten = true)
+ public function getErrors(bool $deep = false, bool $flatten = true)
{
$errors = $this->errors;
@@ -830,7 +841,7 @@ public function all()
/**
* {@inheritdoc}
*/
- public function add($child, $type = null, array $options = [])
+ public function add($child, string $type = null, array $options = [])
{
if ($this->submitted) {
throw new AlreadySubmittedException('You cannot add children to a submitted form');
@@ -901,7 +912,7 @@ public function add($child, $type = null, array $options = [])
/**
* {@inheritdoc}
*/
- public function remove($name)
+ public function remove(string $name)
{
if ($this->submitted) {
throw new AlreadySubmittedException('You cannot remove children from a submitted form');
@@ -921,7 +932,7 @@ public function remove($name)
/**
* {@inheritdoc}
*/
- public function has($name)
+ public function has(string $name)
{
return isset($this->children[$name]);
}
@@ -929,7 +940,7 @@ public function has($name)
/**
* {@inheritdoc}
*/
- public function get($name)
+ public function get(string $name)
{
if (isset($this->children[$name])) {
return $this->children[$name];
diff --git a/src/Symfony/Component/Form/FormBuilder.php b/src/Symfony/Component/Form/FormBuilder.php
index e9c7213a98944..53fbcb51963c2 100644
--- a/src/Symfony/Component/Form/FormBuilder.php
+++ b/src/Symfony/Component/Form/FormBuilder.php
@@ -47,7 +47,7 @@ public function __construct(?string $name, ?string $dataClass, EventDispatcherIn
/**
* {@inheritdoc}
*/
- public function add($child, $type = null, array $options = [])
+ public function add($child, string $type = null, array $options = [])
{
if ($this->locked) {
throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -80,7 +80,7 @@ public function add($child, $type = null, array $options = [])
/**
* {@inheritdoc}
*/
- public function create($name, $type = null, array $options = [])
+ public function create($name, string $type = null, array $options = [])
{
if ($this->locked) {
throw new BadMethodCallException('FormBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
diff --git a/src/Symfony/Component/Form/FormBuilderInterface.php b/src/Symfony/Component/Form/FormBuilderInterface.php
index 902fa0f9505e5..05c565bb6b472 100644
--- a/src/Symfony/Component/Form/FormBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormBuilderInterface.php
@@ -24,11 +24,10 @@ interface FormBuilderInterface extends \Traversable, \Countable, FormConfigBuild
* object hierarchy.
*
* @param string|FormBuilderInterface $child
- * @param string|null $type
*
* @return self
*/
- public function add($child, $type = null, array $options = []);
+ public function add($child, string $type = null, array $options = []);
/**
* Creates a form builder.
@@ -38,36 +37,30 @@ public function add($child, $type = null, array $options = []);
*
* @return self
*/
- public function create($name, $type = null, array $options = []);
+ public function create(string $name, string $type = null, array $options = []);
/**
* Returns a child by name.
*
- * @param string $name The name of the child
- *
* @return self
*
* @throws Exception\InvalidArgumentException if the given child does not exist
*/
- public function get($name);
+ public function get(string $name);
/**
* Removes the field with the given name.
*
- * @param string $name
- *
* @return self
*/
- public function remove($name);
+ public function remove(string $name);
/**
* Returns whether a field with the given name exists.
*
- * @param string $name
- *
* @return bool
*/
- public function has($name);
+ public function has(string $name);
/**
* Returns the children.
diff --git a/src/Symfony/Component/Form/FormConfigBuilder.php b/src/Symfony/Component/Form/FormConfigBuilder.php
index dab8bd56cb2ea..7e7b40edacabb 100644
--- a/src/Symfony/Component/Form/FormConfigBuilder.php
+++ b/src/Symfony/Component/Form/FormConfigBuilder.php
@@ -16,7 +16,6 @@
use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
use Symfony\Component\Form\Exception\BadMethodCallException;
use Symfony\Component\Form\Exception\InvalidArgumentException;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
use Symfony\Component\PropertyAccess\PropertyPath;
use Symfony\Component\PropertyAccess\PropertyPathInterface;
@@ -103,6 +102,7 @@ class FormConfigBuilder implements FormConfigBuilderInterface
private $autoInitialize = false;
private $options;
+ private $isEmptyCallback;
/**
* Creates an empty form configuration.
@@ -130,7 +130,7 @@ public function __construct(?string $name, ?string $dataClass, EventDispatcherIn
/**
* {@inheritdoc}
*/
- public function addEventListener($eventName, $listener, $priority = 0)
+ public function addEventListener(string $eventName, callable $listener, int $priority = 0)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -158,7 +158,7 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber)
/**
* {@inheritdoc}
*/
- public function addViewTransformer(DataTransformerInterface $viewTransformer, $forcePrepend = false)
+ public function addViewTransformer(DataTransformerInterface $viewTransformer, bool $forcePrepend = false)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -190,7 +190,7 @@ public function resetViewTransformers()
/**
* {@inheritdoc}
*/
- public function addModelTransformer(DataTransformerInterface $modelTransformer, $forceAppend = false)
+ public function addModelTransformer(DataTransformerInterface $modelTransformer, bool $forceAppend = false)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -354,7 +354,7 @@ public function getAttributes()
/**
* {@inheritdoc}
*/
- public function hasAttribute($name)
+ public function hasAttribute(string $name)
{
return \array_key_exists($name, $this->attributes);
}
@@ -362,7 +362,7 @@ public function hasAttribute($name)
/**
* {@inheritdoc}
*/
- public function getAttribute($name, $default = null)
+ public function getAttribute(string $name, $default = null)
{
return \array_key_exists($name, $this->attributes) ? $this->attributes[$name] : $default;
}
@@ -449,7 +449,7 @@ public function getOptions()
/**
* {@inheritdoc}
*/
- public function hasOption($name)
+ public function hasOption(string $name)
{
return \array_key_exists($name, $this->options);
}
@@ -457,7 +457,7 @@ public function hasOption($name)
/**
* {@inheritdoc}
*/
- public function getOption($name, $default = null)
+ public function getOption(string $name, $default = null)
{
return \array_key_exists($name, $this->options) ? $this->options[$name] : $default;
}
@@ -465,7 +465,15 @@ public function getOption($name, $default = null)
/**
* {@inheritdoc}
*/
- public function setAttribute($name, $value)
+ public function getIsEmptyCallback(): ?callable
+ {
+ return $this->isEmptyCallback;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function setAttribute(string $name, $value)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
@@ -507,13 +515,13 @@ public function setDataMapper(DataMapperInterface $dataMapper = null)
/**
* {@inheritdoc}
*/
- public function setDisabled($disabled)
+ public function setDisabled(bool $disabled)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->disabled = (bool) $disabled;
+ $this->disabled = $disabled;
return $this;
}
@@ -535,13 +543,13 @@ public function setEmptyData($emptyData)
/**
* {@inheritdoc}
*/
- public function setErrorBubbling($errorBubbling)
+ public function setErrorBubbling(bool $errorBubbling)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->errorBubbling = (bool) $errorBubbling;
+ $this->errorBubbling = $errorBubbling;
return $this;
}
@@ -549,13 +557,13 @@ public function setErrorBubbling($errorBubbling)
/**
* {@inheritdoc}
*/
- public function setRequired($required)
+ public function setRequired(bool $required)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->required = (bool) $required;
+ $this->required = $required;
return $this;
}
@@ -581,13 +589,13 @@ public function setPropertyPath($propertyPath)
/**
* {@inheritdoc}
*/
- public function setMapped($mapped)
+ public function setMapped(bool $mapped)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->mapped = (bool) $mapped;
+ $this->mapped = $mapped;
return $this;
}
@@ -595,13 +603,13 @@ public function setMapped($mapped)
/**
* {@inheritdoc}
*/
- public function setByReference($byReference)
+ public function setByReference(bool $byReference)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->byReference = (bool) $byReference;
+ $this->byReference = $byReference;
return $this;
}
@@ -609,13 +617,13 @@ public function setByReference($byReference)
/**
* {@inheritdoc}
*/
- public function setInheritData($inheritData)
+ public function setInheritData(bool $inheritData)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->inheritData = (bool) $inheritData;
+ $this->inheritData = $inheritData;
return $this;
}
@@ -623,13 +631,13 @@ public function setInheritData($inheritData)
/**
* {@inheritdoc}
*/
- public function setCompound($compound)
+ public function setCompound(bool $compound)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->compound = (bool) $compound;
+ $this->compound = $compound;
return $this;
}
@@ -665,13 +673,13 @@ public function setData($data)
/**
* {@inheritdoc}
*/
- public function setDataLocked($locked)
+ public function setDataLocked(bool $locked)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->dataLocked = (bool) $locked;
+ $this->dataLocked = $locked;
return $this;
}
@@ -693,13 +701,13 @@ public function setFormFactory(FormFactoryInterface $formFactory)
/**
* {@inheritdoc}
*/
- public function setAction($action)
+ public function setAction(string $action)
{
if ($this->locked) {
throw new BadMethodCallException('The config builder cannot be modified anymore.');
}
- $this->action = (string) $action;
+ $this->action = $action;
return $this;
}
@@ -707,7 +715,7 @@ public function setAction($action)
/**
* {@inheritdoc}
*/
- public function setMethod($method)
+ public function setMethod(string $method)
{
if ($this->locked) {
throw new BadMethodCallException('The config builder cannot be modified anymore.');
@@ -735,13 +743,13 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler)
/**
* {@inheritdoc}
*/
- public function setAutoInitialize($initialize)
+ public function setAutoInitialize(bool $initialize)
{
if ($this->locked) {
throw new BadMethodCallException('FormConfigBuilder methods cannot be accessed anymore once the builder is turned into a FormConfigInterface instance.');
}
- $this->autoInitialize = (bool) $initialize;
+ $this->autoInitialize = $initialize;
return $this;
}
@@ -762,22 +770,25 @@ public function getFormConfig()
return $config;
}
+ /**
+ * {@inheritdoc}
+ */
+ public function setIsEmptyCallback(?callable $isEmptyCallback)
+ {
+ $this->isEmptyCallback = $isEmptyCallback;
+
+ return $this;
+ }
+
/**
* Validates whether the given variable is a valid form name.
*
- * @param string|null $name The tested form name
- *
- * @throws UnexpectedTypeException if the name is not a string or an integer
* @throws InvalidArgumentException if the name contains invalid characters
*
- * @internal since Symfony 4.4
+ * @internal
*/
- public static function validateName($name)
+ final public static function validateName(?string $name)
{
- if (null !== $name && !\is_string($name) && !\is_int($name)) {
- throw new UnexpectedTypeException($name, 'string or null');
- }
-
if (!self::isValidName($name)) {
throw new InvalidArgumentException(sprintf('The name "%s" contains illegal characters. Names should start with a letter, digit or underscore and only contain letters, digits, numbers, underscores ("_"), hyphens ("-") and colons (":").', $name));
}
@@ -792,10 +803,8 @@ public static function validateName($name)
* * starts with a letter, digit or underscore
* * contains only letters, digits, numbers, underscores ("_"),
* hyphens ("-") and colons (":")
- *
- * @final since Symfony 4.4
*/
- public static function isValidName(?string $name): bool
+ final public static function isValidName(?string $name): bool
{
return '' === $name || null === $name || preg_match('/^[a-zA-Z0-9_][a-zA-Z0-9_\-:]*$/D', $name);
}
diff --git a/src/Symfony/Component/Form/FormConfigBuilderInterface.php b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
index 59da9520ba109..d9064c1434a00 100644
--- a/src/Symfony/Component/Form/FormConfigBuilderInterface.php
+++ b/src/Symfony/Component/Form/FormConfigBuilderInterface.php
@@ -16,21 +16,21 @@
/**
* @author Bernhard Schussek
+ *
+ * @method $this setIsEmptyCallback(callable|null $isEmptyCallback) Sets the callback that will be called to determine if the model data of the form is empty or not - not implementing it is deprecated since Symfony 5.1
*/
interface FormConfigBuilderInterface extends FormConfigInterface
{
/**
* Adds an event listener to an event on this form.
*
- * @param string $eventName The name of the event to listen to
- * @param callable $listener The listener to execute
- * @param int $priority The priority of the listener. Listeners
- * with a higher priority are called before
- * listeners with a lower priority.
+ * @param int $priority The priority of the listener. Listeners
+ * with a higher priority are called before
+ * listeners with a lower priority.
*
* @return $this The configuration object
*/
- public function addEventListener($eventName, $listener, $priority = 0);
+ public function addEventListener(string $eventName, callable $listener, int $priority = 0);
/**
* Adds an event subscriber for events on this form.
@@ -51,7 +51,7 @@ public function addEventSubscriber(EventSubscriberInterface $subscriber);
*
* @return $this The configuration object
*/
- public function addViewTransformer(DataTransformerInterface $viewTransformer, $forcePrepend = false);
+ public function addViewTransformer(DataTransformerInterface $viewTransformer, bool $forcePrepend = false);
/**
* Clears the view transformers.
@@ -72,7 +72,7 @@ public function resetViewTransformers();
*
* @return $this The configuration object
*/
- public function addModelTransformer(DataTransformerInterface $modelTransformer, $forceAppend = false);
+ public function addModelTransformer(DataTransformerInterface $modelTransformer, bool $forceAppend = false);
/**
* Clears the normalization transformers.
@@ -84,12 +84,11 @@ public function resetModelTransformers();
/**
* Sets the value for an attribute.
*
- * @param string $name The name of the attribute
- * @param mixed $value The value of the attribute
+ * @param mixed $value The value of the attribute
*
* @return $this The configuration object
*/
- public function setAttribute($name, $value);
+ public function setAttribute(string $name, $value);
/**
* Sets the attributes.
@@ -108,11 +107,9 @@ public function setDataMapper(DataMapperInterface $dataMapper = null);
/**
* Sets whether the form is disabled.
*
- * @param bool $disabled Whether the form is disabled
- *
* @return $this The configuration object
*/
- public function setDisabled($disabled);
+ public function setDisabled(bool $disabled);
/**
* Sets the data used for the client data when no value is submitted.
@@ -126,20 +123,16 @@ public function setEmptyData($emptyData);
/**
* Sets whether errors bubble up to the parent.
*
- * @param bool $errorBubbling
- *
* @return $this The configuration object
*/
- public function setErrorBubbling($errorBubbling);
+ public function setErrorBubbling(bool $errorBubbling);
/**
* Sets whether this field is required to be filled out when submitted.
*
- * @param bool $required
- *
* @return $this The configuration object
*/
- public function setRequired($required);
+ public function setRequired(bool $required);
/**
* Sets the property path that the form should be mapped to.
@@ -155,40 +148,32 @@ public function setPropertyPath($propertyPath);
* Sets whether the form should be mapped to an element of its
* parent's data.
*
- * @param bool $mapped Whether the form should be mapped
- *
* @return $this The configuration object
*/
- public function setMapped($mapped);
+ public function setMapped(bool $mapped);
/**
* Sets whether the form's data should be modified by reference.
*
- * @param bool $byReference Whether the data should be modified by reference
- *
* @return $this The configuration object
*/
- public function setByReference($byReference);
+ public function setByReference(bool $byReference);
/**
* Sets whether the form should read and write the data of its parent.
*
- * @param bool $inheritData Whether the form should inherit its parent's data
- *
* @return $this The configuration object
*/
- public function setInheritData($inheritData);
+ public function setInheritData(bool $inheritData);
/**
* Sets whether the form should be compound.
*
- * @param bool $compound Whether the form should be compound
- *
* @return $this The configuration object
*
* @see FormConfigInterface::getCompound()
*/
- public function setCompound($compound);
+ public function setCompound(bool $compound);
/**
* Sets the resolved type.
@@ -216,11 +201,9 @@ public function setData($data);
* It means data passed to a factory method or mapped from the
* parent will be ignored.
*
- * @param bool $locked Whether to lock the default configured data
- *
* @return $this The configuration object
*/
- public function setDataLocked($locked);
+ public function setDataLocked(bool $locked);
/**
* Sets the form factory used for creating new forms.
@@ -230,20 +213,16 @@ public function setFormFactory(FormFactoryInterface $formFactory);
/**
* Sets the target URL of the form.
*
- * @param string $action The target URL of the form
- *
* @return $this The configuration object
*/
- public function setAction($action);
+ public function setAction(string $action);
/**
* Sets the HTTP method used by the form.
*
- * @param string $method The HTTP method of the form
- *
* @return $this The configuration object
*/
- public function setMethod($method);
+ public function setMethod(string $method);
/**
* Sets the request handler used by the form.
@@ -264,7 +243,7 @@ public function setRequestHandler(RequestHandlerInterface $requestHandler);
*
* @return $this The configuration object
*/
- public function setAutoInitialize($initialize);
+ public function setAutoInitialize(bool $initialize);
/**
* Builds and returns the form configuration.
diff --git a/src/Symfony/Component/Form/FormConfigInterface.php b/src/Symfony/Component/Form/FormConfigInterface.php
index 7dbda33033b55..e76986c4fb6b7 100644
--- a/src/Symfony/Component/Form/FormConfigInterface.php
+++ b/src/Symfony/Component/Form/FormConfigInterface.php
@@ -18,6 +18,8 @@
* The configuration of a {@link Form} object.
*
* @author Bernhard Schussek