v2.16.4

(cherry picked from commit 7ba04cc7c5)

.gitignore

@@ -39,3 +39,6 @@ clog
 /php-cs-fixer-2.15.3-705490b.tgz
 /php-cs-fixer-2.16.0-ceaff36.tgz
 /php-cs-fixer-2.16.1-c8afb59.tgz
+/php-cs-fixer-2.16.2-c460a3c.tgz
+/php-cs-fixer-2.16.3-83baf82.tgz
+/php-cs-fixer-2.16.4-1023c34.tgz

php-cs-fixer.spec

@@ -1,6 +1,6 @@
 # remirepo/fedora spec file for php-cs-fixer
 #
-# Copyright (c) 2016-2019 Remi Collet
+# Copyright (c) 2016-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -10,7 +10,7 @@
 # For compatibility with SCL
 %undefine __brp_mangle_shebangs
 
-%global gh_commit    c8afb599858876e95e8ebfcd97812d383fa23f02
+%global gh_commit    1023c3458137ab052f6ff1e09621a721bfdeca13
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     FriendsOfPHP
@@ -26,7 +26,7 @@
 %global gh_diff_short   %(c=%{gh_diff_commit}; echo ${c:0:7})
 
 Name:           php-cs-fixer
-Version:        2.16.1
+Version:        2.16.4
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A tool to automatically fix PHP code style
 
@@ -82,7 +82,7 @@ BuildRequires:  php-symfony3-debug
 #        "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1",
 #        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1",
 #        "phpunitgoodpractices/traits": "^1.8",
-#        "symfony/phpunit-bridge": "^4.3 || ^5.0",
+#        "symfony/phpunit-bridge": "^5.1",
 #        "symfony/yaml": "^3.0 || ^4.0 || ^5.0"
 # ignored as test using it fail strangely
 #BuildRequires: php-composer(keradus/cli-executor) <  2
@@ -93,13 +93,8 @@ BuildRequires:  (php-composer(php-cs-fixer/accessible-object)
 BuildRequires:  (php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) >= 1.1   with php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring) < 2)
 BuildRequires:  (php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd)     >= 1.1   with php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd)     < 2)
 BuildRequires:  (php-composer(phpunitgoodpractices/traits)                       >= 1.8   with php-composer(phpunitgoodpractices/traits)                       < 2)
-%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 %global phpunit %{_bindir}/phpunit7
 BuildRequires:  phpunit7                        >= 7.1
-%else
-%global phpunit %{_bindir}/phpunit6
-BuildRequires:  phpunit6                        >= 6.5.14
-%endif
 %endif
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
@@ -142,17 +137,18 @@ Requires:       php-symfony3-stopwatch
 # Missing dependency for Console
 Requires:       php-symfony3-debug
 # From composer.json, "suggest": {
-#        "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
+#        "ext-dom": "For handling output formats in XML",
+#        "ext-mbstring": "For handling non-UTF8 characters.",
 #        "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.",
 #        "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.",
 #        "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
+Requires:       php-dom
 Requires:       php-mbstring
 Recommends:     php-composer(php-cs-fixer/phpunit-constraint-isidenticalstring)
 Recommends:     php-composer(php-cs-fixer/phpunit-constraint-xmlmatchesxsd)
 # From phpcompatinfo report for version 2.4.0
 Requires:       php-cli
 Requires:       php-reflection
-Requires:       php-dom
 Requires:       php-pcre
 Requires:       php-phar
 Requires:       php-spl
@@ -191,6 +187,7 @@ TESTS="
   tests/Test/IntegrationCaseFactory.php
   tests/Test/IntegrationCaseFactoryInterface.php
   tests/Test/InternalIntegrationCaseFactory.php
+  tests/Test/IsIdenticalConstraint.php
   tests/TestCase.php
 "
 for i in $TESTS; do
@@ -272,17 +269,22 @@ rm tests/Fixtures/Integration/priority/combine_consecutive_issets,no_singleline_
 
 # Disable listener
 sed -e '/<listeners>/,/<\/listeners>/d' phpunit.xml.dist >phpunit.xml
+sed -e '/ExpectDeprecationTrait/d' \
+    -i tests/Fixer/CastNotation/LowercaseCastFixerTest.php tests/Fixer/CastNotation/ShortScalarCastFixerTest.php
+# skip as rely on composer autoloader for phpunit
+rm tests/Fixer/PhpUnit/PhpUnitNamespacedFixerTest.php
+rm tests/AutoReview/ProjectCodeTest.php
 
 # Redirect to buildroot
 sed -e 's:%{php_home}:%{buildroot}%{php_home}:' -i %{name}
 
 ret=0
 # skip testFix74Deprecated as we don't use symfony/phpunit-bridge
-for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
     $1 -d memory_limit=2G ${2:-%{_bindir}/phpunit7} \
-       --filter '^((?!(testFixerContainsAllPhpunitStaticMethodsInItsList|testFix74Deprecated)).)*$' \
+       --filter '^((?!(testFixerContainsAllPhpunitStaticMethodsInItsList|testFix74Deprecated|testFixersPriorityPairsHaveIntegrationTest)).)*$' \
       || ret=1
   fi
 done
@@ -301,6 +303,15 @@ exit $ret
 
 
 %changelog
+* Mon Jun 29 2020 Remi Collet <remi@remirepo.net> - 2.16.4-1
+- update to 2.16.4
+
+* Thu Apr 16 2020 Remi Collet <remi@remirepo.net> - 2.16.3-1
+- update to 2.16.3
+
+* Mon Apr 13 2020 Remi Collet <remi@remirepo.net> - 2.16.2-1
+- update to 2.16.2
+
 * Tue Nov 26 2019 Remi Collet <remi@remirepo.net> - 2.16.1-1
 - update to 2.16.1
 

sources

@@ -1,2 +1,2 @@
-SHA512 (php-cs-fixer-2.16.1-c8afb59.tgz) = 584c7810010e2f5c2e0c1295600c35b7926a9fc05175ac036f8e8db29f7ad402f7a46df837ec2e013efe17f8643624a85b9c9e6fb1705a5da462ab7e01b986cd
-SHA512 (php-cs-fixer-diff-1.3.0-78bb099.tgz) = 6412dea59e92d98d5e8a85ab1aeed5860406b0a2061897623f6653f03b998ad8a455f4144bb1a8ae65f2de9edd323635c0a931d0be1e84727e67a5134005ba88
+SHA512 (php-cs-fixer-2.16.4-1023c34.tgz) = cbd34f30435da346b7c922dfe522bd45e3b040b2181def4824f076ff64a4a05067c8f0fa6fd61d68985786075ca34785cdfc34c218f7a39930de75a5b4b13da2
+SHA512 (php-cs-fixer-diff-1.3.0-78bb099.tgz) = 6544dbf26ffdba71b270191dcf7b82239757d122a9b33fee683b80c61c0477946deb857a12ac727ff813844749de47c4507f1aabedcae65fac8fbfb9526d3838