Rename DataModel namespace to Query (closes #1)

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

src/DataModel/AbstractQuery.php → src/Query/AbstractQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 /**
  * Base class for all queries.

src/DataModel/AroundQuery.php → src/Query/AroundQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\LatLongValue;
 use Wikibase\DataModel\Entity\PropertyId;

src/DataModel/BetweenQuery.php → src/Query/BetweenQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\TimeValue;
 use Wikibase\DataModel\Entity\PropertyId;

src/DataModel/ClaimQuery.php → 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;

src/DataModel/QuantityQuery.php → src/Query/QuantityQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\DecimalValue;
 use Wikibase\DataModel\Entity\PropertyId;

src/DataModel/Serializers/AroundQuerySerializer.php → 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+

src/DataModel/Serializers/BetweenQuerySerializer.php → 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+

src/DataModel/Serializers/ClaimQuerySerializer.php → 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+

src/DataModel/Serializers/QuantityQuerySerializer.php → 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+

src/DataModel/Serializers/StringQuerySerializer.php → 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+

src/DataModel/StringQuery.php → src/Query/StringQuery.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\StringValue;
 use Wikibase\DataModel\Entity\PropertyId;

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;
 

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;
 
 /**

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',
 ) );

tests/unit/DataModel/AroundQueryTest.php → tests/unit/Query/AroundQueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\LatLongValue;
 use Wikibase\DataModel\Entity\PropertyId;

tests/unit/DataModel/BetweenQueryTest.php → tests/unit/Query/BetweenQueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\BetweenValue;
 use DataValues\TimeValue;

tests/unit/DataModel/ClaimQueryTest.php → 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;

tests/unit/DataModel/QuantityQueryTest.php → tests/unit/Query/QuantityQueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\DecimalValue;
 use Wikibase\DataModel\Entity\PropertyId;

tests/unit/DataModel/Serializers/AroundQuerySerializerTest.php → 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

tests/unit/DataModel/Serializers/BetweenQuerySerializerTest.php → 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

tests/unit/DataModel/Serializers/ClaimQuerySerializerTest.php → 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

tests/unit/DataModel/Serializers/QuantityQuerySerializerTest.php → 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

tests/unit/DataModel/Serializers/SerializerBaseTest.php → 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;

tests/unit/DataModel/Serializers/StringQuerySerializerTest.php → 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

tests/unit/DataModel/StringQueryTest.php → tests/unit/Query/StringQueryTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace WikidataQueryApi\DataModel;
+namespace WikidataQueryApi\Query;
 
 use DataValues\StringValue;
 use Wikibase\DataModel\Entity\PropertyId;

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