summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-01-08 11:13:44 +0100
committerRemi Collet <remi@remirepo.net>2021-01-08 11:13:44 +0100
commit20234dabb35434babad2dca20c3fe29f351134db (patch)
tree408db29d07ad85fa8baeaa4094a3a812351a2790
parent3f1aa9fe0621a3469b5cb2fe6e0814ee444c1483 (diff)
update to 1.22.0HEADmaster
provides symfony/polyfill-php81
-rw-r--r--composer.json19
-rw-r--r--php-symfony-polyfill.spec29
-rw-r--r--src/Apcu/composer.json2
-rw-r--r--src/Ctype/composer.json2
-rw-r--r--src/Iconv/composer.json2
-rw-r--r--src/Intl/Grapheme/composer.json2
-rw-r--r--src/Intl/Icu/composer.json14
-rw-r--r--src/Intl/Idn/composer.json2
-rw-r--r--src/Intl/MessageFormatter/composer.json2
-rw-r--r--src/Intl/Normalizer/composer.json2
-rw-r--r--src/Mbstring/composer.json2
-rw-r--r--src/Php72/composer.json2
-rw-r--r--src/Php73/composer.json2
-rw-r--r--src/Php74/composer.json2
-rw-r--r--src/Php80/composer.json2
-rw-r--r--src/Util/composer.json2
-rw-r--r--src/Uuid/composer.json2
-rw-r--r--src/Xml/composer.json2
18 files changed, 51 insertions, 41 deletions
diff --git a/composer.json b/composer.json
index 7049f48..f978b04 100644
--- a/composer.json
+++ b/composer.json
@@ -16,24 +16,21 @@
}
],
"require": {
- "php": ">=7.1",
- "symfony/intl": "~2.3|~3.0|~4.0|~5.0"
+ "php": ">=7.1"
},
"require-dev": {
- "symfony/phpunit-bridge": "^5"
+ "symfony/intl": "^4.4|^5.0",
+ "symfony/phpunit-bridge": "^5.3",
+ "symfony/var-dumper": "^4.4|^5.1"
},
"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-php74": "self.version",
"symfony/polyfill-php80": "self.version",
+ "symfony/polyfill-php81": "self.version",
"symfony/polyfill-iconv": "self.version",
"symfony/polyfill-intl-grapheme": "self.version",
"symfony/polyfill-intl-icu": "self.version",
@@ -51,9 +48,6 @@
"src/bootstrap.php",
"src/Apcu/bootstrap.php",
"src/Ctype/bootstrap.php",
- "src/Php72/bootstrap.php",
- "src/Php73/bootstrap.php",
- "src/Php74/bootstrap.php",
"src/Uuid/bootstrap.php",
"src/Iconv/bootstrap.php",
"src/Intl/Grapheme/bootstrap.php",
@@ -64,6 +58,7 @@
"src/Mbstring/bootstrap.php"
],
"classmap": [
+ "src/Intl/Icu/Resources/stubs",
"src/Intl/MessageFormatter/Resources/stubs",
"src/Intl/Normalizer/Resources/stubs",
"src/Php80/Resources/stubs",
@@ -73,7 +68,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
}
}
}
diff --git a/php-symfony-polyfill.spec b/php-symfony-polyfill.spec
index d2e61d4..df6cce2 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.20.0
-%global github_commit 1601a7637ed1f2f6be3c9d906fa2b0d85a26744a
+%global github_version 1.22.0
+%global github_commit 6d942e4de2d9f2b223f7b968a0e2495290968a11
%global composer_vendor symfony
%global composer_project polyfill
@@ -45,6 +45,8 @@ BuildRequires: php-fedora-autoloader-devel
%else
%global phpunit %{_bindir}/phpunit8
%endif
+BuildRequires: php-symfony4-intl
+BuildRequires: php-symfony4-var-dumper
BuildRequires: %{phpunit}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
@@ -80,6 +82,7 @@ Provides: php-composer(%{composer_vendor}/%{composer_project}-php72) = %{ve
Provides: php-composer(%{composer_vendor}/%{composer_project}-php73) = %{version}
Provides: php-composer(%{composer_vendor}/%{composer_project}-php74) = %{version}
Provides: php-composer(%{composer_vendor}/%{composer_project}-php80) = %{version}
+Provides: php-composer(%{composer_vendor}/%{composer_project}-php81) = %{version}
%description
%{summary}.
@@ -91,13 +94,14 @@ Autoloader: %{phpdir}/Symfony/Polyfill/autoload.php
%setup -qn %{github_name}-%{github_commit}
: Docs
-mkdir -p docs/{Mbstring,Php72,Php73,Php74,Php80,Util}
+mkdir -p docs/{Mbstring,Php72,Php73,Php74,Php80,Php81,Util}
mv *.md composer.json docs/
mv src/Mbstring/{*.md,composer.json} docs/Mbstring/
mv src/Php72/{*.md,composer.json} docs/Php72/
mv src/Php73/{*.md,composer.json} docs/Php73/
mv src/Php74/{*.md,composer.json} docs/Php74/
mv src/Php80/{*.md,composer.json} docs/Php80/
+mv src/Php81/{*.md,composer.json} docs/Php81/
mv src/Util/{*.md,composer.json} docs/Util/
: Remove unneeded polyfills as extensions are available
@@ -115,9 +119,6 @@ cat <<'AUTOLOAD' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required(array(
__DIR__ . '/bootstrap.php',
__DIR__ . '/Mbstring/bootstrap.php',
- __DIR__ . '/Php72/bootstrap.php',
- __DIR__ . '/Php73/bootstrap.php',
- __DIR__ . '/Php74/bootstrap.php',
));
AUTOLOAD
@@ -131,14 +132,20 @@ cp -rp src/* %{buildroot}%{phpdir}/Symfony/Polyfill/
%check
%if %{with tests}
+mkdir vendor
+cat << 'EOF' | tee vendor/autoload.php
+<?php
+require '%{buildroot}%{phpdir}/Symfony/Polyfill/autoload.php';
+require '%{phpdir}/Symfony4/Component/Intl/autoload.php';
+require '%{phpdir}/Symfony4/Component/VarDumper/autoload.php';
+EOF
+
: Upstream tests
RETURN_CODE=0
-# TODO php80
-for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74; do
+for cmdarg in "php %{phpunit}" "php72 %{_bindir}/phpunit8" php73 php74 php80; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose \
- --bootstrap %{buildroot}%{phpdir}/Symfony/Polyfill/autoload.php \
|| RETURN_CODE=1
fi
done
@@ -158,6 +165,10 @@ exit $RETURN_CODE
%changelog
+* Fri Jan 8 2021 Remi Collet <remi@remirepo.net> - 1.22.0-1
+- update to 1.22.0
+- provides symfony/polyfill-php81
+
* Mon Oct 26 2020 Remi Collet <remi@remirepo.net> - 1.20.0-1
- update to 1.20.0
- raise dependency on PHP 7.1
diff --git a/src/Apcu/composer.json b/src/Apcu/composer.json
index 52779b9..94a11e8 100644
--- a/src/Apcu/composer.json
+++ b/src/Apcu/composer.json
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Ctype/composer.json b/src/Ctype/composer.json
index 2088bb9..995978c 100644
--- a/src/Ctype/composer.json
+++ b/src/Ctype/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Iconv/composer.json b/src/Iconv/composer.json
index 26f1e59..4669f3f 100644
--- a/src/Iconv/composer.json
+++ b/src/Iconv/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Intl/Grapheme/composer.json b/src/Intl/Grapheme/composer.json
index 4d0bcb7..5ca4e3b 100644
--- a/src/Intl/Grapheme/composer.json
+++ b/src/Intl/Grapheme/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Intl/Icu/composer.json b/src/Intl/Icu/composer.json
index da274a3..3221002 100644
--- a/src/Intl/Icu/composer.json
+++ b/src/Intl/Icu/composer.json
@@ -16,19 +16,23 @@
}
],
"require": {
- "php": ">=7.1",
- "symfony/intl": "~2.3|~3.0|~4.0|~5.0"
+ "php": ">=7.1"
},
"autoload": {
- "files": [ "bootstrap.php" ]
+ "files": [ "bootstrap.php" ],
+ "psr-4": { "Symfony\\Polyfill\\Intl\\Icu\\": "" },
+ "classmap": [ "Resources/stubs" ],
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
},
"suggest": {
- "ext-intl": "For best performance"
+ "ext-intl": "For best performance and support of other locales than \"en\""
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Intl/Idn/composer.json b/src/Intl/Idn/composer.json
index a3bd0d7..450d1e7 100644
--- a/src/Intl/Idn/composer.json
+++ b/src/Intl/Idn/composer.json
@@ -34,7 +34,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Intl/MessageFormatter/composer.json b/src/Intl/MessageFormatter/composer.json
index 72a0991..fc020a2 100644
--- a/src/Intl/MessageFormatter/composer.json
+++ b/src/Intl/MessageFormatter/composer.json
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Intl/Normalizer/composer.json b/src/Intl/Normalizer/composer.json
index 873abd3..8f4cfb4 100644
--- a/src/Intl/Normalizer/composer.json
+++ b/src/Intl/Normalizer/composer.json
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Mbstring/composer.json b/src/Mbstring/composer.json
index ca4a839..ca82638 100644
--- a/src/Mbstring/composer.json
+++ b/src/Mbstring/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Php72/composer.json b/src/Php72/composer.json
index 994443a..7946892 100644
--- a/src/Php72/composer.json
+++ b/src/Php72/composer.json
@@ -25,7 +25,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Php73/composer.json b/src/Php73/composer.json
index 6c9660d..8b99ab8 100644
--- a/src/Php73/composer.json
+++ b/src/Php73/composer.json
@@ -26,7 +26,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Php74/composer.json b/src/Php74/composer.json
index 32682a4..1630a5d 100644
--- a/src/Php74/composer.json
+++ b/src/Php74/composer.json
@@ -29,7 +29,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Php80/composer.json b/src/Php80/composer.json
index 8ad4c31..a9e6813 100644
--- a/src/Php80/composer.json
+++ b/src/Php80/composer.json
@@ -30,7 +30,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Util/composer.json b/src/Util/composer.json
index d06dab2..3d454a4 100644
--- a/src/Util/composer.json
+++ b/src/Util/composer.json
@@ -24,7 +24,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Uuid/composer.json b/src/Uuid/composer.json
index 4c9c17e..ed0cbea 100644
--- a/src/Uuid/composer.json
+++ b/src/Uuid/composer.json
@@ -28,7 +28,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",
diff --git a/src/Xml/composer.json b/src/Xml/composer.json
index 43958ae..d5ad09d 100644
--- a/src/Xml/composer.json
+++ b/src/Xml/composer.json
@@ -23,7 +23,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-main": "1.20-dev"
+ "dev-main": "1.22-dev"
},
"thanks": {
"name": "symfony/polyfill",