allow symfony 3 and json-schema 5

2 files changed, 25 insertions, 15 deletions

diff --git a/composer-autoload.php b/composer-autoload.php
index 0ac331f..f1f20ac 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -9,15 +9,19 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 // Dependencies
 \Fedora\Autoloader\Dependencies::required(array(
 	array(
+		$vendorDir . '/Symfony3/Component/Console/autoload.php',
 		$vendorDir . '/Symfony/Component/Console/autoload.php',
 	),
 	array(
+		$vendorDir . '/Symfony3/Component/Finder/autoload.php',
 		$vendorDir . '/Symfony/Component/Finder/autoload.php',
 	),
 	array(
+		$vendorDir . '/Symfony3/Component/Process/autoload.php',
 		$vendorDir . '/Symfony/Component/Process/autoload.php',
 	),
 	array(
+		$vendorDir . '/Symfony3/Component/Filesystem/autoload.php',
 		$vendorDir . '/Symfony/Component/Filesystem/autoload.php',
 	),
 	$vendorDir . '/Seld/JsonLint/autoload.php',
@@ -27,7 +31,6 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
 	$vendorDir . '/Composer/Spdx/autoload.php',
 	$vendorDir . '/Composer/Semver/autoload.php',
 	$vendorDir . '/Psr/Log/autoload.php',
-	array(
-		$vendorDir . '/JsonSchema4/autoload.php',
-)));
+	$vendorDir . '/JsonSchema5/autoload.php',
+));
 
diff --git a/composer.spec b/composer.spec
index 1c36b02..08a33f9 100644
--- a/composer.spec
+++ b/composer.spec
@@ -17,7 +17,7 @@
 
 Name:           composer
 Version:        1.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Dependency Manager for PHP
 
 Group:          Development/Libraries
@@ -33,13 +33,14 @@ Source4:        %{name}.csh
 # Use our autoloader, resources path, fix for tests
 Patch0:         %{name}-rpm.patch
 
-# Sticked to json-schema 4 and Symfony 2.8 because of
 # https://github.com/composer/composer/issues/6434
+# https://github.com/composer/composer/pull/6435
+Patch1:         %{name}-pr6435.patch
 
 BuildArch:      noarch
 BuildRequires:  php-cli
 %if %{with_tests}
-BuildRequires:  php-justinrainbow-json-schema4
+BuildRequires:  php-justinrainbow-json-schema5
 BuildRequires:  php-composer(composer/spdx-licenses)    <  2
 BuildRequires:  php-composer(composer/spdx-licenses)    >= 1.0
 BuildRequires:  php-composer(composer/ca-bundle)        <  2
@@ -54,13 +55,13 @@ BuildRequires:  php-composer(seld/cli-prompt)           <  2
 BuildRequires:  php-composer(seld/cli-prompt)           >= 1.0
 BuildRequires:  php-composer(psr/log)                   <  2
 BuildRequires:  php-composer(psr/log)                   >= 1.0
-BuildRequires:  php-composer(symfony/console)           <  3
+BuildRequires:  php-composer(symfony/console)           <  4
 BuildRequires:  php-composer(symfony/console)           >= 2.7
-BuildRequires:  php-composer(symfony/finder)            <  3
+BuildRequires:  php-composer(symfony/finder)            <  4
 BuildRequires:  php-composer(symfony/finder)            >= 2.7
-BuildRequires:  php-composer(symfony/filesystem)        <  3
+BuildRequires:  php-composer(symfony/filesystem)        <  4
 BuildRequires:  php-composer(symfony/filesystem)        >= 2.7
-BuildRequires:  php-composer(symfony/process)           <  3
+BuildRequires:  php-composer(symfony/process)           <  4
 BuildRequires:  php-composer(symfony/process)           >= 2.7
 BuildRequires:  php-zip
 # From composer.json, "require-dev": {
@@ -90,7 +91,7 @@ BuildRequires:  php-PsrLog          >= 1.0.0-8
 #        "psr/log": "^1.0"
 Requires:       php(language)                           >= 5.3.2
 Requires:       php-cli
-Requires:       php-justinrainbow-json-schema4
+Requires:       php-justinrainbow-json-schema5
 Requires:       php-composer(composer/spdx-licenses)    >= 1.0
 Requires:       php-composer(composer/spdx-licenses)    <  2
 Requires:       php-composer(composer/ca-bundle)        >= 1.0
@@ -106,13 +107,13 @@ Requires:       php-composer(seld/cli-prompt)           <  2
 Requires:       php-composer(psr/log)                   >= 1.0
 Requires:       php-composer(psr/log)                   <  2
 Requires:       php-composer(symfony/console)           >= 2.7
-Requires:       php-composer(symfony/console)           <  3
+Requires:       php-composer(symfony/console)           <  4
 Requires:       php-composer(symfony/finder)            >= 2.7
-Requires:       php-composer(symfony/finder)            <  3
+Requires:       php-composer(symfony/finder)            <  4
 Requires:       php-composer(symfony/process)           >= 2.7
-Requires:       php-composer(symfony/process)           <  3
+Requires:       php-composer(symfony/process)           <  4
 Requires:       php-composer(symfony/filesystem)        >= 2.7
-Requires:       php-composer(symfony/filesystem)        <  3
+Requires:       php-composer(symfony/filesystem)        <  4
 # From composer.json, suggest
 #        "ext-zip": "Enabling the zip extension allows you to unzip archives, and allows gzip compression of all internet traffic",
 #        "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages"
@@ -161,6 +162,7 @@ Documentation: https://getcomposer.org/doc/
 
 %patch0 -p1 -b .rpm
 find . -name \*.rpm -exec rm {} \; -print
+%patch1 -p1 -b .pr6435
 
 if grep -r '\.\./res'; then
 	: Patch need to fixed
@@ -257,6 +259,11 @@ exit $ret
 
 
 %changelog
+* Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-2
+- fix autoloader to allow symfony 2 and 3
+- raise dependency on justinrainbow/json-schema v5
+- open https://github.com/composer/composer/pull/6435 - fix tests
+
 * Mon May 22 2017 Remi Collet <remi@remirepo.net> - 1.4.2-1
 - Update to 1.4.2
 - only use json-schema 4 and Symfony 2.8 because of