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

Replace new stdClass with more compact array syntax

Browse source 
It does the exact same. The resulting object is still an stdClass
instance.

Change-Id: Ief68609943ee30aa95732d24021c921dfbad166c
This commit is contained in:
Thiemo Kreuz 2021-11-02 08:59:20 +01:00 committed by Thiemo Kreuz (WMDE)
parent 0bfe17ad12
commit ee0f97378b
5 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/phpunit/includes/filerepo/file/FileTest.php
View file

@ -477,7 +477,7 @@ class FileTest extends MediaWikiMediaTestCase {
* @covers File::getHandlerState * @covers File::getHandlerState
*/ */
public function testSetHandlerState() { public function testSetHandlerState() {
$obj = new stdClass; $obj = (object)[];
$file = new class extends File { $file = new class extends File {
public function __construct() { public function __construct() {
} }

19
tests/phpunit/integration/includes/user/UserRightsProxyTest.php
View file

@ -5,7 +5,6 @@ namespace MediaWiki\Tests\User;
use MediaWiki\User\UserGroupManager; use MediaWiki\User\UserGroupManager;
use MediaWiki\User\UserGroupManagerFactory; use MediaWiki\User\UserGroupManagerFactory;
use MediaWikiIntegrationTestCase; use MediaWikiIntegrationTestCase;
use stdClass;
use UserRightsProxy; use UserRightsProxy;
use Wikimedia\Rdbms\ILoadBalancer; use Wikimedia\Rdbms\ILoadBalancer;
use Wikimedia\Rdbms\LBFactory; use Wikimedia\Rdbms\LBFactory;
@ -27,9 +26,10 @@ class UserRightsProxyTest extends MediaWikiIntegrationTestCase {
$dbMock = $this->createMock( MaintainableDBConnRef::class ); $dbMock = $this->createMock( MaintainableDBConnRef::class );
$row = new stdClass; $row = (object)[
$row->user_name = 'UserRightsProxyTest'; 'user_name' => 'UserRightsProxyTest',
$row->user_id = 12345; 'user_id' => 12345,
];
$dbMock->method( 'selectRow' )->willReturn( $row ); $dbMock->method( 'selectRow' )->willReturn( $row );
$lbMock = $this->createMock( ILoadBalancer::class ); $lbMock = $this->createMock( ILoadBalancer::class );
@ -138,7 +138,7 @@ class UserRightsProxyTest extends MediaWikiIntegrationTestCase {
$userGroupManagerMock $userGroupManagerMock
->expects( $this->once() ) ->expects( $this->once() )
->method( 'getUserGroupMemberships' ) ->method( 'getUserGroupMemberships' )
->willReturn( [ 'bot' => new stdClass, 'sysop' => new stdClass ] ); ->willReturn( [ 'bot' => (object)[], 'sysop' => (object)[] ] );
$userGroupManagerFactoryMock = $this->createMock( UserGroupManagerFactory::class ); $userGroupManagerFactoryMock = $this->createMock( UserGroupManagerFactory::class );
$userGroupManagerFactoryMock $userGroupManagerFactoryMock
->method( 'getUserGroupManager' ) ->method( 'getUserGroupManager' )
@ -161,7 +161,7 @@ class UserRightsProxyTest extends MediaWikiIntegrationTestCase {
$userGroupManagerMock2 $userGroupManagerMock2
->expects( $this->exactly( 2 ) ) ->expects( $this->exactly( 2 ) )
->method( 'getUserGroupMemberships' ) ->method( 'getUserGroupMemberships' )
->willReturn( [ 'bot' => new stdClass ] ); ->willReturn( [ 'bot' => (object)[] ] );
$userGroupManagerFactoryMock2 = $this->createMock( UserGroupManagerFactory::class ); $userGroupManagerFactoryMock2 = $this->createMock( UserGroupManagerFactory::class );
$userGroupManagerFactoryMock2 $userGroupManagerFactoryMock2
->method( 'getUserGroupManager' ) ->method( 'getUserGroupManager' )
@ -184,9 +184,10 @@ class UserRightsProxyTest extends MediaWikiIntegrationTestCase {
$value = 'bar'; $value = 'bar';
$dbMock = $this->createMock( MaintainableDBConnRef::class ); $dbMock = $this->createMock( MaintainableDBConnRef::class );
$row = new stdClass; $row = (object)[
$row->user_name = 'UserRightsProxyTest'; 'user_name' => 'UserRightsProxyTest',
$row->user_id = 12345; 'user_id' => 12345,
];
$dbMock->method( 'selectRow' )->willReturn( $row ); $dbMock->method( 'selectRow' )->willReturn( $row );
$dbMock->method( 'timestamp' )->willReturn( 'timestamp' ); $dbMock->method( 'timestamp' )->willReturn( 'timestamp' );
$dbMock->method( 'getDomainID' )->willReturn( 'foowiki' ); $dbMock->method( 'getDomainID' )->willReturn( 'foowiki' );

3
tests/phpunit/unit/includes/json/JsonCodecTest.php
View file

@ -8,7 +8,6 @@ use JsonSerializable;
use MediaWiki\Json\JsonCodec; use MediaWiki\Json\JsonCodec;
use MediaWiki\Json\JsonConstants; use MediaWiki\Json\JsonConstants;
use MediaWikiUnitTestCase; use MediaWikiUnitTestCase;
use stdClass;
use Title; use Title;
use Wikimedia\Assert\PreconditionException; use Wikimedia\Assert\PreconditionException;
@ -136,7 +135,7 @@ class JsonCodecTest extends MediaWikiUnitTestCase {
yield 'Null' => [ null, true, null ]; yield 'Null' => [ null, true, null ];
yield 'Class' => [ $classInstance, false, '$' ]; yield 'Class' => [ $classInstance, false, '$' ];
yield 'Empty array' => [ [], true, null ]; yield 'Empty array' => [ [], true, null ];
yield 'Empty stdClass' => [ new stdClass(), true, null ]; yield 'Empty stdClass' => [ (object)[], true, null ];
yield 'Non-empty array' => [ [ 1, 2, 3 ], true, null ]; yield 'Non-empty array' => [ [ 1, 2, 3 ], true, null ];
yield 'Non-empty map' => [ [ 'a' => 'b' ], true, null ]; yield 'Non-empty map' => [ [ 'a' => 'b' ], true, null ];
yield 'Nested, serializable' => [ [ 'a' => [ 'b' => [ 'c' => 'd' ] ] ], true, null ]; yield 'Nested, serializable' => [ [ 'a' => [ 'b' => [ 'c' => 'd' ] ] ], true, null ];

2
tests/phpunit/unit/includes/media/TrivialMediaHandlerStateTest.php
View file

@ -5,7 +5,7 @@
*/ */
class TrivialMediaHandlerStateTest extends MediaWikiUnitTestCase { class TrivialMediaHandlerStateTest extends MediaWikiUnitTestCase {
public function testSetHandlerState() { public function testSetHandlerState() {
$obj = new stdClass; $obj = (object)[];
$state = new TrivialMediaHandlerState; $state = new TrivialMediaHandlerState;
$this->assertNull( $state->getHandlerState( 'test' ) ); $this->assertNull( $state->getHandlerState( 'test' ) );
$state->setHandlerState( 'test', $obj ); $state->setHandlerState( 'test', $obj );

2
tests/phpunit/unit/includes/skins/SkinFactoryTest.php
View file

@ -90,7 +90,7 @@ class SkinFactoryTest extends \MediaWikiUnitTestCase {
* @covers SkinFactory::makeSkin * @covers SkinFactory::makeSkin
*/ */
public function testMakeSkinWithValidSpec() { public function testMakeSkinWithValidSpec() {
$serviceInstance = new stdClass(); $serviceInstance = (object)[];
$serviceContainer = $this->createMock( ContainerInterface::class ); $serviceContainer = $this->createMock( ContainerInterface::class );
$serviceContainer->method( 'has' )->willReturn( true ); $serviceContainer->method( 'has' )->willReturn( true );