WordPress.org
Get WordPress

Make WordPress Core

Changeset 49516 for branches/5.1


Ignore:
Timestamp:
11/06/2020 04:39:51 PM (4 years ago)
Author:
desrosj
Message:

Build Tools: Fix running installing Composer dependencies using Composer 2.0.

This updates the dealerdirect/phpcodesniffer-composer-installer package to allow installing version 0.7.0 which supports Composer 2.0.

It also includes several minor spacing/alignment coding standards fixes that are made as a result of the package update.

Props itowhid06, jrf.
Merges [49306] to the 5.1 branch.
See #51624, #48301.

Location:
branches/5.1
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/5.1

  • branches/5.1/composer.json

    r44645 r49516  
    1111    },
    1212    "require-dev": {
    13         "dealerdirect/phpcodesniffer-composer-installer": "~0.5.0",
     13        "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7.0",
    1414        "wp-coding-standards/wpcs": "~2.0.0"
    1515    },

  • branches/5.1/composer.lock

    r44645 r49516  
    55        "This file is @generated automatically"
    66    ],
    7     "content-hash": "c7426ffeca8db395605e43bccf174b02",
     7    "content-hash": "0d68b3d8b17e827e096ecb10a063f34c",
    88    "packages": [],
    99    "packages-dev": [
    1010        {
    1111            "name": "dealerdirect/phpcodesniffer-composer-installer",
    12             "version": "v0.5.0",
     12            "version": "v0.7.0",
    1313            "source": {
    1414                "type": "git",
    1515                "url": "https://github.com/Dealerdirect/phpcodesniffer-composer-installer.git",
    16                 "reference": "e749410375ff6fb7a040a68878c656c2e610b132"
     16                "reference": "e8d808670b8f882188368faaf1144448c169c0b7"
    1717            },
    1818            "dist": {
    1919                "type": "zip",
    20                 "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e749410375ff6fb7a040a68878c656c2e610b132",
    21                 "reference": "e749410375ff6fb7a040a68878c656c2e610b132",
     20                "url": "https://api.github.com/repos/Dealerdirect/phpcodesniffer-composer-installer/zipball/e8d808670b8f882188368faaf1144448c169c0b7",
     21                "reference": "e8d808670b8f882188368faaf1144448c169c0b7",
    2222                "shasum": ""
    2323            },
    2424            "require": {
    25                 "composer-plugin-api": "^1.0",
    26                 "php": "^5.3|^7",
    27                 "squizlabs/php_codesniffer": "^2|^3"
     25                "composer-plugin-api": "^1.0 || ^2.0",
     26                "php": ">=5.3",
     27                "squizlabs/php_codesniffer": "^2 || ^3 || 4.0.x-dev"
    2828            },
    2929            "require-dev": {
    … …  
    7272                "tests"
    7373            ],
    74             "time": "2018-10-26T13:21:45+00:00"
     74            "support": {
     75                "issues": "https://github.com/dealerdirect/phpcodesniffer-composer-installer/issues",
     76                "source": "https://github.com/dealerdirect/phpcodesniffer-composer-installer"
     77            },
     78            "time": "2020-06-25T14:57:39+00:00"
    7579        },
    7680        {
    7781            "name": "squizlabs/php_codesniffer",
    78             "version": "3.4.0",
     82            "version": "3.5.8",
    7983            "source": {
    8084                "type": "git",
    8185                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
    82                 "reference": "379deb987e26c7cd103a7b387aea178baec96e48"
     86                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4"
    8387            },
    8488            "dist": {
    8589                "type": "zip",
    86                 "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/379deb987e26c7cd103a7b387aea178baec96e48",
    87                 "reference": "379deb987e26c7cd103a7b387aea178baec96e48",
     90                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/9d583721a7157ee997f235f327de038e7ea6dac4",
     91                "reference": "9d583721a7157ee997f235f327de038e7ea6dac4",
    8892                "shasum": ""
    8993            },
    … …  
    118122            ],
    119123            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
    120             "homepage": "http://www.squizlabs.com/php-codesniffer",
     124            "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
    121125            "keywords": [
    122126                "phpcs",
    123127                "standards"
    124128            ],
    125             "time": "2018-12-19T23:57:18+00:00"
     129            "support": {
     130                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
     131                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
     132                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
     133            },
     134            "time": "2020-10-23T02:01:07+00:00"
    126135        },
    127136        {
    … …  
    130139            "source": {
    131140                "type": "git",
    132                 "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
     141                "url": "https://github.com/WordPress/WordPress-Coding-Standards.git",
    133142                "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce"
    134143            },
    135144            "dist": {
    136145                "type": "zip",
    137                 "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",
     146                "url": "https://api.github.com/repos/WordPress/WordPress-Coding-Standards/zipball/c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",
    138147                "reference": "c9eaadaafefce36b3cb7e06eb15305b8c4cae9ce",
    139148                "shasum": ""
    … …  
    168177                "wordpress"
    169178            ],
     179            "support": {
     180                "issues": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/issues",
     181                "source": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards",
     182                "wiki": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards/wiki"
     183            },
    170184            "time": "2019-01-16T10:13:16+00:00"
    171185        }
    … …  
    177191    "prefer-lowest": false,
    178192    "platform": [],
    179     "platform-dev": []
     193    "platform-dev": [],
     194    "plugin-api-version": "2.0.0"
    180195}

  • branches/5.1/src/wp-admin/includes/class-wp-links-list-table.php

    r43571 r49516  
    118118            wp_dropdown_categories( $dropdown_options );
    119119            submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
    120         ?>
     120            ?>
    121121        </div>
    122122        <?php

  • branches/5.1/src/wp-admin/includes/media.php

    r49395 r49516  
    30313031            'quicktags'     => $quicktags_settings,
    30323032        );
    3033     ?>
     3033        ?>
    30343034
    30353035    <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong>

  • branches/5.1/src/wp-admin/plugins.php

    r44717 r49516  
    421421                '<p>' . sprintf(
    422422                    /* translators: %s: WordPress Plugin Directory URL */
    423                      __( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
     423                    __( 'If you would like to see more plugins to choose from, click on the &#8220;Add New&#8221; button and you will be able to browse or search for additional plugins from the <a href="%s">WordPress Plugin Directory</a>. Plugins in the WordPress Plugin Directory are designed and developed by third parties, and are compatible with the license WordPress uses. Oh, and they&#8217;re free!' ),
    424424                    __( 'https://wordpress.org/plugins/' )
    425425                ) . '</p>',
    … …  
    434434                '<p>' . sprintf(
    435435                    /* translators: WP_PLUGIN_DIR constant value */
    436                      __( 'If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
     436                    __( 'If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the %s directory and it will be automatically deactivated.' ),
    437437                    '<code>' . WP_PLUGIN_DIR . '</code>'
    438438                ) . '</p>',

  • branches/5.1/src/wp-admin/theme-install.php

    r43571 r49516  
    9494    '<p>' . sprintf(
    9595        /* translators: %s: Theme Directory URL */
    96             __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
     96        __( 'You can find additional themes for your site by using the Theme Browser/Installer on this screen, which will display themes from the <a href="%s">WordPress Theme Directory</a>. These themes are designed and developed by third parties, are available free of charge, and are compatible with the license WordPress uses.' ),
    9797        __( 'https://wordpress.org/themes/' )
    9898    ) . '</p>' .
    … …  
    101101    '<p>' . sprintf(
    102102        /* translators: %s: /wp-content/themes */
    103             __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
     103        __( 'You can Upload a theme manually if you have already downloaded its ZIP archive onto your computer (make sure it is from a trusted and original source). You can also do it the old-fashioned way and copy a downloaded theme&#8217;s folder via FTP into your %s directory.' ),
    104104        '<code>/wp-content/themes</code>'
    105105    ) . '</p>';

  • branches/5.1/src/wp-includes/class-wp-customize-widgets.php

    r43571 r49516  
    18581858        ob_start();
    18591859        dynamic_sidebar( $this->rendering_sidebar_id = $context['sidebar_id'] );
    1860         $container                                   = ob_get_clean();
     1860        $container = ob_get_clean();
    18611861
    18621862        // Reset variables for next partial render.

  • branches/5.1/src/wp-includes/script-loader.php

    r46030 r49516  
    14171417            'themeInstallUnavailable' => sprintf(
    14181418                /* translators: %s: URL to Add Themes admin screen */
    1419                    __( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
     1419                __( 'You won&#8217;t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
    14201420                esc_url( admin_url( 'theme-install.php' ) )
    14211421            ),

  • branches/5.1/tests/phpunit/tests/multisite/network.php

    r42343 r49516  
    275275            // activate the plugin sitewide
    276276            activate_plugin( $path, '', $network_wide = true );
    277             $active_plugins                           = wp_get_active_network_plugins();
     277            $active_plugins = wp_get_active_network_plugins();
    278278            $this->assertEquals( array( WP_PLUGIN_DIR . '/hello.php' ), $active_plugins );
    279279

  • branches/5.1/tests/phpunit/tests/post/getPages.php

    r44587 r49516  
    2323        $this->assertEquals( 3, count( $pages ) );
    2424        $this->assertNotEmpty( $time1 = wp_cache_get( 'last_changed', 'posts' ) );
    25         $num_queries                  = $wpdb->num_queries;
     25        $num_queries = $wpdb->num_queries;
    2626        foreach ( $pages as $page ) {
    2727            $this->assertInstanceOf( 'WP_Post', $page );

  • branches/5.1/tests/phpunit/tests/term/getTerms.php

    r43571 r49516  
    174174        wp_delete_term( $terms[0]->term_id, 'post_tag' );
    175175
    176         $num_queries                           = $wpdb->num_queries;
     176        $num_queries = $wpdb->num_queries;
    177177        $this->assertNotEquals( $time1, $time2 = wp_cache_get( 'last_changed', 'terms' ) );
    178178
Note: See TracChangeset for help on using the changeset viewer.