update to 1.8.0

add symfony/polyfill-php73
use range dependencies

2 files changed, 30 insertions, 8 deletions

diff --git a/composer.json b/composer.json
index 9888e38..cff8bcd 100644
--- a/composer.json
+++ b/composer.json
@@ -26,12 +26,14 @@
     },
     "replace": {
         "symfony/polyfill-apcu": "self.version",
+        "symfony/polyfill-ctype": "self.version",
         "symfony/polyfill-php54": "self.version",
         "symfony/polyfill-php55": "self.version",
         "symfony/polyfill-php56": "self.version",
         "symfony/polyfill-php70": "self.version",
         "symfony/polyfill-php71": "self.version",
         "symfony/polyfill-php72": "self.version",
+        "symfony/polyfill-php73": "self.version",
         "symfony/polyfill-iconv": "self.version",
         "symfony/polyfill-intl-grapheme": "self.version",
         "symfony/polyfill-intl-icu": "self.version",
@@ -44,12 +46,14 @@
         "psr-4": { "Symfony\\Polyfill\\": "src/" },
         "files": [
             "src/Apcu/bootstrap.php",
+            "src/Ctype/bootstrap.php",
             "src/Php54/bootstrap.php",
             "src/Php55/bootstrap.php",
             "src/Php56/bootstrap.php",
             "src/Php70/bootstrap.php",
             "src/Php71/bootstrap.php",
             "src/Php72/bootstrap.php",
+            "src/Php73/bootstrap.php",
             "src/Iconv/bootstrap.php",
             "src/Intl/Grapheme/bootstrap.php",
             "src/Intl/Icu/bootstrap.php",
@@ -65,7 +69,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7-dev"
+            "dev-master": "1.8-dev"
         }
     }
 }
diff --git a/php-symfony-polyfill.spec b/php-symfony-polyfill.spec
index 37f63f5..2c6863e 100644
--- a/php-symfony-polyfill.spec
+++ b/php-symfony-polyfill.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     symfony
 %global github_name      polyfill
-%global github_version   1.7.0
-%global github_commit    86e27771f290e6af6d95c1c256f6d6d15ac9e22e
+%global github_version   1.8.0
+%global github_commit    6f13be2ff1681db53292eee1719dcee57e983207
 
 %global composer_vendor  symfony
 %global composer_project polyfill
@@ -34,7 +34,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       2%{?github_release}%{?dist}
+Release:       1%{?github_release}%{?dist}
 Summary:       Symfony polyfills backporting features to lower PHP versions
 
 License:       MIT
@@ -49,11 +49,16 @@ BuildRequires: php-fedora-autoloader-devel
 BuildRequires: php-composer(phpunit/phpunit)
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(ircmaxell/password-compat) >= %{ircmaxell_password_compat_min_ver} with php-composer(ircmaxell/password-compat) <  %{ircmaxell_password_compat_max_ver})
+BuildRequires: (php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver}     with php-composer(paragonie/random_compat) <  %{paragonie_random_compat_max_ver})
+%else
 BuildRequires: php-composer(ircmaxell/password-compat) <  %{ircmaxell_password_compat_max_ver}
 BuildRequires: php-composer(ircmaxell/password-compat) >= %{ircmaxell_password_compat_min_ver}
 BuildRequires: php-composer(paragonie/random_compat) <  %{paragonie_random_compat_max_ver}
 BuildRequires: php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver}
-## phpcompatinfo (computed from version 1.7.0)
+%endif
+## phpcompatinfo (computed from version 1.8.0)
 BuildRequires: php-hash
 BuildRequires: php-iconv
 BuildRequires: php-intl
@@ -66,11 +71,16 @@ BuildRequires: php-spl
 
 # composer.json
 Requires:      php(language) >= %{php_min_ver}
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:      (php-composer(ircmaxell/password-compat) >= %{ircmaxell_password_compat_min_ver} with php-composer(ircmaxell/password-compat) <  %{ircmaxell_password_compat_max_ver})
+Requires:      (php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver}     with php-composer(paragonie/random_compat) <  %{paragonie_random_compat_max_ver})
+%else
 Requires:      php-composer(ircmaxell/password-compat) <  %{ircmaxell_password_compat_max_ver}
 Requires:      php-composer(ircmaxell/password-compat) >= %{ircmaxell_password_compat_min_ver}
 Requires:      php-composer(paragonie/random_compat) <  %{paragonie_random_compat_max_ver}
 Requires:      php-composer(paragonie/random_compat) >= %{paragonie_random_compat_min_ver}
-# phpcompatinfo (computed from version 1.7.0)
+%endif
+# phpcompatinfo (computed from version 1.8.0)
 Requires:      php-hash
 Requires:      php-iconv
 Requires:      php-intl
@@ -91,6 +101,7 @@ Provides:      php-composer(%{composer_vendor}/%{composer_project}-php56) = %{ve
 Provides:      php-composer(%{composer_vendor}/%{composer_project}-php70) = %{version}
 Provides:      php-composer(%{composer_vendor}/%{composer_project}-php71) = %{version}
 Provides:      php-composer(%{composer_vendor}/%{composer_project}-php72) = %{version}
+Provides:      php-composer(%{composer_vendor}/%{composer_project}-php73) = %{version}
 
 %description
 %{summary}.
@@ -102,7 +113,7 @@ Autoloader: %{phpdir}/Symfony/Polyfill/autoload.php
 %setup -qn %{github_name}-%{github_commit}
 
 : Docs
-mkdir -p docs/{Mbstring,Php54,Php55,Php56,Php70,Php71,Php72,Util}
+mkdir -p docs/{Mbstring,Php54,Php55,Php56,Php70,Php71,Php72,Php73,Util}
 mv *.md composer.json docs/
 mv src/Mbstring/{*.md,composer.json}  docs/Mbstring/
 mv src/Php54/{*.md,composer.json} docs/Php54/
@@ -111,10 +122,11 @@ mv src/Php56/{*.md,composer.json} docs/Php56/
 mv src/Php70/{*.md,composer.json} docs/Php70/
 mv src/Php71/{*.md,composer.json} docs/Php71/
 mv src/Php72/{*.md,composer.json} docs/Php72/
+mv src/Php73/{*.md,composer.json} docs/Php73/
 mv src/Util/{*.md,composer.json}  docs/Util/
 
 : Remove unneeded polyfills
-rm -rf {src,tests}/{Apcu,Iconv,Intl,Xml}
+rm -rf {src,tests}/{Apcu,Ctype,Iconv,Intl,Xml}
 
 
 %build
@@ -133,6 +145,7 @@ cat <<'AUTOLOAD' | tee -a src/autoload.php
     __DIR__ . '/Php70/bootstrap.php',
     __DIR__ . '/Php71/bootstrap.php',
     __DIR__ . '/Php72/bootstrap.php',
+    __DIR__ . '/Php73/bootstrap.php',
     '%{phpdir}/password_compat/password.php',
     '%{phpdir}/random_compat/autoload.php',
 ));
@@ -174,6 +187,11 @@ exit $RETURN_CODE
 
 
 %changelog
+* Fri May  4 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+- add symfony/polyfill-php73
+- use range dependencies
+
 * Wed Apr 11 2018 Remi Collet <remi@remirepo.net> - 1.7.0-2
 - add symfony/polyfill-mbstring for mb_chr, mb_ord, mb_scrub
 - add dependency on iconv and intl extensions