Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libs/composer: Namespace under Wikimedia\Composer

Browse source 
Change-Id: I5ffedacf31e60fb0f38e308f8dcf010e577f919e
This commit is contained in:
Reedy 2024-01-13 18:41:24 +00:00
parent 6000befd1e
commit 72df6cb8da
15 changed files with 36 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
autoload.php
View file

@ -279,9 +279,6 @@ $wgAutoloadLocalClasses = [
'CompareLanguageConverterOutput' => __DIR__ . '/maintenance/compareLanguageConverterOutput.php',
'CompareParserCache' => __DIR__ . '/maintenance/compareParserCache.php',
'CompareParsers' => __DIR__ . '/maintenance/compareParsers.php',
'ComposerInstalled' => __DIR__ . '/includes/libs/composer/ComposerInstalled.php',
'ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'CompressOld' => __DIR__ . '/maintenance/storage/compressOld.php',
'ConcatenatedGzipHistoryBlob' => __DIR__ . '/includes/historyblob/ConcatenatedGzipHistoryBlob.php',
'Config' => __DIR__ . '/includes/config/Config.php',
@ -3059,6 +3056,9 @@ $wgAutoloadLocalClasses = [
'WikiRevision' => __DIR__ . '/includes/import/WikiRevision.php',
'WikiStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
'WikiTextStructure' => __DIR__ . '/includes/content/WikiTextStructure.php',
'Wikimedia\\Composer\\ComposerInstalled' => __DIR__ . '/includes/libs/composer/ComposerInstalled.php',
'Wikimedia\\Composer\\ComposerJson' => __DIR__ . '/includes/libs/composer/ComposerJson.php',
'Wikimedia\\Composer\\ComposerLock' => __DIR__ . '/includes/libs/composer/ComposerLock.php',
'Wikimedia\\DebugInfo\\AnnotationReader' => __DIR__ . '/includes/libs/DebugInfo/AnnotationReader.php',
'Wikimedia\\DebugInfo\\DebugInfoTrait' => __DIR__ . '/includes/libs/DebugInfo/DebugInfoTrait.php',
'Wikimedia\\DebugInfo\\DumpUtils' => __DIR__ . '/includes/libs/DebugInfo/DumpUtils.php',

1
includes/AutoLoader.php
View file

@ -83,6 +83,7 @@ class AutoLoader {
'MediaWiki\\Utils\\' => __DIR__ . '/utils/',
'MediaWiki\\Widget\\' => __DIR__ . '/widget/',
'Wikimedia\\' => __DIR__ . '/libs/',
'Wikimedia\\Composer\\' => __DIR__ . '/libs/composer/',
'Wikimedia\\Http\\' => __DIR__ . '/libs/http/',
'Wikimedia\\Rdbms\\Platform\\' => __DIR__ . '/libs/rdbms/platform/',
'Wikimedia\\UUID\\' => __DIR__ . '/libs/uuid/',

1
includes/api/ApiQuerySiteinfo.php
View file

@ -40,6 +40,7 @@ use MediaWiki\Utils\ExtensionInfo;
use MediaWiki\Utils\GitInfo;
use MediaWiki\Utils\UrlUtils;
use MediaWiki\WikiMap\WikiMap;
use Wikimedia\Composer\ComposerInstalled;
use Wikimedia\ParamValidator\ParamValidator;
use Wikimedia\Rdbms\ILoadBalancer;
use Wikimedia\Rdbms\ReadOnlyMode;

4
includes/composer/LockFileChecker.php
View file

@ -21,9 +21,9 @@
namespace MediaWiki\Composer;
use Composer\Semver\Semver;
use ComposerJson;
use ComposerLock;
use Status;
use Wikimedia\Composer\ComposerJson;
use Wikimedia\Composer\ComposerLock;
/**
* Used to check whether composer-installed dependencies (no-dev) are up-to-date

2
includes/libs/composer/ComposerInstalled.php
View file

@ -1,5 +1,7 @@
<?php
namespace Wikimedia\Composer;
/**
* Reads an installed.json file and provides accessors to get what is
* installed

2
includes/libs/composer/ComposerJson.php
View file

@ -1,5 +1,7 @@
<?php
namespace Wikimedia\Composer;
/**
* Reads a composer.json file and provides accessors to get
* its hash and the required dependencies

2
includes/libs/composer/ComposerLock.php
View file

@ -1,5 +1,7 @@
<?php
namespace Wikimedia\Composer;
/**
* Reads a composer.lock file and provides accessors to get
* its hash and what is installed

2
includes/specials/SpecialVersion.php
View file

@ -23,7 +23,6 @@
namespace MediaWiki\Specials;
use Closure;
use ComposerInstalled;
use ExtensionRegistry;
use HtmlArmor;
use Language;
@ -47,6 +46,7 @@ use ObjectCache;
use Parser;
use ParserFactory;
use Symfony\Component\Yaml\Yaml;
use Wikimedia\Composer\ComposerInstalled;
use Wikimedia\Parsoid\Core\SectionMetadata;
use Wikimedia\Parsoid\Core\TOCData;
use Wikimedia\Rdbms\IConnectionProvider;

2
maintenance/checkComposerLockUpToDate.php
View file

@ -3,6 +3,8 @@
require_once __DIR__ . '/Maintenance.php';
use MediaWiki\Composer\LockFileChecker;
use Wikimedia\Composer\ComposerJson;
use Wikimedia\Composer\ComposerLock;
/**
* Checks whether your composer-installed dependencies are up to date

6
maintenance/convertExtensionToRegistration.php
View file

@ -1,5 +1,7 @@
<?php
use Wikimedia\Composer\ComposerJson;
require_once __DIR__ . '/Maintenance.php';
class ConvertExtensionToRegistration extends Maintenance {
@ -340,9 +342,9 @@ class ConvertExtensionToRegistration extends Maintenance {
protected function needsComposerAutoloader( $path ) {
$path .= '/composer.json';
if ( file_exists( $path ) ) {
// assume, that the composer.json file is in the root of the extension path
// assume that the composer.json file is in the root of the extension path
$composerJson = new ComposerJson( $path );
// check, if there are some dependencies in the require section
// check if there are some dependencies in the require section
if ( $composerJson->getRequiredDependencies() ) {
return true;
}

1
tests/phpunit/includes/api/query/ApiQuerySiteinfoTest.php
View file

@ -4,6 +4,7 @@ use MediaWiki\MainConfigNames;
use MediaWiki\MainConfigSchema;
use MediaWiki\SiteStats\SiteStats;
use MediaWiki\Title\Title;
use Wikimedia\Composer\ComposerInstalled;
use Wikimedia\Rdbms\LoadBalancer;
use Wikimedia\TestingAccessWrapper;

2
tests/phpunit/integration/includes/composer/LockFileCheckerTest.php
View file

@ -19,6 +19,8 @@
*/
use MediaWiki\Composer\LockFileChecker;
use Wikimedia\Composer\ComposerJson;
use Wikimedia\Composer\ComposerLock;
/**
* @covers \MediaWiki\Composer\LockFileChecker

6
tests/phpunit/unit/includes/libs/composer/ComposerInstalledTest.php
View file

@ -1,9 +1,11 @@
<?php
use Wikimedia\Composer\ComposerInstalled;
class ComposerInstalledTest extends PHPUnit\Framework\TestCase {
/**
* @covers ComposerInstalled::__construct
* @covers ComposerInstalled::getInstalledDependencies
* @covers Wikimedia\Composer\ComposerInstalled::__construct
* @covers Wikimedia\Composer\ComposerInstalled::getInstalledDependencies
*
* @dataProvider provideInstalled
*/

8
tests/phpunit/unit/includes/libs/composer/ComposerJsonTest.php
View file

@ -1,5 +1,7 @@
<?php
use Wikimedia\Composer\ComposerJson;
class ComposerJsonTest extends PHPUnit\Framework\TestCase {
private $json;
@ -10,8 +12,8 @@ class ComposerJsonTest extends PHPUnit\Framework\TestCase {
}
/**
* @covers ComposerJson::__construct
* @covers ComposerJson::getRequiredDependencies
* @covers Wikimedia\Composer\ComposerJson::__construct
* @covers Wikimedia\Composer\ComposerJson::getRequiredDependencies
*/
public function testGetRequiredDependencies() {
$json = new ComposerJson( $this->json );
@ -32,7 +34,7 @@ class ComposerJsonTest extends PHPUnit\Framework\TestCase {
/**
* @dataProvider provideNormalizeVersion
* @covers ComposerJson::normalizeVersion
* @covers Wikimedia\Composer\ComposerJson::normalizeVersion
*/
public function testNormalizeVersion( $input, $expected ) {
$this->assertEquals( $expected, ComposerJson::normalizeVersion( $input ) );

6
tests/phpunit/unit/includes/libs/composer/ComposerLockTest.php
View file

@ -1,5 +1,7 @@
<?php
use Wikimedia\Composer\ComposerLock;
class ComposerLockTest extends PHPUnit\Framework\TestCase {
private $lock;
@ -10,8 +12,8 @@ class ComposerLockTest extends PHPUnit\Framework\TestCase {
}
/**
* @covers ComposerLock::__construct
* @covers ComposerLock::getInstalledDependencies
* @covers Wikimedia\Composer\ComposerLock::__construct
* @covers Wikimedia\Composer\ComposerLock::getInstalledDependencies
*/
public function testGetInstalledDependencies() {
$lock = new ComposerLock( $this->lock );