rpms/php-cs-fixer
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to 2.3.1

Browse source 
raise dependency on PHP 5.6
raise dependency on Symfony 3
This commit is contained in:
Remi Collet 2017-05-09 09:30:16 +02:00
commit de937c29d9
4 changed files with 60 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.gitignore vendored
View file

@ -1,11 +1,3 @@
/php-cs-fixer-1.12.4-c5a9d66.tgz
/php-cs-fixer-1.13.0-ac04a51.tgz
/php-cs-fixer-2.0.0-f3baf72.tgz
/php-cs-fixer-2.0.1-863ad25.tgz
/php-cs-fixer-2.1.0-2c69f4d.tgz
/php-cs-fixer-2.1.2-c7de769.tgz
/php-cs-fixer-2.1.3-d30ca69.tgz
/php-cs-fixer-2.2.0-d6f1742.tgz
/php-cs-fixer-2.2.1-aff95e0.tgz
/php-cs-fixer-2.2.2-362d7bd.tgz
/php-cs-fixer-2.2.3-8f33cf3.tgz
clog
/php-cs-fixer-2.2.*.tgz
/php-cs-fixer-2.3.1-d5257f7.tgz

12
php-cs-fixer-autoload.patch
View file

@ -1,6 +1,6 @@
diff -up ./php-cs-fixer.rpm ./php-cs-fixer
--- ./php-cs-fixer.rpm 2017-04-01 08:35:52.000000000 +0200
+++ ./php-cs-fixer 2017-04-01 08:48:58.016723873 +0200
--- ./php-cs-fixer.rpm 2017-05-09 07:05:56.000000000 +0200
+++ ./php-cs-fixer 2017-05-09 07:15:40.115301425 +0200
@@ -42,12 +42,7 @@ set_error_handler(function ($severity, $
}
});
@ -16,13 +16,13 @@ diff -up ./php-cs-fixer.rpm ./php-cs-fixer
use PhpCsFixer\Console\Application;
diff -up ./tests/AutoReview/ProjectCodeTest.php.rpm ./tests/AutoReview/ProjectCodeTest.php
--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2017-04-01 08:50:31.217299123 +0200
+++ ./tests/AutoReview/ProjectCodeTest.php 2017-04-01 08:51:10.127539283 +0200
--- ./tests/AutoReview/ProjectCodeTest.php.rpm 2017-05-09 07:15:40.116301430 +0200
+++ ./tests/AutoReview/ProjectCodeTest.php 2017-05-09 07:17:15.735775739 +0200
@@ -314,6 +314,7 @@ final class ProjectCodeTest extends \PHP
->files()
->name('*.php')
->in(__DIR__.'/../../src')
+ ->notName('autoload.php')
->exclude(array(
->exclude([
'Resources',
))
])

91
php-cs-fixer.spec
View file

