From dd8090f33accf070e51b39f1168127483770e4f0 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 4 May 2023 07:39:17 +0200
Subject: update to 3.6.0

---
 composer.json  |  7 +------
 php-twig3.spec | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 18d3135..aeea640 100644
--- a/composer.json
+++ b/composer.json
@@ -30,7 +30,7 @@
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0",
-        "psr/container": "^1.0"
+        "psr/container": "^1.0|^2.0"
     },
     "autoload": {
         "psr-4" : {
@@ -41,10 +41,5 @@
         "psr-4" : {
             "Twig\\Tests\\" : "tests/"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.5-dev"
-        }
     }
 }
diff --git a/php-twig3.spec b/php-twig3.spec
index d94cc9b..67c7d8c 100644
--- a/php-twig3.spec
+++ b/php-twig3.spec
@@ -14,7 +14,7 @@
 
 %global github_owner     twigphp
 %global github_name      Twig
-%global github_commit    a6e0510cc793912b451fd40ab983a1d28f611c15
+%global github_commit    106c170d08e8415d78be2d16c3d057d0d108262b
 %global github_short     %(c=%{github_commit}; echo ${c:0:7})
 
 %global composer_vendor  twig
@@ -27,7 +27,7 @@
 %global phpdir      %{_datadir}/php
 
 Name:          php-%{composer_project}%{major}
-Version:       3.5.1
+Version:       3.6.0
 Release:       1%{?dist}
 Summary:       The flexible, fast, and secure template engine for PHP
 
@@ -45,10 +45,10 @@ BuildRequires: php-fedora-autoloader-devel
 BuildRequires: php(language) >= 7.3
 # remirepo:1
 %if 0%{?fedora} >= 30 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(psr/container) >= 1.0    with php-composer(psr/container) < 2)
+BuildRequires: (php-composer(psr/container) >= 1.0    with php-composer(psr/container) < 3)
 # remirepo:4
 %else
-BuildRequires: php-psr-container           <  2
+BuildRequires: php-psr-container           <  3
 BuildRequires: php-psr-container           >= 1.0
 %endif
 %global phpunit %{_bindir}/phpunit9
@@ -133,7 +133,10 @@ cat << 'EOF' | tee -a vendor/autoload.php
 require_once '%{buildroot}%{phpdir}/Twig%{major}/autoload.php';
 // Dependencies (require-dev)
 \Fedora\Autoloader\Dependencies::required([
-    '%{phpdir}/Psr/Container/autoload.php',
+    [
+        '%{phpdir}/Psr/Container2/autoload.php',
+        '%{phpdir}/Psr/Container/autoload.php',
+    ],
 ]);
 EOF
 
@@ -164,6 +167,9 @@ exit $RETURN_CODE
 
 
 %changelog
+* Thu May  4 2023 Remi Collet <remi@remirepo.net> - 3.6.0-1
+- update to 3.6.0
+
 * Wed Feb  8 2023 Remi Collet <remi@remirepo.net> - 3.5.1-1
 - update to 3.5.1
 
-- 
cgit