WordPress.org

Make WordPress Core

Ticket #44600: 44600.2.diff

File 44600.2.diff, 5.1 KB (added by pento, 13 months ago)
  • composer.json

    diff --git a/composer.json b/composer.json
    index c612cbbfa3..25204baa8d 100644
    a b  
    1010                "issues": "https://core.trac.wordpress.org/"
    1111        },
    1212        "require-dev": {
    13                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
    14                 "wp-coding-standards/wpcs": "dev-master"
     13                "dealerdirect/phpcodesniffer-composer-installer": "0.4.4",
     14                "wp-coding-standards/wpcs": "1.0.0"
    1515        },
    1616        "scripts": {
    1717                "format": "phpcbf --standard=phpcs.xml.dist --report-summary --report-source",
  • composer.lock

    diff --git a/composer.lock b/composer.lock
    index 2d88e21514..cddcc33588 100644
    a b  
    44        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
    55        "This file is @generated automatically"
    66    ],
    7     "content-hash": "9c2c871b813e89682ef445611d2f5363",
     7    "content-hash": "8b69e7340b77fe803f84b9b4679674d4",
    88    "packages": [],
    99    "packages-dev": [
    1010        {
     
    7777        },
    7878        {
    7979            "name": "squizlabs/php_codesniffer",
    80             "version": "3.3.0",
     80            "version": "3.3.1",
    8181            "source": {
    8282                "type": "git",
    8383                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
    84                 "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266"
     84                "reference": "628a481780561150481a9ec74709092b9759b3ec"
    8585            },
    8686            "dist": {
    8787                "type": "zip",
    88                 "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
    89                 "reference": "d86873af43b4aa9d1f39a3601cc0cfcf02b25266",
     88                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/628a481780561150481a9ec74709092b9759b3ec",
     89                "reference": "628a481780561150481a9ec74709092b9759b3ec",
    9090                "shasum": ""
    9191            },
    9292            "require": {
     
    124124                "phpcs",
    125125                "standards"
    126126            ],
    127             "time": "2018-06-06T23:58:19+00:00"
     127            "time": "2018-07-26T23:47:18+00:00"
    128128        },
    129129        {
    130130            "name": "wp-coding-standards/wpcs",
    131             "version": "dev-master",
     131            "version": "1.0.0",
    132132            "source": {
    133133                "type": "git",
    134134                "url": "https://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git",
    135                 "reference": "cf6b310caad735816caef7573295f8a534374706"
     135                "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755"
    136136            },
    137137            "dist": {
    138138                "type": "zip",
    139                 "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/cf6b310caad735816caef7573295f8a534374706",
    140                 "reference": "cf6b310caad735816caef7573295f8a534374706",
     139                "url": "https://api.github.com/repos/WordPress-Coding-Standards/WordPress-Coding-Standards/zipball/539c6d74e6207daa22b7ea754d6f103e9abb2755",
     140                "reference": "539c6d74e6207daa22b7ea754d6f103e9abb2755",
    141141                "shasum": ""
    142142            },
    143143            "require": {
    144144                "php": ">=5.3",
    145145                "squizlabs/php_codesniffer": "^2.9.0 || ^3.0.2"
    146146            },
     147            "require-dev": {
     148                "phpcompatibility/php-compatibility": "*"
     149            },
    147150            "suggest": {
    148                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
     151                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3 || This Composer plugin will sort out the PHPCS 'installed_paths' automatically."
    149152            },
    150153            "type": "phpcodesniffer-standard",
    151154            "notification-url": "https://packagist.org/downloads/",
     
    164167                "standards",
    165168                "wordpress"
    166169            ],
    167             "time": "2018-02-16T01:57:48+00:00"
     170            "time": "2018-07-25T18:10:35+00:00"
    168171        }
    169172    ],
    170173    "aliases": [],
    171174    "minimum-stability": "stable",
    172     "stability-flags": {
    173         "wp-coding-standards/wpcs": 20
    174     },
     175    "stability-flags": [],
    175176    "prefer-stable": false,
    176177    "prefer-lowest": false,
    177178    "platform": [],
  • phpcs.xml.dist

    diff --git a/phpcs.xml.dist b/phpcs.xml.dist
    index bd476e3e19..6cfe9223aa 100644
    a b  
    55        <rule ref="WordPress-Core"/>
    66        <rule ref="WordPress.CodeAnalysis.EmptyStatement"/>
    77
     8        <rule ref="PEAR.Functions.FunctionCallSignature">
     9                <properties>
     10                        <property name="allowMultipleArguments" value="false"/>
     11                        <property name="requiredSpacesAfterOpen" value="1"/>
     12                        <property name="requiredSpacesBeforeClose" value="1"/>
     13                </properties>
     14        </rule>
     15
    816        <arg name="extensions" value="php"/>
    917
    1018        <!-- Strip the filepaths down to the relevant bit. -->
     
    8795                <exclude-pattern>/wp-tests-config-sample\.php</exclude-pattern>
    8896        </rule>
    8997
     98        <rule ref="Generic.Files.LineEndings">
     99                <exclude-pattern>/wp-config\.php</exclude-pattern>
     100                <exclude-pattern>/wp-config-sample\.php</exclude-pattern>
     101        </rule>
     102
    90103        <!-- Whitelist test classes for select sniffs. -->
    91104        <rule ref="WordPress.Files.FileName">
    92105                <properties>