v2.8.0

3 files changed, 45 insertions, 33 deletions

diff --git a/composer-diff.json b/composer-diff.json
index 49b712b..f8f2377 100644
--- a/composer-diff.json
+++ b/composer-diff.json
@@ -3,7 +3,7 @@
     "description": "sebastian/diff v2 backport support for PHP5.6",
     "keywords": ["diff"],
     "homepage": "https://github.com/PHP-CS-Fixer",
-    "license": "BSD-3-Clause",
+    "license": "BSD-3-Clause|MIT",
     "authors": [
         {
             "name": "Sebastian Bergmann",
@@ -12,13 +12,17 @@
         {
             "name": "Kore Nordmann",
             "email": "mail@kore-nordmann.de"
+        },
+        {
+            "name": "SpacePossum"
         }
     ],
     "require": {
         "php": "^5.6 || ^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35 || ^5.4.3"
+        "phpunit/phpunit": "^4.8.35 || ^5.4.3",
+        "symfony/process": "^3.3"
     },
     "autoload": {
         "classmap": [
@@ -28,7 +32,9 @@
     "autoload-dev": {
         "psr-4": {
             "PhpCsFixer\\Diff\\v1_4\\Tests\\": "tests/v1_4",
-            "PhpCsFixer\\Diff\\v2_0\\Tests\\": "tests/v2_0"
+            "PhpCsFixer\\Diff\\v2_0\\Tests\\": "tests/v2_0",
+            "PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Tests\\": "tests/GeckoPackages/DiffOutputBuilder/Tests",
+            "PhpCsFixer\\Diff\\GeckoPackages\\DiffOutputBuilder\\Utils\\": "tests/GeckoPackages/DiffOutputBuilder/Utils"
         }
     }
 }
diff --git a/composer.json b/composer.json
index 28250d9..e2bf7a1 100644
--- a/composer.json
+++ b/composer.json
@@ -19,25 +19,25 @@
         "ext-tokenizer": "*",
         "composer/semver": "^1.4",
         "doctrine/annotations": "^1.2",
-        "gecko-packages/gecko-php-unit": "^2.0",
-        "php-cs-fixer/diff": "^1.0",
-        "symfony/console": "^3.2",
-        "symfony/event-dispatcher": "^3.0",
-        "symfony/filesystem": "^3.0",
-        "symfony/finder": "^3.0",
-        "symfony/options-resolver": "^3.0",
+        "gecko-packages/gecko-php-unit": "^2.0 || ^3.0",
+        "php-cs-fixer/diff": "^1.2",
+        "symfony/console": "^3.2 || ^4.0",
+        "symfony/event-dispatcher": "^3.0 || ^4.0",
+        "symfony/filesystem": "^3.0 || ^4.0",
+        "symfony/finder": "^3.0 || ^4.0",
+        "symfony/options-resolver": "^3.0 || ^4.0",
         "symfony/polyfill-php70": "^1.0",
         "symfony/polyfill-php72": "^1.4",
-        "symfony/process": "^3.0",
-        "symfony/stopwatch": "^3.0"
+        "symfony/process": "^3.0 || ^4.0",
+        "symfony/stopwatch": "^3.0 || ^4.0"
     },
     "require-dev": {
-        "johnkary/phpunit-speedtrap": "^1.1",
+        "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
         "justinrainbow/json-schema": "^5.0",
+        "php-coveralls/php-coveralls": "^1.0.2",
         "php-cs-fixer/accessible-object": "^1.0",
-        "phpunit/phpunit": "^4.8.35 || ^5.4.3",
-        "satooshi/php-coveralls": "^1.0",
-        "symfony/phpunit-bridge": "^3.2.2"
+        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+        "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
     },
     "suggest": {
         "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index daef3ec..fa2b301 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    ab2e189d94698178988f9732bc75bb4ce8d16f77
+%global gh_commit    89e7b083f27241e03dd776cb8d6781c77e341db6
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     FriendsOfPHP
@@ -16,12 +16,14 @@
 
 # Bundled this fork which is not designed for use outside of php-cs-fixer
 %global gh_diff_owner   PHP-CS-Fixer
-%global gh_diff_version 1.1.0
-%global gh_diff_commit  d068edadcb8f7bc2ea3d3769cdbaf609026ec4f4
+%global gh_diff_version 1.2.0
+%global gh_diff_commit  f0ef6133d674137e902fdf8a6f2e8e97e14a087b
 %global gh_diff_short   %(c=%{gh_diff_commit}; echo ${c:0:7})
 
+# TODO: gecko-packages/gecko-php-unit v3 to use phpunit6
+
 Name:           php-cs-fixer
-Version:        2.7.1
+Version:        2.8.0
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A tool to automatically fix PHP code style
 
@@ -81,12 +83,12 @@ BuildRequires:  php-composer(symfony/debug)            <  4
 BuildRequires:  php-composer(symfony/debug)            >= 3.2
 # From composer.json,     "require-dev": {
 # NOTICE: listener disabled during test suite
-#        "johnkary/phpunit-speedtrap": "^1.1",
+#        "johnkary/phpunit-speedtrap": "^1.1 || ^2.0@dev",
 #        "justinrainbow/json-schema": "^5.0",
+#        "satooshi/php-coveralls": "^1.0.2",
 #        "php-cs-fixer/accessible-object": "^1.0",
-#        "phpunit/phpunit": "^4.8.35 || ^5.4.3",
-#        "satooshi/php-coveralls": "^1.0",
-#        "symfony/phpunit-bridge": "^3.2"
+#        "phpunit/phpunit": "^5.7.23 || ^6.4.3",
+#        "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
 BuildRequires:  php-composer(justinrainbow/json-schema) <  6
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 5.0
 BuildRequires:  php-composer(php-cs-fixer/accessible-object) <  2
@@ -104,19 +106,19 @@ BuildRequires:  php-fedora-autoloader-devel
 #        "ext-tokenizer": "*",
 #        "composer/semver": "^1.4",
 #        "doctrine/annotations": "^1.2",
-#        "gecko-packages/gecko-php-unit": "^2.0",
+#        "gecko-packages/gecko-php-unit": "^2.0 || ^3.0",
 # Bundled
-#        "php-cs-fixer/diff": "^1.0",
-#        "symfony/console": "^3.2",
-#        "symfony/event-dispatcher": "^3.0",
-#        "symfony/filesystem": "^3.0",
-#        "symfony/finder": "^3.0",
-#        "symfony/options-resolver": "^3.0",
+#        "php-cs-fixer/diff": "^1.2",
+#        "symfony/console": "^3.2 || ^4.0",
+#        "symfony/event-dispatcher": "^3.0 || ^4.0",
+#        "symfony/filesystem": "^3.0 || ^4.0",
+#        "symfony/finder": "^3.0 || ^4.0",
+#        "symfony/options-resolver": "^3.0 || ^4.0",
 #        "symfony/polyfill-php70": "^1.0",
 #        "symfony/polyfill-php72": "^1.4",
 #        "symfony/polyfill-xml": "^1.3",
-#        "symfony/process": "^3.0",
-#        "symfony/stopwatch": "^3.0"
+#        "symfony/process": "^3.0 || ^4.0",
+#        "symfony/stopwatch": "^3.0 || ^4.0"
 Requires:       php(language) >= 5.6
 Requires:       php-json
 Requires:       php-tokenizer
@@ -164,6 +166,7 @@ Requires:       php-xml
 # Autoloader
 Requires:       php-composer(fedora/autoloader)
 
+Provides:       bundled(php-cs-fixer/diff) = %{gh_diff_version}
 Provides:       php-composer(friendsofphp/php-cs-fixer) = %{version}
 
 
@@ -282,6 +285,9 @@ exit $ret
 
 
 %changelog
+* Fri Nov  3 2017 Remi Collet <remi@remirepo.net> - 2.8.0-1
+- Update to 2.8.0
+
 * Mon Oct  2 2017 Remi Collet <remi@remirepo.net> - 2.7.1-1
 - Update to 2.7.1