v2.2.13

2 files changed, 27 insertions, 36 deletions

diff --git a/composer.json b/composer.json
index 158dcf7..178282c 100644
--- a/composer.json
+++ b/composer.json
@@ -36,6 +36,7 @@
     "require-dev": {
         "johnkary/phpunit-speedtrap": "^1.0.1",
         "justinrainbow/json-schema": "^5.0",
+        "mikey179/vfsStream": "^1.6",
         "php-coveralls/php-coveralls": "^1.0.2",
         "phpunit/phpunit": "^4.8.35 || ^5.4.3",
         "symfony/phpunit-bridge": "^3.2.2 || ^4.0"
diff --git a/php-cs-fixer.spec b/php-cs-fixer.spec
index 8037d32..4ab2d42 100644
--- a/php-cs-fixer.spec
+++ b/php-cs-fixer.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    362ad63e80d05a238fbe542d75cc1f8e9246797e
+%global gh_commit    669e2327a17b94e47454c3d2e00c6f96203646f0
 %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.12
+Version:        2.2.13
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A tool to automatically fix PHP code style
 
@@ -40,26 +40,19 @@ BuildRequires:  php-composer(doctrine/annotations)     <  2
 BuildRequires:  php-composer(doctrine/annotations)     >= 1.2
 BuildRequires:  php-composer(gecko-packages/gecko-php-unit) <  3
 BuildRequires:  php-composer(gecko-packages/gecko-php-unit) >= 2.0
-BuildRequires:  php-composer(symfony/console)          <  3
-BuildRequires:  php-composer(symfony/console)          >= 2.4
-BuildRequires:  php-composer(symfony/event-dispatcher) <  3
-BuildRequires:  php-composer(symfony/event-dispatcher) >= 2.1
-BuildRequires:  php-composer(symfony/filesystem)       <  3
-BuildRequires:  php-composer(symfony/filesystem)       >= 2.4
-BuildRequires:  php-composer(symfony/finder)           <  3
-BuildRequires:  php-composer(symfony/finder)           >= 2.4
-BuildRequires:  php-composer(symfony/options-resolver) <  3
-BuildRequires:  php-composer(symfony/options-resolver) >= 2.6
+BuildRequires:  php-symfony-console
+BuildRequires:  php-symfony-event-dispatcher
+BuildRequires:  php-symfony-filesystem
+BuildRequires:  php-symfony-finder
+BuildRequires:  php-symfony-options-resolver
 BuildRequires:  php-composer(symfony/polyfill-php55)   <  2
 BuildRequires:  php-composer(symfony/polyfill-php55)   >= 1.4
 BuildRequires:  php-composer(symfony/polyfill-php70)   <  2
 BuildRequires:  php-composer(symfony/polyfill-php70)   >= 1.4
 BuildRequires:  php-composer(symfony/polyfill-php72)   <  2
 BuildRequires:  php-composer(symfony/polyfill-php72)   >= 1.4
-BuildRequires:  php-composer(symfony/process)          <  3
-BuildRequires:  php-composer(symfony/process)          >= 2.3
-BuildRequires:  php-composer(symfony/stopwatch)        <  3
-BuildRequires:  php-composer(symfony/stopwatch)        >= 2.5
+BuildRequires:  php-symfony-process
+BuildRequires:  php-symfony-stopwatch
 BuildRequires:  php-composer(sebastian/diff)           <  2
 BuildRequires:  php-composer(sebastian/diff)           >= 1.4
 BuildRequires:  php-mbstring
@@ -75,13 +68,16 @@ BuildRequires:  php-xml
 # NOTICE: listener disabled
 #        "johnkary/phpunit-speedtrap": "^1.0.1",
 #        "justinrainbow/json-schema": "^5.0",
+#        "mikey179/vfsStream": "^1.6",
 #        "satooshi/php-coveralls": "^1.0.2",
 #        "phpunit/phpunit": "^4.8.35 || ^5.4.3",
 #        "symfony/phpunit-bridge": "^3.2 || ^4.0"
 BuildRequires:  php-composer(justinrainbow/json-schema) <  6
 BuildRequires:  php-composer(justinrainbow/json-schema) >= 5
+BuildRequires:  php-composer(mikey179/vfsStream) <  2
+BuildRequires:  php-composer(mikey179/vfsStream) >= 1.6
 BuildRequires:  php-composer(phpunit/phpunit) >= 4.8.35
-BuildRequires:  php-composer(symfony/phpunit-bridge)
+BuildRequires:  php-symfony-phpunit-bridge
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel
 %endif
@@ -117,26 +113,19 @@ Requires:       php-composer(gecko-packages/gecko-php-unit) <  3
 Requires:       php-composer(gecko-packages/gecko-php-unit) >= 2.0
 Requires:       php-composer(sebastian/diff)           <  2
 Requires:       php-composer(sebastian/diff)           >= 1.4
-Requires:       php-composer(symfony/console)          <  3
-Requires:       php-composer(symfony/console)          >= 2.4
-Requires:       php-composer(symfony/event-dispatcher) <  3
-Requires:       php-composer(symfony/event-dispatcher) >= 2.1
-Requires:       php-composer(symfony/filesystem)       <  3
-Requires:       php-composer(symfony/filesystem)       >= 2.4
-Requires:       php-composer(symfony/finder)           <  3
-Requires:       php-composer(symfony/finder)           >= 2.4
-Requires:       php-composer(symfony/options-resolver) <  3
-Requires:       php-composer(symfony/options-resolver) >= 2.6
+Requires:       php-symfony-console
+Requires:       php-symfony-event-dispatcher
+Requires:       php-symfony-filesystem
+Requires:       php-symfony-finder
+Requires:       php-symfony-options-resolver
 Requires:       php-composer(symfony/polyfill-php55)   <  2
 Requires:       php-composer(symfony/polyfill-php55)   >= 1.4
 Requires:       php-composer(symfony/polyfill-php70)   <  2
 Requires:       php-composer(symfony/polyfill-php70)   >= 1.4
 Requires:       php-composer(symfony/polyfill-php72)   <  2
 Requires:       php-composer(symfony/polyfill-php72)   >= 1.4
-Requires:       php-composer(symfony/process)          <  3
-Requires:       php-composer(symfony/process)          >= 2.3
-Requires:       php-composer(symfony/stopwatch)        <  3
-Requires:       php-composer(symfony/stopwatch)        >= 2.5
+Requires:       php-symfony-process
+Requires:       php-symfony-stopwatch
 # From composer.json, "suggest": {
 #        "ext-mbstring": "For handling non-UTF8 characters in cache signature.",
 #        "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible."
@@ -192,7 +181,7 @@ cat << 'EOF' | tee -a src/autoload.php
 require_once '%{php_home}/Fedora/Autoloader/autoload.php';
 \Fedora\Autoloader\Autoload::addPsr4('PhpCsFixer\\', __DIR__);
 \Fedora\Autoloader\Dependencies::required([
-    '%{php_home}//Composer/Semver/autoload.php',
+    '%{php_home}/Composer/Semver/autoload.php',
     '%{php_home}/Doctrine/Common/Annotations/autoload.php',
     '%{php_home}/GeckoPackages/PHPUnit/autoload.php',
     '%{php_home}/Symfony/Component/autoload.php',
@@ -221,10 +210,8 @@ mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
 \Fedora\Autoloader\Dependencies::required([
-    [
-        '%{php_home}/Symfony3/Bridge/PhpUnit/autoload.php',
-        '%{php_home}/Symfony/Bridge/PhpUnit/autoload.php',
-    ],
+    '%{php_home}/Symfony/Bridge/PhpUnit/autoload.php',
+    '%{php_home}/org/bovigo/vfs/autoload.php',
     '%{php_home}/JsonSchema5/autoload.php',
     '%{buildroot}%{php_home}/PhpCsFixer/autoload.php',
 ]);
@@ -263,6 +250,9 @@ fi
 
 
 %changelog
+* Wed Dec 13 2017 Remi Collet <remi@remirepo.net> - 2.2.13-1
+- Update to 2.2.13
+
 * Mon Nov 27 2017 Remi Collet <remi@remirepo.net> - 2.2.12-1
 - Update to 2.2.12