summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--3563.patch23
-rw-r--r--php-twig.spec11
2 files changed, 32 insertions, 2 deletions
diff --git a/3563.patch b/3563.patch
new file mode 100644
index 0000000..dcb0abb
--- /dev/null
+++ b/3563.patch
@@ -0,0 +1,23 @@
+From 61df934a7ea2ed0c9860bf62c0c68f5318d99926 Mon Sep 17 00:00:00 2001
+From: Remi Collet <fedora@famillecollet.com>
+Date: Wed, 22 Sep 2021 11:33:46 +0200
+Subject: [PATCH] Missing Environment and LoaderInterface
+
+---
+ tests/escapingTest.php | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tests/escapingTest.php b/tests/escapingTest.php
+index a35ce9ab1..6ebb7b7e3 100644
+--- a/tests/escapingTest.php
++++ b/tests/escapingTest.php
+@@ -2,6 +2,9 @@
+
+ namespace Twig\Tests;
+
++use Twig\Environment;
++use Twig\Loader\LoaderInterface;
++
+ /**
+ * This class is adapted from code coming from Zend Framework.
+ *
diff --git a/php-twig.spec b/php-twig.spec
index b57b9db..8fc2888 100644
--- a/php-twig.spec
+++ b/php-twig.spec
@@ -16,8 +16,8 @@
%global github_owner twigphp
%global github_name Twig
-%global github_version 1.44.4
-%global github_commit 4d400421528e9fa40caaffcf7824c172526dd99d
+%global github_version 1.44.5
+%global github_commit dd4353357c5a116322e92a00d16043a31881a81e
%global github_short %(c=%{github_commit}; echo ${c:0:7})
# Lib
@@ -40,6 +40,8 @@ URL: http://twig.sensiolabs.org
Source0: %{name}-%{github_version}-%{github_short}.tgz
Source1: makesrc.sh
+Patch0: https://patch-diff.githubusercontent.com/raw/twigphp/Twig/pull/3563.patch
+
BuildArch: noarch
# as we use phpunit9 (for assertFileDoesNotExist)
BuildRequires: php-devel >= 7.3
@@ -123,6 +125,7 @@ Autoloader: %{phpdir}/Twig/autoload.php
%prep
%setup -qn %{github_name}-%{github_commit}
+%patch0 -p1
: Move the PSR-4 compat library
mv src lib/Twig/psr4
@@ -190,6 +193,10 @@ exit $RETURN_CODE
%changelog
+* Wed Sep 22 2021 Remi Collet <remi@remirepo.net> - 1.44.5-1
+- update to 1.44.5
+- add patch for test suite from https://github.com/twigphp/Twig/pull/3563
+
* Mon May 17 2021 Remi Collet <remi@remirepo.net> - 1.44.4-1
- update to 1.44.4