Skip to content

Commit b9cd14b

Browse files
lloclloc
authored
PHPCS issues addressed (#493)
* Setup * Issues addressed * Plugin check issues applied
1 parent 0d3ceca commit b9cd14b

70 files changed

Lines changed: 416 additions & 356 deletions

Some content is hidden

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

‎.distignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
.distignore
22
.gitattributes
33
.gitignore
4+
.phpcs.cache
5+
.phpcs.xml.dist
46
.scrutinizer.yml
57
/.git
68
/.github
@@ -26,7 +28,6 @@ multisite-language-switcher.zip
2628
package-lock.json
2729
package.json
2830
patchwork.json
29-
phpcs.xml
3031
phpdoc.xml
3132
phpstan.neon.dist
3233
phpunit.xml

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.idea/
3+
.phpcs.cache
34
.phpunit.cache
45
.phpunit.result.cache
56
.vscode/

‎.phpcs.xml.dist‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0"?>
2+
<ruleset name="CS">
3+
<description>PHPCS MSLS configuration</description>
4+
<config name="testVersion" value="7.4-"/>
5+
<exclude-pattern>bin/*</exclude-pattern>
6+
<exclude-pattern>css/*</exclude-pattern>
7+
<exclude-pattern>flags/*</exclude-pattern>
8+
<exclude-pattern>images/*</exclude-pattern>
9+
<exclude-pattern>node_modules/*</exclude-pattern>
10+
<exclude-pattern>tests/*</exclude-pattern>
11+
<exclude-pattern>vendor/*</exclude-pattern>
12+
13+
<arg value="ps"/>
14+
<arg name="colors"/>
15+
<arg name="parallel" value="100"/>
16+
<arg name="extensions" value="php"/>
17+
<arg name="cache" value=".phpcs.cache"/>
18+
19+
<rule ref="WordPress">
20+
<!-- PSR4 -->
21+
<exclude name="Generic.Commenting.DocComment.MissingShort" />
22+
<exclude name="Squiz.Commenting.FileComment.Missing" />
23+
<exclude name="Squiz.Commenting.ClassComment.Missing" />
24+
<exclude name="Squiz.Commenting.FunctionComment.Missing" />
25+
<exclude name="Squiz.Commenting.FunctionComment.MissingParamComment" />
26+
<exclude name="WordPress.Files.FileName" />
27+
</rule>
28+
<rule ref="WordPress-Extra"/>
29+
<rule ref="WordPress-Docs"/>
30+
</ruleset>

‎MultisiteLanguageSwitcher.php‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
/**
33
* Multisite Language Switcher Plugin
44
*
5-
* @copyright Copyright (C) 2011-2022, Dennis Ploetner, re@lloc.de
6-
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 or later
7-
* @wordpress-plugin
8-
*
95
* Plugin Name: Multisite Language Switcher
106
* Version: 2.9.6
117
* Plugin URI: http://msls.co/
@@ -28,6 +24,11 @@
2824
* You should have received a copy of the GNU General Public License
2925
* along with this program; if not, write to the Free Software
3026
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
27+
*
28+
* @copyright Copyright (C) 2011-2022, Dennis Ploetner, re@lloc.de
29+
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 or later
30+
* @wordpress-plugin
31+
* @package msls
3132
*/
3233

3334
if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
@@ -95,24 +96,25 @@ function get_msls_flag_url( string $locale ): string {
9596
* Gets the description for a blog for a specific locale
9697
*
9798
* @param string $locale
99+
* @param string $preset
98100
*
99101
* @return string
100102
*/
101-
function get_msls_blog_description( string $locale, string $default = '' ): string {
103+
function get_msls_blog_description( string $locale, string $preset = '' ): string {
102104
$blog = msls_blog( $locale );
103105

104-
return $blog ? $blog->get_description() : $default;
106+
return $blog ? $blog->get_description() : $preset;
105107
}
106108

107109
/**
108110
* Gets the permalink for a translation of the current post in a given language
109111
*
110112
* @param string $locale
111-
* @param string $default
113+
* @param string $preset
112114
*
113115
* @return string
114116
*/
115-
function get_msls_permalink( string $locale, string $default = '' ): string {
117+
function get_msls_permalink( string $locale, string $preset = '' ): string {
116118
$url = null;
117119
$blog = msls_blog( $locale );
118120

@@ -121,7 +123,7 @@ function get_msls_permalink( string $locale, string $default = '' ): string {
121123
$url = $blog->get_url( $options );
122124
}
123125

124-
return $url ?? $default;
126+
return $url ?? $preset;
125127
}
126128

127129
/**

‎build/translations.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎css/flags.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@
3333
'da_DK' => 'flag-icon-dk',
3434
'de_CH' => 'flag-icon-ch',
3535
'de_DE' => 'flag-icon-de',
36-
'de_AT' => 'flag-icon-at',
3736
'de_DE_formal' => 'flag-icon-de',
3837
'de_CH_informal' => 'flag-icon-ch',
38+
'de_AT' => 'flag-icon-at',
3939
'dzo' => 'flag-icon-bt',
4040
'el' => 'flag-icon-gr',
4141
'en_ZA' => 'flag-icon-za',
42-
'en_AU' => 'flag-icon-au',
4342
'en_GB' => 'flag-icon-gb',
44-
'en_NZ' => 'flag-icon-nz',
43+
'en_AU' => 'flag-icon-au',
4544
'en_CA' => 'flag-icon-ca',
45+
'en_NZ' => 'flag-icon-nz',
4646
'eo' => 'flag-icon-eu',
4747
'es_CR' => 'flag-icon-cr',
4848
'es_PE' => 'flag-icon-pe',
4949
'es_CL' => 'flag-icon-cl',
50+
'es_AR' => 'flag-icon-ar',
5051
'es_CO' => 'flag-icon-co',
5152
'es_ES' => 'flag-icon-es',
5253
'es_VE' => 'flag-icon-ve',
5354
'es_EC' => 'flag-icon-ec',
5455
'es_DO' => 'flag-icon-do',
5556
'es_UY' => 'flag-icon-uy',
5657
'es_PR' => 'flag-icon-pr',
57-
'es_GT' => 'flag-icon-gt',
5858
'es_MX' => 'flag-icon-mx',
59-
'es_AR' => 'flag-icon-ar',
59+
'es_GT' => 'flag-icon-gt',
6060
'et' => 'flag-icon-ee',
6161
'eu' => 'flag-icon-es',
6262
'fa_AF' => 'flag-icon-af',
@@ -97,8 +97,8 @@
9797
'my_MM' => 'flag-icon-mm',
9898
'nb_NO' => 'flag-icon-no',
9999
'ne_NP' => 'flag-icon-np',
100-
'nl_NL' => 'flag-icon-nl',
101100
'nl_BE' => 'flag-icon-be',
101+
'nl_NL' => 'flag-icon-nl',
102102
'nl_NL_formal' => 'flag-icon-nl',
103103
'nn_NO' => 'flag-icon-no',
104104
'oci' => 'flag-icon-es-ca',

‎flags/flags.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,30 @@
3333
'da_DK' => 'dk.png',
3434
'de_CH' => 'ch.png',
3535
'de_DE' => 'de.png',
36-
'de_AT' => 'at.png',
3736
'de_DE_formal' => 'de.png',
3837
'de_CH_informal' => 'ch.png',
38+
'de_AT' => 'at.png',
3939
'dzo' => 'bt.png',
4040
'el' => 'gr.png',
4141
'en_ZA' => 'za.png',
42-
'en_AU' => 'au.png',
4342
'en_GB' => 'gb.png',
44-
'en_NZ' => 'nz.png',
43+
'en_AU' => 'au.png',
4544
'en_CA' => 'ca.png',
45+
'en_NZ' => 'nz.png',
4646
'eo' => 'europeanunion.png',
4747
'es_CR' => 'cr.png',
4848
'es_PE' => 'pe.png',
4949
'es_CL' => 'cl.png',
50+
'es_AR' => 'ar.png',
5051
'es_CO' => 'co.png',
5152
'es_ES' => 'es.png',
5253
'es_VE' => 've.png',
5354
'es_EC' => 'ec.png',
5455
'es_DO' => 'do.png',
5556
'es_UY' => 'uy.png',
5657
'es_PR' => 'pr.png',
57-
'es_GT' => 'gt.png',
5858
'es_MX' => 'mx.png',
59-
'es_AR' => 'ar.png',
59+
'es_GT' => 'gt.png',
6060
'et' => 'ee.png',
6161
'eu' => 'es.png',
6262
'fa_AF' => 'af.png',
@@ -97,8 +97,8 @@
9797
'my_MM' => 'mm.png',
9898
'nb_NO' => 'no.png',
9999
'ne_NP' => 'np.png',
100-
'nl_NL' => 'nl.png',
101100
'nl_BE' => 'be.png',
101+
'nl_NL' => 'nl.png',
102102
'nl_NL_formal' => 'nl.png',
103103
'nn_NO' => 'no.png',
104104
'oci' => 'catalonia.png',

‎includes/Component/Icon.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct() {
3131
* @return string
3232
*/
3333
protected function maybe( string $language, string $prefix = '', string $postfix = '' ): string {
34-
if ( 5 == strlen( $language ) ) {
34+
if ( 5 === strlen( $language ) ) {
3535
$language = strtolower( substr( $language, - 2 ) );
3636
}
3737

‎includes/Component/Input/Select.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ final class Select extends Component {
1919
protected $options;
2020

2121
/**
22-
* @param string $key Name and ID of the form-element
23-
* @param mixed[] $arr Options as associative array
24-
* @param ?string $selected Values which should be selected
22+
* @param string $key Name and ID of the form-element.
23+
* @param mixed[] $arr Options as an associative array.
24+
* @param ?string $selected Values which should be selected.
2525
*/
2626
public function __construct( string $key, array $arr, ?string $selected = null ) {
2727
$this->key = $key;

‎includes/Component/Input/Text.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ final class Text extends Component {
3232
* @param string $key
3333
* @param string|null $value
3434
* @param int $size
35-
* @param bool $readonly
35+
* @param bool $read_only
3636
*/
37-
public function __construct( string $key, ?string $value, int $size = self::DEFAULT_SIZE, bool $readonly = false ) {
37+
public function __construct( string $key, ?string $value, int $size = self::DEFAULT_SIZE, bool $read_only = false ) {
3838
$this->key = $key;
3939
$this->value = $value;
4040
$this->size = $size;
41-
$this->readonly = $readonly ? ' readonly="readonly"' : '';
41+
$this->readonly = $read_only ? ' readonly="readonly"' : '';
4242
}
4343

4444
/**

0 commit comments

Comments
 (0)