v3.1

2 files changed, 23 insertions, 25 deletions

diff --git a/composer.json b/composer.json
index e7b495f..bed82bf 100644
--- a/composer.json
+++ b/composer.json
@@ -17,10 +17,11 @@
     },
     "require": {
         "php": ">=5.3.0",
-        "symfony/expression-language": "^3.1 || ^2.8"
+        "symfony/expression-language": "^3.2 || ^2.8"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.8 || ~5.1"
+        "phpunit/php-code-coverage": "*",
+        "phpunit/phpunit": "~4.8 || ~5.7"
     },
     "autoload": {
         "psr-4": {
diff --git a/php-phpmyadmin-motranslator.spec b/php-phpmyadmin-motranslator.spec
index 52dc1f1..474f809 100644
--- a/php-phpmyadmin-motranslator.spec
+++ b/php-phpmyadmin-motranslator.spec
@@ -9,7 +9,7 @@
 
 ##TODO next version will have tests back
 
-%global gh_commit    b5d5f9a0c1f6ed1127e7b766b3b506766becbb89
+%global gh_commit    9228038e1d18b4dbf6c71cb08bade67959d7e10c
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpmyadmin
 %global gh_project   motranslator
@@ -18,7 +18,7 @@
 %global ns_project   MoTranslator
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        3.0
+Version:        3.1
 Release:        1%{?dist}
 Summary:        Translation API for PHP using Gettext MO files
 
@@ -31,10 +31,11 @@ BuildArch:      noarch
 %if %{with_tests}
 BuildRequires:  php(language) >= 5.3
 BuildRequires:  php-pcre
-BuildRequires:  php-composer(symfony/expression-language) <  3
+BuildRequires:  php-composer(symfony/expression-language) <  4
 BuildRequires:  php-composer(symfony/expression-language) >= 2.8
 # For tests, from composer.json "require-dev": {
-#        "phpunit/phpunit": "~4.8 || ~5.1"
+#        "phpunit/php-code-coverage": "*",
+#        "phpunit/phpunit": "~4.8 || ~5.7"
 BuildRequires:  php-composer(phpunit/phpunit) >= 4.8
 %endif
 # For autoloader
@@ -42,8 +43,8 @@ BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
 #        "php": ">=5.3.0",
-#        "symfony/expression-language": "^3.1 || ^2.8"
-Requires:       php-composer(symfony/expression-language) <  3
+#        "symfony/expression-language": "^3.2 || ^2.8"
+Requires:       php-composer(symfony/expression-language) <  4
 Requires:       php-composer(symfony/expression-language) >= 2.8
 Requires:       php(language) >= 5.3
 # From phpcompatinfo report for 1.2
@@ -86,9 +87,10 @@ 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(
-    '%{_datadir}/php/Symfony/Component/ExpressionLanguage/autoload.php'
-));
+\Fedora\Autoloader\Dependencies::required(array(array(
+    '%{_datadir}/php/Symfony3/Component/ExpressionLanguage/autoload.php',
+    '%{_datadir}/php/Symfony/Component/ExpressionLanguage/autoload.php',
+)));
 AUTOLOAD
 
 
@@ -106,21 +108,12 @@ cat << 'EOF' | tee vendor/autoload.php
 require '%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php';
 EOF
 
-# remirepo:11
-run=0
 ret=0
-if which php56; then
-   php56 %{_bindir}/phpunit --no-coverage || ret=1
-   run=1
-fi
-if which php71; then
-   php71 %{_bindir}/phpunit --no-coverage || ret=1
-   run=1
-fi
-if [ $run -eq 0 ]; then
-%{_bindir}/phpunit --no-coverage --verbose
-# remirepo:2
-fi
+for cmd in php php56 php70 php71 php72; do
+  if which $cmd; then
+   $cmd %{_bindir}/phpunit --no-coverage --verbose || ret=1
+  fi
+done
 exit $ret
 %else
 : Test suite disabled
@@ -137,6 +130,10 @@ exit $ret
 
 
 %changelog
+* Mon May 15 2017 Remi Collet <remi@remirepo.net> - 3.1-1
+- Update to 3.1 (documentation and cleanup only)
+- allow Symfony 3
+
 * Mon Jan 23 2017 Remi Collet <remi@remirepo.net> - 3.0-1
 - update to 3.0 with vendor namespace