summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json16
-rw-r--r--phpcpd-rpm.patch11
-rw-r--r--phpcpd.spec123
3 files changed, 93 insertions, 57 deletions
diff --git a/composer.json b/composer.json
index 468546c..7bab8a0 100644
--- a/composer.json
+++ b/composer.json
@@ -15,18 +15,20 @@
},
"config": {
"platform": {
- "php": "7.1.0"
+ "php": "7.3.0"
},
"optimize-autoloader": true,
"sort-packages": true
},
+ "minimum-stability": "dev",
"prefer-stable": true,
"require": {
- "php": "^7.1",
- "sebastian/finder-facade": "^1.1",
- "sebastian/version": "^1.0|^2.0",
- "symfony/console": "^2.7|^3.0|^4.0",
- "phpunit/php-timer": "^2.0"
+ "php": ">=7.3",
+ "ext-dom": "*",
+ "sebastian/cli-parser": "^1.0",
+ "sebastian/version": "^3.0",
+ "phpunit/php-file-iterator": "^3.0",
+ "phpunit/php-timer": "^5.0"
},
"autoload": {
"classmap": [
@@ -38,7 +40,7 @@
],
"extra": {
"branch-alias": {
- "dev-master": "4.0-dev"
+ "dev-master": "6.0-dev"
}
}
}
diff --git a/phpcpd-rpm.patch b/phpcpd-rpm.patch
index 0370cfe..98cd3f8 100644
--- a/phpcpd-rpm.patch
+++ b/phpcpd-rpm.patch
@@ -1,8 +1,8 @@
diff -up ./phpcpd.rpm ./phpcpd
---- ./phpcpd.rpm 2015-03-26 19:04:39.896182549 +0100
-+++ ./phpcpd 2015-03-26 19:05:35.300399520 +0100
-@@ -15,23 +15,7 @@ if (ini_get('mbstring.internal_encoding'
- ini_set('mbstring.internal_encoding', NULL);
+--- ./phpcpd.rpm 2020-08-13 11:00:53.656423265 +0200
++++ ./phpcpd 2020-08-13 11:01:28.205352474 +0200
+@@ -23,22 +23,6 @@ if (version_compare('7.3.0', PHP_VERSION
+ die(1);
}
-$loaded = false;
@@ -24,5 +24,4 @@ diff -up ./phpcpd.rpm ./phpcpd
-}
+require '/usr/share/php/SebastianBergmann/PHPCPD/autoload.php';
- $application = new SebastianBergmann\PHPCPD\CLI\Application;
- $application->run();
+ exit((new \SebastianBergmann\PHPCPD\Application)->run($_SERVER['argv']));
diff --git a/phpcpd.spec b/phpcpd.spec
index 9497de8..a3f53d5 100644
--- a/phpcpd.spec
+++ b/phpcpd.spec
@@ -6,15 +6,16 @@
# Please, preserve the changelog entries
#
+%bcond_without tests
+
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit bb7953b81fb28e55964d76d5fe2dbe725d43fab3
+%global gh_commit f3683aa0db2e8e09287c2bb33a595b2873ea9176
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project phpcpd
%global php_home %{_datadir}/php
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
# Packagist
%global pk_vendor sebastian
%global pk_project phpcpd
@@ -23,60 +24,62 @@
%global ns_project PHPCPD
Name: %{pk_project}
-Version: 4.0.0
+Version: 6.0.3
Release: 1%{?dist}
Summary: Copy/Paste Detector (CPD) for PHP code
License: BSD
URL: https://github.com/%{gh_owner}/%{gh_project}
-Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
+Source0: %{name}-%{version}-%{gh_short}.tgz
+Source1: makesrc.sh
# Fix for RPM, use autoload
Patch0: %{gh_project}-rpm.patch
BuildArch: noarch
-BuildRequires: php(language) >= 7.1
+BuildRequires: php(language) >= 7.3
BuildRequires: php-fedora-autoloader-devel
-%if %{with_tests}
-BuildRequires: phpunit7
+%if %{with tests}
+BuildRequires: phpunit9
# remirepo:1
-%if 0%{?fedora} >= 27
-BuildRequires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2)
-BuildRequires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3)
-BuildRequires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5)
-BuildRequires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2)
+BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
+BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
+BuildRequires: (php-composer(phpunit/php-timer) >= 5.0 with php-composer(phpunit/php-timer) < 6)
# remirepo:6
%else
-BuildRequires: php-phpunit-FinderFacade
-BuildRequires: php-phpunit-Version
-BuildRequires: php-symfony4-console
-BuildRequires: php-phpunit-php-timer2
+BuildRequires: php-sebastian-cli-parser
+BuildRequires: php-sebastian-version3
+BuildRequires: php-phpunit-php-file-iterator3
+BuildRequires: php-phpunit-php-timer5
%endif
%endif
# From composer.json, requires
-# "php": "^7.1",
-# "sebastian/finder-facade": "^1.1",
-# "sebastian/version": "^1.0|^2.0",
-# "symfony/console": "^2.7|^3.0|^4.0",
-# "phpunit/php-timer": "^2.0"
-Requires: php(language) >= 7.1
+# "php": ">=7.3",
+# "ext-dom": "*",
+# "sebastian/cli-parser": "^1.0",
+# "sebastian/version": "^3.0",
+# "phpunit/php-file-iterator": "^3.0",
+# "phpunit/php-timer": "^5.0"
+Requires: php(language) >= 7.3
+Requires: php-dom
# remirepo:1
-%if 0%{?fedora} >= 27
-Requires: (php-composer(sebastian/finder-facade) >= 1.1 with php-composer(sebastian/finder-facade) < 2)
-Requires: (php-composer(sebastian/version) >= 1.0 with php-composer(sebastian/version) < 3)
-Requires: (php-composer(symfony/console) >= 2.7 with php-composer(symfony/console) < 5)
-Requires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3)
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-composer(sebastian/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2)
+Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
+Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
+Requires: (php-composer(phpunit/php-timer) >= 5.0 with php-composer(phpunit/php-timer) < 6)
# remirepo:6
%else
-Requires: php-phpunit-FinderFacade
-Requires: php-phpunit-Version
-Requires: php-symfony4-console
-Requires: php-phpunit-php-timer2
+Requires: php-sebastian-cli-parser
+Requires: php-sebastian-version3
+Requires: php-phpunit-php-file-iterator3
+Requires: php-phpunit-php-timer5
%endif
# From phpcompatinfo report for version 3.0.0
Requires: php-cli
-Requires: php-dom
Requires: php-mbstring
Requires: php-pcre
Requires: php-spl
@@ -84,7 +87,7 @@ Requires: php-tokenizer
Requires: php-xml
# remirepo:1
-%if 0%{?fedora} >= 26
+%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
Obsoletes: php-phpunit-%{pk_project} < 4
Provides: php-phpunit-%{pk_project} = %{version}
# remirepo:3
@@ -117,14 +120,10 @@ phpab \
cat << 'EOF' | tee -a src/autoload.php
// Dependencies
\Fedora\Autoloader\Dependencies::required([
- '%{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',
- ],
- '%{php_home}/SebastianBergmann/Timer/autoload.php',
+ '%{php_home}/%{ns_vendor}/CliParser/autoload.php',
+ '%{php_home}/%{ns_vendor}/FileIterator3/autoload.php',
+ '%{php_home}/%{ns_vendor}/Timer5/autoload.php',
+ '%{php_home}/%{ns_vendor}/Version3/autoload.php',
]);
EOF
@@ -137,14 +136,14 @@ install -D -p -m 755 phpcpd %{buildroot}%{_bindir}/phpcpd
%check
-%if %{with_tests}
+%if %{with tests}
mkdir vendor
ln -s %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}/autoload.php vendor/autoload.php
ret=0;
-for cmd in php php71 php72; do
+for cmd in php php73 php74 php80; do
if which $cmd; then
- $cmd %{_bindir}/phpunit7 --verbose || ret=1
+ $cmd %{_bindir}/phpunit9 --verbose || ret=1
fi
done
exit $ret
@@ -163,6 +162,42 @@ exit $ret
%changelog
+* Mon Dec 7 2020 Remi Collet <remi@remirepo.net> - 6.0.3-1
+- update to 6.0.3
+
+* Tue Aug 18 2020 Remi Collet <remi@remirepo.net> - 6.0.2-1
+- update to 6.0.2
+
+* Thu Aug 13 2020 Remi Collet <remi@remirepo.net> - 6.0.1-1
+- update to 6.0.1
+
+* Thu Aug 13 2020 Remi Collet <remi@remirepo.net> - 6.0.0-1
+- update to 6.0.0
+- add dependency on phpunit/php-file-iterator
+- add dependency on sebastian/cli-parser
+- raise dependency on phpunit/php-timer 5
+- drop depency on sebastian/finder-facade
+- drop depency on symfony/console
+- sources from git snapshot
+- switch to phpunit9
+
+* Sat Feb 22 2020 Remi Collet <remi@remirepo.net> - 5.0.2-1
+- update to 5.0.2
+- raise depency on phpunit/php-timer 3
+- raise depency on sebastian/version 3
+
+
+* Thu Feb 20 2020 Remi Collet <remi@remirepo.net> - 5.0.1-1
+- update to 5.0.1
+- raise depency on PHP 7.3
+- raise depency on sebastian/finder-facade 2
+- raise depency on sebastian/version 2
+- raise depency on symfony/console 4
+- use phpunit8 for test suite
+
+* Tue Sep 18 2018 Remi Collet <remi@remirepo.net> - 4.1.0-1
+- update to 4.1.0
+
* Tue Feb 6 2018 Remi Collet <remi@remirepo.net> - 4.0.0-1
- Update to 4.0.0
- rename to phpcpd (and obsolete php-phpunit-phpcpd)
generated by cgit (git 2.34.1) at 2024-04-19 13:02:37 +0000