From 0c0cefa65f03ee748a9e581158017dedf7e39e00 Mon Sep 17 00:00:00 2001 From: Jesse Rushlow Date: Thu, 2 Apr 2020 09:23:30 -0400 Subject: [PATCH] check for getDeprecation not definition... --- .docker | 1 + .gitmodules | 3 +++ DependencyInjection/Configuration.php | 8 ++++---- 3 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 .docker create mode 100644 .gitmodules diff --git a/.docker b/.docker new file mode 160000 index 000000000..795b0f6b7 --- /dev/null +++ b/.docker @@ -0,0 +1 @@ +Subproject commit 795b0f6b73866de34e54dc54a298925d9c635bef diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..72595afd7 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule ".docker"] + path = .docker + url = https://github.com/jrushlow/docker-symfony diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index 5b2a1d1e5..3e82d561e 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -695,15 +695,15 @@ private function getAutoGenerateModes() : array * Returns the correct deprecation param's as an array for setDeprecated. * * Symfony/Config v5.1 introduces a deprecation notice when calling - * setDeprecation() with less than 3 args and the getDefinition method was - * introduced at the same time. By checking if getDefinition() exists, + * setDeprecation() with less than 3 args and the getDeprecation method was + * introduced at the same time. By checking if getDeprecation() exists, * we can determine the correct param count to use when calling setDeprecated. */ private function getCommentedParamDeprecationMsg() : array { - $msg = 'The doctrine-bundle type commenting features removed; the corresponding config parameter was deprecated in 2.0 and will be dropped in 3.0.'; + $msg = 'The doctrine-bundle type commenting features were removed; the corresponding config parameter was deprecated in 2.0 and will be dropped in 3.0.'; - if (method_exists(BaseNode::class, 'getDefinition')) { + if (method_exists(BaseNode::class, 'getDeprecation')) { return [ 'doctrine/doctrine-bundle', '2.0',