diff options
| author | Remi Collet <remi@remirepo.net> | 2019-02-14 08:26:36 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2019-02-14 08:26:36 +0100 |
| commit | 2effd2c825f4b4ddbfcaf0243019a59028fc4463 (patch) | |
| tree | 1d28afc606fd7d8dae7f71a6c6d6d8235c122e70 | |
| parent | 90d40a5da2a03ccd96aff101b9eaa25650751806 (diff) | |
v3.3.8 from Fedora
| -rw-r--r-- | composer.json | 8 | ||||
| -rw-r--r-- | php-simplesamlphp-saml2_3.spec | 25 |
2 files changed, 22 insertions, 11 deletions
diff --git a/composer.json b/composer.json index 11fcf46..4330279 100644 --- a/composer.json +++ b/composer.json @@ -18,11 +18,11 @@ "psr/log": "~1.0" }, "require-dev": { - "squizlabs/php_codesniffer": "~1.4", - "phpmd/phpmd": "~1.5", - "sensiolabs/security-checker": "~1.1", + "squizlabs/php_codesniffer": "~3.2", + "phpmd/phpmd": "~2.6", + "sensiolabs/security-checker": "~4.1", "phpunit/phpunit": "~4", - "sebastian/phpcpd": "~1.4", + "sebastian/phpcpd": "~2.0", "mockery/mockery": "~0.9" }, "autoload": { diff --git a/php-simplesamlphp-saml2_3.spec b/php-simplesamlphp-saml2_3.spec index 0d2ffe9..80fb3e6 100644 --- a/php-simplesamlphp-saml2_3.spec +++ b/php-simplesamlphp-saml2_3.spec @@ -2,7 +2,7 @@ # # Fedora spec file for php-simplesamlphp-saml2_3 # -# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski> +# Copyright (c) 2017-2019 Shawn Iwinski <shawn@iwin.ski> # # License: MIT # http://opensource.org/licenses/MIT @@ -12,8 +12,8 @@ %global github_owner simplesamlphp %global github_name saml2 -%global github_version 3.1.5 -%global github_commit a07885a55fe5d3335ef0913ee9e95a75b34bfc52 +%global github_version 3.3.8 +%global github_commit 43753d180f12f7159188995916dc2bbf6ae191b6 %global composer_vendor simplesamlphp %global composer_project saml2 @@ -71,8 +71,9 @@ BuildRequires: php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} BuildRequires: php-dom BuildRequires: php-openssl BuildRequires: php-zlib -## phpcompatinfo (computed from version 3.1.4) +## phpcompatinfo (computed from version 3.3.8) BuildRequires: php-date +BuildRequires: php-filter BuildRequires: php-libxml BuildRequires: php-pcre BuildRequires: php-soap @@ -95,8 +96,9 @@ Requires: php-composer(robrichards/xmlseclibs) >= %{xmlseclibs_min_ver} Requires: php-dom Requires: php-openssl Requires: php-zlib -# phpcompatinfo (computed from version 3.1.4) +# phpcompatinfo (computed from version 3.3.8) Requires: php-date +Requires: php-filter Requires: php-libxml Requires: php-pcre Requires: php-soap @@ -154,14 +156,20 @@ require_once '%{buildroot}%{phpdir}/SAML2_3/autoload.php'; require_once '%{phpdir}/Mockery/autoload.php'; AUTOLOAD -: Skip test known to fail +: Skip tests known to fail +sed -e 's/function testMarshalling/function SKIP_testMarshalling/' \ + -e 's/function testMarshallingChildren/function SKIP_testMarshallingChildren/' \ + -i tests/SAML2/XML/mdui/DiscoHintsTest.php +sed -e 's/function testMarshalling/function SKIP_testMarshalling/' \ + -e 's/function testMarshallingChildren/function SKIP_testMarshallingChildren/' \ + -i tests/SAML2/XML/mdui/UIInfoTest.php sed 's/function testToString/function SKIP_testToString/' \ -i tests/SAML2/XML/saml/NameIDTest.php : Upstream tests RETURN_CODE=0 PHPUNIT=$(which phpunit) -for PHP_EXEC in php %{?rhel:php55 php56} php70 php71 php72; do +for PHP_EXEC in php %{?rhel:php55 php56} php70 php71 php72 php73; do if [ "php" = "$PHP_EXEC" ] || which $PHP_EXEC; then $PHP_EXEC $PHPUNIT --configuration=tools/phpunit --verbose || RETURN_CODE=1 fi @@ -181,6 +189,9 @@ exit $RETURN_CODE %changelog +* Wed Feb 13 2019 Shawn Iwinski <shawn@iwin.ski> - 3.3.8-1 +- Update to 3.3.8 (RHBZ #1600514) + * Sun Apr 29 2018 Shawn Iwinski <shawn@iwin.ski> - 3.1.5-1 - Update to 3.1.5 (RHBZ #1568917) |