From 32f8a43319ee5c945f1184be308934444e669bcb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 1 Jan 2023 09:42:51 +0100 Subject: [PATCH 1/4] Bump LICENSE year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 9c907a4..5c7ba05 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019-2022 Fabien Potencier +Copyright (c) 2019-2023 Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 9964cb0b3721b60d041d27dbf37b470ad2ad610e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Wed, 8 Feb 2023 08:44:48 +0100 Subject: [PATCH 2/4] Fix LICENSE year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 5c7ba05..f37c76b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2019-2023 Fabien Potencier +Copyright (c) 2019-present Fabien Potencier Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2ef589ce1a5e130d3d42b927377b1e0d4bcd404f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Thu, 9 Feb 2023 07:45:16 +0100 Subject: [PATCH 3/4] Bump version to 3.6 --- composer.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/composer.json b/composer.json index 3e18370..b7f739b 100644 --- a/composer.json +++ b/composer.json @@ -36,10 +36,5 @@ "exclude-from-classmap": [ "/Tests/" ] - }, - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } } } From 4a9674e775f49a9df5e26da66546e8f3364afe67 Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Fri, 14 Apr 2023 12:03:02 +0100 Subject: [PATCH 4/4] return annotation to suppress deprecation warning --- TwigExtraBundle.php | 1 + 1 file changed, 1 insertion(+) diff --git a/TwigExtraBundle.php b/TwigExtraBundle.php index 5ed32a8..a9c8f73 100644 --- a/TwigExtraBundle.php +++ b/TwigExtraBundle.php @@ -17,6 +17,7 @@ class TwigExtraBundle extends Bundle { + /** @return void */ public function build(ContainerBuilder $container) { parent::build($container);