diff --git a/Makefile b/Makefile index b7262a4..137b35f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PHP_IMAGE_TAG=flyeralarm/php-code-valiator-cli:$(PHP_VERSION) +PHP_IMAGE_TAG=flyeralarm/php-code-validator:$(PHP_VERSION) PHP_VERSION?=8.3 PHP_BIN=$(RUNNER) php @@ -40,6 +40,7 @@ test: .PHONY: test-all test-all: + PHP_VERSION=8.4 $(MAKE) build update sniff test PHP_VERSION=8.3 $(MAKE) build update sniff test PHP_VERSION=8.2 $(MAKE) build update sniff test PHP_VERSION=8.1 $(MAKE) build update sniff test diff --git a/README.md b/README.md index 49b9b87..b3d4e81 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # FLYERALARM PHP Coding Guideline Validator This repository contains the ruleset for the PHP code we develop at [FLYERALARM](https://flyeralarm.com). -It mostly consists of PSR-12 with some custom additions. The rules are enforced with the help of squizlabs/PHP_CodeSniffer +It mostly consists of PSR-12 with some custom additions. The rules are enforced with the help of PHPCSStandards/PHP_CodeSniffer The key words “MUST”, “MUST NOT”, “REQUIRED”, “SHALL”, “SHALL NOT”, “SHOULD”, “SHOULD NOT”, “RECOMMENDED”, “MAY”, and “OPTIONAL” in this document are to be @@ -68,7 +68,7 @@ test: The recommended way to define custom rules for the own project is to provide a ```phpcs.xml``` in the root of your project. -PHP_CodeSniffer will automatically detect this standard if no other standard was defined (See [PHP_CodeSniffer Advanced Usage](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file)). +PHP_CodeSniffer will automatically detect this standard if no other standard was defined (See [PHP_CodeSniffer Advanced Usage](https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki/Advanced-Usage#using-a-default-configuration-file)). This ```phpcs.xml``` can then reference the FLYERALARM PHP coding standard. ```xml diff --git a/composer.lock b/composer.lock index 4d94c98..4485182 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "squizlabs/php_codesniffer", - "version": "3.11.1", + "version": "3.13.5", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87" + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", - "reference": "19473c30efe4f7b3cd42522d0b2e6e7f243c6f87", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4", + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4", "shasum": "" }, "require": { @@ -34,11 +34,6 @@ "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -82,9 +77,13 @@ { "url": "https://opencollective.com/php_codesniffer", "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" } ], - "time": "2024-11-16T12:02:36+00:00" + "time": "2025-11-04T16:30:35+00:00" } ], "packages-dev": [], @@ -95,5 +94,5 @@ "prefer-lowest": false, "platform": {}, "platform-dev": {}, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" }