Skip to content

PHPStan Level 6 #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JJJ merged 7 commits into from
May 21, 2025
Merged

PHPStan Level 6 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
892e153
PHPStan Level 6
lloc Apr 29, 2025
4445b5c
esc_html_e doesn\'t need echo
lloc Apr 29, 2025
094662a
@return void for the first batch of functions
lloc Apr 29, 2025
fabd3d0
@return void for the second batch of functions
lloc Apr 29, 2025
e6b01eb
@return void for commands, throw error transformed into WP_CLI::error()
lloc Apr 30, 2025
edaa70d
Value type specified in iterable type array
lloc Apr 30, 2025
b7f93fd
Solves 'Method x has parameter y with generic class z but does not sp…
lloc May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
parameters:
level: 5
level: 6
paths:
- wp-multi-network/includes
- wpmn-loader.php
Expand Down
53 changes: 30 additions & 23 deletions wp-multi-network/includes/classes/class-wp-ms-network-command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class WP_MS_Network_Command {
* Default fields to display for each object.
*
* @since 1.3.0
* @var array
* @var string[]
*/
protected $obj_fields = array(
'id',
Expand Down Expand Up @@ -54,11 +54,12 @@ class WP_MS_Network_Command {
*
* @since 1.3.0
*
* @param array $args Positional CLI arguments.
* @param array $assoc_args Associative CLI arguments.
* @param string[] $args Positional CLI arguments.
* @param array<string, mixed> $assoc_args Associative CLI arguments.
* @return void
*/
public function create( $args, $assoc_args ) {
list( $domain, $path ) = $args;
[ $domain, $path ] = $args;

$assoc_args = wp_parse_args(
$assoc_args, array(
Expand All @@ -74,7 +75,7 @@ public function create( $args, $assoc_args ) {
$users = new \WP_CLI\Fetchers\User();
$user = $users->get( $assoc_args['network_admin'] );
if ( ! $user ) {
return new WP_Error( 'network_super_admin', 'Super user does not exist.' );
WP_CLI::error( 'Super user does not exist.' );
}
$network_admin_id = $user->ID;
} else {
Expand Down Expand Up @@ -122,18 +123,19 @@ public function create( $args, $assoc_args ) {
*
* @since 1.3.0
*
* @param array $args Positional CLI arguments.
* @param array $assoc_args Associative CLI arguments.
* @param string[] $args Positional CLI arguments.
* @param array<string, mixed> $assoc_args Associative CLI arguments.
* @return void
*/
public function update( $args, $assoc_args ) {
list( $id, $domain ) = $args;
[ $id, $domain ] = $args;

$defaults = array(
'path' => '',
);
$assoc_args = wp_parse_args( $assoc_args, $defaults );

$network_id = update_network( $id, $domain, $assoc_args['path'] );
$network_id = update_network( (int) $id, $domain, $assoc_args['path'] );

if ( is_wp_error( $network_id ) ) {
WP_CLI::error( $network_id );
Expand All @@ -153,19 +155,20 @@ public function update( $args, $assoc_args ) {
*
* @since 1.3.0
*
* @param array $args Positional CLI arguments.
* @param array $assoc_args Associative CLI arguments.
* @param string[] $args Positional CLI arguments.
* @param array<string, mixed> $assoc_args Associative CLI arguments.
* @return void
*/
public function delete( $args, $assoc_args ) {
list( $id ) = $args;
[ $id ] = $args;

$assoc_args = wp_parse_args(
$assoc_args, array(
'delete_blogs' => false,
)
);

$network_id = delete_network( $id, $assoc_args['delete_blogs'] );
$network_id = delete_network( (int) $id, $assoc_args['delete_blogs'] );

if ( is_wp_error( $network_id ) ) {
WP_CLI::error( $network_id );
Expand All @@ -187,13 +190,14 @@ public function delete( $args, $assoc_args ) {
*
* @since 1.3.0
*
* @param array $args Positional CLI arguments.
* @param array $assoc_args Associative CLI arguments.
* @param string[] $args Positional CLI arguments.
* @param array<string, mixed> $assoc_args Associative CLI arguments.
* @return void
*/
public function move_site( $args, $assoc_args ) { // phpcs:ignore Generic.CodeAnalysis.UnusedFunctionParameter.FoundAfterLastUsed
list( $site_id, $new_network_id ) = $args;
[ $site_id, $new_network_id ] = $args;

$network_id = move_site( $site_id, $new_network_id );
$network_id = move_site( (int) $site_id, (int) $new_network_id );

if ( is_wp_error( $network_id ) ) {
WP_CLI::error( $network_id );
Expand Down Expand Up @@ -223,8 +227,9 @@ public function move_site( $args, $assoc_args ) { // phpcs:ignore Generic.CodeAn
*
* @since 1.3.0
*
* @param array $args Positional CLI arguments.
* @param array $assoc_args Associative CLI arguments.
* @param string[] $args Positional CLI arguments.
* @param array<string, mixed> $assoc_args Associative CLI arguments.
* @return void
*/
public function list_( $args, $assoc_args ) {
$items = get_networks();
Expand Down Expand Up @@ -252,8 +257,9 @@ public function list_( $args, $assoc_args ) {
*
* @since 1.3.0
*
* @param array $args Positional CLI arguments.
* @param array $assoc_args Associative CLI arguments.
* @param string[] $args Positional CLI arguments.
* @param array<string, mixed> $assoc_args Associative CLI arguments.
* @return void
*/
public function plugin( $args, $assoc_args ) {
$fetchers_plugin = new \WP_CLI\Fetchers\Plugin();
Expand All @@ -276,7 +282,7 @@ public function plugin( $args, $assoc_args ) {
if ( $all ) {
$args = array_map(
function ( $file ) {
return \WP_CLI\Utils\get_plugin_name( $file );
return \WP_CLI\Utils\get_plugin_name( $file );
}, array_keys( get_plugins() )
);
}
Expand Down Expand Up @@ -322,7 +328,7 @@ function ( $file ) {
*
* @since 1.3.0
*
* @param array $assoc_args Associative CLI arguments. Passed by reference.
* @param array<string, mixed> $assoc_args Associative CLI arguments. Passed by reference.
* @return WP_CLI\Formatter WP-CLI formatter instance.
*/
protected function get_formatter( &$assoc_args ) {
Expand Down Expand Up @@ -373,6 +379,7 @@ protected function get_status( $file ) {
* @param string $file Plugin main file path relative to the plugins directory.
* @param bool $network_wide Whether to check network-wide or not.
* @param string $action Action performed.
* @return void
*/
private function active_output( $name, $file, $network_wide, $action ) {
$network_wide = $network_wide || ( is_multisite() && is_network_only_plugin( $file ) );
Expand Down
2 changes: 2 additions & 0 deletions wp-multi-network/includes/classes/class-wp-ms-networks-admin-bar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public function add_hooks(): void {
*
* @since 2.2.0
* @since 3.0.0 Prevent rendering of CSS if admin bar is not shown.
* @return void
*/
public function admin_print_styles() {
if ( ! is_admin_bar_showing() ) {
Expand All @@ -61,6 +62,7 @@ public function admin_print_styles() {
* @since 2.2.0
*
* @param WP_Admin_Bar $wp_admin_bar Admin bar instance.
* @return void
*/
public function admin_bar( $wp_admin_bar ) {

Expand Down
Loading
Loading