summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer-autoload.php2
-rw-r--r--composer-rpm.patch35
-rw-r--r--composer.json4
-rw-r--r--composer.spec16
4 files changed, 31 insertions, 26 deletions
diff --git a/composer-autoload.php b/composer-autoload.php
index e36e932..f66b4f8 100644
--- a/composer-autoload.php
+++ b/composer-autoload.php
@@ -17,7 +17,7 @@ require_once $vendorDir . '/Fedora/Autoloader/autoload.php';
$vendorDir . '/Composer/Semver/autoload.php',
$vendorDir . '/Psr/Log/autoload.php',
array(
+ $vendorDir . '/JsonSchema5/autoload.php',
$vendorDir . '/JsonSchema4/autoload.php',
- $vendorDir . '/JsonSchema2/autoload.php',
)));
diff --git a/composer-rpm.patch b/composer-rpm.patch
index 1cdfd7d..9b896a2 100644
--- a/composer-rpm.patch
+++ b/composer-rpm.patch
@@ -1,6 +1,6 @@
diff -up ./bin/composer.rpm ./bin/composer
---- ./bin/composer.rpm 2016-12-12 10:30:58.174009561 +0100
-+++ ./bin/composer 2016-12-12 10:32:17.465427241 +0100
+--- ./bin/composer.rpm 2017-03-08 17:51:24.000000000 +0100
++++ ./bin/composer 2017-03-08 19:16:24.206124958 +0100
@@ -5,7 +5,7 @@ if (PHP_SAPI !== 'cli') {
echo 'Warning: Composer should be invoked via the CLI version of PHP, not the '.PHP_SAPI.' SAPI'.PHP_EOL;
}
@@ -11,8 +11,8 @@ diff -up ./bin/composer.rpm ./bin/composer
use Composer\Factory;
use Composer\XdebugHandler;
diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autoload/AutoloadGenerator.php
---- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Autoload/AutoloadGenerator.php 2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Autoload/AutoloadGenerator.php.rpm 2017-03-08 17:51:24.000000000 +0100
++++ ./src/Composer/Autoload/AutoloadGenerator.php 2017-03-08 19:16:24.207124963 +0100
@@ -305,7 +305,7 @@ EOF;
file_put_contents($targetDir.'/autoload_real.php', $this->getAutoloadRealFile(true, (bool) $includePathFileContents, $targetDirLoader, (bool) $includeFilesFileContents, $vendorPathCode, $appBaseDirCode, $suffix, $useGlobalIncludePath, $prependAutoloader, $staticPhpVersion));
@@ -23,8 +23,8 @@ diff -up ./src/Composer/Autoload/AutoloadGenerator.php.rpm ./src/Composer/Autolo
if ($this->runScripts) {
$this->eventDispatcher->dispatchScript(ScriptEvents::POST_AUTOLOAD_DUMP, $this->devMode, array(), array(
diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
---- ./src/Composer/Compiler.php.rpm 2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Compiler.php 2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Compiler.php.rpm 2017-03-08 17:51:24.000000000 +0100
++++ ./src/Composer/Compiler.php 2017-03-08 19:16:24.207124963 +0100
@@ -97,7 +97,7 @@ class Compiler
$finder = new Finder();
$finder->files()
@@ -35,26 +35,27 @@ diff -up ./src/Composer/Compiler.php.rpm ./src/Composer/Compiler.php
->sort($finderSort)
;
diff -up ./src/Composer/Json/JsonFile.php.rpm ./src/Composer/Json/JsonFile.php
---- ./src/Composer/Json/JsonFile.php.rpm 2016-12-11 17:04:50.000000000 +0100
-+++ ./src/Composer/Json/JsonFile.php 2016-12-12 10:30:58.175009567 +0100
+--- ./src/Composer/Json/JsonFile.php.rpm 2017-03-08 19:16:24.207124963 +0100
++++ ./src/Composer/Json/JsonFile.php 2017-03-08 19:17:35.148449586 +0100
@@ -156,7 +156,7 @@ class JsonFile
self::validateSyntax($content, $this->path);
}
- $schemaFile = __DIR__ . '/../../../res/composer-schema.json';
+ $schemaFile = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
- $schemaData = json_decode(file_get_contents($schemaFile));
- if ($schema === self::LAX_SCHEMA) {
+ // Prepend with file:// only when not using a special schema already (e.g. in the phar)
+ if (false === strpos($schemaFile, '://')) {
diff -up ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm ./tests/Composer/Test/Json/ComposerSchemaTest.php
---- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2016-12-11 17:04:50.000000000 +0100
-+++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2016-12-12 10:30:58.175009567 +0100
-@@ -95,7 +95,7 @@ class ComposerSchemaTest extends \PHPUni
-
+--- ./tests/Composer/Test/Json/ComposerSchemaTest.php.rpm 2017-03-08 19:16:24.207124963 +0100
++++ ./tests/Composer/Test/Json/ComposerSchemaTest.php 2017-03-08 19:19:02.243848127 +0100
+@@ -96,7 +96,8 @@ class ComposerSchemaTest extends \PHPUni
private function check($json)
{
-- $schema = json_decode(file_get_contents(__DIR__ . '/../../../../res/composer-schema.json'));
-+ $schema = json_decode(file_get_contents((getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json'));
$validator = new Validator();
- $validator->check(json_decode($json), $schema);
+- $validator->check(json_decode($json), (object) array('$ref' => 'file://' . __DIR__ . '/../../../../res/composer-schema.json'));
++ $f = (getenv('BUILDROOT')?:'') . '/usr/share/composer/res/composer-schema.json';
++ $validator->check(json_decode($json), (object) array('$ref' => 'file://' . $f));
+ if (!$validator->isValid()) {
+ $errors = $validator->getErrors();
diff --git a/composer.json b/composer.json
index 8e9ba21..adc7d01 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,7 @@
},
"require": {
"php": "^5.3.2 || ^7.0",
- "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
+ "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
"composer/ca-bundle": "^1.0",
"composer/semver": "^1.0",
"composer/spdx-licenses": "^1.0",
@@ -59,7 +59,7 @@
"bin": ["bin/composer"],
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.4-dev"
}
},
"scripts": {
diff --git a/composer.spec b/composer.spec
index 24c863f..9b193ed 100644
--- a/composer.spec
+++ b/composer.spec
@@ -6,7 +6,7 @@
#
# Please, preserve the changelog entries
#
-%global gh_commit 989d68725bc8ebf97e795d4feb386f52adb096e3
+%global gh_commit b19655f1304a3365213204bcf9a9b84476d0d265
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_branch 1.0-dev
%global gh_owner composer
@@ -16,7 +16,7 @@
#global prever RC
Name: composer
-Version: 1.3.3
+Version: 1.4.0
Release: 1%{?dist}
Summary: Dependency Manager for PHP
@@ -37,7 +37,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: php-cli
%if %{with_tests}
-BuildRequires: php-composer(justinrainbow/json-schema) >= 2.0
+BuildRequires: php-composer(justinrainbow/json-schema) >= 3.0
BuildRequires: php-composer(composer/spdx-licenses) >= 1.0
BuildRequires: php-composer(composer/ca-bundle) >= 1.0
BuildRequires: php-composer(composer/semver) >= 1.0
@@ -63,7 +63,7 @@ BuildRequires: php-PsrLog >= 1.0.0-8
# From composer.json, "require": {
# "php": "^5.3.2 || ^7.0",
-# "justinrainbow/json-schema": "^1.6 || ^2.0 || ^3.0 || ^4.0",
+# "justinrainbow/json-schema": "^3.0 || ^4.0 || ^5.0",
# "composer/ca-bundle": "^1.0",
# "composer/semver": "^1.0",
# "composer/spdx-licenses": "^1.0",
@@ -77,8 +77,8 @@ BuildRequires: php-PsrLog >= 1.0.0-8
# "psr/log": "^1.0"
Requires: php(language) >= 5.3.2
Requires: php-cli
-Requires: php-composer(justinrainbow/json-schema) >= 2.0
-Requires: php-composer(justinrainbow/json-schema) < 5
+Requires: php-composer(justinrainbow/json-schema) >= 3.0
+Requires: php-composer(justinrainbow/json-schema) < 6
Requires: php-composer(composer/spdx-licenses) >= 1.0
Requires: php-composer(composer/spdx-licenses) < 2
Requires: php-composer(composer/ca-bundle) >= 1.0
@@ -263,6 +263,10 @@ rm -rf %{buildroot}
%changelog
+* Wed Mar 8 2017 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- Update to 1.4.0
+- raise dependency on justinrainbow/json-schema version 3 to 5
+
* Wed Mar 8 2017 Remi Collet <remi@remirepo.net> - 1.3.3-1
- Update to 1.3.3
generated by cgit (git 2.34.1) at 2025-11-04 13:47:57 +0000