diff options
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | composer.json | 37 | ||||
| -rw-r--r-- | php-zendframework-zend-soap.spec | 20 |
3 files changed, 41 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fc9aa8c --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +clog +package-*.xml +*.tgz +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/composer.json b/composer.json index 2768e4b..173e294 100644 --- a/composer.json +++ b/composer.json @@ -13,16 +13,16 @@ } }, "require": { - "php": ">=5.3.23", - "zendframework/zend-server": "~2.5", - "zendframework/zend-stdlib": "~2.5", - "zendframework/zend-uri": "~2.5" + "php": "^5.5 || ^7.0", + "zendframework/zend-server": "^2.6.1", + "zendframework/zend-stdlib": "^2.7 || ^3.0", + "zendframework/zend-uri": "^2.5.2" }, "require-dev": { - "zendframework/zend-config": "~2.5", - "zendframework/zend-http": "~2.5", - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/PHPUnit": "~4.0" + "zendframework/zend-config": "^2.6", + "zendframework/zend-http": "^2.5.4", + "phpunit/PHPUnit": "^4.8", + "squizlabs/php_codesniffer": "^2.3.1" }, "suggest": { "zendframework/zend-http": "Zend\\Http component" @@ -31,13 +31,28 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload-dev": { "psr-4": { "ZendTest\\Soap\\": "test/" - } + }, + "files": [ + "test/TestAsset/commontypes.php", + "test/TestAsset/call_user_func.php" + ] + }, + "scripts": { + "check": [ + "@cs-check", + "@test" + ], + "upload-coverage": "coveralls -v", + "cs-check": "phpcs", + "cs-fix": "phpcbf", + "test": "phpunit", + "test-coverage": "phpunit --coverage-clover clover.xml" } } diff --git a/php-zendframework-zend-soap.spec b/php-zendframework-zend-soap.spec index d5b1401..e28fae7 100644 --- a/php-zendframework-zend-soap.spec +++ b/php-zendframework-zend-soap.spec @@ -30,7 +30,6 @@ URL: https://zendframework.github.io/%{gh_project}/ Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz Source1: makesrc.sh -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch # Tests %if %{with_tests} @@ -106,8 +105,6 @@ mv LICENSE.md LICENSE %install -rm -rf %{buildroot} - mkdir -p %{buildroot}%{php_home}/Zend/ cp -pr src %{buildroot}%{php_home}/Zend/%{library} @@ -129,22 +126,19 @@ require_once 'test/TestAsset/commontypes.php'; require_once 'test/TestAsset/call_user_func.php'; EOF -%{_bindir}/phpunit --include-path=%{buildroot}%{php_home} - -if which php70; then - php70 %{_bindir}/phpunit --include-path=%{buildroot}%{php_home} || : ignore -fi +ret=0 +for cmd in php php56 php70 php71 php72; do + if which $cmd; then + $cmd %{_bindir}/phpunit || ret=1 + fi +done +exit $ret %else : Test suite disabled %endif -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{!?_licensedir:%global license %%doc} %license LICENSE %doc *.md |