summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-06-19 11:58:49 +0200
committerRemi Collet <remi@remirepo.net>2019-06-19 11:58:49 +0200
commit44212fecd55036d8864cb3fccf8602302c5cd808 (patch)
tree30db0342653a2b003becfb93f40ccd314138fa4f
parent985ab5559d08dc448cda180e87dbb7812a90d310 (diff)
v3.1.2 from FedoraHEADmaster
-rw-r--r--composer.json9
-rw-r--r--php-typo3-phar-stream-wrapper.spec15
2 files changed, 18 insertions, 6 deletions
diff --git a/composer.json b/composer.json
index 939ce99..6c1b61d 100644
--- a/composer.json
+++ b/composer.json
@@ -7,13 +7,15 @@
"keywords": ["php", "phar", "stream-wrapper", "security"],
"require": {
"php": "^7.0",
- "ext-fileinfo": "*",
"ext-json": "*"
},
"require-dev": {
"ext-xdebug": "*",
"phpunit/phpunit": "^6.5"
},
+ "suggest": {
+ "ext-fileinfo": "For PHP builtin file type guessing, otherwise uses internal processing"
+ },
"autoload": {
"psr-4": {
"TYPO3\\PharStreamWrapper\\": "src/"
@@ -23,5 +25,10 @@
"psr-4": {
"TYPO3\\PharStreamWrapper\\Tests\\": "tests/"
}
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "v3.x-dev"
+ }
}
}
diff --git a/php-typo3-phar-stream-wrapper.spec b/php-typo3-phar-stream-wrapper.spec
index bc75f48..0d78b2a 100644
--- a/php-typo3-phar-stream-wrapper.spec
+++ b/php-typo3-phar-stream-wrapper.spec
@@ -12,8 +12,8 @@
%global github_owner TYPO3
%global github_name phar-stream-wrapper
-%global github_version 3.1.1
-%global github_commit fff6f5e037882f816cd41a9f5ccd8d8f97bfdebf
+%global github_version 3.1.2
+%global github_commit df7609a2f6cc4013d7bd12f1a2412d127b28f771
%global composer_vendor typo3
%global composer_project phar-stream-wrapper
@@ -47,9 +47,10 @@ BuildRequires: php(language) >= %{php_min_ver}
BuildRequires: php-composer(phpunit/phpunit)
BuildRequires: php-fileinfo
BuildRequires: php-json
-## phpcompatinfo for version 3.1.1
+## phpcompatinfo for version 3.1.2
BuildRequires: php-pcre
BuildRequires: php-pecl(opcache)
+BuildRequires: php-reflection
BuildRequires: php-spl
## Autoloader
BuildRequires: php-composer(fedora/autoloader)
@@ -57,9 +58,8 @@ BuildRequires: php-composer(fedora/autoloader)
# composer.json
Requires: php(language) >= %{php_min_ver}
-Requires: php-fileinfo
Requires: php-json
-# phpcompatinfo for version 3.1.1
+# phpcompatinfo for version 3.1.2
Requires: php-pcre
Requires: php-spl
# Autoloader
@@ -67,6 +67,7 @@ Requires: php-composer(fedora/autoloader)
# Weak dependencies
%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8
+Suggests: php-fileinfo
Suggests: php-pecl(opcache)
%endif
@@ -121,6 +122,7 @@ rm -f tests/Functional/Interceptor/PharExtensionInterceptorTest.php
: Upstream tests
RETURN_CODE=0
PHPUNIT=$(which phpunit)
+# TODO 7.4 - 28 failed tests (Failed asserting that 1547807882 is equal to expected exception code 1539632368)
for PHP_EXEC in php php71 php72 php73; do
if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
$PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php || RETURN_CODE=1
@@ -142,6 +144,9 @@ exit $RETURN_CODE
%changelog
+* Sun Jun 16 2019 Shawn Iwinski <shawn@iwin.ski> - 3.1.2-1
+- Update to 3.1.2
+
* Wed May 08 2019 Shawn Iwinski <shawn@iwin.ski> - 3.1.1-1
- Update to 3.1.1 (RHBZ #1708651, #1708646, #1708649)
- https://typo3.org/security/advisory/typo3-psa-2019-007/