update to 5.3.0

add weak dependency on apcu extension
allow Symfony 6

3 files changed, 41 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/composer.json b/composer.json
index 8a1c0c5..2536f58 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,10 @@
         "source": "https://github.com/phpmyadmin/motranslator"
     },
     "scripts": {
-        "phpcbf": "./vendor/bin/phpcbf",
-        "phpcs": "./vendor/bin/phpcs",
-        "phpstan": "./vendor/bin/phpstan analyse",
-        "phpunit": "./vendor/bin/phpunit --color=always",
+        "phpcbf": "@php phpcbf",
+        "phpcs": "@php phpcs",
+        "phpstan": "@php phpstan",
+        "phpunit": "@php phpunit",
         "test": [
             "@phpcs",
             "@phpstan",
@@ -28,12 +28,12 @@
     },
     "require": {
         "php": "^7.1 || ^8.0",
-        "symfony/expression-language": "^4.0 || ^5.0"
+        "symfony/expression-language": "^4.0 || ^5.0 || ^6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.4 || ^8 || ^9",
-        "phpmyadmin/coding-standard": "^2.1.1",
-        "phpstan/phpstan": "^0.12.56"
+        "phpmyadmin/coding-standard": "^3.0.0",
+        "phpstan/phpstan": "^1.4.6"
     },
     "autoload": {
         "psr-4": {
@@ -44,5 +44,13 @@
         "psr-4": {
             "PhpMyAdmin\\MoTranslator\\Tests\\": "tests"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
+    },
+    "suggest": {
+        "ext-apcu": "Needed for ACPu-backed translation cache"
     }
 }
diff --git a/php-phpmyadmin-motranslator5.spec b/php-phpmyadmin-motranslator5.spec
index 1af035e..01f8f05 100644
--- a/php-phpmyadmin-motranslator5.spec
+++ b/php-phpmyadmin-motranslator5.spec
@@ -1,13 +1,13 @@
 # remirepo/fedora spec file for php-phpmyadmin-motranslator5
 #
-# Copyright (c) 2017-2021 Remi Collet
+# Copyright (c) 2017-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 
-%global gh_commit    cea68a8d0abf5e7fabc4179f07ef444223ddff44
+%global gh_commit    87baa97809ec556c40e4cba4bdef998a2de2a003
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpmyadmin
 %global gh_project   motranslator
@@ -17,10 +17,10 @@
 %global major        5
 
 %global sym_min_ver 4.0
-%global sym_max_ver 6
+%global sym_max_ver 7
 
 Name:           php-%{gh_owner}-%{gh_project}%{major}
-Version:        5.2.0
+Version:        5.3.0
 Release:        1%{?dist}
 Summary:        Translation API for PHP using Gettext MO files
 
@@ -42,25 +42,24 @@ BuildRequires:  php-symfony4-expression-language
 %endif
 # For tests, from composer.json "require-dev": {
 #        "phpunit/phpunit": "^7.4 || ^8 || ^9",
-#        "phpmyadmin/coding-standard": "^2.1.1",
-#        "phpstan/phpstan": "^0.12.56"
-%if 0%{?fedora} >= 32 || 0%{?rhel} >= 9
+#        "phpmyadmin/coding-standard": "^3.0.0",
+#        "phpstan/phpstan": "^1.4.6"
 %global phpunit %{_bindir}/phpunit9
 BuildRequires:  %{phpunit}
-%else
-%global phpunit %{_bindir}/phpunit8
-BuildRequires:  %{phpunit}
-%endif
 %endif
+BuildRequires:  php-apcu
 # For autoloader
 BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
 #        "php": "^7.1 || ^8.0",
-#        "symfony/expression-language": ""^4.0 || ^5.0"
+#        "symfony/expression-language": ""^4.0 || ^5.0 || ^6.0"
+# From composer.json, "suggest": {
+#        "ext-apcu": "Needed for ACPu-backed translation cache"
 # remirepo:1
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 Requires:      (php-composer(symfony/expression-language) >= %{sym_min_ver} with php-composer(symfony/expression-language) < %{sym_max_ver})
+Recommends:     php-apcu
 # remirepo:3
 %else
 Requires:       php-symfony4-expression-language
@@ -106,10 +105,13 @@ cat <<'AUTOLOAD' | tee src/autoload.php
 require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
 
 \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__);
-\Fedora\Autoloader\Dependencies::required(array(array(
+\Fedora\Autoloader\Dependencies::required([
+  [
+    '%{_datadir}/php/Symfony6/Component/ExpressionLanguage/autoload.php',
     '%{_datadir}/php/Symfony5/Component/ExpressionLanguage/autoload.php',
     '%{_datadir}/php/Symfony4/Component/ExpressionLanguage/autoload.php',
-)));
+  ],
+]);
 AUTOLOAD
 
 
@@ -128,10 +130,11 @@ require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}%{major}/autoload
 EOF
 
 ret=0
-for cmd in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 "php74" php80; do
+for cmd in "php %{phpunit}" php74 php80 php81; do
   if which $cmd; then
     set $cmd
-    $1 ${2:-%{_bindir}/phpunit9} --no-coverage --verbose || ret=1
+    $1 -d apc.enable_cli=1 \
+      ${2:-%{_bindir}/phpunit9} --no-coverage --verbose || ret=1
   fi
 done
 exit $ret
@@ -151,6 +154,11 @@ exit $ret
 
 
 %changelog
+* Tue Apr 26 2022 Remi Collet <remi@remirepo.net> - 5.3.0-1
+- update to 5.3.0
+- add weak dependency on apcu extension
+- allow Symfony 6
+
 * Mon Feb  8 2021 Remi Collet <remi@remirepo.net> - 5.2.0-1
 - update to 5.2.0