From 8df348c1c290527039c7e629a97fb6195b93ca73 Mon Sep 17 00:00:00 2001 From: Joe McGill Date: Wed, 14 Oct 2020 17:40:01 -0500 Subject: [PATCH] Update Alley Coding standards This updates the project to make use of the Alley Interactive coding standards that are published to Packagist and updates our phpcs.xml file to reference the new "Alley-Interactive" sniff name. --- composer.json | 8 +---- composer.lock | 95 ++++++++++++++++++++++++++++++++++++++++----------- phpcs.xml | 2 +- 3 files changed, 78 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index d7cb0b23..13b641b3 100644 --- a/composer.json +++ b/composer.json @@ -7,14 +7,8 @@ "email": "noreply@alleyinteractive.com" } ], - "repositories": [ - { - "type": "git", - "url": "https://github.com/alleyinteractive/Alley-Coding-Standards" - } - ], "require-dev": { - "alley/alley-coding-standards": "dev-master" + "alleyinteractive/alley-coding-standards": "dev-master" }, "scripts": { "phpcs": "phpcs . -p", diff --git a/composer.lock b/composer.lock index 39d519c6..aea9529c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,46 +4,54 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2c89a8ad098a038dda37c0245cf59c3c", + "content-hash": "a0c756484cf8d02e1c3909082f462ffd", "packages": [], "packages-dev": [ { - "name": "alley/alley-coding-standards", + "name": "alleyinteractive/alley-coding-standards", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/alleyinteractive/Alley-Coding-Standards", - "reference": "59d28c74a881f11c7886b719281a3fbc3d655428" + "url": "https://github.com/alleyinteractive/alley-coding-standards.git", + "reference": "40ac47bc2119934a767a3c0ef194c7943b07c658" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/alleyinteractive/alley-coding-standards/zipball/40ac47bc2119934a767a3c0ef194c7943b07c658", + "reference": "40ac47bc2119934a767a3c0ef194c7943b07c658", + "shasum": "" }, "require": { "automattic/vipwpcs": "^2.1.0", - "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", + "dealerdirect/phpcodesniffer-composer-installer": "*", "squizlabs/php_codesniffer": "^3.5.0", "wp-coding-standards/wpcs": "^2.3.0" }, - "type": "project", + "type": "phpcodesniffer-standard", + "notification-url": "https://packagist.org/downloads/", "license": [ "GPL-2.0-or-later" ], "description": "PHPCS sniffs for Alley Interactive", - "time": "2020-07-14T19:47:58+00:00" + "time": "2020-10-14T21:50:28+00:00" }, { "name": "automattic/vipwpcs", - "version": "2.1.0", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/Automattic/VIP-Coding-Standards.git", - "reference": "03e75ddd0261b675dece60fb67fc2e9c6af4ad35" + "reference": "4d0612461232b313d06321f1501c3989bd6aecf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Automattic/VIP-Coding-Standards/zipball/03e75ddd0261b675dece60fb67fc2e9c6af4ad35", - "reference": "03e75ddd0261b675dece60fb67fc2e9c6af4ad35", + "url": "https://api.github.com/repos/Automattic/VIP-Coding-Standards/zipball/4d0612461232b313d06321f1501c3989bd6aecf9", + "reference": "4d0612461232b313d06321f1501c3989bd6aecf9", "shasum": "" }, "require": { "php": ">=5.4", + "sirbrillig/phpcs-variable-analysis": "^2.8.3", "squizlabs/php_codesniffer": "^3.5.5", "wp-coding-standards/wpcs": "^2.3" }, @@ -72,7 +80,7 @@ "standards", "wordpress" ], - "time": "2020-07-07T07:48:04+00:00" + "time": "2020-09-07T10:45:45+00:00" }, { "name": "dealerdirect/phpcodesniffer-composer-installer", @@ -140,18 +148,66 @@ ], "time": "2020-06-25T14:57:39+00:00" }, + { + "name": "sirbrillig/phpcs-variable-analysis", + "version": "v2.9.0", + "source": { + "type": "git", + "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", + "reference": "ff54d4ec7f2bd152d526fdabfeff639aa9b8be01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/ff54d4ec7f2bd152d526fdabfeff639aa9b8be01", + "reference": "ff54d4ec7f2bd152d526fdabfeff639aa9b8be01", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "squizlabs/php_codesniffer": "^3.1" + }, + "require-dev": { + "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4 || ^0.5 || ^0.6", + "limedeck/phpunit-detailed-printer": "^3.1 || ^4.0 || ^5.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^5.0 || ^6.5 || ^7.0 || ^8.0", + "sirbrillig/phpcs-import-detection": "^1.1" + }, + "type": "phpcodesniffer-standard", + "autoload": { + "psr-4": { + "VariableAnalysis\\": "VariableAnalysis/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Sam Graham", + "email": "php-codesniffer-variableanalysis@illusori.co.uk" + }, + { + "name": "Payton Swick", + "email": "payton@foolord.com" + } + ], + "description": "A PHPCS sniff to detect problems with variables.", + "time": "2020-10-07T23:32:29+00:00" + }, { "name": "squizlabs/php_codesniffer", - "version": "3.5.5", + "version": "3.5.6", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6" + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/73e2e7f57d958e7228fce50dc0c61f58f017f9f6", - "reference": "73e2e7f57d958e7228fce50dc0c61f58f017f9f6", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/e97627871a7eab2f70e59166072a6b767d5834e0", + "reference": "e97627871a7eab2f70e59166072a6b767d5834e0", "shasum": "" }, "require": { @@ -189,7 +245,7 @@ "phpcs", "standards" ], - "time": "2020-04-17T01:09:41+00:00" + "time": "2020-08-10T04:50:15+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -241,10 +297,11 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "alley/alley-coding-standards": 20 + "alleyinteractive/alley-coding-standards": 20 }, "prefer-stable": false, "prefer-lowest": false, "platform": [], - "platform-dev": [] + "platform-dev": [], + "plugin-api-version": "1.1.0" } diff --git a/phpcs.xml b/phpcs.xml index 8b66403b..6275e4f0 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -3,7 +3,7 @@ PHP_CodeSniffer standard for WP Irving. - +