Normalize class loading

[szepe.viktor]

While trying to autoload core classes I've found these 3 irregularities:

wp-admin/includes/ajax-actions.php:3259: require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php';
wp-admin/update.php:220: include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' ); //for themes_api..
wp-includes/update.php:559: include_once( ABSPATH . '/wp-admin/includes/class-wp-upgrader.php' );

• remove leading slash as ABSPATH contains it
• remove trailing comment

Thank you.

[szepe.viktor]

If anyone interested:

Unpack the current release and

{
    "require" : {
        "giacocorsiglia/wordpress-stubs": "4.9.8"
    },
    "autoload": {
        "psr-4": {
            "": "wordpress/"
        }
    }
}

composer update -o

 /bin/bash

sed -ne "s#.* . '/wordpress/\(.*\)',#\1#p" ../vendor/composer/autoload_classmap.php | uniq \
    | xargs -I% grep -rExn "\s*(require|include)(_once)?\(?\s*ABSPATH\s*\.\s*'/?%'\s*\)?;.*" | cut -d: -f1-2 \
    | while read -r FILE_LINE; do echo "$FILE_LINE ..."; sed -e "${FILE_LINE#*:}"'s|.*|// AUTOLOAD &|' -i "${FILE_LINE%:*}"; done

[dmsnell]

Removes duplicated leading slashes of file imports

[dmsnell]

@szepeviktor thanks for finding these duplicated slashes in the include references. I found a few more and added a patch to strip them out.

I'm not sure I understand why you want to remove the comment in update.php though - can you explain that a bit more?

[szepe.viktor]

I'm not sure I understand why you want to remove the comment

My regexp did not match :)

Maybe we can move the comment from the end of line to the previous line. What do you think?

[dmsnell]

My regexp did not match :)

Ah. That makes sense. Let's not move the comment though - there's nothing wrong with it being there.

You will definitely have better luck doing what you are wanting to do if you work from a PHP parser instead of from a RegExp. There aren't many choices but you shouldn't have any problem with ​nikic's php-parser.

If you want to catch trailing comments though I don't see why your pattern should be failing. Did you debug the matches to see why?

[szepe.viktor]

Okay, let's not touch the comment.

I proceed with class autoloading in core here: ​https://github.com/szepeviktor/wordpress-autoloaded

[birgire]

46327-2.diff​ removes some other cases of duplicated leading slashes within:

• src/wp-admin/includes/class-wp-site-health-auto-updates.php
• src/wp-admin/includes/class-wp-debug-data.php
• src/index.php

[SergeyBiryukov]

In 45190:

Bootstrap/Load: Remove duplicate leading slashes on inclusion of various files under ABSPATH.

Props dmsnell, birgire, szepe.viktor.
Fixes #46327.