diff options
| -rw-r--r-- | composer.json | 24 | ||||
| -rw-r--r-- | php-pdepend-PHP-Depend.spec | 29 |
2 files changed, 37 insertions, 16 deletions
diff --git a/composer.json b/composer.json index d4bacec..fd08e2a 100644 --- a/composer.json +++ b/composer.json @@ -2,18 +2,32 @@ "name": "pdepend/pdepend", "description": "Official version of pdepend to be handled with Composer", "license": "BSD-3-Clause", + "type": "library", "require": { "php": ">=5.3.7", - "symfony/dependency-injection": "^2.3.0|^3|^4", - "symfony/filesystem": "^2.3.0|^3|^4", - "symfony/config": "^2.3.0|^3|^4" + "symfony/dependency-injection": "^2.3.0|^3|^4|^5", + "symfony/filesystem": "^2.3.0|^3|^4|^5", + "symfony/config": "^2.3.0|^3|^4|^5" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.7", - "squizlabs/php_codesniffer": "^2.0.0" + "phpunit/phpunit": "^4.8.35|^5.7", + "squizlabs/php_codesniffer": "^2.0.0", + "gregwar/rst": "^1.0", + "easy-doc/easy-doc": "0.0.0 || ^1.2.3" }, "bin": ["src/bin/pdepend"], "autoload": { "psr-4": {"PDepend\\": "src/main/php/PDepend"} + }, + "scripts": { + "test": "phpunit", + "cs-check": "phpcs -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 ./src/main/php ./src/test/php", + "cs-fix": "phpcbf -p --standard=PSR2 --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 ./src/main/php ./src/test/php", + "build-website": "easy-doc build src/site/config.php --verbose" + }, + "extra": { + "branch-alias": { + "dev-master": "2.x-dev" + } } } diff --git a/php-pdepend-PHP-Depend.spec b/php-pdepend-PHP-Depend.spec index 6d866ec..6e6cb6b 100644 --- a/php-pdepend-PHP-Depend.spec +++ b/php-pdepend-PHP-Depend.spec @@ -7,7 +7,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 9daf26d0368d4a12bed1cacae1a9f3a6f0adf239 +%global gh_commit 395b0f356bc0881ef88864bffb4ba1423ca0d111 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner pdepend %global gh_project pdepend @@ -17,17 +17,17 @@ %global php_home %{_datadir}/php/PDepend %global with_tests 0%{!?_without_tests:1} -%if 0%{?fedora} >= 27 || "%{?vendor}" == "Remi Collet" -%global sym_pref php-symfony3 -%global sym_path %{_datadir}/php/Symfony3 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 || "%{?vendor}" == "Remi Collet" +%global sym_pref php-symfony4 +%global sym_path %{_datadir}/php/Symfony4 %else %global sym_pref php-symfony %global sym_path %{_datadir}/php/Symfony %endif Name: php-pdepend-PHP-Depend -Version: 2.5.2 -Release: 2%{?dist} +Version: 2.6.1 +Release: 1%{?dist} Summary: PHP_Depend design quality metrics for PHP package Group: Development/Libraries @@ -68,9 +68,9 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": ">=5.3.7" -# "symfony/dependency-injection": "^2.3.0|^3|^4", -# "symfony/filesystem": "^2.3.0|^3|^4", -# "symfony/config": "^2.3.0|^3|^4" +# "symfony/dependency-injection": "^2.3.0|^3|^4|^5", +# "symfony/filesystem": "^2.3.0|^3|^4|^5", +# "symfony/config": "^2.3.0|^3|^4|^5", Requires: php(language) >= 5.3.7 Requires: %{sym_pref}-dependency-injection Requires: %{sym_pref}-filesystem @@ -151,10 +151,14 @@ require '%{buildroot}%{php_home}/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('PDepend\\', __DIR__); EOF +# testSetModifiersThrowsExpectedExceptionForInvalidModifier fails with 7.4 ret=0 -for cmd in php php56 php70 php71 php72; do +for cmd in php php72 php73 php74; do if which $cmd; then - $cmd %{_bindir}/phpunit -d memory_limit=1G --no-coverage --verbose || ret=1 + $cmd %{_bindir}/phpunit -d memory_limit=1G \ + --no-coverage \ + --filter '^((?!(testSetModifiersThrowsExpectedExceptionForInvalidModifier)).)*$' \ + --verbose || ret=1 fi done exit $ret @@ -181,6 +185,9 @@ fi %changelog +* Fri Jan 3 2020 Remi Collet <remi@remirepo.net> - 2.6.1-1 +- update to 2.6.1 + * Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 2.5.2-2 - Update to 2.5.2 (new sources) |