@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
%global gh_commit 8f33cf3da0da94b67b9cd696b2b9dda81c928f72
%global gh_commit d5257f7433bb490299c4f300d95598fd911a8ab0
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
#global gh_date 20150717
%global gh_owner FriendsOfPHP
@ -15,7 +15,7 @@
%global with_tests 0%{!?_without_tests:1}
Name: php-cs-fixer
Version: 2.2.3
Version: 2.3.1
Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
Summary: A tool to automatically fix PHP code style
@ -37,23 +37,21 @@ BuildRequires: php-tokenizer
BuildRequires: php-composer(doctrine/annotations) < 2
BuildRequires: php-composer(doctrine/annotations) >= 1.2
BuildRequires: php-composer(symfony/console) < 4
BuildRequires: php-composer(symfony/console) >= 2.4
BuildRequires: php-composer(symfony/console) >= 3.0
BuildRequires: php-composer(symfony/event-dispatcher) < 4
BuildRequires: php-composer(symfony/event-dispatcher) >= 2.1
BuildRequires: php-composer(symfony/event-dispatcher) >= 3.0
BuildRequires: php-composer(symfony/filesystem) < 4
BuildRequires: php-composer(symfony/filesystem) >= 2.4
BuildRequires: php-composer(symfony/filesystem) >= 3.0
BuildRequires: php-composer(symfony/finder) < 4
BuildRequires: php-composer(symfony/finder) >= 2.4
BuildRequires: php-composer(symfony/finder) >= 3.0
BuildRequires: php-composer(symfony/options-resolver) < 4
BuildRequires: php-composer(symfony/options-resolver) >= 2.6
BuildRequires: php-composer(symfony/polyfill-php55) < 4
BuildRequires: php-composer(symfony/polyfill-php55) >= 1.3
BuildRequires: php-composer(symfony/options-resolver) >= 3.0
BuildRequires: php-composer(symfony/polyfill-php70) < 4
BuildRequires: php-composer(symfony/polyfill-php70) >= 1.3
BuildRequires: php-composer(symfony/process) < 4
BuildRequires: php-composer(symfony/process) >= 2.3
BuildRequires: php-composer(symfony/process) >= 3.0
BuildRequires: php-composer(symfony/stopwatch) < 4
BuildRequires: php-composer(symfony/stopwatch) >= 2.5
BuildRequires: php-composer(symfony/stopwatch) >= 3.0
BuildRequires: php-composer(sebastian/diff) < 2
BuildRequires: php-composer(sebastian/diff) >= 1.4
BuildRequires: php-mbstring
@ -65,6 +63,9 @@ BuildRequires: php-pcre
BuildRequires: php-phar
BuildRequires: php-spl
BuildRequires: php-xml
# Missing dependency for Console
BuildRequires: php-composer(symfony/debug) < 4
BuildRequires: php-composer(symfony/debug) >= 3.0
# From composer.json, "require-dev": {
# "gecko-packages/gecko-php-unit": "^2.0",
# "justinrainbow/json-schema": "^5.0",
@ -82,46 +83,46 @@ BuildRequires: php-composer(fedora/autoloader)
%endif
# From composer.json, "require": {
# "php": "^5.3.6 || >=7.0 <7.2",
# "php": "^5.6 || >=7.0 <7.2",
# "doctrine/annotations": "^1.2",
# "ext-tokenizer": "*",
# "sebastian/diff": "^1.4",
# "symfony/console": "^2.4 || ^3.0",
# "symfony/event-dispatcher": "^2.1 || ^3.0",
# "symfony/filesystem": "^2.4 || ^3.0",
# "symfony/finder": "^2.2 || ^3.0",
# "symfony/options-resolver": "^2.6 || ^3.0",
# "symfony/console": "^3.0",
# "symfony/event-dispatcher": "^3.0",
# "symfony/filesystem": "^3.0",
# "symfony/finder": "^3.0",
# "symfony/options-resolver": "^3.0",
# "symfony/polyfill-php54": "^1.0",
# "symfony/polyfill-php55": "^1.3",
# "symfony/polyfill-php70": "^1.0",
# "symfony/polyfill-xml": "^1.3",
# "symfony/process": "^2.3 || ^3.0",
# "symfony/stopwatch": "^2.5 || ^3.0"
# use 5.4 to avoid polyfill
Requires: php(language) >= 5.4
# "symfony/process": "^3.0",
# "symfony/stopwatch": "^3.0"
Requires: php(language) >= 5.6
Requires: php-tokenizer
Requires: php-composer(doctrine/annotations) < 2
Requires: php-composer(doctrine/annotations) >= 1.2
Requires: php-composer(sebastian/diff) < 2
Requires: php-composer(sebastian/diff) >= 1.4
Requires: php-composer(symfony/console) < 4
Requires: php-composer(symfony/console) >= 2.4
Requires: php-composer(symfony/console) >= 3.0
Requires: php-composer(symfony/event-dispatcher) < 4
Requires: php-composer(symfony/event-dispatcher) >= 2.1
Requires: php-composer(symfony/event-dispatcher) >= 3.0
Requires: php-composer(symfony/filesystem) < 4
Requires: php-composer(symfony/filesystem) >= 2.4
Requires: php-composer(symfony/filesystem) >= 3.0
Requires: php-composer(symfony/finder) < 4
Requires: php-composer(symfony/finder) >= 2.4
Requires: php-composer(symfony/finder) >= 3.0
Requires: php-composer(symfony/options-resolver) < 4
Requires: php-composer(symfony/options-resolver) >= 2.6
Requires: php-composer(symfony/polyfill-php55) < 2
Requires: php-composer(symfony/polyfill-php55) >= 1.3
Requires: php-composer(symfony/options-resolver) >= 3.0
Requires: php-composer(symfony/polyfill-php70) < 2
Requires: php-composer(symfony/polyfill-php70) >= 1.0
Requires: php-composer(symfony/process) < 4
Requires: php-composer(symfony/process) >= 2.3
Requires: php-composer(symfony/process) >= 3.0
Requires: php-composer(symfony/stopwatch) < 4
Requires: php-composer(symfony/stopwatch) >= 2.5
Requires: php-composer(symfony/stopwatch) >= 3.0
# Missing dependency for Console
Requires: php-composer(symfony/debug) < 4
Requires: php-composer(symfony/debug) >= 3.0
# From composer.json, "suggest": {
# "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
# "ext-xml": "For better performance.",
@ -164,10 +165,13 @@ require_once '%{php_home}/Fedora/Autoloader/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__);
\Fedora\Autoloader\Dependencies::required([
'%{php_home}/Doctrine/Common/Annotations/autoload.php',
[
'%{php_home}/Symfony3/Component/autoload.php',
'%{php_home}/Symfony/Component/autoload.php',
],
'%{php_home}/Symfony3/Component/Console/autoload.php',
'%{php_home}/Symfony3/Component/EventDispatcher/autoload.php',
'%{php_home}/Symfony3/Component/Filesystem/autoload.php',
'%{php_home}/Symfony3/Component/Finder/autoload.php',
'%{php_home}/Symfony3/Component/OptionsResolver/autoload.php',
'%{php_home}/Symfony3/Component/Process/autoload.php',
'%{php_home}/Symfony3/Component/Stopwatch//autoload.php',
'%{php_home}/SebastianBergmann/Diff/autoload.php',
'%{php_home}/Symfony/Polyfill/autoload.php',
]);
@ -204,13 +208,13 @@ cat << 'EOF' | tee vendor/autoload.php
\Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\Tests\\', dirname(__DIR__) . '/tests');
EOF
# see https://github.com/FriendsOfPHP/PHP-CS-Fixer/blob/master/.travis.yml
if php -r 'exit (version_compare(PHP_VERSION, "5.6", "<") ? 0 : 1);'; then
export SKIP_LINT_TEST_CASES=1
fi
%{_bindir}/phpunit --verbose
ret=0
for cmd in php php56 php70 php71; do
if which $cmd; then
$cmd %{_bindir}/phpunit --verbose || ret=1
fi
done
exit $ret
%else
: Test suite disabled
%endif
@ -226,6 +230,11 @@ fi
%changelog
* Tue May 9 2017 Remi Collet <remi@remirepo.net> - 2.3.1-1
- Update to 2.3.1
- raise dependency on PHP 5.6
- raise dependency on Symfony 3
* Wed Apr 26 2017 Remi Collet <remi@remirepo.net> - 2.2.3-1
- Update to 2.2.3

2
sources
View file

@ -1 +1 @@
SHA512 (php-cs-fixer-2.2.3-8f33cf3.tgz) = 51451799b412715e35eee354050e7d566ff9af33719a33f8aa782324bb68a7b81386937612a721e7a81c74c49f6eab78548d4e5948f7c1bb712840165e8b579e
SHA512 (php-cs-fixer-2.3.1-d5257f7.tgz) = 0047785c228df0a0ae713e21293b9dc1aec174b035cbf65f2fc00a1a358d1127a85f67428570399677620bd8d7de2e7de05333be17c63d3ff4d2ce35d27ffec0