Merge pull request #9071 from pamil/1.0-composer-lock

Update composer.json (1.0)
This commit is contained in:
Kamil Kokot 2017-12-28 22:26:43 +01:00 committed by GitHub
commit 1f7822d5bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 35 deletions

View file

@ -31,7 +31,7 @@
"doctrine/doctrine-cache-bundle": "^1.3",
"doctrine/doctrine-fixtures-bundle": "^2.3",
"doctrine/doctrine-migrations-bundle": "^1.2",
"doctrine/orm": "^2.5",
"doctrine/orm": "~2.5.0",
"friendsofsymfony/oauth-server-bundle": "^1.5",
"friendsofsymfony/rest-bundle": "^2.1",
"fzaninotto/faker": "^1.6",
@ -64,6 +64,7 @@
"twig/twig": "^2.0",
"webmozart/assert": "^1.1",
"white-october/pagerfanta-bundle": "^1.0.8",
"willdurand/hateoas": "~2.10.0",
"willdurand/hateoas-bundle": "^1.2",
"winzou/state-machine-bundle": "^0.3",
"zendframework/zend-hydrator": "^2.2",

60
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
"content-hash": "5dd7ad2869e179b1894d367fa9bcf11d",
"content-hash": "d3d5c201a0cb83912f785c8e23ccd888",
"packages": [
{
"name": "behat/transliterator",
@ -1175,40 +1175,38 @@
},
{
"name": "doctrine/orm",
"version": "v2.6.0",
"version": "v2.5.14",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "374e7ace49d864dad8cddbc55346447c8a6a2083"
"reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/374e7ace49d864dad8cddbc55346447c8a6a2083",
"reference": "374e7ace49d864dad8cddbc55346447c8a6a2083",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/810a7baf81462a5ddf10e8baa8cb94b6eec02754",
"reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754",
"shasum": ""
},
"require": {
"doctrine/annotations": "~1.5",
"doctrine/cache": "~1.6",
"doctrine/collections": "^1.4",
"doctrine/common": "^2.7.1",
"doctrine/dbal": "^2.6",
"doctrine/instantiator": "~1.1",
"doctrine/cache": "~1.4",
"doctrine/collections": "~1.2",
"doctrine/common": ">=2.5-dev,<2.9-dev",
"doctrine/dbal": ">=2.5-dev,<2.7-dev",
"doctrine/instantiator": "^1.0.1",
"ext-pdo": "*",
"php": "^7.1",
"symfony/console": "~3.0|~4.0"
"php": ">=5.4",
"symfony/console": "~2.5|~3.0|~4.0"
},
"require-dev": {
"doctrine/coding-standard": "^1.0",
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^3.2",
"symfony/yaml": "~3.4|~4.0"
"phpunit/phpunit": "~4.0",
"symfony/yaml": "~2.3|~3.0|~4.0"
},
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
"bin": [
"bin/doctrine"
"bin/doctrine",
"bin/doctrine.php"
],
"type": "library",
"extra": {
@ -1217,8 +1215,8 @@
}
},
"autoload": {
"psr-4": {
"Doctrine\\ORM\\": "lib/Doctrine/ORM"
"psr-0": {
"Doctrine\\ORM\\": "lib/"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -1241,10 +1239,6 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
},
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com"
}
],
"description": "Object-Relational-Mapper for PHP",
@ -1253,7 +1247,7 @@
"database",
"orm"
],
"time": "2017-12-20T00:38:15+00:00"
"time": "2017-12-17T02:57:51+00:00"
},
{
"name": "egulias/email-validator",
@ -5729,24 +5723,24 @@
},
{
"name": "willdurand/hateoas",
"version": "2.11.0",
"version": "2.10.0",
"source": {
"type": "git",
"url": "https://github.com/willdurand/Hateoas.git",
"reference": "bc5c1035f7f040f13810fbed9ac87ba540af7758"
"reference": "ada89d867e47040f8c4be3be2c8e7930a3d01189"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/willdurand/Hateoas/zipball/bc5c1035f7f040f13810fbed9ac87ba540af7758",
"reference": "bc5c1035f7f040f13810fbed9ac87ba540af7758",
"url": "https://api.github.com/repos/willdurand/Hateoas/zipball/ada89d867e47040f8c4be3be2c8e7930a3d01189",
"reference": "ada89d867e47040f8c4be3be2c8e7930a3d01189",
"shasum": ""
},
"require": {
"doctrine/annotations": "~1.0",
"doctrine/common": "~2.0",
"jms/metadata": "~1.1",
"jms/serializer": "^1.7",
"php": "^5.5|^7.0",
"jms/serializer": "~1.0",
"php": ">=5.4",
"phpoption/phpoption": ">=1.1.0,<2.0-dev",
"symfony/expression-language": "~2.4 || ~3.0"
},
@ -5766,7 +5760,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.11-dev"
"dev-master": "2.10-dev"
}
},
"autoload": {
@ -5789,7 +5783,7 @@
}
],
"description": "A PHP library to support implementing representations for HATEOAS REST web services",
"time": "2017-05-22T10:27:33+00:00"
"time": "2016-05-19T11:30:35+00:00"
},
{
"name": "willdurand/hateoas-bundle",

View file

@ -30,7 +30,7 @@
"symfony/templating": "^3.2"
},
"require-dev": {
"doctrine/orm": "^2.5",
"doctrine/orm": "~2.5.0",
"phpspec/phpspec": "^4.0",
"phpunit/phpunit": "^5.6",
"symfony/browser-kit": "^3.2",