Rename DataModel namespace to Query (closes #1)

Tpt · Tpt · commit 8eba3052a655 · 2014-11-23T17:46:38.000+01:00
diff --git a/README.md b/README.md
@@ -20,11 +20,11 @@ Use one of the below methods:
 
     composer require "ppp/wikidataquery-api":dev-master"
 
-2 - Create a composer.json file that just defines a dependency on version 0.2 of this package, and run 'composer install' in the directory:
+2 - Create a composer.json file that just defines a dependency on version 1.0 of this package, and run 'composer install' in the directory:
 
     {
         "require": {
-            "ppp/wikidataquery-api"": "~0.2.0"
+            "ppp/wikidataquery-api"": "~1.0"
         }
     }
 
@@ -38,10 +38,10 @@ Here is a small usage example:
 require_once( __DIR__ . "/vendor/autoload.php" );
 
 // Initialise HTTP connection
-$api = new \WikidataQueryApi\WikidataQueryApi( 'https://wdq.wmflabs.org/api' );
+$api = new WikidataQueryApi( 'https://wdq.wmflabs.org/api' );
 
 // Build helper tools
-$wikidataQueryFactory = new  \WikidataQueryApi\WikidataQueryFactory( $api );
+$wikidataQueryFactory = new WikidataQueryFactory( $api );
 $simpleQueryService = $wikidataQueryFactory->newSimpleQueryService());
 
 //Do a query that returns a list of ItemId
