[MediaWiki-commits] [Gerrit] Ground work for deserialization code - change (mediawiki...Ask)

2013-07-08 Thread Denny Vrandecic (Code Review) 
Denny Vrandecic has submitted this change and it was merged.

Change subject: Ground work for deserialization code
..


Ground work for deserialization code

* Added Deserializer interface
* Added DeserializationException
* Added objectType key to serialization so objects can be
  unserialized without the need for further context
* Changed various keys and values in the serialization from
  alllowercase to camelCase

Change-Id: Ibb143de40736a789fd60d864a7c6644453021569
---
M Tests/Integration/Serializers/QuerySerialializationTest.php
A Tests/Phpunit/Deserializers/Exceptions/UnsupportedTypeExceptionTest.php
M Tests/Phpunit/Serializers/DescriptionSerializerTest.php
M Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php
M Tests/Phpunit/Serializers/QuerySerializerTest.php
M Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php
M Tests/Phpunit/Serializers/SortExpressionSerializerTest.php
A includes/Ask/Deserializers/Deserializer.php
A includes/Ask/Deserializers/Exceptions/DeserializationException.php
A includes/Ask/Deserializers/Exceptions/UnsupportedTypeException.php
M includes/Ask/Language/Description/AnyValue.php
M includes/Ask/Language/Description/SomeProperty.php
M includes/Ask/Language/Description/ValueDescription.php
M includes/Ask/Serializers/DescriptionSerializer.php
M includes/Ask/Serializers/Exceptions/SerializationException.php
M includes/Ask/Serializers/Exceptions/UnsupportedObjectException.php
M includes/Ask/Serializers/QueryOptionsSerializer.php
M includes/Ask/Serializers/QuerySerializer.php
M includes/Ask/Serializers/SelectionRequestSerializer.php
M includes/Ask/Serializers/SortExpressionSerializer.php
20 files changed, 218 insertions(+), 36 deletions(-)

Approvals:
  Denny Vrandecic: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Tests/Integration/Serializers/QuerySerialializationTest.php 
b/Tests/Integration/Serializers/QuerySerialializationTest.php
index 63f6307..6bd2be3 100644
--- a/Tests/Integration/Serializers/QuerySerialializationTest.php
+++ b/Tests/Integration/Serializers/QuerySerialializationTest.php
@@ -74,66 +74,77 @@
 
protected function getExpectedSerialization( StringValue $p42, 
StringValue $p9001, StringValue $foo ) {
return array(
+   'objectType' = 'query',
'description' = array(
-   'type' = 'conjunction',
+   'objectType' = 'description',
+   'descriptionType' = 'conjunction',
'value' = array(
'descriptions' = array(
array(
-   'type' = 
'someproperty',
+   'objectType' = 
'description',
+   'descriptionType' = 
'someProperty',
'value' = array(
'property' = 
$p42-toArray(),
'description' 
= array(
-   'type' 
= 'anyvalue',
+   
'objectType' = 'description',
+   
'descriptionType' = 'anyValue',
'value' 
= null
),
-   'issubproperty' 
= false
+   'isSubProperty' 
= false
),
),
array(
-   'type' = 
'someproperty',
+   'objectType' = 
'description',
+   'descriptionType' = 
'someProperty',
'value' = array(
'property' = 
$p9001-toArray(),
'description' 
= array(
-   'type' 
= 'valuedescription',
+   
'objectType' = 'description',
+   
'descriptionType' = 'valueDescription',

[MediaWiki-commits] [Gerrit] Ground work for deserialization code - change (mediawiki...Ask)

2013-07-01 Thread Jeroen De Dauw (Code Review) 
Jeroen De Dauw has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/71383


Change subject: Ground work for deserialization code
..

Ground work for deserialization code

* Added Deserializer interface
* Added DeserializationException
* Added objectType key to serialization so objects can be
  unserialized without the need for further context
* Changed various keys and values in the serialization from
  alllowercase to camelCase

Change-Id: Ibb143de40736a789fd60d864a7c6644453021569
---
M Tests/Integration/Serializers/QuerySerialializationTest.php
A Tests/Phpunit/Deserializers/Exceptions/UnsupportedTypeExceptionTest.php
M Tests/Phpunit/Serializers/DescriptionSerializerTest.php
M Tests/Phpunit/Serializers/QueryOptionsSerializerTest.php
M Tests/Phpunit/Serializers/QuerySerializerTest.php
M Tests/Phpunit/Serializers/SelectionRequestSerializerTest.php
M Tests/Phpunit/Serializers/SortExpressionSerializerTest.php
A includes/Ask/Deserializers/Deserializer.php
A includes/Ask/Deserializers/Exceptions/DeserializationException.php
A includes/Ask/Deserializers/Exceptions/UnsupportedTypeException.php
M includes/Ask/Language/Description/AnyValue.php
M includes/Ask/Language/Description/SomeProperty.php
M includes/Ask/Language/Description/ValueDescription.php
M includes/Ask/Serializers/DescriptionSerializer.php
M includes/Ask/Serializers/Exceptions/SerializationException.php
M includes/Ask/Serializers/Exceptions/UnsupportedObjectException.php
M includes/Ask/Serializers/QueryOptionsSerializer.php
M includes/Ask/Serializers/QuerySerializer.php
M includes/Ask/Serializers/SelectionRequestSerializer.php
M includes/Ask/Serializers/SortExpressionSerializer.php
20 files changed, 209 insertions(+), 36 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Ask 
refs/changes/83/71383/1

diff --git a/Tests/Integration/Serializers/QuerySerialializationTest.php 
b/Tests/Integration/Serializers/QuerySerialializationTest.php
index 63f6307..6bd2be3 100644
--- a/Tests/Integration/Serializers/QuerySerialializationTest.php
+++ b/Tests/Integration/Serializers/QuerySerialializationTest.php
@@ -74,66 +74,77 @@
 
protected function getExpectedSerialization( StringValue $p42, 
StringValue $p9001, StringValue $foo ) {
return array(
+   'objectType' = 'query',
'description' = array(
-   'type' = 'conjunction',
+   'objectType' = 'description',
+   'descriptionType' = 'conjunction',
'value' = array(
'descriptions' = array(
array(
-   'type' = 
'someproperty',
+   'objectType' = 
'description',
+   'descriptionType' = 
'someProperty',
'value' = array(
'property' = 
$p42-toArray(),
'description' 
= array(
-   'type' 
= 'anyvalue',
+   
'objectType' = 'description',
+   
'descriptionType' = 'anyValue',
'value' 
= null
),
-   'issubproperty' 
= false
+   'isSubProperty' 
= false
),
),
array(
-   'type' = 
'someproperty',
+   'objectType' = 
'description',
+   'descriptionType' = 
'someProperty',
'value' = array(
'property' = 
$p9001-toArray(),
'description' 
= array(
-   'type' 
= 'valuedescription',
+   
'objectType' = 'description',
+   
'descriptionType' = 'valueDescription',