Skip to content

Commit 6d5cfd0

Browse files
francoispluchinofrancoispluchino
committed
Update php code styles
1 parent 2206d2e commit 6d5cfd0

File tree

78 files changed

+1443
-1044
lines changed

Some content is hidden

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

78 files changed

+1443
-1044
lines changed

‎.php_cs.dist

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,19 @@
22

33
return PhpCsFixer\Config::create()
44
->setRules(array(
5-
'@Symfony' => true,
6-
'@Symfony:risky' => true,
5+
'@PhpCsFixer' => true,
6+
'@PhpCsFixer:risky' => true,
7+
'@PHPUnit60Migration:risky' => true,
78
'array_syntax' => array('syntax' => 'long'),
9+
'class_definition' => array('singleLine' => false),
10+
'declare_strict_types' => false,
11+
'ordered_imports' => true,
12+
'php_unit_expectation' => false,
13+
'php_unit_no_expectation_annotation' => false,
14+
'php_unit_strict' => false,
15+
'php_unit_test_class_requires_covers' => false,
16+
'self_accessor' => false,
17+
'single_line_comment_style' => false,
818
))
919
->setRiskyAllowed(true)
1020
->setFinder(

‎Assets.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ class Assets
7878
*
7979
* @param string $type
8080
*
81-
* @return AssetTypeInterface
82-
*
8381
* @throws InvalidArgumentException When the asset type does not exist
82+
*
83+
* @return AssetTypeInterface
8484
*/
8585
public static function createType($type)
8686
{

‎Composer/ScriptHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected static function getIgnoreConfigSection()
7878
*
7979
* @param OperationInterface $operation The operation
8080
*
81-
* @return PackageInterface|null Return NULL if the package is an asset
81+
* @return null|PackageInterface Return NULL if the package is an asset
8282
*/
8383
protected static function getLibraryPackage(OperationInterface $operation)
8484
{
@@ -97,7 +97,7 @@ protected static function getLibraryPackage(OperationInterface $operation)
9797
*
9898
* @param OperationInterface $operation The operation
9999
*
100-
* @return PackageInterface|null Return NULL if the operation is not INSTALL or UPDATE
100+
* @return null|PackageInterface Return NULL if the operation is not INSTALL or UPDATE
101101
*/
102102
protected static function getOperationPackage(OperationInterface $operation)
103103
{

‎Config/Config.php

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,24 +57,23 @@ public function getArray($key, array $default = array())
5757
* Get the config value.
5858
*
5959
* @param string $key The config key
60-
* @param mixed|null $default The default value
60+
* @param null|mixed $default The default value
6161
*
62-
* @return mixed|null
62+
* @return null|mixed
6363
*/
6464
public function get($key, $default = null)
6565
{
66-
if (array_key_exists($key, $this->cacheEnv)) {
66+
if (\array_key_exists($key, $this->cacheEnv)) {
6767
return $this->cacheEnv[$key];
68-
} else {
69-
$envKey = $this->convertEnvKey($key);
70-
$envValue = getenv($envKey);
68+
}
69+
$envKey = $this->convertEnvKey($key);
70+
$envValue = getenv($envKey);
7171

72-
if (false !== $envValue) {
73-
return $this->cacheEnv[$key] = $this->convertEnvValue($envValue, $envKey);
74-
}
72+
if (false !== $envValue) {
73+
return $this->cacheEnv[$key] = $this->convertEnvValue($envValue, $envKey);
7574
}
7675

77-
return array_key_exists($key, $this->config)
76+
return \array_key_exists($key, $this->config)
7877
? $this->config[$key]
7978
: $default;
8079
}
@@ -97,7 +96,7 @@ private function convertEnvKey($key)
9796
* @param string $value The value of environment variable
9897
* @param string $environmentVariable The environment variable name
9998
*
100-
* @return string|bool|int|array
99+
* @return array|bool|int|string
101100
*/
102101
private function convertEnvValue($value, $environmentVariable)
103102
{
@@ -125,7 +124,7 @@ private function isBoolean($value)
125124
{
126125
$value = strtolower($value);
127126

128-
return in_array($value, array('true', 'false', '1', '0', 'yes', 'no', 'y', 'n'), true);
127+
return \in_array($value, array('true', 'false', '1', '0', 'yes', 'no', 'y', 'n'), true);
129128
}
130129

131130
/**
@@ -137,7 +136,7 @@ private function isBoolean($value)
137136
*/
138137
private function convertBoolean($value)
139138
{
140-
return in_array($value, array('true', '1', 'yes', 'y'), true);
139+
return \in_array($value, array('true', '1', 'yes', 'y'), true);
141140
}
142141

143142
/**

‎Config/ConfigBuilder.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ abstract class ConfigBuilder
5050
*/
5151
public static function validate(IOInterface $io, RootPackageInterface $package, $commandName = null)
5252
{
53-
if (null === $commandName || in_array($commandName, array('install', 'update', 'validate', 'require', 'remove'))) {
53+
if (null === $commandName || \in_array($commandName, array('install', 'update', 'validate', 'require', 'remove'), true)) {
5454
$extra = (array) $package->getExtra();
5555

5656
foreach (self::$deprecatedOptions as $new => $old) {
57-
if (array_key_exists($old, $extra)) {
57+
if (\array_key_exists($old, $extra)) {
5858
$io->write(sprintf('<warning>The "extra.%s" option is deprecated, use the "config.fxp-asset.%s" option</warning>', $old, $new));
5959
}
6060
}
@@ -65,7 +65,7 @@ public static function validate(IOInterface $io, RootPackageInterface $package,
6565
* Build the config of plugin.
6666
*
6767
* @param Composer $composer The composer
68-
* @param IOInterface|null $io The composer input/output
68+
* @param null|IOInterface $io The composer input/output
6969
*
7070
* @return Config
7171
*/
@@ -88,7 +88,7 @@ public static function build(Composer $composer, $io = null)
8888
private static function injectDeprecatedConfig(array $config, array $extra)
8989
{
9090
foreach (self::$deprecatedOptions as $key => $deprecatedKey) {
91-
if (array_key_exists($deprecatedKey, $extra) && !array_key_exists($key, $config)) {
91+
if (\array_key_exists($deprecatedKey, $extra) && !\array_key_exists($key, $config)) {
9292
$config[$key] = $extra[$deprecatedKey];
9393
}
9494
}
@@ -100,7 +100,7 @@ private static function injectDeprecatedConfig(array $config, array $extra)
100100
* Get the base of data.
101101
*
102102
* @param Composer $composer The composer
103-
* @param IOInterface|null $io The composer input/output
103+
* @param null|IOInterface $io The composer input/output
104104
*
105105
* @return array
106106
*/
@@ -109,7 +109,7 @@ private static function getConfigBase(Composer $composer, $io = null)
109109
$globalPackageConfig = self::getGlobalConfig($composer, 'composer', $io);
110110
$globalConfig = self::getGlobalConfig($composer, 'config', $io);
111111
$packageConfig = $composer->getPackage()->getConfig();
112-
$packageConfig = isset($packageConfig['fxp-asset']) && is_array($packageConfig['fxp-asset'])
112+
$packageConfig = isset($packageConfig['fxp-asset']) && \is_array($packageConfig['fxp-asset'])
113113
? $packageConfig['fxp-asset']
114114
: array();
115115

@@ -121,7 +121,7 @@ private static function getConfigBase(Composer $composer, $io = null)
121121
*
122122
* @param Composer $composer The composer
123123
* @param string $filename The filename
124-
* @param IOInterface|null $io The composer input/output
124+
* @param null|IOInterface $io The composer input/output
125125
*
126126
* @return array
127127
*/
@@ -134,7 +134,7 @@ private static function getGlobalConfig(Composer $composer, $filename, $io = nul
134134
if ($file->exists()) {
135135
$data = $file->read();
136136

137-
if (isset($data['config']['fxp-asset']) && is_array($data['config']['fxp-asset'])) {
137+
if (isset($data['config']['fxp-asset']) && \is_array($data['config']['fxp-asset'])) {
138138
$config = $data['config']['fxp-asset'];
139139

140140
if ($io instanceof IOInterface && $io->isDebug()) {

‎Converter/AbstractPackageConverter.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ protected function convertData(array $asset, array $keys, array $dependencies, a
8484
* @param array $asset The asset data
8585
* @param string $assetKey The asset key
8686
* @param array $composer The composer data
87-
* @param string|array $composerKey The composer key or array with composer key name and closure
87+
* @param array|string $composerKey The composer key or array with composer key name and closure
8888
*
8989
* @throws InvalidArgumentException When the 'composerKey' argument of asset packager converter is not an string or an array with the composer key and closure
9090
*/
9191
protected function convertKey(array $asset, $assetKey, array &$composer, $composerKey)
9292
{
93-
if (is_array($composerKey)) {
93+
if (\is_array($composerKey)) {
9494
PackageUtil::convertArrayKey($asset, $assetKey, $composer, $composerKey);
9595
} else {
9696
PackageUtil::convertStringKey($asset, $assetKey, $composer, $composerKey);
@@ -103,7 +103,7 @@ protected function convertKey(array $asset, $assetKey, array &$composer, $compos
103103
* @param array $asset The asset data
104104
* @param string $assetKey The asset extra key
105105
* @param array $composer The composer data
106-
* @param string|array $composerKey The composer extra key or array with composer extra key name and closure
106+
* @param array|string $composerKey The composer extra key or array with composer extra key name and closure
107107
* @param string $extraKey The extra key name
108108
*/
109109
protected function convertExtraKey(array $asset, $assetKey, array &$composer, $composerKey, $extraKey = 'extra')
@@ -112,7 +112,7 @@ protected function convertExtraKey(array $asset, $assetKey, array &$composer, $c
112112

113113
$this->convertKey($asset, $assetKey, $extra, $composerKey);
114114

115-
if (count($extra) > 0) {
115+
if (\count($extra) > 0) {
116116
$composer[$extraKey] = $extra;
117117
}
118118
}
@@ -128,7 +128,7 @@ protected function convertExtraKey(array $asset, $assetKey, array &$composer, $c
128128
*/
129129
protected function convertDependencies(array $asset, $assetKey, array &$composer, $composerKey, array &$vcsRepos = array())
130130
{
131-
if (isset($asset[$assetKey]) && is_array($asset[$assetKey])) {
131+
if (isset($asset[$assetKey]) && \is_array($asset[$assetKey])) {
132132
$newDependencies = array();
133133

134134
foreach ($asset[$assetKey] as $dependency => $version) {

‎Converter/BowerPackageConverter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected function checkGithubRepositoryVersion($dependency, $version)
7878
{
7979
if (preg_match('/^[A-Za-z0-9\-_]+\/[A-Za-z0-9\-_.]+/', $version)) {
8080
$pos = strpos($version, '#');
81-
$pos = false === $pos ? strlen($version) : $pos;
81+
$pos = false === $pos ? \strlen($version) : $pos;
8282
$realVersion = substr($version, $pos);
8383
$version = 'git://github.com/'.substr($version, 0, $pos).'.git'.$realVersion;
8484
}

‎Converter/NpmPackageUtil.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ public static function revertName($name)
5959
*/
6060
public static function convertLicenses($licenses)
6161
{
62-
if (!is_array($licenses)) {
62+
if (!\is_array($licenses)) {
6363
return $licenses;
6464
}
6565

6666
$result = array();
6767
foreach ($licenses as $license) {
68-
if (is_array($license)) {
68+
if (\is_array($license)) {
6969
if (!empty($license['type'])) {
7070
$result[] = $license['type'];
7171
} elseif (!empty($license['name'])) {
@@ -82,7 +82,7 @@ public static function convertLicenses($licenses)
8282
/**
8383
* Convert the author section.
8484
*
85-
* @param string|null $value The current value
85+
* @param null|string $value The current value
8686
*
8787
* @return array
8888
*/
@@ -98,17 +98,17 @@ public static function convertAuthor($value)
9898
/**
9999
* Convert the contributors section.
100100
*
101-
* @param string|null $value The current value
102-
* @param string|null $prevValue The previous value
101+
* @param null|string $value The current value
102+
* @param null|string $prevValue The previous value
103103
*
104104
* @return array
105105
*/
106106
public static function convertContributors($value, $prevValue)
107107
{
108-
$mergeValue = is_array($prevValue) ? $prevValue : array();
109-
$mergeValue = array_merge($mergeValue, is_array($value) ? $value : array());
108+
$mergeValue = \is_array($prevValue) ? $prevValue : array();
109+
$mergeValue = array_merge($mergeValue, \is_array($value) ? $value : array());
110110

111-
if (count($mergeValue) > 0) {
111+
if (\count($mergeValue) > 0) {
112112
$value = $mergeValue;
113113
}
114114

@@ -118,18 +118,18 @@ public static function convertContributors($value, $prevValue)
118118
/**
119119
* Convert the dist section.
120120
*
121-
* @param string|null $value The current value
121+
* @param null|string $value The current value
122122
*
123123
* @return array
124124
*/
125125
public static function convertDist($value)
126126
{
127-
if (is_array($value)) {
127+
if (\is_array($value)) {
128128
$data = (array) $value;
129129
$value = array();
130130

131131
foreach ($data as $type => $url) {
132-
if (is_string($url)) {
132+
if (\is_string($url)) {
133133
self::convertDistEntry($value, $type, $url);
134134
}
135135
}
@@ -150,15 +150,15 @@ private static function convertDistEntry(array &$value, $type, $url)
150150
$httpPrefix = 'http://';
151151

152152
if (0 === strpos($url, $httpPrefix)) {
153-
$url = 'https://'.substr($url, strlen($httpPrefix));
153+
$url = 'https://'.substr($url, \strlen($httpPrefix));
154154
}
155155

156156
if ('shasum' === $type) {
157157
$value[$type] = $url;
158158
} elseif ('tarball' === $type) {
159159
$value['type'] = 'tar';
160160
$value['url'] = $url;
161-
} elseif (in_array($type, self::getDownloaderTypes(), true)) {
161+
} elseif (\in_array($type, self::getDownloaderTypes(), true)) {
162162
$value['type'] = $type;
163163
$value['url'] = $url;
164164
}

‎Converter/PackageUtil.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static function isUrlArchive($url)
9393
{
9494
if (0 === strpos($url, 'http')) {
9595
foreach (self::$extensions as $extension) {
96-
if (substr($url, -strlen($extension)) === $extension) {
96+
if (substr($url, -\strlen($extension)) === $extension) {
9797
return true;
9898
}
9999
}
@@ -182,8 +182,8 @@ public static function convertStringKey(array $asset, $assetKey, array &$compose
182182
*/
183183
public static function convertArrayKey(array $asset, $assetKey, array &$composer, $composerKey)
184184
{
185-
if (2 !== count($composerKey)
186-
|| !is_string($composerKey[0]) || !$composerKey[1] instanceof \Closure) {
185+
if (2 !== \count($composerKey)
186+
|| !\is_string($composerKey[0]) || !$composerKey[1] instanceof \Closure) {
187187
throw new InvalidArgumentException('The "composerKey" argument of asset packager converter must be an string or an array with the composer key and closure');
188188
}
189189

@@ -233,7 +233,7 @@ protected static function splitUrlVersion($version)
233233
protected static function getUrlFileDependencyName(AssetTypeInterface $assetType, array $composer, $dependency)
234234
{
235235
$prefix = isset($composer['name'])
236-
? substr($composer['name'], strlen($assetType->getComposerVendorName()) + 1).'-'
236+
? substr($composer['name'], \strlen($assetType->getComposerVendorName()) + 1).'-'
237237
: '';
238238

239239
return $prefix.$dependency.'-file';
@@ -273,7 +273,7 @@ protected static function hasUrlDependencySupported($url)
273273
$io = new NullIO();
274274
$config = new Config();
275275

276-
/* @var VcsDriverInterface $driver */
276+
/** @var VcsDriverInterface $driver */
277277
foreach (Assets::getVcsDrivers() as $driver) {
278278
$supported = $driver::supports($io, $config, $url);
279279

0 commit comments

Comments
 (0)