From 4d400421528e9fa40caaffcf7824c172526dd99d Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 16 May 2021 14:11:20 +0200 Subject: [PATCH 1/6] Prepare the 1.44.4 release --- CHANGELOG | 2 +- src/Environment.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index c73272f08..372189a11 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -# 1.44.4 (2021-XX-XX) +# 1.44.4 (2021-05-16) * Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)" diff --git a/src/Environment.php b/src/Environment.php index ed09d1acf..5f686fabc 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -41,12 +41,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - public const VERSION = '1.44.4-DEV'; + public const VERSION = '1.44.4'; public const VERSION_ID = 14404; public const MAJOR_VERSION = 1; public const MINOR_VERSION = 44; public const RELEASE_VERSION = 4; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; protected $charset; protected $loader; From 577c5423d6da4b360fae7dde671a1ed760ccd263 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 16 May 2021 14:11:59 +0200 Subject: [PATCH 2/6] Bump version --- CHANGELOG | 4 ++++ src/Environment.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 372189a11..ff23e9b7f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +# 1.44.5 (2021-XX-XX) + + * n/a + # 1.44.4 (2021-05-16) * Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)" diff --git a/src/Environment.php b/src/Environment.php index 5f686fabc..14585ef56 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -41,12 +41,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - public const VERSION = '1.44.4'; - public const VERSION_ID = 14404; + public const VERSION = '1.44.5-DEV'; + public const VERSION_ID = 14405; public const MAJOR_VERSION = 1; public const MINOR_VERSION = 44; - public const RELEASE_VERSION = 4; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 5; + public const EXTRA_VERSION = 'DEV'; protected $charset; protected $loader; From 27e5cf2b05e3744accf39d4c68a3235d9966d260 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 16 May 2021 14:12:47 +0200 Subject: [PATCH 3/6] Prepare the 2.14.6 release --- CHANGELOG | 2 +- src/Environment.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5970a9b66..57f4ed31d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -# 2.14.6 (2021-XX-XX) +# 2.14.6 (2021-05-16) * Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)" diff --git a/src/Environment.php b/src/Environment.php index 0f164f8ab..df8ee44ba 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - public const VERSION = '2.14.6-DEV'; + public const VERSION = '2.14.6'; public const VERSION_ID = 21406; public const MAJOR_VERSION = 2; public const MINOR_VERSION = 14; public const RELEASE_VERSION = 6; - public const EXTRA_VERSION = 'DEV'; + public const EXTRA_VERSION = ''; private $charset; private $loader; From 80de1a14c0c71d9b74ea55fb3e23092630c1b710 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 16 May 2021 14:13:42 +0200 Subject: [PATCH 4/6] Bump version --- CHANGELOG | 4 ++++ src/Environment.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 57f4ed31d..26c16c185 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +# 2.14.7 (2021-XX-XX) + + * n/a + # 2.14.6 (2021-05-16) * Revert "Throw a proper exception when a template name is an absolute path (as it has never been supported)" diff --git a/src/Environment.php b/src/Environment.php index df8ee44ba..212521ee9 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - public const VERSION = '2.14.6'; - public const VERSION_ID = 21406; + public const VERSION = '2.14.7'; + public const VERSION_ID = 21407; public const MAJOR_VERSION = 2; public const MINOR_VERSION = 14; - public const RELEASE_VERSION = 6; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 7; + public const EXTRA_VERSION = 'DEV'; private $charset; private $loader; From bd70652057ee311b3762d3b903c4193543ebd5d7 Mon Sep 17 00:00:00 2001 From: romainmenke Date: Tue, 18 May 2021 12:02:16 +0200 Subject: [PATCH 5/6] fix file permissions --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 3a3ce6e7c..a1e83d16f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ /tests export-ignore /phpunit.xml.dist export-ignore +./drupal_test.sh export-ignore From 2fa8bce914365e6abcc5d42f7203396bb14d3bb9 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 18 May 2021 13:09:01 +0200 Subject: [PATCH 6/6] Move Drupal test file to tests/ --- .gitattributes | 1 - .github/workflows/ci.yml | 2 +- drupal_test.sh => tests/drupal_test.sh | 0 3 files changed, 1 insertion(+), 2 deletions(-) rename drupal_test.sh => tests/drupal_test.sh (100%) mode change 100755 => 100644 diff --git a/.gitattributes b/.gitattributes index a1e83d16f..3a3ce6e7c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,2 @@ /tests export-ignore /phpunit.xml.dist export-ignore -./drupal_test.sh export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7878fd41d..a77b8a05a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,5 +94,5 @@ jobs: ini-values: memory_limit=-1 tools: composer:v2 - - run: ./drupal_test.sh + - run: bash ./tests/drupal_test.sh shell: "bash" diff --git a/drupal_test.sh b/tests/drupal_test.sh old mode 100755 new mode 100644 similarity index 100% rename from drupal_test.sh rename to tests/drupal_test.sh