From 1132af3d4d5624d63274548bab24de22b7e81f1c Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Sun, 16 Feb 2020 11:47:55 +0100 Subject: [PATCH 1/3] Do not ignore lexer subfolder for export as this contains source files and add smarty-lexer as a composer dev-dependency. --- .gitattributes | 1 - composer.json | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitattributes b/.gitattributes index 5013f4251..1e90448c6 100644 --- a/.gitattributes +++ b/.gitattributes @@ -11,6 +11,5 @@ /.travis.yml export-ignore /.gitignore export-ignore /.gitattributes export-ignore -/lexer/ export-ignore /utilities/ export-ignore /error_reporting.ini export-ignore diff --git a/composer.json b/composer.json index 28c392c95..889cb9444 100644 --- a/composer.json +++ b/composer.json @@ -40,6 +40,7 @@ } }, "require-dev": { - "phpunit/phpunit": "6.4.1" + "phpunit/phpunit": "6.4.1", + "smarty/smarty-lexer": "^3.1" } } From 24e694f29873dafb019314a3ba5451eec72a9c73 Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Mon, 13 Apr 2020 22:05:54 +0200 Subject: [PATCH 2/3] Remove unit tests etc from archive export --- .gitattributes | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1e90448c6..760ebd195 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,10 +6,14 @@ *.lex text eol=lf # exclude from git export -/travis.ini export-ignore -/myconfig.ini export-ignore -/.travis.yml export-ignore -/.gitignore export-ignore -/.gitattributes export-ignore +/tests export-ignore /utilities/ export-ignore + +/.gitattributes export-ignore +/.gitignore export-ignore +/.travis.yml export-ignore /error_reporting.ini export-ignore +/phpunit.sh export-ignore +/phpunit.xml export-ignore +/TODO.md export-ignore +/travis.ini export-ignore From a699556bfcf7d4eea29289a413d61368d197914e Mon Sep 17 00:00:00 2001 From: Simon Wisselink Date: Mon, 13 Apr 2020 22:07:02 +0200 Subject: [PATCH 3/3] Changelog --- change_log.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/change_log.txt b/change_log.txt index 10a0169cc..6380cf4de 100644 --- a/change_log.txt +++ b/change_log.txt @@ -1,4 +1,5 @@ - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506 + - fix files contained in git export archive for package maintainers https://github.com/smarty-php/smarty/issues/325 ===== 3.1.34 release ===== 05.11.2019 13.01.2020