Skip to content

Commit b55b922

Browse files
author
addwiki-ci
committed
PSR4 Namespacing (#51)
* Try using PSR4 namespaces (untested) * composer fix (mainly fixing sorting) * Add missing PSR4 relnotes * Fix psr4 migration issues caught by psalm * Seemingly fix unit tests * Fix wikibase-api integration tests * fix mediawiki-api integration tests * composer fix again * Fix composer.json issues * Fix rector issues * rector psr4 checks * composer fix again again * Update branch aliases to 3.0 * vendor/bin/monorepo-builder bump-interdependency * Fix previous versions used in READMEs
1 parent f874de7 commit b55b922

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+208
-214
lines changed

‎README.md

+3-17
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,9 @@ Issue tracker: https://github.com/addwiki/addwiki/issues
88

99
## Installation
1010

11-
Use one of the below methods:
11+
Use composer to install the library and all its dependencies:
1212

13-
1 - Use composer to install the library and all its dependencies using the master branch:
14-
15-
composer require "addwiki/wikibase-api:dev-master"
16-
17-
2 - Create a composer.json file that just defines a dependency on version 0.7 of this package, and run 'composer install' in the directory:
18-
19-
{
20-
"require": {
21-
"addwiki/wikibase-api": "~0.8.0"
22-
}
23-
}
24-
25-
The tests can be run as follows:
26-
27-
phpunit -c tests/unit/
13+
composer require "addwiki/wikibase-api:~3.0"
2814

2915
## Example Usage
3016

@@ -56,7 +42,7 @@ $dataValueClasses = array(
5642
'multilingualtext' => 'DataValues\MultilingualTextValue',
5743
'quantity' => 'DataValues\QuantityValue',
5844
'time' => 'DataValues\TimeValue',
59-
'wikibase-entityid' => 'Wikibase\DataModel\Entity\EntityIdValue',
45+
'wikibase-entityid' => 'Addwiki\Wikibase\DataModel\Entity\EntityIdValue',
6046
);
6147
$wbFactory = new WikibaseFactory(
6248
$api,

‎RELEASENOTES.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
# Release Notes
22

3+
## Unreleased
4+
5+
- PSR4 namespacing. Now in `Addwiki\Wikibase`
6+
37
## Version 2.8 (16 February 2021)
48

59
- Installable with 7.3+ (including PHP8)
6-
- Set `maxlag` parameter when `EditInfo` with maxlag is passed to `Wikibase\Api\WikibaseApi`
10+
- Set `maxlag` parameter when `EditInfo` with maxlag is passed to `Addwiki\Wikibase\Api\WikibaseApi`
711
- `RevisionSaver` only sets `clear` parameter if it is given an empty entity
812

913
## Version 2.7 (15 February 2021)

‎composer.json

+8-7
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
},
2525
"require": {
2626
"php": ">=7.3",
27-
"addwiki/mediawiki-api-base": "^2.8",
28-
"addwiki/mediawiki-datamodel": "^2.8",
27+
"addwiki/mediawiki-api-base": "^3.0",
28+
"addwiki/mediawiki-datamodel": "^3.0",
2929
"serialization/serialization": "~3.2 || ~4.0",
3030
"wikibase/data-model": "~9.2|~8.0",
3131
"wikibase/data-model-serialization": "~2.0",
@@ -45,17 +45,18 @@
4545
},
4646
"autoload": {
4747
"psr-4": {
48-
"Wikibase\\": "src/"
48+
"Addwiki\\Wikibase\\": "src/"
4949
}
5050
},
5151
"autoload-dev": {
52-
"files": [
53-
"tests/integration/TestEnvironment.php"
54-
]
52+
"psr-4": {
53+
"Addwiki\\Wikibase\\Tests\\Unit\\": "tests/unit/",
54+
"Addwiki\\Wikibase\\Tests\\Integration\\": "tests/integration/"
55+
}
5556
},
5657
"extra": {
5758
"branch-alias": {
58-
"dev-main": "2.9-dev"
59+
"dev-main": "3.0-dev"
5960
}
6061
},
6162
"minimum-stability": "dev",

‎src/Api/GenericOptions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Wikibase\Api;
3+
namespace Addwiki\Wikibase\Api;
44

55
use InvalidArgumentException;
66
use OutOfBoundsException;

‎src/Api/Lookup/EntityApiLookup.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

3-
namespace Wikibase\Api\Lookup;
3+
namespace Addwiki\Wikibase\Api\Lookup;
44

5-
use Wikibase\Api\Service\RevisionGetter;
5+
use Addwiki\Wikibase\Api\Service\RevisionGetter;
66
use Wikibase\DataModel\Entity\EntityId;
77
use Wikibase\DataModel\Services\Lookup\EntityLookup;
88

‎src/Api/Lookup/EntityRedirectApiLookup.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Lookup;
3+
namespace Addwiki\Wikibase\Api\Lookup;
44

5+
use Addwiki\Mediawiki\Api\Client\MediawikiApi;
6+
use Addwiki\Mediawiki\Api\Client\SimpleRequest;
57
use BadMethodCallException;
6-
use Mediawiki\Api\MediawikiApi;
7-
use Mediawiki\Api\SimpleRequest;
88
use Wikibase\DataModel\Entity\BasicEntityIdParser;
99
use Wikibase\DataModel\Entity\EntityId;
1010
use Wikibase\DataModel\Services\Lookup\EntityRedirectLookup;
@@ -23,7 +23,7 @@ class EntityRedirectApiLookup implements EntityRedirectLookup {
2323
private $api;
2424

2525
/**
26-
* @param MediawikiApi $api
26+
* @param \Addwiki\Mediawiki\Api\Client\MediawikiApi $api
2727
*/
2828
public function __construct( MediawikiApi $api ) {
2929
$this->api = $api;

‎src/Api/Lookup/ItemApiLookup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Wikibase\Api\Lookup;
3+
namespace Addwiki\Wikibase\Api\Lookup;
44

55
use Wikibase\DataModel\Entity\ItemId;
66
use Wikibase\DataModel\Services\Lookup\EntityLookup;

‎src/Api/Lookup/PropertyApiLookup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Wikibase\Api\Lookup;
3+
namespace Addwiki\Wikibase\Api\Lookup;
44

55
use Wikibase\DataModel\Entity\PropertyId;
66
use Wikibase\DataModel\Services\Lookup\EntityLookup;

‎src/Api/Service/AliasGroupSetter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
67
use UnexpectedValueException;
7-
use Wikibase\Api\WikibaseApi;
88
use Wikibase\DataModel\Entity\EntityId;
99
use Wikibase\DataModel\Entity\Item;
1010
use Wikibase\DataModel\Entity\Property;

‎src/Api/Service/BadgeIdsGetter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\Api\MediawikiApi;
6-
use Mediawiki\Api\SimpleRequest;
5+
use Addwiki\Mediawiki\Api\Client\MediawikiApi;
6+
use Addwiki\Mediawiki\Api\Client\SimpleRequest;
77
use Wikibase\DataModel\Entity\ItemId;
88

99
/**

‎src/Api/Service/DescriptionSetter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
67
use UnexpectedValueException;
7-
use Wikibase\Api\WikibaseApi;
88
use Wikibase\DataModel\Entity\EntityId;
99
use Wikibase\DataModel\Entity\Item;
1010
use Wikibase\DataModel\Entity\Property;

‎src/Api/Service/EntityDocumentSaver.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\Content;
6-
use Mediawiki\DataModel\EditInfo;
7-
use Mediawiki\DataModel\Revision;
5+
use Addwiki\Mediawiki\DataModel\Content;
6+
use Addwiki\Mediawiki\DataModel\EditInfo;
7+
use Addwiki\Mediawiki\DataModel\Revision;
88
use Wikibase\DataModel\Entity\EntityDocument;
99

1010
/**

‎src/Api/Service/EntitySearcher.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\Api\MediawikiApi;
6-
use Mediawiki\Api\SimpleRequest;
5+
use Addwiki\Mediawiki\Api\Client\MediawikiApi;
6+
use Addwiki\Mediawiki\Api\Client\SimpleRequest;
77

88
/**
99
* @access private
@@ -18,7 +18,7 @@ class EntitySearcher {
1818
private $api;
1919

2020
/**
21-
* @param MediawikiApi $api
21+
* @param \Addwiki\Mediawiki\Api\Client\MediawikiApi $api
2222
*/
2323
public function __construct( MediawikiApi $api ) {
2424
$this->api = $api;

‎src/Api/Service/ItemMerger.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
57
use InvalidArgumentException;
6-
use Mediawiki\DataModel\EditInfo;
7-
use Wikibase\Api\WikibaseApi;
88
use Wikibase\DataModel\Entity\Item;
99
use Wikibase\DataModel\Entity\ItemId;
1010

‎src/Api/Service/LabelSetter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
67
use UnexpectedValueException;
7-
use Wikibase\Api\WikibaseApi;
88
use Wikibase\DataModel\Entity\EntityId;
99
use Wikibase\DataModel\Entity\Item;
1010
use Wikibase\DataModel\Entity\Property;

‎src/Api/Service/RedirectCreator.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
6-
use Wikibase\Api\WikibaseApi;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
77
use Wikibase\DataModel\Entity\EntityId;
88

99
/**

‎src/Api/Service/ReferenceRemover.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
67
use UnexpectedValueException;
7-
use Wikibase\Api\WikibaseApi;
88
use Wikibase\DataModel\Reference;
99
use Wikibase\DataModel\Statement\Statement;
1010
use Wikibase\DataModel\Statement\StatementGuid;

‎src/Api/Service/ReferenceSetter.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
67
use Serializers\Serializer;
78
use UnexpectedValueException;
8-
use Wikibase\Api\WikibaseApi;
99
use Wikibase\DataModel\Reference;
1010
use Wikibase\DataModel\Statement\Statement;
1111
use Wikibase\DataModel\Statement\StatementGuid;

‎src/Api/Service/RevisionGetter.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5+
use Addwiki\Mediawiki\Api\Client\MediawikiApi;
6+
use Addwiki\Mediawiki\Api\Client\SimpleRequest;
7+
use Addwiki\Mediawiki\DataModel\PageIdentifier;
8+
use Addwiki\Mediawiki\DataModel\Revision;
9+
use Addwiki\Wikibase\DataModel\ItemContent;
10+
use Addwiki\Wikibase\DataModel\PropertyContent;
511
use Deserializers\Deserializer;
6-
use Mediawiki\Api\MediawikiApi;
7-
use Mediawiki\Api\SimpleRequest;
8-
use Mediawiki\DataModel\PageIdentifier;
9-
use Mediawiki\DataModel\Revision;
1012
use RuntimeException;
1113
use Wikibase\DataModel\Entity\EntityId;
1214
use Wikibase\DataModel\Entity\Item;
1315
use Wikibase\DataModel\Entity\Property;
14-
use Wikibase\DataModel\ItemContent;
15-
use Wikibase\DataModel\PropertyContent;
1616
use Wikibase\DataModel\SiteLink;
1717

1818
/**
@@ -23,7 +23,7 @@
2323
class RevisionGetter {
2424

2525
/**
26-
* @var MediawikiApi
26+
* @var \Addwiki\Mediawiki\Api\Client\MediawikiApi
2727
*/
2828
protected $api;
2929

‎src/Api/Service/RevisionSaver.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Mediawiki\DataModel\Revision;
7+
use Addwiki\Wikibase\Api\WikibaseApi;
58
use Deserializers\Deserializer;
69
use InvalidArgumentException;
7-
use Mediawiki\DataModel\EditInfo;
8-
use Mediawiki\DataModel\Revision;
910
use RuntimeException;
1011
use Serializers\Serializer;
11-
use Wikibase\Api\WikibaseApi;
1212
use Wikibase\DataModel\Entity\EntityDocument;
1313
use Wikibase\DataModel\Entity\Item;
1414
use Wikibase\DataModel\Entity\Property;

‎src/Api/Service/RevisionsGetter.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5+
use Addwiki\Mediawiki\Api\Client\MediawikiApi;
6+
use Addwiki\Mediawiki\Api\Client\SimpleRequest;
7+
use Addwiki\Mediawiki\DataModel\PageIdentifier;
8+
use Addwiki\Mediawiki\DataModel\Revision;
9+
use Addwiki\Mediawiki\DataModel\Revisions;
10+
use Addwiki\Wikibase\DataModel\ItemContent;
11+
use Addwiki\Wikibase\DataModel\PropertyContent;
512
use Deserializers\Deserializer;
613
use InvalidArgumentException;
7-
use Mediawiki\Api\MediawikiApi;
8-
use Mediawiki\Api\SimpleRequest;
9-
use Mediawiki\DataModel\PageIdentifier;
10-
use Mediawiki\DataModel\Revision;
11-
use Mediawiki\DataModel\Revisions;
1214
use RuntimeException;
1315
use Wikibase\DataModel\Entity\EntityId;
1416
use Wikibase\DataModel\Entity\Item;
1517
use Wikibase\DataModel\Entity\Property;
16-
use Wikibase\DataModel\ItemContent;
17-
use Wikibase\DataModel\PropertyContent;
1818
use Wikibase\DataModel\SiteLink;
1919

2020
/**

‎src/Api/Service/SiteLinkLinker.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

3-
namespace Wikibase\Api\Service;
3+
namespace Addwiki\Wikibase\Api\Service;
44

5-
use Mediawiki\DataModel\EditInfo;
6-
use Wikibase\Api\WikibaseApi;
5+
use Addwiki\Mediawiki\DataModel\EditInfo;
6+
use Addwiki\Wikibase\Api\WikibaseApi;
77
use Wikibase\DataModel\SiteLink;
88

99
/**

0 commit comments

Comments
 (0)