From 0af167600d898aa48fe41d30791dc60ca324cb61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Wed, 14 Oct 2015 12:04:22 +0200 Subject: [PATCH 01/16] Added support for custom handlers for primitive types. --- src/JMS/Serializer/GraphNavigator.php | 42 +++++++++++++++++-- .../ObjectWithPrimitiveCustomHandler.php | 31 ++++++++++++++ .../Serializer/BaseSerializationTest.php | 25 +++++++++++ 3 files changed, 95 insertions(+), 3 deletions(-) create mode 100644 tests/JMS/Serializer/Tests/Fixtures/ObjectWithPrimitiveCustomHandler.php diff --git a/src/JMS/Serializer/GraphNavigator.php b/src/JMS/Serializer/GraphNavigator.php index 87a4908f7..9b423cd94 100644 --- a/src/JMS/Serializer/GraphNavigator.php +++ b/src/JMS/Serializer/GraphNavigator.php @@ -28,6 +28,7 @@ use JMS\Serializer\Metadata\ClassMetadata; use Metadata\MetadataFactoryInterface; use JMS\Serializer\Exception\InvalidArgumentException; +use LogicException; /** * Handles traversal along the object graph. @@ -138,8 +139,12 @@ public function accept($data, array $type = null, Context $context) default: // TODO: The rest of this method needs some refactoring. + + $this->assertObjectOrCustomHandlerForSerialization($data, $type, $context); + if ($context instanceof SerializationContext) { - if (null !== $data) { + //If data is a primitive type with custom handler, do not trigger visiting. + if (null !== $data && is_object($data)) { if ($context->isVisiting($data)) { return null; } @@ -148,7 +153,7 @@ public function accept($data, array $type = null, Context $context) // If we're serializing a polymorphic type, then we'll be interested in the // metadata for the actual type of the object, not the base class. - if (class_exists($type['name'], false) || interface_exists($type['name'], false)) { + if (is_object($data) && class_exists($type['name'], false) || interface_exists($type['name'], false)) { if (is_subclass_of($data, $type['name'], false)) { $type = array('name' => get_class($data), 'params' => array()); } @@ -181,7 +186,7 @@ public function accept($data, array $type = null, Context $context) return $rs; } - + $exclusionStrategy = $context->getExclusionStrategy(); /** @var $metadata ClassMetadata */ @@ -283,6 +288,10 @@ private function resolveMetadata(DeserializationContext $context, $data, ClassMe private function leaveScope(Context $context, $data) { if ($context instanceof SerializationContext) { + //Visiting does not exist for primitive types + if (!is_object($data) && $data !== null) { + return; + } $context->stopVisiting($data); } elseif ($context instanceof DeserializationContext) { $context->decreaseDepth(); @@ -314,4 +323,31 @@ private function afterVisitingObject(ClassMetadata $metadata, $object, array $ty $this->dispatcher->dispatch('serializer.post_deserialize', $metadata->name, $context->getFormat(), new ObjectEvent($context, $object, $type)); } } + + /** + * Asserts during serialization, that provided data is either an object, or has custom handler registered. + * + * @param mixed $data + * @param array $type + * @param \JMS\Serializer\Context $context + * @throws \LogicException Thrown, when a primitive type has no custom handler registered. + */ + public function assertObjectOrCustomHandlerForSerialization($data, $type, Context $context) + { + //Ok during deserialization + if ($context->getDirection() === static::DIRECTION_DESERIALIZATION) { + return; + } + //Ok, if data is an object + if (is_object($data) || $data === null) { + return; + } + //Ok, if custom handler exists + if (null !== $this->handlerRegistry->getHandler($context->getDirection(), $type['name'], $context->getFormat())) { + return; + } + + //Not ok - throw an exception + throw new LogicException('Expected object but got '.gettype($data).'. Do you have the wrong @Type mapping or could this be a Doctrine many-to-many relation?'); + } } diff --git a/tests/JMS/Serializer/Tests/Fixtures/ObjectWithPrimitiveCustomHandler.php b/tests/JMS/Serializer/Tests/Fixtures/ObjectWithPrimitiveCustomHandler.php new file mode 100644 index 000000000..2a667900e --- /dev/null +++ b/tests/JMS/Serializer/Tests/Fixtures/ObjectWithPrimitiveCustomHandler.php @@ -0,0 +1,31 @@ + + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +namespace JMS\Serializer\Tests\Fixtures; + +use JMS\Serializer\Annotation\Type; + +class ObjectWithPrimitiveCustomHandler +{ + /** + * + * @var integer + * @Type("Integer") + */ + public $intProperty = 1; +} diff --git a/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php b/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php index 1e0d4f6a4..3c1ab2c20 100644 --- a/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php +++ b/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php @@ -77,6 +77,7 @@ use JMS\Serializer\Tests\Fixtures\InitializedBlogPostConstructor; use JMS\Serializer\Tests\Fixtures\Log; use JMS\Serializer\Tests\Fixtures\ObjectWithLifecycleCallbacks; +use JMS\Serializer\Tests\Fixtures\ObjectWithPrimitiveCustomHandler; use JMS\Serializer\Tests\Fixtures\ObjectWithVersionedVirtualProperties; use JMS\Serializer\Tests\Fixtures\ObjectWithVirtualProperties; use JMS\Serializer\Tests\Fixtures\Order; @@ -755,6 +756,30 @@ public function testCustomHandler() $object = $this->serializer->deserialize($serialized, 'CustomDeserializationObject', $this->getFormat()); $this->assertEquals('customly_unserialized_value', $object->someProperty); } + + public function testCustomHandlerForPrimitive() + { + if ( ! $this->hasDeserializer()) { + return; + } + + $this->handlerRegistry->registerHandler(GraphNavigator::DIRECTION_SERIALIZATION, 'Integer', $this->getFormat(), + function(VisitorInterface $visitor, $object, array $type, Context $context) { + return $visitor->visitInteger($object, $type, $context); + } + ); + + $this->handlerRegistry->registerHandler(GraphNavigator::DIRECTION_DESERIALIZATION, 'Integer', $this->getFormat(), + function() { + return "customly_unserialized_value"; + } + ); + + //This is itself a test - if serialization fails with a logic exception, custom handlers for primitive types does not work + $serialized = $this->serializer->serialize(new ObjectWithPrimitiveCustomHandler(), $this->getFormat()); + $object = $this->serializer->deserialize($serialized, 'JMS\Serializer\Tests\Fixtures\ObjectWithPrimitiveCustomHandler', $this->getFormat()); + $this->assertEquals('customly_unserialized_value', $object->intProperty); + } public function testInput() { From 52ab5dee66643def6bb833b23df826754a282ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Wed, 14 Oct 2015 14:53:13 +0200 Subject: [PATCH 02/16] Fix detecting doctype for whitelisting. --- src/JMS/Serializer/XmlDeserializationVisitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/JMS/Serializer/XmlDeserializationVisitor.php b/src/JMS/Serializer/XmlDeserializationVisitor.php index fe2fd7d6f..7d6fe64dd 100644 --- a/src/JMS/Serializer/XmlDeserializationVisitor.php +++ b/src/JMS/Serializer/XmlDeserializationVisitor.php @@ -356,7 +356,7 @@ public function getDoctypeWhitelist() */ private function getDomDocumentTypeEntitySubset(\DOMDocumentType $child, $data) { - if (null !== $child->internalSubset) { + if (null !== $child->internalSubset && stripos($child->internalSubset, "internalSubset); } From acaa4c223787989c4a8602c06fb7c9e7682ff85d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 12:40:53 +0200 Subject: [PATCH 03/16] Corrected tests. --- .../JMS/Serializer/Tests/Serializer/BaseSerializationTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php b/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php index cf85d2742..15807170f 100644 --- a/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php +++ b/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php @@ -247,11 +247,11 @@ public function testArrayEmpty() $this->markTestSkipped('XML can\'t be tested for empty array'); } - $data = array('array' => []); + $data = array('array' => array()); $this->assertEquals($this->getContent('array_empty'), $this->serialize($data)); if ($this->hasDeserializer()) { - $this->assertEquals($data, $this->deserialize($this->getContent('array_empty')), 'array'); + $this->assertEquals($data, $this->deserialize($this->getContent('array_empty'), 'array')); } } From e6d06d25451f45348de8eb6d61876c16c4e23813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 12:51:02 +0200 Subject: [PATCH 04/16] Corrected travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a75b50a5f..3039e8d86 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ matrix: before_script: - composer self-update - - composer install --dev + - composer install --dev --no-interaction script: vendor/bin/phpunit --coverage-clover clover From 36c23d901d57cdae9fca33a47c96c769be1bb47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 12:53:41 +0200 Subject: [PATCH 05/16] Corrected travis. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3039e8d86..6f19db745 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ matrix: - php: 7.0 before_script: - - composer self-update - - composer install --dev --no-interaction + - travis_retry composer self-update + - travis_retry composer install --no-interaction --prefer-source --dev script: vendor/bin/phpunit --coverage-clover clover From f1d4b195bbaa9d2403a75615dd746ec519469edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 12:58:15 +0200 Subject: [PATCH 06/16] Corrected dependencies. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 26e976e96..90c69a948 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "doctrine/phpcr-odm": "~1.0.1", "jackalope/jackalope-doctrine-dbal": "1.0.*", "propel/propel1": "~1.7", - "symfony/yaml": "2.*", + "symfony/yaml": "~2.8.0", "symfony/translation": "~2.0", "symfony/validator": "~2.0", "symfony/form": "~2.1", From 2639c9bb631f13c2eff9e755a8759e416e0a7eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 12:58:29 +0200 Subject: [PATCH 07/16] Corrected dependencies. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 90c69a948..1e2ef7ec8 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "doctrine/phpcr-odm": "~1.0.1", "jackalope/jackalope-doctrine-dbal": "1.0.*", "propel/propel1": "~1.7", - "symfony/yaml": "~2.8.0", + "symfony/yaml": "~2.0", "symfony/translation": "~2.0", "symfony/validator": "~2.0", "symfony/form": "~2.1", From 592cba0b2cee679101f6c6a06da232684bcd1445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 13:49:19 +0200 Subject: [PATCH 08/16] Corrected composer and tests --- composer.json | 2 +- composer.lock | 1473 ++++++++++------- .../Serializer/BaseSerializationTest.php | 6 +- .../SymfonyValidatorSubscriberTest.php | 2 +- 4 files changed, 835 insertions(+), 648 deletions(-) diff --git a/composer.json b/composer.json index 1e2ef7ec8..26e976e96 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "doctrine/phpcr-odm": "~1.0.1", "jackalope/jackalope-doctrine-dbal": "1.0.*", "propel/propel1": "~1.7", - "symfony/yaml": "~2.0", + "symfony/yaml": "2.*", "symfony/translation": "~2.0", "symfony/validator": "~2.0", "symfony/form": "~2.1", diff --git a/composer.lock b/composer.lock index a411b052c..c8e390a4c 100644 --- a/composer.lock +++ b/composer.lock @@ -1,23 +1,24 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "e46f04cd4220c50a1b3a7562449e1d32", + "hash": "b90be7afd4e5e8fa50a92a50eba90c52", + "content-hash": "7ae1f2fe431c7d62a423faf523902fa0", "packages": [ { "name": "doctrine/annotations", - "version": "v1.1.2", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670" + "reference": "2e1b1f7597e2f647e99e96e747fcae9718ac817b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670", - "reference": "40db0c96985aab2822edbc4848b3bd2429e02670", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/2e1b1f7597e2f647e99e96e747fcae9718ac817b", + "reference": "2e1b1f7597e2f647e99e96e747fcae9718ac817b", "shasum": "" }, "require": { @@ -25,12 +26,13 @@ "php": ">=5.3.2" }, "require-dev": { - "doctrine/cache": "1.*" + "doctrine/cache": "1.*", + "phpunit/phpunit": "4.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -43,17 +45,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -62,11 +53,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Docblock Annotations Parser", @@ -76,7 +73,61 @@ "docblock", "parser" ], - "time": "2013-06-16 21:33:03" + "time": "2016-03-24 07:09:52" + }, + { + "name": "doctrine/instantiator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/416fb8ad1d095a87f1d21bc40711843cd122fd4a", + "reference": "416fb8ad1d095a87f1d21bc40711843cd122fd4a", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2016-03-31 10:24:22" }, { "name": "doctrine/lexer", @@ -84,12 +135,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "57d5a024b48709c56ce5bb93072948359220f36c" + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/57d5a024b48709c56ce5bb93072948359220f36c", - "reference": "57d5a024b48709c56ce5bb93072948359220f36c", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", "shasum": "" }, "require": { @@ -111,20 +162,17 @@ "MIT" ], "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", @@ -133,7 +181,7 @@ "lexer", "parser" ], - "time": "2013-11-19 06:15:26" + "time": "2014-09-09 13:34:57" }, { "name": "jms/metadata", @@ -141,12 +189,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "3cb8bd396b961c156e964e3f58c9ad5206acf0a0" + "reference": "427a06e7c25d0fa1fbd37bf0325d9d3eb2dc383a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/3cb8bd396b961c156e964e3f58c9ad5206acf0a0", - "reference": "3cb8bd396b961c156e964e3f58c9ad5206acf0a0", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/427a06e7c25d0fa1fbd37bf0325d9d3eb2dc383a", + "reference": "427a06e7c25d0fa1fbd37bf0325d9d3eb2dc383a", "shasum": "" }, "require": { @@ -168,14 +216,12 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "Apache" + "Apache-2.0" ], "authors": [ { "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Class/method/property metadata management in PHP", @@ -185,7 +231,7 @@ "xml", "yaml" ], - "time": "2013-12-02 21:16:56" + "time": "2015-01-14 15:37:39" }, { "name": "jms/parser-lib", @@ -193,12 +239,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/parser-lib.git", - "reference": "d5961fa3fa039aa5ee0e50021c6681ba949e360c" + "reference": "6067cc609074ae215b96dc51047affee65f77b0f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/d5961fa3fa039aa5ee0e50021c6681ba949e360c", - "reference": "d5961fa3fa039aa5ee0e50021c6681ba949e360c", + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/6067cc609074ae215b96dc51047affee65f77b0f", + "reference": "6067cc609074ae215b96dc51047affee65f77b0f", "shasum": "" }, "require": { @@ -220,7 +266,7 @@ "Apache2" ], "description": "A library for easily creating recursive-descent parsers.", - "time": "2013-08-09 15:53:02" + "time": "2014-07-08 16:40:41" }, { "name": "phpcollection/phpcollection", @@ -228,12 +274,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "5c8ec0d1091c95b973b59a3bf0eb19c5de72d8d1" + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/5c8ec0d1091c95b973b59a3bf0eb19c5de72d8d1", - "reference": "5c8ec0d1091c95b973b59a3bf0eb19c5de72d8d1", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", "shasum": "" }, "require": { @@ -242,7 +288,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.2-dev" + "dev-master": "0.4-dev" } }, "autoload": { @@ -257,9 +303,7 @@ "authors": [ { "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "General-Purpose Collection Library for PHP", @@ -270,25 +314,28 @@ "sequence", "set" ], - "time": "2013-08-22 09:46:14" + "time": "2015-05-17 12:39:23" }, { "name": "phpoption/phpoption", - "version": "dev-master", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941" + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/1c7e8016289d17d83ced49c56d0f266fd0568941", - "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", "shasum": "" }, "require": { "php": ">=5.3.0" }, + "require-dev": { + "phpunit/phpunit": "4.7.*" + }, "type": "library", "extra": { "branch-alias": { @@ -307,9 +354,7 @@ "authors": [ { "name": "Johannes M. Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Option Type for PHP", @@ -319,7 +364,7 @@ "php", "type" ], - "time": "2013-05-19 11:09:35" + "time": "2015-07-25 16:39:46" } ], "packages-dev": [ @@ -329,33 +374,33 @@ "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "ff36d4216fef8242c3d8ee97fceee977e3c9b9a6" + "reference": "4e3b8b9464d511eccbefe07cef94c275bce7e434" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/ff36d4216fef8242c3d8ee97fceee977e3c9b9a6", - "reference": "ff36d4216fef8242c3d8ee97fceee977e3c9b9a6", + "url": "https://api.github.com/repos/doctrine/cache/zipball/4e3b8b9464d511eccbefe07cef94c275bce7e434", + "reference": "4e3b8b9464d511eccbefe07cef94c275bce7e434", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "~5.5|~7.0" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": ">=3.7", - "satooshi/php-coveralls": "~0.6" + "phpunit/phpunit": "~4.8|~5.0", + "predis/predis": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Cache\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" } }, "notification-url": "https://packagist.org/downloads/", @@ -363,17 +408,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -382,11 +416,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Caching library offering an object-oriented API for many cache backends", @@ -395,7 +435,7 @@ "cache", "caching" ], - "time": "2013-11-23 16:10:06" + "time": "2016-03-11 16:30:04" }, { "name": "doctrine/collections", @@ -403,21 +443,24 @@ "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc" + "reference": "4a9f909f73a2f70be8cd8cdd5b72ce376f21db26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/bcb53776a096a0c64579cc8d8ec0db62f1109fbc", - "reference": "bcb53776a096a0c64579cc8d8ec0db62f1109fbc", + "url": "https://api.github.com/repos/doctrine/collections/zipball/4a9f909f73a2f70be8cd8cdd5b72ce376f21db26", + "reference": "4a9f909f73a2f70be8cd8cdd5b72ce376f21db26", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -430,17 +473,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan H. Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -449,11 +481,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Collections Abstraction library", @@ -463,7 +501,7 @@ "collections", "iterator" ], - "time": "2013-08-29 16:56:45" + "time": "2016-04-28 05:33:48" }, { "name": "doctrine/common", @@ -471,12 +509,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "c94d6ff79e25418b1225e187c782bf4742f23a8b" + "reference": "1b0f957ae7facde8a48500894f5c20bce352b9f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/c94d6ff79e25418b1225e187c782bf4742f23a8b", - "reference": "c94d6ff79e25418b1225e187c782bf4742f23a8b", + "url": "https://api.github.com/repos/doctrine/common/zipball/1b0f957ae7facde8a48500894f5c20bce352b9f3", + "reference": "1b0f957ae7facde8a48500894f5c20bce352b9f3", "shasum": "" }, "require": { @@ -487,6 +525,9 @@ "doctrine/lexer": "1.*", "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "~3.7" + }, "type": "library", "extra": { "branch-alias": { @@ -503,17 +544,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -522,11 +552,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common Library for Doctrine projects", @@ -538,35 +574,37 @@ "persistence", "spl" ], - "time": "2013-09-07 10:20:35" + "time": "2015-08-31 14:43:41" }, { "name": "doctrine/dbal", - "version": "2.3.x-dev", + "version": "2.4.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "69e91a3ea72c120f2516cf7983df6e9b550d00ea" + "reference": "f5b85d182799c539d1a56aa145977aa2c43dfe1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/69e91a3ea72c120f2516cf7983df6e9b550d00ea", - "reference": "69e91a3ea72c120f2516cf7983df6e9b550d00ea", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/f5b85d182799c539d1a56aa145977aa2c43dfe1a", + "reference": "f5b85d182799c539d1a56aa145977aa2c43dfe1a", "shasum": "" }, "require": { - "doctrine/common": ">=2.3.0,<2.5-dev", + "doctrine/common": "~2.4", "php": ">=5.3.2" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3.x-dev" - } + "require-dev": { + "phpunit/phpunit": "3.7.*", + "symfony/console": "~2.0" + }, + "suggest": { + "symfony/console": "For helpful console commands such as SQL execution and import of files." }, + "type": "library", "autoload": { "psr-0": { - "Doctrine\\DBAL": "lib/" + "Doctrine\\DBAL\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -574,17 +612,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -592,6 +619,14 @@ { "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" } ], "description": "Database Abstraction Layer", @@ -602,7 +637,7 @@ "persistence", "queryobject" ], - "time": "2013-11-13 00:02:59" + "time": "2016-01-05 22:19:09" }, { "name": "doctrine/inflector", @@ -610,21 +645,24 @@ "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c" + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c", - "reference": "8b4b3ccec7aafc596e2fc1e593c9f2e78f939c8c", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "shasum": "" }, "require": { "php": ">=5.3.2" }, + "require-dev": { + "phpunit/phpunit": "4.*" + }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -637,17 +675,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -656,11 +683,17 @@ "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com", - "homepage": "http://jmsyst.com", - "role": "Developer of wrapped JMSSerializerBundle" + "email": "schmittjoh@gmail.com" } ], "description": "Common String Manipulations with regard to casing and singular/plural rules.", @@ -671,81 +704,32 @@ "singularize", "string" ], - "time": "2013-04-10 16:14:30" - }, - { - "name": "doctrine/instantiator", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/f976e5de371104877ebc89bd8fecb0019ed9c119", - "reference": "f976e5de371104877ebc89bd8fecb0019ed9c119", - "shasum": "" - }, - "require": { - "php": ">=5.3,<8.0-DEV" - }, - "require-dev": { - "athletic/athletic": "~0.1.8", - "ext-pdo": "*", - "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "2.0.*@ALPHA" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Instantiator\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "http://ocramius.github.com/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", - "keywords": [ - "constructor", - "instantiate" - ], - "time": "2014-10-13 12:58:55" + "time": "2015-11-06 14:35:42" }, { "name": "doctrine/orm", - "version": "2.3.x-dev", + "version": "2.4.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "1a30e0a2e069999de835722bfbafe3da146b8ebb" + "reference": "ea713a0b01267745e245cf52a0c569425deb170e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/1a30e0a2e069999de835722bfbafe3da146b8ebb", - "reference": "1a30e0a2e069999de835722bfbafe3da146b8ebb", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/ea713a0b01267745e245cf52a0c569425deb170e", + "reference": "ea713a0b01267745e245cf52a0c569425deb170e", "shasum": "" }, "require": { - "doctrine/dbal": "2.3.*", + "doctrine/collections": "~1.1", + "doctrine/dbal": "~2.4", "ext-pdo": "*", "php": ">=5.3.2", - "symfony/console": "2.*" + "symfony/console": "~2.0" + }, + "require-dev": { + "satooshi/php-coveralls": "dev-master", + "symfony/yaml": "~2.1" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" @@ -757,12 +741,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "2.4.x-dev" } }, "autoload": { "psr-0": { - "Doctrine\\ORM": "lib/" + "Doctrine\\ORM\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -770,17 +754,6 @@ "MIT" ], "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com", - "homepage": "http://www.jwage.com/", - "role": "Creator" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com", - "homepage": "http://www.instaclick.com" - }, { "name": "Roman Borschel", "email": "roman@code-factory.org" @@ -788,6 +761,14 @@ { "name": "Benjamin Eberlei", "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" } ], "description": "Object-Relational-Mapper for PHP", @@ -796,7 +777,7 @@ "database", "orm" ], - "time": "2013-10-29 08:25:52" + "time": "2015-08-31 13:19:01" }, { "name": "doctrine/phpcr-odm", @@ -804,12 +785,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/phpcr-odm.git", - "reference": "a4f63ec755f8a76f854777424a99d02fe41d3adc" + "reference": "fc72cc95305bd9eee955aad6cda05df8559a5622" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/a4f63ec755f8a76f854777424a99d02fe41d3adc", - "reference": "a4f63ec755f8a76f854777424a99d02fe41d3adc", + "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/fc72cc95305bd9eee955aad6cda05df8559a5622", + "reference": "fc72cc95305bd9eee955aad6cda05df8559a5622", "shasum": "" }, "require": { @@ -847,12 +828,6 @@ "MIT" ], "authors": [ - { - "name": "Jordi Boggiano", - "email": "j.boggiano@seld.be", - "homepage": "http://seld.be", - "role": "Developer" - }, { "name": "Lukas Kahwe Smith", "email": "smith@pooteeweet.org" @@ -860,6 +835,10 @@ { "name": "David Buchmann", "email": "david@liip.ch" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be" } ], "description": "Object-Document-Mapper for PHPCR", @@ -869,20 +848,20 @@ "odm", "phpcr" ], - "time": "2013-12-04 16:02:18" + "time": "2014-11-21 13:50:50" }, { "name": "jackalope/jackalope", - "version": "dev-master", + "version": "1.0.x-dev", "source": { "type": "git", "url": "https://github.com/jackalope/jackalope.git", - "reference": "605a3fb6d83c906d19ad88b2347be9453c96a19f" + "reference": "b49d1d0458869f127f387c946df5dd871972ecaf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope/zipball/605a3fb6d83c906d19ad88b2347be9453c96a19f", - "reference": "605a3fb6d83c906d19ad88b2347be9453c96a19f", + "url": "https://api.github.com/repos/jackalope/jackalope/zipball/b49d1d0458869f127f387c946df5dd871972ecaf", + "reference": "b49d1d0458869f127f387c946df5dd871972ecaf", "shasum": "" }, "require": { @@ -922,20 +901,20 @@ "keywords": [ "phpcr" ], - "time": "2013-11-06 10:28:46" + "time": "2014-06-02 05:59:58" }, { "name": "jackalope/jackalope-doctrine-dbal", - "version": "dev-master", + "version": "1.0.x-dev", "source": { "type": "git", "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git", - "reference": "8dd5db26e05f763680350c7be0b5a0c6784f4484" + "reference": "d284e44e29b6ecc1b04a8ea78e942c793845d93b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/8dd5db26e05f763680350c7be0b5a0c6784f4484", - "reference": "8dd5db26e05f763680350c7be0b5a0c6784f4484", + "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/d284e44e29b6ecc1b04a8ea78e942c793845d93b", + "reference": "d284e44e29b6ecc1b04a8ea78e942c793845d93b", "shasum": "" }, "require": { @@ -983,29 +962,67 @@ "phpcr", "transport implementation" ], - "time": "2013-12-01 11:46:25" + "time": "2013-12-14 15:23:15" }, { "name": "phing/phing", - "version": "2.6.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/phingofficial/phing.git", - "reference": "3f7d71bf561bafea39087250f777b349438cc32e" + "reference": "fce72c0a0f1e60d2a935f434cfe70778bf2304bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phingofficial/phing/zipball/3f7d71bf561bafea39087250f777b349438cc32e", - "reference": "3f7d71bf561bafea39087250f777b349438cc32e", + "url": "https://api.github.com/repos/phingofficial/phing/zipball/fce72c0a0f1e60d2a935f434cfe70778bf2304bf", + "reference": "fce72c0a0f1e60d2a935f434cfe70778bf2304bf", "shasum": "" }, "require": { "php": ">=5.2.0" }, + "require-dev": { + "ext-pdo_sqlite": "*", + "lastcraft/simpletest": "@dev", + "mikey179/vfsstream": "^1.6", + "pdepend/pdepend": "2.x", + "pear/archive_tar": "1.4.x", + "pear/http_request2": "dev-trunk", + "pear/net_growl": "dev-trunk", + "pear/pear-core-minimal": "1.10.1", + "pear/versioncontrol_git": "@dev", + "pear/versioncontrol_svn": "~0.5", + "phpdocumentor/phpdocumentor": "2.x", + "phploc/phploc": "~2.0.6", + "phpmd/phpmd": "~2.2", + "phpunit/phpunit": ">=3.7", + "sebastian/git": "~1.0", + "sebastian/phpcpd": "2.x", + "squizlabs/php_codesniffer": "~2.2", + "symfony/yaml": "~2.7" + }, + "suggest": { + "pdepend/pdepend": "PHP version of JDepend", + "pear/archive_tar": "Tar file management class", + "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository", + "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system", + "phpdocumentor/phpdocumentor": "Documentation Generator for PHP", + "phploc/phploc": "A tool for quickly measuring the size of a PHP project", + "phpmd/phpmd": "PHP version of PMD tool", + "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information", + "phpunit/phpunit": "The PHP Unit Testing Framework", + "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code", + "tedivm/jshrink": "Javascript Minifier built in PHP" + }, "bin": [ "bin/phing" ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.15.x-dev" + } + }, "autoload": { "classmap": [ "classes/phing/" @@ -1016,7 +1033,7 @@ "classes" ], "license": [ - "LGPL3" + "LGPL-3.0" ], "authors": [ { @@ -1025,17 +1042,18 @@ }, { "name": "Phing Community", - "homepage": "http://www.phing.info/trac/wiki/Development/Contributors" + "homepage": "https://www.phing.info/trac/wiki/Development/Contributors" } ], "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.", - "homepage": "http://www.phing.info/", + "homepage": "https://www.phing.info/", "keywords": [ "build", + "phing", "task", "tool" ], - "time": "2013-08-26 21:13:03" + "time": "2016-04-18 13:59:08" }, { "name": "phpcr/phpcr", @@ -1043,12 +1061,12 @@ "source": { "type": "git", "url": "https://github.com/phpcr/phpcr.git", - "reference": "f9483968fb77584e47c1dbf2dbc7906447f8c5b1" + "reference": "8ff80a3056205de0787ec54b117a2a9f4c90a087" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr/zipball/f9483968fb77584e47c1dbf2dbc7906447f8c5b1", - "reference": "f9483968fb77584e47c1dbf2dbc7906447f8c5b1", + "url": "https://api.github.com/repos/phpcr/phpcr/zipball/8ff80a3056205de0787ec54b117a2a9f4c90a087", + "reference": "8ff80a3056205de0787ec54b117a2a9f4c90a087", "shasum": "" }, "require": { @@ -1090,20 +1108,20 @@ "contentrepository", "phpcr" ], - "time": "2013-10-07 15:34:44" + "time": "2015-11-04 14:19:36" }, { "name": "phpcr/phpcr-utils", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/phpcr/phpcr-utils.git", - "reference": "89165eab123907050b914e16a77d373c4e1eb310" + "reference": "7920ce3c60cffceb325819bfdf4ebe873df69839" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/89165eab123907050b914e16a77d373c4e1eb310", - "reference": "89165eab123907050b914e16a77d373c4e1eb310", + "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/7920ce3c60cffceb325819bfdf4ebe873df69839", + "reference": "7920ce3c60cffceb325819bfdf4ebe873df69839", "shasum": "" }, "require": { @@ -1153,20 +1171,20 @@ "contentrepository", "phpcr" ], - "time": "2013-11-13 12:10:20" + "time": "2013-10-10 19:46:30" }, { "name": "phpdocumentor/reflection-docblock", - "version": "dev-master", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "fd0ac2007401505fb596fdfb859ec4e103d69e55" + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/fd0ac2007401505fb596fdfb859ec4e103d69e55", - "reference": "fd0ac2007401505fb596fdfb859ec4e103d69e55", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { @@ -1202,25 +1220,28 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2014-09-02 14:26:20" + "time": "2015-02-03 12:10:50" }, { "name": "phpspec/prophecy", - "version": "v1.3.1", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9" + "reference": "b02221e42163be673f9b44a0bc92a8b4907a7c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/9ca52329bcdd1500de24427542577ebf3fc2f1c9", - "reference": "9ca52329bcdd1500de24427542577ebf3fc2f1c9", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b02221e42163be673f9b44a0bc92a8b4907a7c6d", + "reference": "b02221e42163be673f9b44a0bc92a8b4907a7c6d", "shasum": "" }, "require": { - "doctrine/instantiator": "~1.0,>=1.0.2", - "phpdocumentor/reflection-docblock": "~2.0" + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1", + "sebastian/recursion-context": "~1.0" }, "require-dev": { "phpspec/phpspec": "~2.0" @@ -1228,7 +1249,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.6.x-dev" } }, "autoload": { @@ -1252,7 +1273,7 @@ } ], "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "http://phpspec.org", + "homepage": "https://github.com/phpspec/prophecy", "keywords": [ "Double", "Dummy", @@ -1261,20 +1282,20 @@ "spy", "stub" ], - "time": "2014-11-17 16:23:49" + "time": "2016-02-21 17:41:21" }, { "name": "phpunit/php-code-coverage", - "version": "dev-master", + "version": "2.2.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "b8781bdc6379749fd3f3f76aa5109957f46bc9e6" + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/b8781bdc6379749fd3f3f76aa5109957f46bc9e6", - "reference": "b8781bdc6379749fd3f3f76aa5109957f46bc9e6", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "shasum": "" }, "require": { @@ -1282,12 +1303,12 @@ "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": { "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4.3" + "phpunit/phpunit": "~4" }, "suggest": { "ext-dom": "*", @@ -1297,7 +1318,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { @@ -1306,9 +1327,6 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1326,35 +1344,37 @@ "testing", "xunit" ], - "time": "2014-12-02 13:16:21" + "time": "2015-10-06 15:47:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.3.4", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb" + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb", - "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", "shasum": "" }, "require": { "php": ">=5.3.3" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, "autoload": { "classmap": [ - "File/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1371,20 +1391,20 @@ "filesystem", "iterator" ], - "time": "2013-10-10 15:34:57" + "time": "2015-06-21 13:08:43" }, { "name": "phpunit/php-text-template", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a" + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", - "reference": "206dfefc0ffe9cebf65c413e3d0e809c82fbf00a", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", "shasum": "" }, "require": { @@ -1393,20 +1413,17 @@ "type": "library", "autoload": { "classmap": [ - "Text/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1415,20 +1432,20 @@ "keywords": [ "template" ], - "time": "2014-01-30 17:20:04" + "time": "2015-06-21 13:50:34" }, { "name": "phpunit/php-timer", - "version": "1.0.5", + "version": "1.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", - "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", "shasum": "" }, "require": { @@ -1437,13 +1454,10 @@ "type": "library", "autoload": { "classmap": [ - "PHP/" + "src/" ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -1459,7 +1473,7 @@ "keywords": [ "timer" ], - "time": "2013-08-02 07:42:54" + "time": "2015-06-21 08:01:12" }, { "name": "phpunit/php-token-stream", @@ -1467,12 +1481,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "f8d5d08c56de5cfd592b3340424a81733259a876" + "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/f8d5d08c56de5cfd592b3340424a81733259a876", - "reference": "f8d5d08c56de5cfd592b3340424a81733259a876", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cab6c6fefee93d7b7c3a01292a0fe0884ea66644", + "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644", "shasum": "" }, "require": { @@ -1485,7 +1499,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1508,20 +1522,20 @@ "keywords": [ "tokenizer" ], - "time": "2014-08-31 06:12:13" + "time": "2015-09-23 14:46:55" }, { "name": "phpunit/phpunit", - "version": "dev-master", + "version": "4.8.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "e3692ba00e445b66477bb65659dcf768c29a0cb8" + "reference": "3c4becbce99732549949904c47b76ffe602a7595" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e3692ba00e445b66477bb65659dcf768c29a0cb8", - "reference": "e3692ba00e445b66477bb65659dcf768c29a0cb8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3c4becbce99732549949904c47b76ffe602a7595", + "reference": "3c4becbce99732549949904c47b76ffe602a7595", "shasum": "" }, "require": { @@ -1531,19 +1545,19 @@ "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", - "phpspec/prophecy": "~1.3.1", - "phpunit/php-code-coverage": "3.0.*@dev", - "phpunit/php-file-iterator": "~1.3.2", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", + "phpunit/php-file-iterator": "~1.4", "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "~1.0.2", - "phpunit/phpunit-mock-objects": "2.4.*@dev", - "sebastian/comparator": "1.1.*@dev", - "sebastian/diff": "~1.1", - "sebastian/environment": "~1.2", - "sebastian/exporter": "~1.0", - "sebastian/global-state": "1.0.*@dev", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", "sebastian/version": "~1.0", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.1|~3.0" }, "suggest": { "phpunit/php-invoker": "~1.1" @@ -1554,7 +1568,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.5.x-dev" + "dev-master": "4.8.x-dev" } }, "autoload": { @@ -1580,29 +1594,30 @@ "testing", "xunit" ], - "time": "2014-11-27 18:04:59" + "time": "2016-04-25 09:17:33" }, { "name": "phpunit/phpunit-mock-objects", - "version": "dev-master", + "version": "2.3.x-dev", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "96c5b81f9842f38fe6c73ad0020306cc4862a9e3" + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/96c5b81f9842f38fe6c73ad0020306cc4862a9e3", - "reference": "96c5b81f9842f38fe6c73ad0020306cc4862a9e3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", "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.*@dev" + "phpunit/phpunit": "~4.4" }, "suggest": { "ext-soap": "*" @@ -1610,7 +1625,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { @@ -1635,7 +1650,7 @@ "mock", "xunit" ], - "time": "2014-10-04 10:04:20" + "time": "2015-10-02 06:51:40" }, { "name": "propel/propel1", @@ -1643,12 +1658,12 @@ "source": { "type": "git", "url": "https://github.com/propelorm/Propel.git", - "reference": "93f9fc84d1ee631f7b4d92bf3bdba4da82fef015" + "reference": "3f7a284906ce3e402bcb101938270842fdad71fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel/zipball/93f9fc84d1ee631f7b4d92bf3bdba4da82fef015", - "reference": "93f9fc84d1ee631f7b4d92bf3bdba4da82fef015", + "url": "https://api.github.com/repos/propelorm/Propel/zipball/3f7a284906ce3e402bcb101938270842fdad71fa", + "reference": "3f7a284906ce3e402bcb101938270842fdad71fa", "shasum": "" }, "require": { @@ -1698,7 +1713,7 @@ "orm", "persistence" ], - "time": "2013-11-11 11:10:35" + "time": "2014-04-17 20:39:42" }, { "name": "sebastian/comparator", @@ -1706,26 +1721,26 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "c484a80f97573ab934e37826dba0135a3301b26a" + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a", - "reference": "c484a80f97573ab934e37826dba0135a3301b26a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", "shasum": "" }, "require": { "php": ">=5.3.3", - "sebastian/diff": "~1.1", - "sebastian/exporter": "~1.0" + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1762,7 +1777,7 @@ "compare", "equality" ], - "time": "2014-11-16 21:32:38" + "time": "2015-07-26 15:48:44" }, { "name": "sebastian/diff", @@ -1770,24 +1785,24 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "f38057b48125c2b421361da224a8aa800d70aeca" + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/f38057b48125c2b421361da224a8aa800d70aeca", - "reference": "f38057b48125c2b421361da224a8aa800d70aeca", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "~4.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1810,11 +1825,11 @@ } ], "description": "Diff implementation", - "homepage": "http://www.github.com/sebastianbergmann/diff", + "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ "diff" ], - "time": "2014-11-22 06:25:40" + "time": "2015-12-08 07:14:41" }, { "name": "sebastian/environment", @@ -1822,24 +1837,24 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7" + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e6c71d918088c251b181ba8b3088af4ac336dd7", - "reference": "6e6c71d918088c251b181ba8b3088af4ac336dd7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "~4.3" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -1864,7 +1879,7 @@ "environment", "hhvm" ], - "time": "2014-10-25 08:00:45" + "time": "2016-02-26 18:40:46" }, { "name": "sebastian/exporter", @@ -1872,24 +1887,26 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0" + "reference": "f88f8936517d54ae6d589166810877fb2015d0a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", - "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f88f8936517d54ae6d589166810877fb2015d0a2", + "reference": "f88f8936517d54ae6d589166810877fb2015d0a2", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -1929,20 +1946,20 @@ "export", "exporter" ], - "time": "2014-09-10 00:51:36" + "time": "2015-08-09 04:23:41" }, { "name": "sebastian/global-state", - "version": "dev-master", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "231d48620efde984fd077ee92916099a3ece9a59" + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/231d48620efde984fd077ee92916099a3ece9a59", - "reference": "231d48620efde984fd077ee92916099a3ece9a59", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { @@ -1980,20 +1997,73 @@ "keywords": [ "global state" ], - "time": "2014-10-06 09:49:11" + "time": "2015-10-12 03:26:01" + }, + { + "name": "sebastian/recursion-context", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7", + "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2016-01-28 05:39:29" }, { "name": "sebastian/version", - "version": "1.0.3", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43" + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", - "reference": "b6e1f0cf6b9e1ec409a0d3e2f2a5fb0998e36b43", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", "shasum": "" }, "type": "library", @@ -2015,42 +2085,49 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2014-03-07 15:35:33" + "time": "2015-06-21 13:59:46" }, { "name": "symfony/console", - "version": "dev-master", - "target-dir": "Symfony/Component/Console", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Console.git", - "reference": "ff8d5444c1b4dc7675aaeecd35f7ed1f0872c242" + "url": "https://github.com/symfony/console.git", + "reference": "48221d3de4dc22d2cd57c97e8b9361821da86609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Console/zipball/ff8d5444c1b4dc7675aaeecd35f7ed1f0872c242", - "reference": "ff8d5444c1b4dc7675aaeecd35f7ed1f0872c242", + "url": "https://api.github.com/repos/symfony/console/zipball/48221d3de4dc22d2cd57c97e8b9361821da86609", + "reference": "48221d3de4dc22d2cd57c97e8b9361821da86609", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/event-dispatcher": "~2.1" + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/process": "~2.1|~3.0.0" }, "suggest": { - "symfony/event-dispatcher": "" + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Console\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2063,44 +2140,55 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Console Component", - "homepage": "http://symfony.com", - "time": "2013-11-28 10:27:35" + "homepage": "https://symfony.com", + "time": "2016-04-26 12:00:47" }, { "name": "symfony/event-dispatcher", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/EventDispatcher", + "version": "3.0.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/EventDispatcher.git", - "reference": "e1d18ff0ff6f3e45ac82f000bc221135df635527" + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/e1d18ff0ff6f3e45ac82f000bc221135df635527", - "reference": "e1d18ff0ff6f3e45ac82f000bc221135df635527", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/17b04e6b1ede45b57d3ad5146abe50df6c3968b4", + "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5.9" }, "require-dev": { - "symfony/dependency-injection": "2.1.*" + "psr/log": "~1.0", + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" }, "suggest": { - "symfony/dependency-injection": "2.1.*", - "symfony/http-kernel": "2.1.*" + "symfony/dependency-injection": "", + "symfony/http-kernel": "" }, "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\EventDispatcher": "" + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" } }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -2112,41 +2200,43 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony EventDispatcher Component", - "homepage": "http://symfony.com", - "time": "2013-02-11 11:26:14" + "homepage": "https://symfony.com", + "time": "2016-04-12 18:09:53" }, { "name": "symfony/filesystem", - "version": "dev-master", - "target-dir": "Symfony/Component/Filesystem", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Filesystem.git", - "reference": "c136348f53ef538f1a3fa0b25b73c9c3bf223b31" + "url": "https://github.com/symfony/filesystem.git", + "reference": "dee379131dceed90a429e951546b33edfe7dccbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Filesystem/zipball/c136348f53ef538f1a3fa0b25b73c9c3bf223b31", - "reference": "c136348f53ef538f1a3fa0b25b73c9c3bf223b31", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/dee379131dceed90a429e951546b33edfe7dccbb", + "reference": "dee379131dceed90a429e951546b33edfe7dccbb", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Filesystem\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2159,53 +2249,68 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Filesystem Component", - "homepage": "http://symfony.com", - "time": "2013-11-24 20:17:07" + "homepage": "https://symfony.com", + "time": "2016-04-12 18:01:21" }, { "name": "symfony/form", - "version": "2.3.x-dev", - "target-dir": "Symfony/Component/Form", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Form.git", - "reference": "9a90bf14fe3dd91f46fc6e75cb1813fd0f6ff118" + "url": "https://github.com/symfony/form.git", + "reference": "922807a06e25c0c6e06b86f83ffe4710080a8b2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Form/zipball/9a90bf14fe3dd91f46fc6e75cb1813fd0f6ff118", - "reference": "9a90bf14fe3dd91f46fc6e75cb1813fd0f6ff118", + "url": "https://api.github.com/repos/symfony/form/zipball/922807a06e25c0c6e06b86f83ffe4710080a8b2e", + "reference": "922807a06e25c0c6e06b86f83ffe4710080a8b2e", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/event-dispatcher": "~2.1", - "symfony/intl": "~2.3", - "symfony/options-resolver": "~2.1", - "symfony/property-access": "~2.3" + "php": ">=5.3.9", + "symfony/event-dispatcher": "~2.1|~3.0.0", + "symfony/intl": "~2.4|~3.0.0", + "symfony/options-resolver": "~2.6", + "symfony/polyfill-mbstring": "~1.0", + "symfony/property-access": "~2.3|~3.0.0" + }, + "conflict": { + "symfony/doctrine-bridge": "<2.7", + "symfony/framework-bundle": "<2.7", + "symfony/twig-bridge": "<2.7" }, "require-dev": { - "symfony/http-foundation": "~2.2", - "symfony/validator": "~2.2" + "doctrine/collections": "~1.0", + "symfony/dependency-injection": "~2.3|~3.0.0", + "symfony/http-foundation": "~2.2|~3.0.0", + "symfony/http-kernel": "~2.4|~3.0.0", + "symfony/security-csrf": "~2.4|~3.0.0", + "symfony/translation": "~2.0,>=2.0.5|~3.0.0", + "symfony/validator": "~2.8|~3.0.0" }, "suggest": { - "symfony/http-foundation": "", - "symfony/validator": "" + "symfony/framework-bundle": "For templating with PHP.", + "symfony/security-csrf": "For protecting forms against CSRF attacks.", + "symfony/twig-bridge": "For templating with Twig.", + "symfony/validator": "For form validation." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Form\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2218,101 +2323,117 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Form Component", - "homepage": "http://symfony.com", - "time": "2014-01-29 06:46:08" + "homepage": "https://symfony.com", + "time": "2016-04-28 09:59:09" }, { - "name": "symfony/icu", - "version": "1.2.x-dev", - "target-dir": "Symfony/Component/Icu", + "name": "symfony/intl", + "version": "3.0.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Icu.git", - "reference": "98e197da54df1f966dd5e8a4992135703569c987" + "url": "https://github.com/symfony/intl.git", + "reference": "a602fe5a36cfc6367c5495b38a88c443570e75da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Icu/zipball/98e197da54df1f966dd5e8a4992135703569c987", - "reference": "98e197da54df1f966dd5e8a4992135703569c987", + "url": "https://api.github.com/repos/symfony/intl/zipball/a602fe5a36cfc6367c5495b38a88c443570e75da", + "reference": "a602fe5a36cfc6367c5495b38a88c443570e75da", "shasum": "" }, "require": { - "lib-icu": ">=4.4", - "php": ">=5.3.3", - "symfony/intl": "~2.3" + "php": ">=5.5.9", + "symfony/polyfill-intl-icu": "~1.0" + }, + "require-dev": { + "symfony/filesystem": "~2.8|~3.0" + }, + "suggest": { + "ext-intl": "to use the component with locales other than \"en\"" }, "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Icu\\": "" + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" } }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Intl\\": "" + }, + "classmap": [ + "Resources/stubs" + ], + "exclude-from-classmap": [ + "/Tests/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, { "name": "Bernhard Schussek", "email": "bschussek@gmail.com" + }, + { + "name": "Eriksen Costa", + "email": "eriksen.costa@infranology.com.br" + }, + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "Contains an excerpt of the ICU data and classes to load it.", - "homepage": "http://symfony.com", + "description": "A PHP replacement layer for the C intl extension that includes additional data from the ICU library.", + "homepage": "https://symfony.com", "keywords": [ + "i18n", "icu", - "intl" + "internationalization", + "intl", + "l10n", + "localization" ], - "time": "2013-10-04 10:06:38" + "time": "2016-04-01 06:34:33" }, { - "name": "symfony/intl", - "version": "dev-master", - "target-dir": "Symfony/Component/Intl", + "name": "symfony/options-resolver", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Intl.git", - "reference": "e36018d0170a9fcc22cf66a8bca23d433dce3b16" + "url": "https://github.com/symfony/options-resolver.git", + "reference": "496d650b0137e57c2920eb14f9d366ff506761a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Intl/zipball/e36018d0170a9fcc22cf66a8bca23d433dce3b16", - "reference": "e36018d0170a9fcc22cf66a8bca23d433dce3b16", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/496d650b0137e57c2920eb14f9d366ff506761a8", + "reference": "496d650b0137e57c2920eb14f9d366ff506761a8", "shasum": "" }, "require": { - "php": ">=5.3.3", - "symfony/icu": "~1.0-RC" - }, - "require-dev": { - "symfony/filesystem": ">=2.1" - }, - "suggest": { - "ext-intl": "to use the component with locales other than \"en\"" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Component\\Intl\\": "" + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" }, - "classmap": [ - "Symfony/Component/Intl/Resources/stubs" - ], - "files": [ - "Symfony/Component/Intl/Resources/stubs/functions.php" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2321,155 +2442,170 @@ ], "authors": [ { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch", - "homepage": "http://wiedler.ch/igor/" - }, - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { - "name": "Eriksen Costa", - "email": "eriksen.costa@infranology.com.br" + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A PHP replacement layer for the C intl extension that includes additional data from the ICU library.", - "homepage": "http://symfony.com", + "description": "Symfony OptionsResolver Component", + "homepage": "https://symfony.com", "keywords": [ - "i18n", - "icu", - "internationalization", - "intl", - "l10n", - "localization" + "config", + "configuration", + "options" ], - "time": "2014-01-24 14:36:35" + "time": "2016-03-04 07:54:35" }, { - "name": "symfony/locale", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/Locale", + "name": "symfony/polyfill-intl-icu", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/Locale.git", - "reference": "3ad6a5129809b3815a2b9056eee470dc2877717f" + "url": "https://github.com/symfony/polyfill-intl-icu.git", + "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Locale/zipball/3ad6a5129809b3815a2b9056eee470dc2877717f", - "reference": "3ad6a5129809b3815a2b9056eee470dc2877717f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/8328069d9f5322f0e7b3c3518485acfdc94c3942", + "reference": "8328069d9f5322f0e7b3c3518485acfdc94c3942", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "symfony/intl": "~2.3|~3.0" }, "suggest": { - "ext-intl": ">=5.3.3" + "ext-intl": "For best performance" }, "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Locale": "" + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" } }, + "autoload": { + "files": [ + "bootstrap.php" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Locale Component", - "homepage": "http://symfony.com", - "time": "2013-01-10 04:41:59" + "description": "Symfony polyfill for intl's ICU-related data and classes", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "icu", + "intl", + "polyfill", + "portable", + "shim" + ], + "time": "2016-02-26 16:18:12" }, { - "name": "symfony/options-resolver", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/OptionsResolver", + "name": "symfony/polyfill-mbstring", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/OptionsResolver.git", - "reference": "1a1319747462c2d457c3e1c8c2c9a26ad4bcb67b" + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "6bab34bbffa5f5ac079fdc4a68e143f158e87b7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/OptionsResolver/zipball/1a1319747462c2d457c3e1c8c2c9a26ad4bcb67b", - "reference": "1a1319747462c2d457c3e1c8c2c9a26ad4bcb67b", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6bab34bbffa5f5ac079fdc4a68e143f158e87b7d", + "reference": "6bab34bbffa5f5ac079fdc4a68e143f158e87b7d", "shasum": "" }, "require": { "php": ">=5.3.3" }, + "suggest": { + "ext-mbstring": "For best performance" + }, "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\OptionsResolver": "" + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" } }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony OptionsResolver Component", - "homepage": "http://symfony.com", + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", "keywords": [ - "config", - "configuration", - "options" + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" ], - "time": "2013-01-09 08:51:07" + "time": "2016-04-15 07:04:29" }, { "name": "symfony/property-access", - "version": "dev-master", - "target-dir": "Symfony/Component/PropertyAccess", + "version": "3.0.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/PropertyAccess.git", - "reference": "0a1328b9b197753b2e19aaa24f05c21b2760f0b7" + "url": "https://github.com/symfony/property-access.git", + "reference": "d9deeca5d2f0dffd90f9547d3d9a2007bd6ee61b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/PropertyAccess/zipball/0a1328b9b197753b2e19aaa24f05c21b2760f0b7", - "reference": "0a1328b9b197753b2e19aaa24f05c21b2760f0b7", + "url": "https://api.github.com/repos/symfony/property-access/zipball/d9deeca5d2f0dffd90f9547d3d9a2007bd6ee61b", + "reference": "d9deeca5d2f0dffd90f9547d3d9a2007bd6ee61b", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "3.0-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\PropertyAccess\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2482,11 +2618,11 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony PropertyAccess Component", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "access", "array", @@ -2498,40 +2634,54 @@ "property path", "reflection" ], - "time": "2014-01-07 13:29:57" + "time": "2016-04-20 18:53:54" }, { "name": "symfony/translation", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/Translation", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Translation.git", - "reference": "39ba7a5dc560959667c45c9353b70f43182ca4b3" + "url": "https://github.com/symfony/translation.git", + "reference": "d60b8e076d22953aabebeebda53bf334438e7aca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Translation/zipball/39ba7a5dc560959667c45c9353b70f43182ca4b3", - "reference": "39ba7a5dc560959667c45c9353b70f43182ca4b3", + "url": "https://api.github.com/repos/symfony/translation/zipball/d60b8e076d22953aabebeebda53bf334438e7aca", + "reference": "d60b8e076d22953aabebeebda53bf334438e7aca", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/config": "<2.7" }, "require-dev": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "psr/log": "~1.0", + "symfony/config": "~2.8", + "symfony/intl": "~2.4|~3.0.0", + "symfony/yaml": "~2.2|~3.0.0" }, "suggest": { - "symfony/config": "2.1.*", - "symfony/yaml": "2.1.*" + "psr/log": "To use logging capability in translator", + "symfony/config": "", + "symfony/yaml": "" }, "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Translation": "" + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" } }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -2543,47 +2693,68 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Translation Component", - "homepage": "http://symfony.com", - "time": "2013-04-20 08:25:59" + "homepage": "https://symfony.com", + "time": "2016-03-25 01:40:30" }, { "name": "symfony/validator", - "version": "2.1.x-dev", - "target-dir": "Symfony/Component/Validator", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Validator.git", - "reference": "20e121114768672e0a90a25a378e5b14e1331ec0" + "url": "https://github.com/symfony/validator.git", + "reference": "4c8f9fd8e2150dbc4745ef13378e690588365df0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Validator/zipball/20e121114768672e0a90a25a378e5b14e1331ec0", - "reference": "20e121114768672e0a90a25a378e5b14e1331ec0", + "url": "https://api.github.com/repos/symfony/validator/zipball/4c8f9fd8e2150dbc4745ef13378e690588365df0", + "reference": "4c8f9fd8e2150dbc4745ef13378e690588365df0", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation": "~2.4|~3.0.0" }, "require-dev": { - "symfony/http-foundation": "2.1.*", - "symfony/locale": "2.1.*", - "symfony/yaml": "2.1.*" + "doctrine/annotations": "~1.0", + "doctrine/cache": "~1.0", + "egulias/email-validator": "~1.2,>=1.2.1", + "symfony/config": "~2.2|~3.0.0", + "symfony/expression-language": "~2.4|~3.0.0", + "symfony/http-foundation": "~2.1|~3.0.0", + "symfony/intl": "~2.7.4|~2.8|~3.0.0", + "symfony/property-access": "~2.3|~3.0.0", + "symfony/yaml": "~2.0,>=2.0.5|~3.0.0" }, "suggest": { - "doctrine/common": "~2.1", - "symfony/http-foundation": "2.1.*", - "symfony/yaml": "2.1.*" + "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.", + "doctrine/cache": "For using the default cached annotation reader and metadata cache.", + "egulias/email-validator": "Strict (RFC compliant) email validation", + "symfony/config": "", + "symfony/expression-language": "For using the 2.4 Expression validator", + "symfony/http-foundation": "", + "symfony/intl": "", + "symfony/property-access": "For using the 2.4 Validator API", + "symfony/yaml": "" }, "type": "library", - "autoload": { - "psr-0": { - "Symfony\\Component\\Validator": "" + "extra": { + "branch-alias": { + "dev-master": "2.8-dev" } }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Validator\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -2595,41 +2766,43 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Validator Component", - "homepage": "http://symfony.com", - "time": "2013-08-06 05:58:11" + "homepage": "https://symfony.com", + "time": "2016-04-14 08:48:44" }, { "name": "symfony/yaml", - "version": "dev-master", - "target-dir": "Symfony/Component/Yaml", + "version": "2.8.x-dev", "source": { "type": "git", - "url": "https://github.com/symfony/Yaml.git", - "reference": "1481f096caead542c2dfadd67d9fd6124d97e273" + "url": "https://github.com/symfony/yaml.git", + "reference": "e4fbcc65f90909c999ac3b4dfa699ee6563a9940" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Yaml/zipball/1481f096caead542c2dfadd67d9fd6124d97e273", - "reference": "1481f096caead542c2dfadd67d9fd6124d97e273", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e4fbcc65f90909c999ac3b4dfa699ee6563a9940", + "reference": "e4fbcc65f90909c999ac3b4dfa699ee6563a9940", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.8-dev" } }, "autoload": { - "psr-0": { + "psr-4": { "Symfony\\Component\\Yaml\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2642,34 +2815,39 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony Yaml Component", - "homepage": "http://symfony.com", - "time": "2013-11-26 16:42:52" + "homepage": "https://symfony.com", + "time": "2016-03-29 19:00:15" }, { "name": "twig/twig", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/fabpot/Twig.git", - "reference": "fcecb284f0c3d8f04ea282b70363a2a2023570d9" + "url": "https://github.com/twigphp/Twig.git", + "reference": "0ddc3c6395f3d5d2781657d957be319190bfaf5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/fcecb284f0c3d8f04ea282b70363a2a2023570d9", - "reference": "fcecb284f0c3d8f04ea282b70363a2a2023570d9", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/0ddc3c6395f3d5d2781657d957be319190bfaf5d", + "reference": "0ddc3c6395f3d5d2781657d957be319190bfaf5d", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": ">=5.5", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/debug": "~2.7", + "symfony/phpunit-bridge": "~2.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2684,11 +2862,19 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" }, { "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com" + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + }, + { + "name": "Twig Team", + "homepage": "http://twig.sensiolabs.org/contributors", + "role": "Contributors" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", @@ -2696,15 +2882,16 @@ "keywords": [ "templating" ], - "time": "2013-12-03 14:16:16" + "time": "2016-04-24 13:56:57" } ], "aliases": [], "minimum-stability": "dev", "stability-flags": [], "prefer-stable": false, + "prefer-lowest": false, "platform": { - "php": ">=5.3.2" + "php": ">=5.4.0" }, "platform-dev": [] } diff --git a/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php b/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php index 15807170f..168822dbe 100644 --- a/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php +++ b/tests/JMS/Serializer/Tests/Serializer/BaseSerializationTest.php @@ -628,7 +628,7 @@ public function testFormErrorsWithNonFormComponents() public function testConstraintViolation() { - $violation = new ConstraintViolation('Message of violation', array(), null, 'foo', null); + $violation = new ConstraintViolation('Message of violation', "Message of violation", array(), null, 'foo', null); $this->assertEquals($this->getContent('constraint_violation'), $this->serialize($violation)); } @@ -636,8 +636,8 @@ public function testConstraintViolation() public function testConstraintViolationList() { $violations = new ConstraintViolationList(); - $violations->add(new ConstraintViolation('Message of violation', array(), null, 'foo', null)); - $violations->add(new ConstraintViolation('Message of another violation', array(), null, 'bar', null)); + $violations->add(new ConstraintViolation('Message of violation', "Message of violation", array(), null, 'foo', null)); + $violations->add(new ConstraintViolation('Message of another violation', "Message of another violation", array(), null, 'bar', null)); $this->assertEquals($this->getContent('constraint_violation_list'), $this->serialize($violations)); } diff --git a/tests/JMS/Serializer/Tests/Serializer/EventDispatcher/Subscriber/SymfonyValidatorSubscriberTest.php b/tests/JMS/Serializer/Tests/Serializer/EventDispatcher/Subscriber/SymfonyValidatorSubscriberTest.php index 7081c064e..c7b12ec82 100644 --- a/tests/JMS/Serializer/Tests/Serializer/EventDispatcher/Subscriber/SymfonyValidatorSubscriberTest.php +++ b/tests/JMS/Serializer/Tests/Serializer/EventDispatcher/Subscriber/SymfonyValidatorSubscriberTest.php @@ -63,7 +63,7 @@ public function testValidateThrowsExceptionWhenListIsNotEmpty() $this->validator->expects($this->once()) ->method('validate') ->with($obj, array('foo')) - ->will($this->returnValue(new ConstraintViolationList(array(new ConstraintViolation('foo', array(), 'a', 'b', 'c'))))); + ->will($this->returnValue(new ConstraintViolationList(array(new ConstraintViolation('foo', 'foo', array(), 'a', 'b', 'c'))))); $context = DeserializationContext::create()->setAttribute('validation_groups', array('foo')); From 561154db074d638e0d7307f7e23b32034c8834c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 14:28:46 +0200 Subject: [PATCH 09/16] Updated composer. Removed PHP 5.3 from travis. --- .travis.yml | 1 - composer.lock | 156 +++++++++++++++++++++++++++++++++++--------------- 2 files changed, 109 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6f19db745..3784e7642 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ matrix: - php: hhvm php: - - 5.3 - 5.4 - 5.5 - 5.6 diff --git a/composer.lock b/composer.lock index c8e390a4c..7e157b86b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "b90be7afd4e5e8fa50a92a50eba90c52", - "content-hash": "7ae1f2fe431c7d62a423faf523902fa0", + "hash": "c7d4e2da1c68d66508e13eb074a8a3d8", + "content-hash": "4614dcfb58512f1385004d7847eca873", "packages": [ { "name": "doctrine/annotations", @@ -370,32 +370,33 @@ "packages-dev": [ { "name": "doctrine/cache", - "version": "dev-master", + "version": "1.5.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "4e3b8b9464d511eccbefe07cef94c275bce7e434" + "reference": "fb3f5917781cf95863d3fd4d2595da43da3686c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/4e3b8b9464d511eccbefe07cef94c275bce7e434", - "reference": "4e3b8b9464d511eccbefe07cef94c275bce7e434", + "url": "https://api.github.com/repos/doctrine/cache/zipball/fb3f5917781cf95863d3fd4d2595da43da3686c1", + "reference": "fb3f5917781cf95863d3fd4d2595da43da3686c1", "shasum": "" }, "require": { - "php": "~5.5|~7.0" + "php": ">=5.3.2" }, "conflict": { "doctrine/common": ">2.2,<2.4" }, "require-dev": { - "phpunit/phpunit": "~4.8|~5.0", - "predis/predis": "~1.0" + "phpunit/phpunit": ">=3.7", + "predis/predis": "~1.0", + "satooshi/php-coveralls": "~0.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -435,7 +436,7 @@ "cache", "caching" ], - "time": "2016-03-11 16:30:04" + "time": "2015-12-19 05:04:23" }, { "name": "doctrine/collections", @@ -2149,27 +2150,27 @@ }, { "name": "symfony/event-dispatcher", - "version": "3.0.x-dev", + "version": "2.8.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4" + "reference": "81c4c51f7fd6d0d40961bd53dd60cade32db6ed6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/17b04e6b1ede45b57d3ad5146abe50df6c3968b4", - "reference": "17b04e6b1ede45b57d3ad5146abe50df6c3968b4", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/81c4c51f7fd6d0d40961bd53dd60cade32db6ed6", + "reference": "81c4c51f7fd6d0d40961bd53dd60cade32db6ed6", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.0,>=2.0.5|~3.0.0", + "symfony/dependency-injection": "~2.6|~3.0.0", + "symfony/expression-language": "~2.6|~3.0.0", + "symfony/stopwatch": "~2.3|~3.0.0" }, "suggest": { "symfony/dependency-injection": "", @@ -2178,7 +2179,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2205,7 +2206,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-04-12 18:09:53" + "time": "2016-04-05 16:36:54" }, { "name": "symfony/filesystem", @@ -2332,24 +2333,25 @@ }, { "name": "symfony/intl", - "version": "3.0.x-dev", + "version": "2.8.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "a602fe5a36cfc6367c5495b38a88c443570e75da" + "reference": "0ca1089d64b929fa999d709423f74d858bec11d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/a602fe5a36cfc6367c5495b38a88c443570e75da", - "reference": "a602fe5a36cfc6367c5495b38a88c443570e75da", + "url": "https://api.github.com/repos/symfony/intl/zipball/0ca1089d64b929fa999d709423f74d858bec11d4", + "reference": "0ca1089d64b929fa999d709423f74d858bec11d4", "shasum": "" }, "require": { - "php": ">=5.5.9", - "symfony/polyfill-intl-icu": "~1.0" + "php": ">=5.3.9", + "symfony/polyfill-intl-icu": "~1.0", + "symfony/polyfill-php54": "~1.0" }, "require-dev": { - "symfony/filesystem": "~2.8|~3.0" + "symfony/filesystem": "~2.1|~3.0.0" }, "suggest": { "ext-intl": "to use the component with locales other than \"en\"" @@ -2357,7 +2359,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2403,7 +2405,7 @@ "l10n", "localization" ], - "time": "2016-04-01 06:34:33" + "time": "2016-03-23 13:11:46" }, { "name": "symfony/options-resolver", @@ -2576,27 +2578,85 @@ ], "time": "2016-04-15 07:04:29" }, + { + "name": "symfony/polyfill-php54", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php54.git", + "reference": "95e9a5cc46972bb8bd38dc7a960a3041c5813075" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/95e9a5cc46972bb8bd38dc7a960a3041c5813075", + "reference": "95e9a5cc46972bb8bd38dc7a960a3041c5813075", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Php54\\": "" + }, + "files": [ + "bootstrap.php" + ], + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "time": "2016-03-29 10:16:13" + }, { "name": "symfony/property-access", - "version": "3.0.x-dev", + "version": "2.8.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "d9deeca5d2f0dffd90f9547d3d9a2007bd6ee61b" + "reference": "1d6f0181fbddda4bb2e2a41f7a5928d590f06b34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/d9deeca5d2f0dffd90f9547d3d9a2007bd6ee61b", - "reference": "d9deeca5d2f0dffd90f9547d3d9a2007bd6ee61b", + "url": "https://api.github.com/repos/symfony/property-access/zipball/1d6f0181fbddda4bb2e2a41f7a5928d590f06b34", + "reference": "1d6f0181fbddda4bb2e2a41f7a5928d590f06b34", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=5.3.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -2634,7 +2694,7 @@ "property path", "reflection" ], - "time": "2016-04-20 18:53:54" + "time": "2016-04-20 18:52:26" }, { "name": "symfony/translation", @@ -2824,21 +2884,20 @@ }, { "name": "twig/twig", - "version": "dev-master", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "0ddc3c6395f3d5d2781657d957be319190bfaf5d" + "reference": "f167cc0a65ab0a2a53558c9385b4a324c1a36b02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/0ddc3c6395f3d5d2781657d957be319190bfaf5d", - "reference": "0ddc3c6395f3d5d2781657d957be319190bfaf5d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/f167cc0a65ab0a2a53558c9385b4a324c1a36b02", + "reference": "f167cc0a65ab0a2a53558c9385b4a324c1a36b02", "shasum": "" }, "require": { - "php": ">=5.5", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=5.2.7" }, "require-dev": { "symfony/debug": "~2.7", @@ -2847,7 +2906,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.24-dev" } }, "autoload": { @@ -2882,7 +2941,7 @@ "keywords": [ "templating" ], - "time": "2016-04-24 13:56:57" + "time": "2016-04-24 13:54:56" } ], "aliases": [], @@ -2893,5 +2952,8 @@ "platform": { "php": ">=5.4.0" }, - "platform-dev": [] + "platform-dev": [], + "platform-overrides": { + "php": "5.4.0" + } } From be1310824b3769c006c1f8f87f7c7a54719b9509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 14:33:39 +0200 Subject: [PATCH 10/16] Moved hhvm to allowed failures. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3784e7642..57d61addf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,11 +9,11 @@ php: - 5.5 - 5.6 - 7.0 - - hhvm matrix: allow_failures: - php: 7.0 + - hhvm before_script: - travis_retry composer self-update From b97d45c4418bbece3caacf6fb020071e1f214b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 14:36:35 +0200 Subject: [PATCH 11/16] Moved hhvm to allowed failures. --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 57d61addf..529e17a5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,17 @@ language: php -matrix: - allow_failures: - - php: hhvm - php: - 5.4 - 5.5 - 5.6 - 7.0 + - hhvm matrix: allow_failures: - - php: 7.0 - - hhvm + - php: + - 7.0 + - hhvm before_script: - travis_retry composer self-update From 223d11f65f651f096346245ef011303267d92600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 14:37:56 +0200 Subject: [PATCH 12/16] Moved hhvm to allowed failures. --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 529e17a5c..89161ba9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,9 +9,8 @@ php: matrix: allow_failures: - - php: - - 7.0 - - hhvm + - php: 7.0 + - php: hhvm before_script: - travis_retry composer self-update From 3fcaafa57114ee1bb9f879bae72f5ffadc980b4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 15:01:04 +0200 Subject: [PATCH 13/16] Upped dependencies and removed PHPCR autoloader from tests bootstrap. --- composer.json | 9 +- composer.lock | 261 +++++++++++++++++++++++++++++--------------- tests/bootstrap.php | 2 +- 3 files changed, 184 insertions(+), 88 deletions(-) diff --git a/composer.json b/composer.json index 26e976e96..65ae25763 100644 --- a/composer.json +++ b/composer.json @@ -11,6 +11,11 @@ "email": "schmittjoh@gmail.com" } ], + "config": { + "platform": { + "php": "5.4.0" + } + }, "require": { "php": ">=5.4.0", "jms/metadata": "~1.1", @@ -29,8 +34,8 @@ "require-dev": { "twig/twig": "~1.12|~2.0", "doctrine/orm": "~2.1", - "doctrine/phpcr-odm": "~1.0.1", - "jackalope/jackalope-doctrine-dbal": "1.0.*", + "doctrine/phpcr-odm": "~1.3.0", + "jackalope/jackalope-doctrine-dbal": "1.2.*", "propel/propel1": "~1.7", "symfony/yaml": "2.*", "symfony/translation": "~2.0", diff --git a/composer.lock b/composer.lock index 7e157b86b..ccd8862a7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "c7d4e2da1c68d66508e13eb074a8a3d8", - "content-hash": "4614dcfb58512f1385004d7847eca873", + "hash": "f02195df77a88c020f41a2fcc2d72fee", + "content-hash": "74ed1a007190d24fe6eea2ecc8c090dd", "packages": [ { "name": "doctrine/annotations", @@ -506,16 +506,16 @@ }, { "name": "doctrine/common", - "version": "2.4.x-dev", + "version": "2.5.x-dev", "source": { "type": "git", "url": "https://github.com/doctrine/common.git", - "reference": "1b0f957ae7facde8a48500894f5c20bce352b9f3" + "reference": "68c0e2f52fce0b8379ddcee7d5e85f32387559c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/common/zipball/1b0f957ae7facde8a48500894f5c20bce352b9f3", - "reference": "1b0f957ae7facde8a48500894f5c20bce352b9f3", + "url": "https://api.github.com/repos/doctrine/common/zipball/68c0e2f52fce0b8379ddcee7d5e85f32387559c2", + "reference": "68c0e2f52fce0b8379ddcee7d5e85f32387559c2", "shasum": "" }, "require": { @@ -532,7 +532,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.5.x-dev" } }, "autoload": { @@ -575,34 +575,99 @@ "persistence", "spl" ], - "time": "2015-08-31 14:43:41" + "time": "2015-12-25 13:10:52" + }, + { + "name": "doctrine/data-fixtures", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/data-fixtures.git", + "reference": "b4213c21f138c96c29ba2f57349d6fca5b2878a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/b4213c21f138c96c29ba2f57349d6fca5b2878a9", + "reference": "b4213c21f138c96c29ba2f57349d6fca5b2878a9", + "shasum": "" + }, + "require": { + "doctrine/common": "~2.2", + "php": ">=5.3.2" + }, + "conflict": { + "doctrine/orm": "< 2.4" + }, + "require-dev": { + "doctrine/orm": "~2.4" + }, + "suggest": { + "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\DataFixtures": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Data Fixtures for all Doctrine Object Managers", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database" + ], + "time": "2015-11-02 22:38:12" }, { "name": "doctrine/dbal", - "version": "2.4.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "f5b85d182799c539d1a56aa145977aa2c43dfe1a" + "reference": "3df22ccdf20a68fafe34cb1ae452aee7cde7d442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/f5b85d182799c539d1a56aa145977aa2c43dfe1a", - "reference": "f5b85d182799c539d1a56aa145977aa2c43dfe1a", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/3df22ccdf20a68fafe34cb1ae452aee7cde7d442", + "reference": "3df22ccdf20a68fafe34cb1ae452aee7cde7d442", "shasum": "" }, "require": { "doctrine/common": "~2.4", - "php": ">=5.3.2" + "php": ">=5.4" }, "require-dev": { - "phpunit/phpunit": "3.7.*", - "symfony/console": "~2.0" + "phpunit/phpunit": "4.*", + "symfony/console": "2.*" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." }, + "bin": [ + "bin/doctrine-dbal" + ], "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.6.x-dev" + } + }, "autoload": { "psr-0": { "Doctrine\\DBAL\\": "lib/" @@ -638,7 +703,7 @@ "persistence", "queryobject" ], - "time": "2016-01-05 22:19:09" + "time": "2016-04-03 03:13:05" }, { "name": "doctrine/inflector", @@ -709,45 +774,47 @@ }, { "name": "doctrine/orm", - "version": "2.4.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "ea713a0b01267745e245cf52a0c569425deb170e" + "reference": "59a041095183f188faac6bc784074f4f88475a4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/ea713a0b01267745e245cf52a0c569425deb170e", - "reference": "ea713a0b01267745e245cf52a0c569425deb170e", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/59a041095183f188faac6bc784074f4f88475a4a", + "reference": "59a041095183f188faac6bc784074f4f88475a4a", "shasum": "" }, "require": { - "doctrine/collections": "~1.1", - "doctrine/dbal": "~2.4", + "doctrine/cache": "~1.4", + "doctrine/collections": "~1.2", + "doctrine/common": ">=2.5-dev,<2.7-dev", + "doctrine/dbal": ">=2.5-dev,<2.7-dev", + "doctrine/instantiator": "~1.0.1", "ext-pdo": "*", - "php": ">=5.3.2", - "symfony/console": "~2.0" + "php": ">=5.4", + "symfony/console": "~2.5|~3.0" }, "require-dev": { - "satooshi/php-coveralls": "dev-master", - "symfony/yaml": "~2.1" + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.3|~3.0" }, "suggest": { "symfony/yaml": "If you want to use YAML Metadata Mapping Driver" }, "bin": [ - "bin/doctrine", - "bin/doctrine.php" + "bin/doctrine" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.6.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\ORM\\": "lib/" + "psr-4": { + "Doctrine\\ORM\\": "lib/Doctrine/ORM" } }, "notification-url": "https://packagist.org/downloads/", @@ -770,6 +837,10 @@ { "name": "Jonathan Wage", "email": "jonwage@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], "description": "Object-Relational-Mapper for PHP", @@ -778,36 +849,45 @@ "database", "orm" ], - "time": "2015-08-31 13:19:01" + "time": "2016-04-21 15:26:15" }, { "name": "doctrine/phpcr-odm", - "version": "1.0.x-dev", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/doctrine/phpcr-odm.git", - "reference": "fc72cc95305bd9eee955aad6cda05df8559a5622" + "reference": "713e88c8e89a0e289ac39d9a24caeecd056ba19a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/fc72cc95305bd9eee955aad6cda05df8559a5622", - "reference": "fc72cc95305bd9eee955aad6cda05df8559a5622", + "url": "https://api.github.com/repos/doctrine/phpcr-odm/zipball/713e88c8e89a0e289ac39d9a24caeecd056ba19a", + "reference": "713e88c8e89a0e289ac39d9a24caeecd056ba19a", "shasum": "" }, "require": { - "doctrine/common": "~2.4.0", - "php": ">=5.3.3", - "phpcr/phpcr-implementation": "~2.1.0", - "phpcr/phpcr-utils": "~1.0.0" + "doctrine/annotations": "^1.2", + "doctrine/common": "^2.4", + "doctrine/data-fixtures": "^1.0", + "doctrine/instantiator": "^1.0.1", + "php": "^5.3.9|~7.0", + "phpcr/phpcr": "^2.1.1", + "phpcr/phpcr-implementation": "^2.1.0", + "phpcr/phpcr-utils": "^1.2.8", + "symfony/console": "^2.3|^3.0" + }, + "conflict": { + "jackalope/jackalope-doctrine-dbal": "<1.1.5" }, "require-dev": { - "liip/rmt": "dev-master", - "symfony/yaml": "~2.0" + "liip/rmt": "~1.2", + "symfony/phpunit-bridge": "^2.7|^3.0", + "symfony/yaml": "^2.3|^3.0" }, "suggest": { - "jackalope/jackalope-doctrine-dbal": "~1.0.0", - "jackalope/jackalope-jackrabbit": "~1.0.0", - "symfony/yaml": "~2.0" + "jackalope/jackalope-doctrine-dbal": "^1.1.5", + "jackalope/jackalope-jackrabbit": "^1.0", + "symfony/yaml": "^2.3|^3.0" }, "bin": [ "bin/phpcrodm", @@ -816,12 +896,12 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.3-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\ODM\\PHPCR": "lib/" + "psr-4": { + "Doctrine\\ODM\\PHPCR\\": "lib/Doctrine/ODM/PHPCR" } }, "notification-url": "https://packagist.org/downloads/", @@ -849,28 +929,28 @@ "odm", "phpcr" ], - "time": "2014-11-21 13:50:50" + "time": "2016-04-06 05:21:14" }, { "name": "jackalope/jackalope", - "version": "1.0.x-dev", + "version": "1.2.x-dev", "source": { "type": "git", "url": "https://github.com/jackalope/jackalope.git", - "reference": "b49d1d0458869f127f387c946df5dd871972ecaf" + "reference": "daa1a31268165af21c02d633b5b408280d9e734b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope/zipball/b49d1d0458869f127f387c946df5dd871972ecaf", - "reference": "b49d1d0458869f127f387c946df5dd871972ecaf", + "url": "https://api.github.com/repos/jackalope/jackalope/zipball/daa1a31268165af21c02d633b5b408280d9e734b", + "reference": "daa1a31268165af21c02d633b5b408280d9e734b", "shasum": "" }, "require": { - "ext-libxml": "*", + "ext-xml": "*", "jackalope/jackalope-transport": "*", - "php": ">=5.3.2", - "phpcr/phpcr": "~2.1.0", - "phpcr/phpcr-utils": "~1.0.0" + "php": ">=5.3.3", + "phpcr/phpcr": "~2.1.0,>=2.1.0-beta12", + "phpcr/phpcr-utils": "~1.2,>=1.2.6" }, "provide": { "phpcr/phpcr-implementation": "2.1.0" @@ -878,7 +958,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -902,34 +982,37 @@ "keywords": [ "phpcr" ], - "time": "2014-06-02 05:59:58" + "time": "2016-02-08 13:50:55" }, { "name": "jackalope/jackalope-doctrine-dbal", - "version": "1.0.x-dev", + "version": "1.2.x-dev", "source": { "type": "git", "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git", - "reference": "d284e44e29b6ecc1b04a8ea78e942c793845d93b" + "reference": "d80439e095a12750094af0df769744aaa6dea1b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/d284e44e29b6ecc1b04a8ea78e942c793845d93b", - "reference": "d284e44e29b6ecc1b04a8ea78e942c793845d93b", + "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/d80439e095a12750094af0df769744aaa6dea1b7", + "reference": "d80439e095a12750094af0df769744aaa6dea1b7", "shasum": "" }, "require": { - "doctrine/dbal": ">=2.2.0,<2.5", - "jackalope/jackalope": "~1.0.0", + "doctrine/dbal": ">=2.4.5,<3.0.x-dev", + "jackalope/jackalope": "~1.2.0", "php": ">=5.3.3", - "phpcr/phpcr": "~2.1.0-RC1", - "phpcr/phpcr-utils": "~1.0.0" + "phpcr/phpcr": "~2.1.2", + "phpcr/phpcr-utils": "~1.2,>=1.2.4" }, "provide": { - "jackalope/jackalope-transport": "1.0.0" + "jackalope/jackalope-transport": "1.1.0" }, "require-dev": { - "phpcr/phpcr-api-tests": "2.1.0" + "phpcr/phpcr-api-tests": "2.1.4", + "phpunit/dbunit": "~1.3", + "phpunit/phpunit": "4.7.*", + "psr/log": "~1.0" }, "bin": [ "bin/jackalope" @@ -937,7 +1020,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -963,7 +1046,7 @@ "phpcr", "transport implementation" ], - "time": "2013-12-14 15:23:15" + "time": "2015-06-25 11:19:27" }, { "name": "phing/phing", @@ -1113,27 +1196,36 @@ }, { "name": "phpcr/phpcr-utils", - "version": "1.0.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/phpcr/phpcr-utils.git", - "reference": "7920ce3c60cffceb325819bfdf4ebe873df69839" + "reference": "9f51c3ebfcd1afd83d52f8735a4b14f8bee7e210" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/7920ce3c60cffceb325819bfdf4ebe873df69839", - "reference": "7920ce3c60cffceb325819bfdf4ebe873df69839", + "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/9f51c3ebfcd1afd83d52f8735a4b14f8bee7e210", + "reference": "9f51c3ebfcd1afd83d52f8735a4b14f8bee7e210", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=5.3.3", "phpcr/phpcr": "~2.1.0", - "symfony/console": "~2.0" + "symfony/console": "~2.3|~3.0" + }, + "conflict": { + "jackalope/jackalope-jackrabbit": "<1.2.1" + }, + "suggest": { + "ramsey/uuid": "A PHP 5.4+ library for generating RFC 4122 version 1, 3, 4, and 5 universally unique identifiers (UUID)." }, + "bin": [ + "bin/phpcr" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -1155,24 +1247,23 @@ "name": "David Buchmann", "email": "david@liip.ch" }, - { - "name": "Daniel Barsotti", - "email": "daniel.barsotti@liip.ch", - "role": "maintainer" - }, { "name": "Nacho Martín", "email": "nitram.ohcan@gmail.com" + }, + { + "name": "Daniel Barsotti", + "email": "daniel.barsotti@liip.ch" } ], "description": "PHP Content Repository implementation independant utilities", - "homepage": "http://phpcr.github.com", + "homepage": "http://phpcr.github.io", "keywords": [ "cli", "contentrepository", "phpcr" ], - "time": "2013-10-10 19:46:30" + "time": "2016-02-12 13:58:06" }, { "name": "phpdocumentor/reflection-docblock", diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 5d1b9e956..bc114c0bd 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -27,5 +27,5 @@ $loader->add('JMS\Serializer\Tests', __DIR__); AnnotationRegistry::registerLoader('class_exists'); - AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php'); +// AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php'); }); From ca72f9da879d8f70ab63adc3bd95ba5dfc0efb10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 15:07:03 +0200 Subject: [PATCH 14/16] Corrected phpcr odm test to use Field annotation instead of String, Date and Boolean. --- .../Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php index 397dc926c..db03ee5ed 100644 --- a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php +++ b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/BlogPost.php @@ -39,24 +39,24 @@ class BlogPost protected $id; /** - * @PHPCRODM\String() + * @PHPCRODM\Field(type="string") * @Groups({"comments","post"}) */ private $title; /** - * @PHPCRODM\String() + * @PHPCRODM\Field(type="string") */ protected $slug; /** - * @PHPCRODM\Date() + * @PHPCRODM\Field(type="date") * @XmlAttribute */ private $createdAt; /** - * @PHPCRODM\Boolean() + * @PHPCRODM\Field(type="boolean") * @Type("integer") * This boolean to integer conversion is one of the few changes between this * and the standard BlogPost class. It's used to test the override behavior From 85a29505502200011ab8c6d8e2b850c43b50e398 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 15:11:44 +0200 Subject: [PATCH 15/16] Corrected phpcr odm test to use Field annotation instead of String, Date and Boolean. --- tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php | 2 +- tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php index e726197e1..3774ff5e1 100644 --- a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php +++ b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Author.php @@ -32,7 +32,7 @@ class Author protected $id; /** - * @PHPCRODM\String() + * @PHPCRODM\Field(type="string") * @SerializedName("full_name") */ private $name; diff --git a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php index 6d27fdac6..587d1717f 100644 --- a/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php +++ b/tests/JMS/Serializer/Tests/Fixtures/DoctrinePHPCR/Comment.php @@ -39,7 +39,7 @@ class Comment private $blogPost; /** - * @PHPCRODM\String() + * @PHPCRODM\Field(type="string") */ private $text; From 7be27e75b8ff2114a20716027bc0d057bf5e00c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Struczy=C5=84ski?= Date: Thu, 28 Apr 2016 15:49:58 +0200 Subject: [PATCH 16/16] Corrected tests. --- tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php b/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php index 49cded5d2..0a14543e1 100644 --- a/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php +++ b/tests/JMS/Serializer/Tests/Metadata/ClassMetadataTest.php @@ -45,8 +45,12 @@ public function testSetAccessorOrder() $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('a')); $this->assertEquals(array('a', 'b'), array_keys($metadata->propertyMetadata)); + //We're not sure, in which order array will be sorted. + //We only know, that it should contain both properties $metadata->setAccessorOrder(ClassMetadata::ACCESSOR_ORDER_CUSTOM, array('foo', 'bar')); - $this->assertEquals(array('b', 'a'), array_keys($metadata->propertyMetadata)); + $this->assertArrayHasKey('a', $metadata->propertyMetadata); + $this->assertArrayHasKey('b', $metadata->propertyMetadata); + $this->assertCount(2, $metadata->propertyMetadata); } /**