Skip to content

Commit 71681c2

Browse files
francoispluchinofrancoispluchino
committed
Update php code style
1 parent a5679e4 commit 71681c2

37 files changed

+1208
-1224
lines changed

‎Tests/AssetsTest.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ final class AssetsTest extends \PHPUnit\Framework\TestCase
2424
{
2525
public function testGetTypes()
2626
{
27-
$this->assertEquals(array(
27+
static::assertEquals(array(
2828
'npm',
2929
'bower',
3030
), Assets::getTypes());
3131
}
3232

3333
public function testDefaultGetRegistries()
3434
{
35-
$this->assertEquals(array(
35+
static::assertEquals(array(
3636
'npm',
3737
'bower',
3838
), array_keys(Assets::getDefaultRegistries()));
3939
}
4040

4141
public function testGetVcsRepositoryDrivers()
4242
{
43-
$this->assertEquals(array(
43+
static::assertEquals(array(
4444
'vcs',
4545
'github',
4646
'git-bitbucket',
@@ -55,7 +55,7 @@ public function testGetVcsRepositoryDrivers()
5555

5656
public function testGetVcsDrivers()
5757
{
58-
$this->assertEquals(array(
58+
static::assertEquals(array(
5959
'github',
6060
'git-bitbucket',
6161
'git',
@@ -79,20 +79,20 @@ public function testCreationOfNpmAsset()
7979
{
8080
$type = Assets::createType('npm');
8181

82-
$this->assertInstanceOf('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface', $type);
82+
static::assertInstanceOf('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface', $type);
8383
}
8484

8585
public function testCreationOfBowerAsset()
8686
{
8787
$type = Assets::createType('bower');
8888

89-
$this->assertInstanceOf('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface', $type);
89+
static::assertInstanceOf('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface', $type);
9090
}
9191

9292
public function testCreationOfPrivateBowerAsset()
9393
{
9494
$type = Assets::createType('bower');
9595

96-
$this->assertInstanceOf('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface', $type);
96+
static::assertInstanceOf('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface', $type);
9797
}
9898
}

‎Tests/Composer/ScriptHandlerTest.php

+27-27
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ protected function setUp()
6868
$this->package = $this->getMockBuilder('Composer\Package\PackageInterface')->getMock();
6969

7070
$this->config = $this->getMockBuilder('Composer\Config')->getMock();
71-
$this->config->expects($this->any())
71+
$this->config->expects(static::any())
7272
->method('get')
73-
->will($this->returnCallback(function ($key) {
73+
->willReturnCallback(function ($key) {
7474
$val = null;
7575

7676
switch ($key) {
@@ -81,35 +81,35 @@ protected function setUp()
8181
}
8282

8383
return $val;
84-
}))
84+
})
8585
;
8686

8787
$rootPackage = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock();
8888

89-
$this->composer->expects($this->any())
89+
$this->composer->expects(static::any())
9090
->method('getConfig')
91-
->will($this->returnValue($this->config))
91+
->willReturn($this->config)
9292
;
93-
$this->composer->expects($this->any())
93+
$this->composer->expects(static::any())
9494
->method('getPackage')
95-
->will($this->returnValue($rootPackage))
95+
->willReturn($rootPackage)
9696
;
9797

9898
$plugin = $this->getMockBuilder(FxpAssetPlugin::class)->disableOriginalConstructor()->getMock();
99-
$plugin->expects($this->any())
99+
$plugin->expects(static::any())
100100
->method('getConfig')
101101
->willReturn(new Config(array()))
102102
;
103103

104104
$pm = $this->getMockBuilder(PluginManager::class)->disableOriginalConstructor()->getMock();
105-
$pm->expects($this->any())
105+
$pm->expects(static::any())
106106
->method('getPlugins')
107107
->willReturn(array($plugin))
108108
;
109109

110-
$this->composer->expects($this->any())
110+
$this->composer->expects(static::any())
111111
->method('getPluginManager')
112-
->will($this->returnValue($pm))
112+
->willReturn($pm)
113113
;
114114
}
115115

@@ -138,7 +138,7 @@ public function getPackageComposerTypes()
138138
public function testDeleteIgnoreFiles($composerType)
139139
{
140140
$this->operation = $this->getMockBuilder('Composer\DependencyResolver\Operation\OperationInterface')->getMock();
141-
$this->assertInstanceOf('Composer\DependencyResolver\Operation\OperationInterface', $this->operation);
141+
static::assertInstanceOf('Composer\DependencyResolver\Operation\OperationInterface', $this->operation);
142142

143143
ScriptHandler::deleteIgnoredFiles($this->createEvent($composerType));
144144
}
@@ -154,7 +154,7 @@ public function testDeleteIgnoreFilesWithInstallOperation($composerType)
154154
->disableOriginalConstructor()
155155
->getMock()
156156
;
157-
$this->assertInstanceOf('Composer\DependencyResolver\Operation\OperationInterface', $this->operation);
157+
static::assertInstanceOf('Composer\DependencyResolver\Operation\OperationInterface', $this->operation);
158158

159159
ScriptHandler::deleteIgnoredFiles($this->createEvent($composerType));
160160
}
@@ -170,7 +170,7 @@ public function testDeleteIgnoreFilesWithUpdateOperation($composerType)
170170
->disableOriginalConstructor()
171171
->getMock()
172172
;
173-
$this->assertInstanceOf('Composer\DependencyResolver\Operation\OperationInterface', $this->operation);
173+
static::assertInstanceOf('Composer\DependencyResolver\Operation\OperationInterface', $this->operation);
174174

175175
ScriptHandler::deleteIgnoredFiles($this->createEvent($composerType));
176176
}
@@ -188,24 +188,24 @@ public function testGetConfig($composerType)
188188
$rootPackage = $this->getMockBuilder('Composer\Package\RootPackageInterface')->getMock();
189189

190190
$this->composer = $this->getMockBuilder('Composer\Composer')->getMock();
191-
$this->composer->expects($this->any())
191+
$this->composer->expects(static::any())
192192
->method('getConfig')
193-
->will($this->returnValue($this->config))
193+
->willReturn($this->config)
194194
;
195-
$this->composer->expects($this->any())
195+
$this->composer->expects(static::any())
196196
->method('getPackage')
197-
->will($this->returnValue($rootPackage))
197+
->willReturn($rootPackage)
198198
;
199199

200200
$pm = $this->getMockBuilder(PluginManager::class)->disableOriginalConstructor()->getMock();
201-
$pm->expects($this->any())
201+
$pm->expects(static::any())
202202
->method('getPlugins')
203203
->willReturn(array())
204204
;
205205

206-
$this->composer->expects($this->any())
206+
$this->composer->expects(static::any())
207207
->method('getPluginManager')
208-
->will($this->returnValue($pm))
208+
->willReturn($pm)
209209
;
210210

211211
$this->operation = $this->getMockBuilder('Composer\DependencyResolver\Operation\OperationInterface')->getMock();
@@ -220,22 +220,22 @@ public function testGetConfig($composerType)
220220
*/
221221
protected function createEvent($composerType)
222222
{
223-
$this->package->expects($this->any())
223+
$this->package->expects(static::any())
224224
->method('getType')
225-
->will($this->returnValue($composerType))
225+
->willReturn($composerType)
226226
;
227227

228228
if ($this->operation instanceof UpdateOperation) {
229-
$this->operation->expects($this->any())
229+
$this->operation->expects(static::any())
230230
->method('getTargetPackage')
231-
->will($this->returnValue($this->package))
231+
->willReturn($this->package)
232232
;
233233
}
234234

235235
if ($this->operation instanceof InstallOperation) {
236-
$this->operation->expects($this->any())
236+
$this->operation->expects(static::any())
237237
->method('getPackage')
238-
->will($this->returnValue($this->package))
238+
->willReturn($this->package)
239239
;
240240
}
241241

‎Tests/Config/ConfigTest.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ protected function setUp()
5353
$this->io = $this->getMockBuilder(IOInterface::class)->getMock();
5454
$this->package = $this->getMockBuilder(RootPackageInterface::class)->getMock();
5555

56-
$this->composer->expects($this->any())
56+
$this->composer->expects(static::any())
5757
->method('getPackage')
5858
->willReturn($this->package)
5959
;
6060

61-
$this->composer->expects($this->any())
61+
$this->composer->expects(static::any())
6262
->method('getConfig')
6363
->willReturn($this->composerConfig)
6464
;
@@ -98,27 +98,27 @@ public function testGetConfig($key, $expected, $default = null, $env = null)
9898
}
9999

100100
$globalPath = realpath(__DIR__.'/../Fixtures/package/global');
101-
$this->composerConfig->expects($this->any())
101+
$this->composerConfig->expects(static::any())
102102
->method('has')
103103
->with('home')
104104
->willReturn(true)
105105
;
106106

107-
$this->composerConfig->expects($this->any())
107+
$this->composerConfig->expects(static::any())
108108
->method('get')
109109
->with('home')
110110
->willReturn($globalPath)
111111
;
112112

113-
$this->package->expects($this->any())
113+
$this->package->expects(static::any())
114114
->method('getExtra')
115115
->willReturn(array(
116116
'asset-baz' => false,
117117
'asset-repositories' => 42,
118118
))
119119
;
120120

121-
$this->package->expects($this->any())
121+
$this->package->expects(static::any())
122122
->method('getConfig')
123123
->willReturn(array(
124124
'fxp-asset' => array(
@@ -130,16 +130,16 @@ public function testGetConfig($key, $expected, $default = null, $env = null)
130130
;
131131

132132
if (0 === strpos($key, 'global-')) {
133-
$this->io->expects($this->atLeast(2))
133+
$this->io->expects(static::atLeast(2))
134134
->method('isDebug')
135135
->willReturn(true)
136136
;
137137

138-
$this->io->expects($this->at(1))
138+
$this->io->expects(static::at(1))
139139
->method('writeError')
140140
->with(sprintf('Loading fxp-asset config in file %s/composer.json', $globalPath))
141141
;
142-
$this->io->expects($this->at(3))
142+
$this->io->expects(static::at(3))
143143
->method('writeError')
144144
->with(sprintf('Loading fxp-asset config in file %s/config.json', $globalPath))
145145
;
@@ -152,12 +152,12 @@ public function testGetConfig($key, $expected, $default = null, $env = null)
152152
if (null !== $env) {
153153
$envKey = substr($env, 0, strpos($env, '='));
154154
putenv($envKey);
155-
$this->assertFalse(getenv($envKey));
155+
static::assertFalse(getenv($envKey));
156156
}
157157

158-
$this->assertSame($expected, $value);
158+
static::assertSame($expected, $value);
159159
// test cache
160-
$this->assertSame($expected, $config->get($key, $default));
160+
static::assertSame($expected, $config->get($key, $default));
161161
}
162162

163163
/**
@@ -177,7 +177,7 @@ public function testGetEnvConfigWithInvalidJson()
177177
}
178178

179179
putenv('FXP_ASSET__ENV_JSON');
180-
$this->assertFalse(getenv('FXP_ASSET__ENV_JSON'));
180+
static::assertFalse(getenv('FXP_ASSET__ENV_JSON'));
181181

182182
if (null === $ex) {
183183
throw new \Exception('The expected exception was not thrown');
@@ -201,13 +201,13 @@ public function testValidateConfig()
201201
'asset-main-files' => 'deprecated',
202202
);
203203

204-
$this->package->expects($this->any())
204+
$this->package->expects(static::any())
205205
->method('getExtra')
206206
->willReturn($deprecated)
207207
;
208208

209209
foreach (array_keys($deprecated) as $i => $option) {
210-
$this->io->expects($this->at($i))
210+
$this->io->expects(static::at($i))
211211
->method('write')
212212
->with('<warning>The "extra.'.$option.'" option is deprecated, use the "config.fxp-asset.'.substr($option, 6).'" option</warning>')
213213
;

‎Tests/Converter/AbstractPackageConverterTest.php

+15-15
Original file line numberDiff line numberDiff line change
@@ -40,36 +40,36 @@ abstract class AbstractPackageConverterTest extends \PHPUnit\Framework\TestCase
4040
protected function setUp()
4141
{
4242
$versionConverter = $this->getMockBuilder('Fxp\Composer\AssetPlugin\Converter\VersionConverterInterface')->getMock();
43-
$versionConverter->expects($this->any())
43+
$versionConverter->expects(static::any())
4444
->method('convertVersion')
45-
->will($this->returnCallback(function ($value) {
45+
->willReturnCallback(function ($value) {
4646
return $value;
47-
}))
47+
})
4848
;
49-
$versionConverter->expects($this->any())
49+
$versionConverter->expects(static::any())
5050
->method('convertRange')
51-
->will($this->returnCallback(function ($value) {
51+
->willReturnCallback(function ($value) {
5252
return $value;
53-
}))
53+
})
5454
;
5555
$type = $this->getMockBuilder('Fxp\Composer\AssetPlugin\Type\AssetTypeInterface')->getMock();
56-
$type->expects($this->any())
56+
$type->expects(static::any())
5757
->method('getComposerVendorName')
58-
->will($this->returnValue('ASSET'))
58+
->willReturn('ASSET')
5959
;
60-
$type->expects($this->any())
60+
$type->expects(static::any())
6161
->method('getComposerType')
62-
->will($this->returnValue('ASSET_TYPE'))
62+
->willReturn('ASSET_TYPE')
6363
;
64-
$type->expects($this->any())
64+
$type->expects(static::any())
6565
->method('getVersionConverter')
66-
->will($this->returnValue($versionConverter))
66+
->willReturn($versionConverter)
6767
;
68-
$type->expects($this->any())
68+
$type->expects(static::any())
6969
->method('formatComposerName')
70-
->will($this->returnCallback(function ($value) {
70+
->willReturnCallback(function ($value) {
7171
return 'ASSET/'.$value;
72-
}))
72+
})
7373
;
7474

7575
$this->type = $type;

0 commit comments

Comments
 (0)