commit 3a2c7dff68bd8e26502dfd7e7e484d0b729cc0de
parent 02ee59567a370127df0f80839513a32b93ec0a2e
Author: Felicitus <felicitus@felicitus.org>
Date: Fri, 11 Sep 2015 19:11:34 +0200
Upgraded to most recent DunglasAPIBundle and updated to more recent packages as well
Diffstat:
6 files changed, 282 insertions(+), 255 deletions(-)
diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php
@@ -638,7 +638,7 @@ class SymfonyRequirements extends RequirementCollection
}
$this->addRecommendation(
- class_exists('Locale'),
+ extension_loaded('intl'),
'intl extension should be available',
'Install and enable the <strong>intl</strong> extension (used for validators).'
);
diff --git a/app/check.php b/app/check.php
@@ -42,9 +42,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) {
}
if ($checkPassed) {
- echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects', true);
+ echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
} else {
- echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects', true);
+ echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
echo_title('Fix the following mandatory requirements', 'red');
@@ -80,7 +80,7 @@ function get_error_message(Requirement $requirement, $lineSize)
return;
}
- $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
+ $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL;
$errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL;
return $errorMessage;
@@ -121,8 +121,8 @@ function echo_block($style, $title, $message)
echo PHP_EOL.PHP_EOL;
echo_style($style, str_repeat(' ', $width).PHP_EOL);
- echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
- echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+ echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+ echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
echo_style($style, str_repeat(' ', $width).PHP_EOL);
}
diff --git a/composer.json b/composer.json
@@ -33,14 +33,14 @@
"sensio/distribution-bundle": "~4.0.0",
"sensio/framework-extra-bundle": "~3.0",
"sensio/generator-bundle": "~2.3",
- "nelmio/api-doc-bundle": "2.9.0",
+ "nelmio/api-doc-bundle": "~2.9@dev",
"friendsofsymfony/rest-bundle": "~1.7.1",
"cbsi/doctrine2-nestedset": "dev-master",
"partkeepr/extjs6": "dev-master",
"fortawesome/font-awesome": "4.3.0",
"doctrine/doctrine-fixtures-bundle": "2.2.*",
"symfony/doctrine-bridge": "2.7.x-dev",
- "dunglas/api-bundle": "1.0.*@dev",
+ "dunglas/api-bundle": "dev-master",
"brainbits/fugue-icons-bundle": "^3.5",
"imagine/imagine": "^0.6.2",
"ramsey/uuid": "dev-master",
diff --git a/composer.lock b/composer.lock
@@ -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"
],
- "hash": "2253aa266bd8d574e2d78436792b6eda",
+ "hash": "a7a8cba356272970c52c8713c6421f41",
"packages": [
{
"name": "atelierspierrot/famfamfam-silk-sprite",
@@ -283,16 +283,16 @@
},
{
"name": "doctrine/annotations",
- "version": "v1.2.6",
+ "version": "v1.2.7",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
- "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4"
+ "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/annotations/zipball/f4a91702ca3cd2e568c3736aa031ed00c3752af4",
- "reference": "f4a91702ca3cd2e568c3736aa031ed00c3752af4",
+ "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+ "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
"shasum": ""
},
"require": {
@@ -347,20 +347,20 @@
"docblock",
"parser"
],
- "time": "2015-06-17 12:21:22"
+ "time": "2015-08-31 12:32:49"
},
{
"name": "doctrine/cache",
- "version": "v1.4.1",
+ "version": "v1.4.2",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
- "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03"
+ "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/cache/zipball/c9eadeb743ac6199f7eec423cb9426bc518b7b03",
- "reference": "c9eadeb743ac6199f7eec423cb9426bc518b7b03",
+ "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
+ "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
"shasum": ""
},
"require": {
@@ -417,7 +417,7 @@
"cache",
"caching"
],
- "time": "2015-04-15 00:11:59"
+ "time": "2015-08-31 12:36:41"
},
{
"name": "doctrine/collections",
@@ -487,16 +487,16 @@
},
{
"name": "doctrine/common",
- "version": "v2.5.0",
+ "version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
- "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3"
+ "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/common/zipball/cd8daf2501e10c63dced7b8b9b905844316ae9d3",
- "reference": "cd8daf2501e10c63dced7b8b9b905844316ae9d3",
+ "url": "https://api.github.com/repos/doctrine/common/zipball/0009b8f0d4a917aabc971fb089eba80e872f83f9",
+ "reference": "0009b8f0d4a917aabc971fb089eba80e872f83f9",
"shasum": ""
},
"require": {
@@ -556,7 +556,7 @@
"persistence",
"spl"
],
- "time": "2015-04-02 19:55:44"
+ "time": "2015-08-31 13:00:22"
},
{
"name": "doctrine/data-fixtures",
@@ -688,16 +688,16 @@
},
{
"name": "doctrine/doctrine-bundle",
- "version": "v1.5.0",
+ "version": "v1.5.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineBundle.git",
- "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f"
+ "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/0b9e27037c4fdbad515ee5ec89842e9091a6480f",
- "reference": "0b9e27037c4fdbad515ee5ec89842e9091a6480f",
+ "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01",
+ "reference": "8c5cedb4f2f7ebb66a963ae46ad9daa1e31cee01",
"shasum": ""
},
"require": {
@@ -705,16 +705,16 @@
"doctrine/doctrine-cache-bundle": "~1.0",
"jdorn/sql-formatter": "~1.1",
"php": ">=5.3.2",
- "symfony/console": "~2.3",
- "symfony/doctrine-bridge": "~2.2",
- "symfony/framework-bundle": "~2.3"
+ "symfony/console": "~2.3|~3.0",
+ "symfony/doctrine-bridge": "~2.2|~3.0",
+ "symfony/framework-bundle": "~2.3|~3.0"
},
"require-dev": {
"doctrine/orm": "~2.3",
"phpunit/phpunit": "~4",
"satooshi/php-coveralls": "~0.6.1",
- "symfony/validator": "~2.2",
- "symfony/yaml": "~2.2",
+ "symfony/validator": "~2.2|~3.0",
+ "symfony/yaml": "~2.2|~3.0",
"twig/twig": "~1.10"
},
"suggest": {
@@ -762,7 +762,7 @@
"orm",
"persistence"
],
- "time": "2015-05-28 12:27:15"
+ "time": "2015-08-12 15:52:00"
},
{
"name": "doctrine/doctrine-cache-bundle",
@@ -850,17 +850,16 @@
},
{
"name": "doctrine/doctrine-fixtures-bundle",
- "version": "v2.2.0",
- "target-dir": "Doctrine/Bundle/FixturesBundle",
+ "version": "v2.2.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineFixturesBundle.git",
- "reference": "c811f96f0cf83b997e3a3ed037cac729bbe3e803"
+ "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/c811f96f0cf83b997e3a3ed037cac729bbe3e803",
- "reference": "c811f96f0cf83b997e3a3ed037cac729bbe3e803",
+ "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/817c2d233fde0fe85cb7e4d25d43fbfcd028aef8",
+ "reference": "817c2d233fde0fe85cb7e4d25d43fbfcd028aef8",
"shasum": ""
},
"require": {
@@ -872,12 +871,12 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "2.2.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Bundle\\FixturesBundle": ""
+ "psr-4": {
+ "Doctrine\\Bundle\\FixturesBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -886,18 +885,16 @@
],
"authors": [
{
- "name": "Fabien Potencier",
- "email": "fabien@symfony.com",
- "homepage": "http://fabien.potencier.org",
- "role": "Lead Developer"
- },
- {
"name": "Symfony Community",
"homepage": "http://symfony.com/contributors"
},
{
"name": "Doctrine Project",
"homepage": "http://www.doctrine-project.org"
+ },
+ {
+ "name": "Fabien Potencier",
+ "email": "fabien@symfony.com"
}
],
"description": "Symfony DoctrineFixturesBundle",
@@ -906,38 +903,37 @@
"Fixture",
"persistence"
],
- "time": "2013-09-05 11:23:37"
+ "time": "2015-08-04 22:43:14"
},
{
"name": "doctrine/doctrine-migrations-bundle",
"version": "dev-master",
- "target-dir": "Doctrine/Bundle/MigrationsBundle",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
- "reference": "861d3564c03b3867845ffd87d9b19f49dc673c69"
+ "reference": "238aaa5fa04b5755a9957715e269d542cd0f8e39"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/238aaa5fa04b5755a9957715e269d542cd0f8e39",
- "reference": "861d3564c03b3867845ffd87d9b19f49dc673c69",
+ "reference": "238aaa5fa04b5755a9957715e269d542cd0f8e39",
"shasum": ""
},
"require": {
"doctrine/doctrine-bundle": "~1.0",
- "doctrine/migrations": "~1.0@dev",
+ "doctrine/migrations": "~1.0",
"php": ">=5.3.2",
"symfony/framework-bundle": "~2.3|~3.0"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "1.0-dev"
}
},
"autoload": {
- "psr-0": {
- "Doctrine\\Bundle\\MigrationsBundle": ""
+ "psr-4": {
+ "Doctrine\\Bundle\\MigrationsBundle\\": ""
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -965,7 +961,7 @@
"migrations",
"schema"
],
- "time": "2015-06-16 12:48:54"
+ "time": "2015-08-04 22:31:10"
},
{
"name": "doctrine/inflector",
@@ -1148,12 +1144,12 @@
"source": {
"type": "git",
"url": "https://github.com/doctrine/migrations.git",
- "reference": "78954cce4962a4655ff47c0751eb78021fbaf2cc"
+ "reference": "4e85ba638acf62e1afe735f94b0c51aa971f8773"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/migrations/zipball/4e85ba638acf62e1afe735f94b0c51aa971f8773",
- "reference": "78954cce4962a4655ff47c0751eb78021fbaf2cc",
+ "reference": "4e85ba638acf62e1afe735f94b0c51aa971f8773",
"shasum": ""
},
"require": {
@@ -1173,10 +1169,13 @@
"suggest": {
"symfony/console": "to run the migration from the console"
},
+ "bin": [
+ "bin/doctrine-migrations"
+ ],
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.0.x-dev"
+ "dev-master": "v1.0.x-dev"
}
},
"autoload": {
@@ -1204,20 +1203,20 @@
"database",
"migrations"
],
- "time": "2015-07-05 21:24:36"
+ "time": "2015-08-27 12:05:11"
},
{
"name": "doctrine/orm",
- "version": "v2.5.0",
+ "version": "v2.5.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
- "reference": "aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe"
+ "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe",
- "reference": "aa80c7d2c55a372f5f9f825f5c66dbda53a6e3fe",
+ "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/e6a83bedbe67579cb0bfb688e982e617943a2945",
+ "reference": "e6a83bedbe67579cb0bfb688e982e617943a2945",
"shasum": ""
},
"require": {
@@ -1281,20 +1280,20 @@
"database",
"orm"
],
- "time": "2015-04-02 20:40:18"
+ "time": "2015-08-31 12:59:39"
},
{
"name": "dunglas/api-bundle",
- "version": "1.0.x-dev",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/dunglas/DunglasApiBundle.git",
- "reference": "8f50c735df47cf9680b4149097fdf2410044762c"
+ "reference": "7fb55b9f1599d8efa7a11d2e2228a5d67c48069a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/dunglas/DunglasApiBundle/zipball/7fb55b9f1599d8efa7a11d2e2228a5d67c48069a",
- "reference": "8f50c735df47cf9680b4149097fdf2410044762c",
+ "reference": "7fb55b9f1599d8efa7a11d2e2228a5d67c48069a",
"shasum": ""
},
"require": {
@@ -1308,7 +1307,8 @@
"symfony/framework-bundle": "~2.6|~3.0",
"symfony/proxy-manager-bridge": "~2.3",
"symfony/serializer": "^2.7.2|~3.0",
- "symfony/validator": "~2.5|~3.0"
+ "symfony/validator": "~2.5|~3.0",
+ "willdurand/negotiation": "~1.4"
},
"require-dev": {
"behat/behat": "~3.0",
@@ -1316,10 +1316,11 @@
"behat/mink-browserkit-driver": "~1.1",
"behat/mink-extension": "~2.0",
"behat/symfony2-extension": "~2.0",
- "behatch/contexts": "dev-master#eef7ab39ca896796bf3ba25a0fa5a95f15276eb7",
+ "behatch/contexts": "dev-master",
"friendsofsymfony/user-bundle": "~1.3",
"phpunit/phpunit": "~4.6",
- "symfony/finder": "~2.3"
+ "symfony/finder": "~2.3",
+ "symfony/security": "~2.7.2|~3.0"
},
"suggest": {
"friendsofsymfony/user-bundle": "To use the FOSUserBundle bridge."
@@ -1355,7 +1356,7 @@
"json",
"rest"
],
- "time": "2015-09-03 16:33:45"
+ "time": "2015-09-01 15:26:41"
},
{
"name": "dunglas/php-property-info",
@@ -1608,16 +1609,16 @@
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
- "reference": "5d7017d35f73cdb74e069f9d607cd0448d305078"
+ "reference": "6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60",
- "reference": "5d7017d35f73cdb74e069f9d607cd0448d305078",
+ "reference": "6b7bb04c6d507bb5356bf70b2d1bc30ce64ffc60",
"shasum": ""
},
"require": {
- "php": ">=5.3.2",
+ "php": ">=5.3.9",
"symfony/form": "~2.3",
"symfony/framework-bundle": "~2.3",
"symfony/security-bundle": "~2.3",
@@ -1667,7 +1668,7 @@
"keywords": [
"User management"
],
- "time": "2015-07-31 13:22:19"
+ "time": "2015-09-07 08:53:52"
},
{
"name": "gedmo/doctrine-extensions",
@@ -1907,35 +1908,39 @@
},
{
"name": "kriswallsmith/assetic",
- "version": "v1.2.1",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/kriswallsmith/assetic.git",
- "reference": "b20efe38845d20458702f97f3ff625d80805897b"
+ "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b",
- "reference": "b20efe38845d20458702f97f3ff625d80805897b",
+ "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/56cb5d6dec9e7a68a4da2fa89844f39d41092f31",
+ "reference": "56cb5d6dec9e7a68a4da2fa89844f39d41092f31",
"shasum": ""
},
"require": {
"php": ">=5.3.1",
"symfony/process": "~2.1"
},
+ "conflict": {
+ "twig/twig": "<1.12"
+ },
"require-dev": {
"cssmin/cssmin": "*",
"joliclic/javascript-packer": "*",
"kamicane/packager": "*",
- "leafo/lessphp": "*",
- "leafo/scssphp": "*",
- "leafo/scssphp-compass": "*",
+ "leafo/lessphp": "^0.3.7",
+ "leafo/scssphp": "*@dev",
+ "leafo/scssphp-compass": "*@dev",
"mrclay/minify": "*",
- "patchwork/jsqueeze": "~1.0",
- "phpunit/phpunit": "~4",
+ "patchwork/jsqueeze": "~1.0|~2.0",
+ "phpunit/phpunit": "~4.8",
"psr/log": "~1.0",
"ptachoire/cssembed": "*",
- "twig/twig": "~1.6"
+ "symfony/phpunit-bridge": "~2.7",
+ "twig/twig": "~1.8|~2.0"
},
"suggest": {
"leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
@@ -1948,7 +1953,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -1977,7 +1982,7 @@
"compression",
"minification"
],
- "time": "2014-12-12 05:04:05"
+ "time": "2015-08-31 19:07:16"
},
{
"name": "michelf/php-markdown",
@@ -2032,16 +2037,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.15.0",
+ "version": "1.17.1",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
- "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0"
+ "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/monolog/zipball/dc5150cc608f2334c72c3b6a553ec9668a4156b0",
- "reference": "dc5150cc608f2334c72c3b6a553ec9668a4156b0",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/0524c87587ab85bc4c2d6f5b41253ccb930a5422",
+ "reference": "0524c87587ab85bc4c2d6f5b41253ccb930a5422",
"shasum": ""
},
"require": {
@@ -2058,7 +2063,7 @@
"php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0",
- "raven/raven": "~0.8",
+ "raven/raven": "~0.11",
"ruflin/elastica": ">=0.90 <3.0",
"swiftmailer/swiftmailer": "~5.3",
"videlalvaro/php-amqplib": "~2.4"
@@ -2078,7 +2083,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.15.x-dev"
+ "dev-master": "1.16.x-dev"
}
},
"autoload": {
@@ -2104,7 +2109,7 @@
"logging",
"psr-3"
],
- "time": "2015-07-12 13:54:09"
+ "time": "2015-08-31 09:17:37"
},
{
"name": "moontoast/math",
@@ -2144,40 +2149,42 @@
},
{
"name": "nelmio/api-doc-bundle",
- "version": "2.9.0",
+ "version": "dev-master",
"target-dir": "Nelmio/ApiDocBundle",
"source": {
"type": "git",
"url": "https://github.com/nelmio/NelmioApiDocBundle.git",
- "reference": "de31760fd84a45fadbb4fe24db050b5e29ea70d1"
+ "reference": "874c8752e6114fd2d384d93d48e859a680f2ae9d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/de31760fd84a45fadbb4fe24db050b5e29ea70d1",
- "reference": "de31760fd84a45fadbb4fe24db050b5e29ea70d1",
+ "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/874c8752e6114fd2d384d93d48e859a680f2ae9d",
+ "reference": "874c8752e6114fd2d384d93d48e859a680f2ae9d",
"shasum": ""
},
"require": {
"michelf/php-markdown": "~1.4",
- "symfony/console": "~2.1",
- "symfony/framework-bundle": "~2.1",
- "symfony/twig-bundle": "~2.1"
+ "symfony/console": "~2.3",
+ "symfony/framework-bundle": "~2.3",
+ "symfony/twig-bundle": "~2.3"
},
"conflict": {
"jms/serializer": "<0.12",
"jms/serializer-bundle": "<0.11"
},
"require-dev": {
- "dunglas/api-bundle": "dev-master",
+ "dunglas/api-bundle": "~1.0@beta",
"friendsofsymfony/rest-bundle": "~1.0",
"jms/serializer-bundle": ">=0.11",
"sensio/framework-extra-bundle": "~3.0",
- "symfony/browser-kit": "~2.1",
- "symfony/css-selector": "~2.1",
- "symfony/form": "~2.1",
- "symfony/serializer": "~2.7@dev",
- "symfony/validator": "~2.1",
- "symfony/yaml": "~2.1"
+ "symfony/browser-kit": "~2.3",
+ "symfony/css-selector": "~2.3",
+ "symfony/finder": "~2.3",
+ "symfony/form": "~2.3",
+ "symfony/phpunit-bridge": "~2.7",
+ "symfony/serializer": "~2.7",
+ "symfony/validator": "~2.3",
+ "symfony/yaml": "~2.3"
},
"suggest": {
"dunglas/api-bundle": "For making use of resources definitions of DunglasApiBundle.",
@@ -2218,7 +2225,7 @@
"documentation",
"rest"
],
- "time": "2015-05-16 17:16:14"
+ "time": "2015-08-13 07:46:00"
},
{
"name": "nikic/php-parser",
@@ -2267,16 +2274,16 @@
},
{
"name": "ocramius/proxy-manager",
- "version": "1.0.0",
+ "version": "1.0.2",
"source": {
"type": "git",
"url": "https://github.com/Ocramius/ProxyManager.git",
- "reference": "a80a39fac4fbd771aea7d3871929933a3a1bbf3e"
+ "reference": "57e9272ec0e8deccf09421596e0e2252df440e11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/a80a39fac4fbd771aea7d3871929933a3a1bbf3e",
- "reference": "a80a39fac4fbd771aea7d3871929933a3a1bbf3e",
+ "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/57e9272ec0e8deccf09421596e0e2252df440e11",
+ "reference": "57e9272ec0e8deccf09421596e0e2252df440e11",
"shasum": ""
},
"require": {
@@ -2326,7 +2333,7 @@
"proxy pattern",
"service proxies"
],
- "time": "2014-12-12 10:59:05"
+ "time": "2015-08-09 04:28:19"
},
{
"name": "partkeepr/extjs6",
@@ -2504,12 +2511,12 @@
"source": {
"type": "git",
"url": "https://github.com/ramsey/uuid.git",
- "reference": "32d2a7ffe9aca7370c98f092f86c0e16f2b2d15b"
+ "reference": "77a34348d52d18d6f2224ba7635808d52a7a725f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/ramsey/uuid/zipball/77a34348d52d18d6f2224ba7635808d52a7a725f",
- "reference": "32d2a7ffe9aca7370c98f092f86c0e16f2b2d15b",
+ "reference": "77a34348d52d18d6f2224ba7635808d52a7a725f",
"shasum": ""
},
"require": {
@@ -2569,7 +2576,7 @@
"identifier",
"uuid"
],
- "time": "2015-07-16 18:03:15"
+ "time": "2015-09-04 03:28:07"
},
{
"name": "reputation-vip/composer-assets-installer",
@@ -2613,22 +2620,22 @@
},
{
"name": "sensio/distribution-bundle",
- "version": "v4.0.0",
+ "version": "v4.0.1",
"target-dir": "Sensio/Bundle/DistributionBundle",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
- "reference": "97929c0a642977acead3d911b2c5c1a944739d40"
+ "reference": "62d99ba41144e704300e40f755346553702b27c9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/97929c0a642977acead3d911b2c5c1a944739d40",
- "reference": "97929c0a642977acead3d911b2c5c1a944739d40",
+ "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/62d99ba41144e704300e40f755346553702b27c9",
+ "reference": "62d99ba41144e704300e40f755346553702b27c9",
"shasum": ""
},
"require": {
"php": ">=5.3.9",
- "sensiolabs/security-checker": "~2.0",
+ "sensiolabs/security-checker": "~3.0",
"symfony/class-loader": "~2.2",
"symfony/framework-bundle": "~2.3",
"symfony/process": "~2.2"
@@ -2669,20 +2676,20 @@
"configuration",
"distribution"
],
- "time": "2015-06-11 20:55:01"
+ "time": "2015-08-03 10:07:56"
},
{
"name": "sensio/framework-extra-bundle",
- "version": "v3.0.9",
+ "version": "v3.0.10",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git",
- "reference": "0616fd568da051adc19ca63006cc808531ba2da4"
+ "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/0616fd568da051adc19ca63006cc808531ba2da4",
- "reference": "0616fd568da051adc19ca63006cc808531ba2da4",
+ "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c",
+ "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c",
"shasum": ""
},
"require": {
@@ -2724,7 +2731,7 @@
"annotations",
"controllers"
],
- "time": "2015-06-05 13:59:21"
+ "time": "2015-08-03 11:59:27"
},
{
"name": "sensio/generator-bundle",
@@ -2776,20 +2783,19 @@
},
{
"name": "sensiolabs/security-checker",
- "version": "v2.0.5",
+ "version": "v3.0.1",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/security-checker.git",
- "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810"
+ "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/2c2a71f1c77d9765c12638c4724d9ca23658a810",
- "reference": "2c2a71f1c77d9765c12638c4724d9ca23658a810",
+ "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/7735fd97ff7303d9df776b8dbc970f949399abc9",
+ "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9",
"shasum": ""
},
"require": {
- "ext-curl": "*",
"symfony/console": "~2.0"
},
"bin": [
@@ -2798,7 +2804,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.0-dev"
+ "dev-master": "3.0-dev"
}
},
"autoload": {
@@ -2817,7 +2823,7 @@
}
],
"description": "A security checker for your composer.lock",
- "time": "2015-05-28 14:22:40"
+ "time": "2015-08-11 12:11:25"
},
{
"name": "stof/doctrine-extensions-bundle",
@@ -2825,16 +2831,16 @@
"source": {
"type": "git",
"url": "https://github.com/stof/StofDoctrineExtensionsBundle.git",
- "reference": "2ff8473e33e224af87dc00d48a552a35a75115af"
+ "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/stof/StofDoctrineExtensionsBundle/zipball/7b3144572617b0555f9a443317dbc2f9cf5b524e",
- "reference": "2ff8473e33e224af87dc00d48a552a35a75115af",
+ "reference": "7b3144572617b0555f9a443317dbc2f9cf5b524e",
"shasum": ""
},
"require": {
- "gedmo/doctrine-extensions": "~2.3.1",
+ "gedmo/doctrine-extensions": "^2.3.1",
"php": ">=5.3.2",
"symfony/framework-bundle": "~2.1"
},
@@ -2878,7 +2884,7 @@
"translatable",
"tree"
],
- "time": "2014-09-30 08:24:40"
+ "time": "2015-08-12 16:23:48"
},
{
"name": "swiftmailer/swiftmailer",
@@ -2935,32 +2941,37 @@
},
{
"name": "symfony/assetic-bundle",
- "version": "v2.6.1",
+ "version": "v2.7.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/AsseticBundle.git",
- "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0"
+ "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0",
- "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0",
+ "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5",
+ "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5",
"shasum": ""
},
"require": {
- "kriswallsmith/assetic": "~1.2",
+ "kriswallsmith/assetic": "~1.3",
"php": ">=5.3.0",
"symfony/console": "~2.3",
"symfony/dependency-injection": "~2.3",
"symfony/framework-bundle": "~2.3",
"symfony/yaml": "~2.3"
},
+ "conflict": {
+ "kriswallsmith/spork": "<=0.2",
+ "twig/twig": "<1.20"
+ },
"require-dev": {
- "kriswallsmith/spork": "~0.2",
+ "kriswallsmith/spork": "~0.3",
"patchwork/jsqueeze": "~1.0",
"symfony/class-loader": "~2.3",
"symfony/css-selector": "~2.3",
"symfony/dom-crawler": "~2.3",
+ "symfony/phpunit-bridge": "~2.7",
"symfony/twig-bundle": "~2.3"
},
"suggest": {
@@ -2970,7 +2981,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev"
+ "dev-master": "2.7-dev"
}
},
"autoload": {
@@ -2996,7 +3007,7 @@
"compression",
"minification"
],
- "time": "2015-01-27 12:45:16"
+ "time": "2015-09-01 00:05:29"
},
{
"name": "symfony/doctrine-bridge",
@@ -3004,12 +3015,12 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/DoctrineBridge.git",
- "reference": "ebb229c16d04ef5548551a1294d3a7c219ef39ca"
+ "reference": "2da451d821347f3d33db2e0bd588c2c6f6ad34be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/a1c0ede6fe783f204455a3cfe867f8639afe371f",
- "reference": "ebb229c16d04ef5548551a1294d3a7c219ef39ca",
+ "url": "https://api.github.com/repos/symfony/DoctrineBridge/zipball/2da451d821347f3d33db2e0bd588c2c6f6ad34be",
+ "reference": "2da451d821347f3d33db2e0bd588c2c6f6ad34be",
"shasum": ""
},
"require": {
@@ -3065,7 +3076,7 @@
],
"description": "Symfony Doctrine Bridge",
"homepage": "https://symfony.com",
- "time": "2015-07-14 18:21:52"
+ "time": "2015-09-09 17:42:36"
},
{
"name": "symfony/monolog-bundle",
@@ -3185,23 +3196,23 @@
},
{
"name": "symfony/symfony",
- "version": "v2.7.2",
+ "version": "v2.7.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
- "reference": "969d709ad428076bf1084e386dc26dd904d9fb84"
+ "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/symfony/zipball/969d709ad428076bf1084e386dc26dd904d9fb84",
- "reference": "969d709ad428076bf1084e386dc26dd904d9fb84",
+ "url": "https://api.github.com/repos/symfony/symfony/zipball/1fdf23fe28876844b887b0e1935c9adda43ee645",
+ "reference": "1fdf23fe28876844b887b0e1935c9adda43ee645",
"shasum": ""
},
"require": {
"doctrine/common": "~2.3",
"php": ">=5.3.9",
"psr/log": "~1.0",
- "twig/twig": "~1.18"
+ "twig/twig": "~1.20|~2.0"
},
"replace": {
"symfony/asset": "self.version",
@@ -3303,24 +3314,24 @@
"keywords": [
"framework"
],
- "time": "2015-07-13 19:27:49"
+ "time": "2015-09-08 14:26:39"
},
{
"name": "twig/extensions",
- "version": "v1.2.0",
+ "version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig-extensions.git",
- "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd"
+ "reference": "449e3c8a9ffad7c2479c7864557275a32b037499"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
- "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd",
+ "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/449e3c8a9ffad7c2479c7864557275a32b037499",
+ "reference": "449e3c8a9ffad7c2479c7864557275a32b037499",
"shasum": ""
},
"require": {
- "twig/twig": "~1.12"
+ "twig/twig": "~1.20|~2.0"
},
"require-dev": {
"symfony/translation": "~2.3"
@@ -3331,7 +3342,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.2.x-dev"
+ "dev-master": "1.3-dev"
}
},
"autoload": {
@@ -3355,29 +3366,33 @@
"i18n",
"text"
],
- "time": "2014-10-30 14:30:03"
+ "time": "2015-08-22 16:38:35"
},
{
"name": "twig/twig",
- "version": "v1.18.2",
+ "version": "v1.21.2",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
- "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602"
+ "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twigphp/Twig/zipball/e8e6575abf6102af53ec283f7f14b89e304fa602",
- "reference": "e8e6575abf6102af53ec283f7f14b89e304fa602",
+ "url": "https://api.github.com/repos/twigphp/Twig/zipball/ddce1136beb8db29b9cd7dffa8ab518b978c9db3",
+ "reference": "ddce1136beb8db29b9cd7dffa8ab518b978c9db3",
"shasum": ""
},
"require": {
"php": ">=5.2.7"
},
+ "require-dev": {
+ "symfony/debug": "~2.7",
+ "symfony/phpunit-bridge": "~2.7"
+ },
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.18-dev"
+ "dev-master": "1.21-dev"
}
},
"autoload": {
@@ -3412,7 +3427,7 @@
"keywords": [
"templating"
],
- "time": "2015-06-06 23:31:24"
+ "time": "2015-09-09 05:28:51"
},
{
"name": "willdurand/jsonp-callback-validator",
@@ -3456,16 +3471,16 @@
},
{
"name": "willdurand/negotiation",
- "version": "1.3.4",
+ "version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/willdurand/Negotiation.git",
- "reference": "d7fa4ce4a0436915b9ba9f7cb5ff37719f0a834c"
+ "reference": "8a84c5956e765f432542fc52a8c6e9aff4508eb3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/d7fa4ce4a0436915b9ba9f7cb5ff37719f0a834c",
- "reference": "d7fa4ce4a0436915b9ba9f7cb5ff37719f0a834c",
+ "url": "https://api.github.com/repos/willdurand/Negotiation/zipball/8a84c5956e765f432542fc52a8c6e9aff4508eb3",
+ "reference": "8a84c5956e765f432542fc52a8c6e9aff4508eb3",
"shasum": ""
},
"require": {
@@ -3474,12 +3489,12 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.3-dev"
+ "dev-master": "1.4-dev"
}
},
"autoload": {
- "psr-0": {
- "Negotiation": "src/"
+ "psr-4": {
+ "Negotiation\\": "src/Negotiation"
}
},
"notification-url": "https://packagist.org/downloads/",
@@ -3501,24 +3516,24 @@
"header",
"negotiation"
],
- "time": "2014-10-02 07:26:00"
+ "time": "2015-07-28 13:10:50"
},
{
"name": "zendframework/zend-code",
- "version": "2.5.1",
+ "version": "2.5.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-code.git",
- "reference": "5d998f261ec2a55171c71da57a11622745680153"
+ "reference": "a97ef49f82496fabc3b7379b37f6bbff925b58b8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-code/zipball/5d998f261ec2a55171c71da57a11622745680153",
- "reference": "5d998f261ec2a55171c71da57a11622745680153",
+ "url": "https://api.github.com/repos/zendframework/zend-code/zipball/a97ef49f82496fabc3b7379b37f6bbff925b58b8",
+ "reference": "a97ef49f82496fabc3b7379b37f6bbff925b58b8",
"shasum": ""
},
"require": {
- "php": ">=5.3.23",
+ "php": ">=5.5",
"zendframework/zend-eventmanager": "~2.5"
},
"require-dev": {
@@ -3554,7 +3569,7 @@
"code",
"zf2"
],
- "time": "2015-06-03 15:31:59"
+ "time": "2015-07-21 22:40:59"
},
{
"name": "zendframework/zend-eventmanager",
@@ -3603,20 +3618,20 @@
},
{
"name": "zendframework/zend-stdlib",
- "version": "2.5.1",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-stdlib.git",
- "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae"
+ "reference": "a35758803fc9051ec1aff43989e679b6b451b1b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cc8e90a60dd5d44b9730b77d07b97550091da1ae",
- "reference": "cc8e90a60dd5d44b9730b77d07b97550091da1ae",
+ "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/a35758803fc9051ec1aff43989e679b6b451b1b4",
+ "reference": "a35758803fc9051ec1aff43989e679b6b451b1b4",
"shasum": ""
},
"require": {
- "php": ">=5.3.23"
+ "php": ">=5.5"
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
@@ -3637,8 +3652,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.5-dev",
- "dev-develop": "2.6-dev"
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
}
},
"autoload": {
@@ -3655,7 +3670,7 @@
"stdlib",
"zf2"
],
- "time": "2015-06-03 15:32:03"
+ "time": "2015-07-21 17:08:05"
}
],
"packages-dev": [
@@ -3665,12 +3680,12 @@
"source": {
"type": "git",
"url": "https://github.com/codeclimate/php-test-reporter.git",
- "reference": "418ae782307841ac50fe26daa4cfe04520b0de9c"
+ "reference": "85b5de950678a25f3e85adb6bc26de7f7f231d18"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/codeclimate/php-test-reporter/zipball/f7afa2f80e88faf722167488f47dea0ba6178a45",
- "reference": "418ae782307841ac50fe26daa4cfe04520b0de9c",
+ "url": "https://api.github.com/repos/codeclimate/php-test-reporter/zipball/85b5de950678a25f3e85adb6bc26de7f7f231d18",
+ "reference": "85b5de950678a25f3e85adb6bc26de7f7f231d18",
"shasum": ""
},
"require": {
@@ -3715,7 +3730,7 @@
"codeclimate",
"coverage"
],
- "time": "2015-04-18 14:43:54"
+ "time": "2015-09-08 14:22:33"
},
{
"name": "guzzle/guzzle",
@@ -3871,16 +3886,16 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.4.1",
+ "version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
+ "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
- "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+ "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
"shasum": ""
},
"require": {
@@ -3927,20 +3942,20 @@
"spy",
"stub"
],
- "time": "2015-04-27 22:15:08"
+ "time": "2015-08-13 10:07:40"
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.1.8",
+ "version": "2.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "6044546998c7627ab997501a3d0db972b3db9790"
+ "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6044546998c7627ab997501a3d0db972b3db9790",
- "reference": "6044546998c7627ab997501a3d0db972b3db9790",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2d7c03c0e4e080901b8f33b2897b0577be18a13c",
+ "reference": "2d7c03c0e4e080901b8f33b2897b0577be18a13c",
"shasum": ""
},
"require": {
@@ -3948,7 +3963,7 @@
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
"phpunit/php-token-stream": "~1.3",
- "sebastian/environment": "~1.0",
+ "sebastian/environment": "^1.3.2",
"sebastian/version": "~1.0"
},
"require-dev": {
@@ -3963,7 +3978,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.1.x-dev"
+ "dev-master": "2.2.x-dev"
}
},
"autoload": {
@@ -3989,20 +4004,20 @@
"testing",
"xunit"
],
- "time": "2015-07-13 11:25:58"
+ "time": "2015-08-04 03:42:39"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.0",
+ "version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb"
+ "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a923bb15680d0089e2316f7a4af8f437046e96bb",
- "reference": "a923bb15680d0089e2316f7a4af8f437046e96bb",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+ "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
"shasum": ""
},
"require": {
@@ -4036,7 +4051,7 @@
"filesystem",
"iterator"
],
- "time": "2015-04-02 05:19:05"
+ "time": "2015-06-21 13:08:43"
},
{
"name": "phpunit/php-text-template",
@@ -4081,16 +4096,16 @@
},
{
"name": "phpunit/php-timer",
- "version": "1.0.6",
+ "version": "1.0.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-timer.git",
- "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d"
+ "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/83fe1bdc5d47658b727595c14da140da92b3d66d",
- "reference": "83fe1bdc5d47658b727595c14da140da92b3d66d",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+ "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
"shasum": ""
},
"require": {
@@ -4118,20 +4133,20 @@
"keywords": [
"timer"
],
- "time": "2015-06-13 07:35:30"
+ "time": "2015-06-21 08:01:12"
},
{
"name": "phpunit/php-token-stream",
- "version": "1.4.3",
+ "version": "1.4.6",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9"
+ "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
- "reference": "7a9b0969488c3c54fd62b4d504b3ec758fd005d9",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
+ "reference": "3ab72c62e550370a6cd5dc873e1a04ab57562f5b",
"shasum": ""
},
"require": {
@@ -4167,7 +4182,7 @@
"keywords": [
"tokenizer"
],
- "time": "2015-06-19 03:43:16"
+ "time": "2015-08-16 08:51:00"
},
{
"name": "phpunit/phpunit",
@@ -4243,22 +4258,23 @@
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.3.5",
+ "version": "2.3.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "1c330b1b6e1ea8fd15f2fbea46770576e366855c"
+ "reference": "5e2645ad49d196e020b85598d7c97e482725786a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/1c330b1b6e1ea8fd15f2fbea46770576e366855c",
- "reference": "1c330b1b6e1ea8fd15f2fbea46770576e366855c",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5e2645ad49d196e020b85598d7c97e482725786a",
+ "reference": "5e2645ad49d196e020b85598d7c97e482725786a",
"shasum": ""
},
"require": {
- "doctrine/instantiator": "~1.0,>=1.0.2",
+ "doctrine/instantiator": "^1.0.2",
"php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2"
+ "phpunit/php-text-template": "~1.2",
+ "sebastian/exporter": "~1.2"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
@@ -4294,7 +4310,7 @@
"mock",
"xunit"
],
- "time": "2015-07-04 05:41:32"
+ "time": "2015-08-19 09:14:08"
},
{
"name": "satooshi/php-coveralls",
@@ -4366,16 +4382,16 @@
},
{
"name": "sebastian/comparator",
- "version": "1.1.1",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/comparator.git",
- "reference": "1dd8869519a225f7f2b9eb663e225298fade819e"
+ "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e",
- "reference": "1dd8869519a225f7f2b9eb663e225298fade819e",
+ "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+ "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
"shasum": ""
},
"require": {
@@ -4389,7 +4405,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.1.x-dev"
+ "dev-master": "1.2.x-dev"
}
},
"autoload": {
@@ -4426,7 +4442,7 @@
"compare",
"equality"
],
- "time": "2015-01-29 16:28:08"
+ "time": "2015-07-26 15:48:44"
},
{
"name": "sebastian/diff",
@@ -4482,16 +4498,16 @@
},
{
"name": "sebastian/environment",
- "version": "1.2.2",
+ "version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/environment.git",
- "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e"
+ "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5a8c7d31914337b69923db26c4221b81ff5a196e",
- "reference": "5a8c7d31914337b69923db26c4221b81ff5a196e",
+ "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6324c907ce7a52478eeeaede764f48733ef5ae44",
+ "reference": "6324c907ce7a52478eeeaede764f48733ef5ae44",
"shasum": ""
},
"require": {
@@ -4528,20 +4544,20 @@
"environment",
"hhvm"
],
- "time": "2015-01-01 10:01:08"
+ "time": "2015-08-03 06:14:51"
},
{
"name": "sebastian/exporter",
- "version": "1.2.0",
+ "version": "1.2.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
- "reference": "84839970d05254c73cde183a721c7af13aede943"
+ "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943",
- "reference": "84839970d05254c73cde183a721c7af13aede943",
+ "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+ "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
"shasum": ""
},
"require": {
@@ -4594,7 +4610,7 @@
"export",
"exporter"
],
- "time": "2015-01-27 07:23:06"
+ "time": "2015-06-21 07:55:53"
},
{
"name": "sebastian/global-state",
@@ -4649,16 +4665,16 @@
},
{
"name": "sebastian/recursion-context",
- "version": "1.0.0",
+ "version": "1.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/recursion-context.git",
- "reference": "3989662bbb30a29d20d9faa04a846af79b276252"
+ "reference": "994d4a811bafe801fb06dccbee797863ba2792ba"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252",
- "reference": "3989662bbb30a29d20d9faa04a846af79b276252",
+ "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/994d4a811bafe801fb06dccbee797863ba2792ba",
+ "reference": "994d4a811bafe801fb06dccbee797863ba2792ba",
"shasum": ""
},
"require": {
@@ -4698,7 +4714,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2015-01-24 09:48:32"
+ "time": "2015-06-21 08:04:50"
},
{
"name": "sebastian/version",
@@ -4739,6 +4755,7 @@
"aliases": [],
"minimum-stability": "stable",
"stability-flags": {
+ "nelmio/api-doc-bundle": 20,
"cbsi/doctrine2-nestedset": 20,
"partkeepr/extjs6": 20,
"symfony/doctrine-bridge": 20,
diff --git a/src/PartKeepr/DoctrineReflectionBundle/Filter/AdvancedSearchFilter.php b/src/PartKeepr/DoctrineReflectionBundle/Filter/AdvancedSearchFilter.php
@@ -7,6 +7,7 @@ use Dunglas\ApiBundle\Api\IriConverterInterface;
use Dunglas\ApiBundle\Api\ResourceInterface;
use Dunglas\ApiBundle\Doctrine\Orm\Filter\AbstractFilter;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\RequestStack;
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
/**
@@ -59,6 +60,8 @@ class AdvancedSearchFilter extends AbstractFilter
private $parameterCount = 0;
+ private $requestStack;
+
private $joins = array();
/**
@@ -72,10 +75,11 @@ class AdvancedSearchFilter extends AbstractFilter
ManagerRegistry $managerRegistry,
IriConverterInterface $iriConverter,
PropertyAccessorInterface $propertyAccessor,
+ RequestStack $requestStack,
array $properties = null
) {
parent::__construct($managerRegistry, $properties);
-
+ $this->requestStack = $requestStack;
$this->iriConverter = $iriConverter;
$this->propertyAccessor = $propertyAccessor;
}
@@ -88,11 +92,16 @@ class AdvancedSearchFilter extends AbstractFilter
/**
* {@inheritdoc}
*/
- public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder, Request $request)
+ public function apply(ResourceInterface $resource, QueryBuilder $queryBuilder)
{
$metadata = $this->getClassMetadata($resource);
$fieldNames = array_flip($metadata->getFieldNames());
+ $request = $this->requestStack->getCurrentRequest();
+ if (null === $request) {
+ return;
+ }
+
$properties = $this->extractProperties($request);
$filters = $properties["filters"];
$sorters = $properties["sorters"];
diff --git a/src/PartKeepr/DoctrineReflectionBundle/Resources/config/services.xml b/src/PartKeepr/DoctrineReflectionBundle/Resources/config/services.xml
@@ -15,6 +15,7 @@
<argument type="service" id="doctrine" />
<argument type="service" id="api.iri_converter" />
<argument type="service" id="property_accessor" />
+ <argument type="service" id="request_stack" />
</service>
</services>
