diff options
| author | Remi Collet <remi@remirepo.net> | 2018-01-26 06:52:44 +0100 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2018-01-26 06:52:44 +0100 |
| commit | 102e1feac224135acd8d424b38e22c09b4e66d36 (patch) | |
| tree | 47a6e967b174b8a1e20cddab501f4e12b60cd9cc | |
| parent | e102b10b851bf6a655ca1aec9e2249a4278b4a6d (diff) | |
v2.6.2
| -rw-r--r-- | composer.json | 5 | ||||
| -rw-r--r-- | php-zendframework-zend-xmlrpc.spec | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/composer.json b/composer.json index e442430..8bca64b 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ "ZendTest\\XmlRpc\\": "test/" }, "files": [ + "test/autoload.php", "test/TestAsset/functions.php" ] }, @@ -29,8 +30,8 @@ "zendframework/zendxml": "^1.0.2" }, "require-dev": { - "phpunit/PHPUnit": "^4.8", - "squizlabs/php_codesniffer": "^2.3.1" + "phpunit/PHPUnit": "^5.7.25 || ^6.4.4", + "zendframework/zend-coding-standard": "~1.0.0" }, "suggest": { "zendframework/zend-cache": "To support Zend\\XmlRpc\\Server\\Cache usage" diff --git a/php-zendframework-zend-xmlrpc.spec b/php-zendframework-zend-xmlrpc.spec index bbd291d..9b351ea 100644 --- a/php-zendframework-zend-xmlrpc.spec +++ b/php-zendframework-zend-xmlrpc.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit b41116f63a0c73c6efc33c3b2f912e868e7172fe +%global gh_commit 5470f555b336b48fe22db52df973c786a4a146d7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner zendframework %global gh_project zend-xmlrpc @@ -20,7 +20,7 @@ %endif Name: php-%{gh_owner}-%{gh_project} -Version: 2.6.1 +Version: 2.6.2 Release: 2%{?dist} Summary: Zend Framework %{library} component @@ -48,9 +48,9 @@ BuildRequires: php-autoloader(%{gh_owner}/zend-server) >= 2.7 BuildRequires: php-autoloader(%{gh_owner}/zend-stdlib) >= 2.7 BuildRequires: php-autoloader(%{gh_owner}/zendxml) >= 1.0.2 # From composer, "require-dev": { -# "phpunit/PHPUnit": "^4.8", -# "squizlabs/php_codesniffer": "^2.3.1" -BuildRequires: php-composer(phpunit/phpunit) >= 4.8 +# "phpunit/PHPUnit": "^5.7.25 || ^6.4.4", +# "zendframework/zend-coding-standard": "~1.0.0" +BuildRequires: phpunit6 >= 6.4.4 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel @@ -145,13 +145,14 @@ cat << 'EOF' | tee vendor/autoload.php <?php require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('ZendTest\\%{library}\\', dirname(__DIR__) . '/test'); +require_once 'test/autoload.php'; require_once 'test/TestAsset/functions.php'; EOF ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php71 php72; do if which $cmd; then - $cmd %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || ret=1 + $cmd %{_bindir}/phpunit6 --include-path=%{buildroot}%{php_home} || ret=1 fi done exit $ret @@ -169,6 +170,10 @@ exit $ret %changelog +* Fri Jan 26 2018 Remi Collet <remi@remirepo.net> - 2.6.2-1 +- Update to 2.6.2 +- switch to phpunit6 + * Mon Dec 11 2017 Remi Collet <remi@remirepo.net> - 2.6.1-2 - switch from zend-loader to fedora/autoloader |