diff --git a/src/Query/AbstractQuery.php b/src/Query/AbstractQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 /**
  * Base class for all queries.
diff --git a/src/Query/AroundQuery.php b/src/Query/AroundQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\LatLongValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/src/Query/BetweenQuery.php b/src/Query/BetweenQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\TimeValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/src/Query/ClaimQuery.php b/src/Query/ClaimQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/src/Query/QuantityQuery.php b/src/Query/QuantityQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\DecimalValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/src/Query/Serializers/AroundQuerySerializer.php b/src/Query/Serializers/AroundQuerySerializer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Serializers\DispatchableSerializer;
 use Serializers\Exceptions\UnsupportedObjectException;
-use WikidataQueryApi\DataModel\AroundQuery;
+use WikidataQueryApi\Query\AroundQuery;
 
 /**
  * @licence GPLv2+
diff --git a/src/Query/Serializers/BetweenQuerySerializer.php b/src/Query/Serializers/BetweenQuerySerializer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Serializers\DispatchableSerializer;
 use Serializers\Exceptions\UnsupportedObjectException;
-use WikidataQueryApi\DataModel\BetweenQuery;
+use WikidataQueryApi\Query\BetweenQuery;
 
 /**
  * @licence GPLv2+
diff --git a/src/Query/Serializers/ClaimQuerySerializer.php b/src/Query/Serializers/ClaimQuerySerializer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Serializers\DispatchableSerializer;
 use Serializers\Exceptions\UnsupportedObjectException;
-use WikidataQueryApi\DataModel\ClaimQuery;
+use WikidataQueryApi\Query\ClaimQuery;
 
 /**
  * @licence GPLv2+
diff --git a/src/Query/Serializers/QuantityQuerySerializer.php b/src/Query/Serializers/QuantityQuerySerializer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Serializers\DispatchableSerializer;
 use Serializers\Exceptions\UnsupportedObjectException;
-use WikidataQueryApi\DataModel\QuantityQuery;
+use WikidataQueryApi\Query\QuantityQuery;
 
 /**
  * @licence GPLv2+
diff --git a/src/Query/Serializers/StringQuerySerializer.php b/src/Query/Serializers/StringQuerySerializer.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Serializers\DispatchableSerializer;
 use Serializers\Exceptions\UnsupportedObjectException;
-use WikidataQueryApi\DataModel\StringQuery;
+use WikidataQueryApi\Query\StringQuery;
 
 /**
  * @licence GPLv2+
diff --git a/src/Query/StringQuery.php b/src/Query/StringQuery.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\StringValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/src/Services/SimpleQueryService.php b/src/Services/SimpleQueryService.php
@@ -4,7 +4,7 @@
 
 use Serializers\Serializer;
 use Wikibase\DataModel\Entity\ItemId;
-use WikidataQueryApi\DataModel\AbstractQuery;
+use WikidataQueryApi\Query\AbstractQuery;
 use WikidataQueryApi\WikibaseQueryApiException;
 use WikidataQueryApi\WikidataQueryApi;
 
diff --git a/src/WikidataQueryFactory.php b/src/WikidataQueryFactory.php
@@ -3,10 +3,10 @@
 namespace WikidataQueryApi;
 
 use Serializers\DispatchingSerializer;
-use WikidataQueryApi\DataModel\Serializers\AroundQuerySerializer;
-use WikidataQueryApi\DataModel\Serializers\BetweenQuerySerializer;
-use WikidataQueryApi\DataModel\Serializers\ClaimQuerySerializer;
-use WikidataQueryApi\DataModel\Serializers\StringQuerySerializer;
+use WikidataQueryApi\Query\Serializers\AroundQuerySerializer;
+use WikidataQueryApi\Query\Serializers\BetweenQuerySerializer;
+use WikidataQueryApi\Query\Serializers\ClaimQuerySerializer;
+use WikidataQueryApi\Query\Serializers\StringQuerySerializer;
 use WikidataQueryApi\Services\SimpleQueryService;
 
 /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -10,5 +10,5 @@
 
 $loader = require_once( __DIR__ . '/../vendor/autoload.php' );
 $loader->addClassMap( array(
-	'WikidataQueryApi\DataModel\Serializers\SerializerBaseTest' => __DIR__ . '/unit/DataModel/Serializers/SerializerBaseTest.php',
+	'WikidataQueryApi\Query\Serializers\SerializerBaseTest' => __DIR__ . '/unit/Query/Serializers/SerializerBaseTest.php',
 ) );
diff --git a/tests/unit/Query/AroundQueryTest.php b/tests/unit/Query/AroundQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\LatLongValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/tests/unit/Query/BetweenQueryTest.php b/tests/unit/Query/BetweenQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\BetweenValue;
 use DataValues\TimeValue;
diff --git a/tests/unit/Query/ClaimQueryTest.php b/tests/unit/Query/ClaimQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/tests/unit/Query/QuantityQueryTest.php b/tests/unit/Query/QuantityQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\DecimalValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/tests/unit/Query/Serializers/AroundQuerySerializerTest.php b/tests/unit/Query/Serializers/AroundQuerySerializerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use DataValues\LatLongValue;
 use Wikibase\DataModel\Entity\PropertyId;
-use WikidataQueryApi\DataModel\AroundQuery;
+use WikidataQueryApi\Query\AroundQuery;
 
 /**
  * @covers WikidataQueryApi\DataModel\Serializers\AroundQuerySerializer
diff --git a/tests/unit/Query/Serializers/BetweenQuerySerializerTest.php b/tests/unit/Query/Serializers/BetweenQuerySerializerTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use DataValues\BetweenValue;
 use DataValues\TimeValue;
 use Wikibase\DataModel\Entity\PropertyId;
-use WikidataQueryApi\DataModel\BetweenQuery;
+use WikidataQueryApi\Query\BetweenQuery;
 
 /**
  * @covers WikidataQueryApi\DataModel\Serializers\BetweenQuerySerializer
diff --git a/tests/unit/Query/Serializers/ClaimQuerySerializerTest.php b/tests/unit/Query/Serializers/ClaimQuerySerializerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
-use WikidataQueryApi\DataModel\ClaimQuery;
+use WikidataQueryApi\Query\ClaimQuery;
 
 /**
  * @covers WikidataQueryApi\DataModel\Serializers\ClaimQuerySerializer
diff --git a/tests/unit/Query/Serializers/QuantityQuerySerializerTest.php b/tests/unit/Query/Serializers/QuantityQuerySerializerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use DataValues\DecimalValue;
 use Wikibase\DataModel\Entity\PropertyId;
-use WikidataQueryApi\DataModel\QuantityQuery;
+use WikidataQueryApi\Query\QuantityQuery;
 
 /**
  * @covers WikidataQueryApi\DataModel\Serializers\QuantityQuerySerializer
diff --git a/tests/unit/Query/Serializers/SerializerBaseTest.php b/tests/unit/Query/Serializers/SerializerBaseTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use Serializers\DispatchableSerializer;
 use Serializers\Serializer;
diff --git a/tests/unit/Query/Serializers/StringQuerySerializerTest.php b/tests/unit/Query/Serializers/StringQuerySerializerTest.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace WikidataQueryApi\DataModel\Serializers;
+namespace WikidataQueryApi\Query\Serializers;
 
 use DataValues\StringValue;
 use Wikibase\DataModel\Entity\PropertyId;
-use WikidataQueryApi\DataModel\StringQuery;
+use WikidataQueryApi\Query\StringQuery;
 
 /**
  * @covers WikidataQueryApi\DataModel\Serializers\StringQuerySerializer
diff --git a/tests/unit/Query/StringQueryTest.php b/tests/unit/Query/StringQueryTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\StringValue;
 use Wikibase\DataModel\Entity\PropertyId;
diff --git a/tests/unit/Services/SimpleQueryServiceTest.php b/tests/unit/Services/SimpleQueryServiceTest.php
@@ -3,8 +3,8 @@
 namespace WikidataQueryApi\Services;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\PropertyId;
-use WikidataQueryApi\DataModel\ClaimQuery;
-use WikidataQueryApi\DataModel\Serializers\ClaimQuerySerializer;
+use WikidataQueryApi\Query\ClaimQuery;
+use WikidataQueryApi\Query\Serializers\ClaimQuerySerializer;
 
 /**
  * @covers WikidataQueryApi\Services\SimpleQueryService

Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ Use one of the below methods:`
`20`	`20`
`21`	`21`	`composer require "ppp/wikidataquery-api":dev-master"`
`22`	`22`
`23`		`-2 - Create a composer.json file that just defines a dependency on version 0.2 of this package, and run 'composer install' in the directory:`
	`23`	`+2 - Create a composer.json file that just defines a dependency on version 1.0 of this package, and run 'composer install' in the directory:`
`24`	`24`
`25`	`25`	`{`
`26`	`26`	`"require": {`
`27`		`- "ppp/wikidataquery-api"": "~0.2.0"`
	`27`	`+ "ppp/wikidataquery-api"": "~1.0"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`@@ -38,10 +38,10 @@ Here is a small usage example:`
`38`	`38`	`require_once( __DIR__ . "/vendor/autoload.php" );`
`39`	`39`
`40`	`40`	`// Initialise HTTP connection`
`41`		`-$api = new \WikidataQueryApi\WikidataQueryApi( 'https://wdq.wmflabs.org/api' );`
	`41`	`+$api = new WikidataQueryApi( 'https://wdq.wmflabs.org/api' );`
`42`	`42`
`43`	`43`	`// Build helper tools`
`44`		`-$wikidataQueryFactory = new \WikidataQueryApi\WikidataQueryFactory( $api );`
	`44`	`+$wikidataQueryFactory = new WikidataQueryFactory( $api );`
`45`	`45`	`$simpleQueryService = $wikidataQueryFactory->newSimpleQueryService());`
`46`	`46`
`47`	`47`	`//Do a query that returns a list of ItemId`