Update to 3.0.1

allow Symfony 4

3 files changed, 40 insertions, 13 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 acf4eb0..658e187 100644
--- a/composer.json
+++ b/composer.json
@@ -16,13 +16,16 @@
     "config": {
         "platform": {
             "php": "5.6.0"
-        }
+        },
+        "optimize-autoloader": true,
+        "sort-packages": true
     },
+    "prefer-stable": true,
     "require": {
         "php": "^5.6|^7.0",
         "sebastian/finder-facade": "^1.1",
-        "sebastian/version": "^2.0",
-        "symfony/console": "^3.0",
+        "sebastian/version": "^1.0|^2.0",
+        "symfony/console": "^2.7|^3.0|^4.0",
         "phpunit/php-timer": "^1.0.6"
     },
     "autoload": {
diff --git a/php-phpunit-phpcpd.spec b/php-phpunit-phpcpd.spec
index 6c59d4d..9414b17 100644
--- a/php-phpunit-phpcpd.spec
+++ b/php-phpunit-phpcpd.spec
@@ -5,7 +5,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    d7006078b75a34c9250831c3453a2e256a687615
+%global gh_commit    dfed51c1288790fc957c9433e2f49ab152e8a564
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   phpcpd
@@ -19,14 +19,14 @@
 %global ns_project   PHPCPD
 
 Name:           php-phpunit-%{pk_project}
-Version:        3.0.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        Copy/Paste Detector (CPD) for PHP code
 
 Group:          Development/Libraries
 License:        BSD
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}.tar.gz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
 # Fix for RPM, use autoload
 Patch0:         %{gh_project}-rpm.patch
@@ -37,26 +37,37 @@ BuildRequires:  php(language)  >= 5.6
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
 BuildRequires:  %{_bindir}/phpunit
+BuildRequires:  php-composer(sebastian/finder-facade) <  2
 BuildRequires:  php-composer(sebastian/finder-facade) >= 1.1
+BuildRequires:  php-composer(sebastian/version)       <  3
 BuildRequires:  php-composer(sebastian/version)       >= 1.0
+%if 0%{?fedora} >= 26
+BuildRequires:  php-composer(symfony/console)         <  5
+%else
+BuildRequires:  php-composer(symfony/console)         <  4
+%endif
 BuildRequires:  php-composer(symfony/console)         >= 2.7
+BuildRequires:  php-composer(phpunit/php-timer)       <  2
 BuildRequires:  php-composer(phpunit/php-timer)       >= 1.0.6
 %endif
 
 # From composer.json, requires
 #        "php": "^5.6|^7.0",
 #        "sebastian/finder-facade": "^1.1",
-#        "sebastian/version": "^2.0",
-#        "symfony/console": "^3.0",
+#        "sebastian/version": "^1.0|^2.0",
+#        "symfony/console": "^2.7|^3.0|^4.0",
 #        "phpunit/php-timer": "^1.0.6"
 Requires:       php(language) >= 5.6
-Requires:       php-composer(sebastian/finder-facade) >= 1.1
 Requires:       php-composer(sebastian/finder-facade) <  2
-Requires:       php-composer(sebastian/version)       >= 2.0
+Requires:       php-composer(sebastian/finder-facade) >= 1.1
 Requires:       php-composer(sebastian/version)       <  3
-# temporarily ignore min version
-Requires:       php-composer(symfony/console)         >= 2.8
+Requires:       php-composer(sebastian/version)       >= 1.0
+%if 0%{?fedora} >= 26
+Requires:       php-composer(symfony/console)         <  5
+%else
 Requires:       php-composer(symfony/console)         <  4
+%endif
+Requires:       php-composer(symfony/console)         >= 2.8
 Requires:       php-composer(phpunit/php-timer)       >= 1.0.6
 # From phpcompatinfo report for version 3.0.0
 Requires:       php-cli
@@ -97,6 +108,7 @@ cat << 'EOF' | tee -a src/autoload.php
     '%{php_home}/%{ns_vendor}/FinderFacade/autoload.php',
     '%{php_home}/%{ns_vendor}/Version/autoload.php',
     [
+        '%{php_home}/Symfony4/Component/Console/autoload.php',
         '%{php_home}/Symfony3/Component/Console/autoload.php',
         '%{php_home}/Symfony/Component/Console/autoload.php',
     ],
@@ -118,7 +130,7 @@ mkdir vendor
 ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php
 
 ret=0;
-for cmd in php56 php70 php71 php; do
+for cmd in php php56 php70 php71 php72; do
    if which $cmd; then
       $cmd %{_bindir}/phpunit --verbose || ret=1
    fi
@@ -143,6 +155,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Nov 16 2017 Remi Collet <remi@remirepo.net> - 3.0.1-1
+- Update to 3.0.1
+- allow Symfony 4
+
 * Wed Feb  8 2017 Remi Collet <remi@fedoraproject.org> - 3.0.0-1
 - Update to 3.0.0
 - raise dependency on PHP 5.6