Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/linters/.codespellrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[codespell]
skip = ./.git,.claude/*,.codex/*,.vscode/*,code_coverage/*,composer.lock,runtime/*,scaffold-lock.json,vendor/*,*/tests/*,tests/**,*/composer.lock,*/composer.json,*/package-lock.json,*/dist/*,*/node_modules/*
skip = ./.git,.claude/*,.codex/*,.config/gh/*,.github/agents/*,.github/copilot-instructions.md,.github/copilot/*,.github/instructions/*,.github/prompts/*,.github/skills/*,.vscode/*,*/composer.json,*/composer.lock,*/dist/*,*/node_modules/*,*/package-lock.json,*/tests/*,code_coverage/*,CHANGELOG.md,UPGRADE.md,runtime/*,scaffold-lock.json,vendor/*
15 changes: 11 additions & 4 deletions .github/linters/.editorconfig-checker.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
{
"Exclude": [
"\\.min\\.css$",
"\\.min\\.js$",
"^\\.claude/",
"^\\.codex/",
"^\\.config/gh/",
"^\\.github/agents/",
"^\\.github/copilot-instructions\\.md$",
"^\\.github/copilot/",
"^\\.github/instructions/",
"^\\.github/prompts/",
"^\\.github/skills/",
"^\\.vscode/",
"^code_coverage/",
"^composer\\.lock$",
"phpstan-baseline\\.neon$",
"^runtime/",
"^tests/runtime/",
"\\.min\\.css$",
"\\.min\\.js$",
"^vendor/",
"^runtime/",
"phpstan-baseline\\.neon$",
"scaffold-lock\\.json$"
]
}
2 changes: 0 additions & 2 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,4 @@ jobs:
codespell-config: .github/linters/.codespellrc
editorconfig-checker-config: .github/linters/.editorconfig-checker.json
markdownlint-config: .github/linters/.markdown-lint.yml
prettier-config: .prettierrc.json
prettier-ignore-path: .prettierignore
yamllint-targets: .github
67 changes: 62 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# AI agents (if present)
.codex
# Local AI agent, editor, and GitHub CLI config (if present)
.claude
.codex
.config/gh

# codecoverage (if present)
code_coverage
Expand All @@ -11,7 +12,7 @@ c3.php
# composer
composer.lock

# gitHub copilot config (if present)
# GitHub Copilot config (if present)
.github/agents/**
.github/copilot-instructions.md
.github/copilot/**
Expand All @@ -28,18 +29,74 @@ nbproject
# node_modules (if present)
node_modules
package-lock.json
!src/assets/package-lock.json

# phpstorm project (if present)
.idea

# phpactor (if present)
.phpactor.*

# phpunit (if present)
.phpunit.cache
.phpunit.result.cache

# vagrant (if present)
.vagrant

# vendor
vendor

# vscode project (if present)
.vscode

# windows thumbnail cache (if present)
Thumbs.db

# zend studio for eclipse project (if present)
.buildpath
.project
.settings
# Local AI agent, editor, and GitHub CLI config (if present)
.claude
.codex
.config/gh

# codecoverage (if present)
code_coverage

# codeception (if present)
c3.php

# composer
composer.lock

# GitHub Copilot config (if present)
.github/agents/**
.github/copilot-instructions.md
.github/copilot/**
.github/instructions/**
.github/prompts/**
.github/skills/**

# mac ds_store (if present)
.DS_Store

# netbeans project (if present)
nbproject

# node_modules (if present)
node_modules
package-lock.json

# phpstorm project (if present)
.idea

# phpactor (if present)
.phpactor.*

# phpunit (if present)
.phpunit.cache
.phpunit.result.cache
phpunit.xml

# vagrant (if present)
.vagrant
Expand Down
21 changes: 0 additions & 21 deletions .prettierignore

This file was deleted.

28 changes: 0 additions & 28 deletions .prettierrc.json

This file was deleted.

2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## 0.3.4 Under development

- fix: support ECS `13.3.2+` with the native PER-CS set and explicit PHP `8.1-8.4` migration rules instead of the removed `withPhpCsFixerSets()` arguments.

## 0.3.3 July 05, 2026

- ci: replace Super-Linter with reusable quality and security workflows, pin reusable ECS workflow, group Dependabot updates, and refresh linter and Gitleaks configs.
Expand Down
36 changes: 17 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Or add the dependency manually to `composer.json`:

```json
{
"require-dev": {
"php-forge/coding-standard": "^0.3"
}
"require-dev": {
"php-forge/coding-standard": "^0.3"
}
}
```

Expand Down Expand Up @@ -146,19 +146,17 @@ composer require yii2-extensions/scaffold:^0.1 --dev

```json
{
"config": {
"allow-plugins": {
"yii2-extensions/scaffold": true
}
},
"extra": {
"scaffold": {
"auto": false,
"allowed-packages": [
"php-forge/coding-standard"
]
}
"config": {
"allow-plugins": {
"yii2-extensions/scaffold": true
}
},
"extra": {
"scaffold": {
"auto": false,
"allowed-packages": ["php-forge/coding-standard"]
}
}
}
```

Expand All @@ -182,10 +180,10 @@ Follow the same convention used across PHP Forge repositories:

```json
{
"scripts": {
"ecs": "./vendor/bin/ecs --fix",
"rector": "./vendor/bin/rector process"
}
"scripts": {
"ecs": "./vendor/bin/ecs --fix",
"rector": "./vendor/bin/rector process"
}
}
```

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"require": {
"php": ">=8.1",
"rector/rector": "^2.4",
"symplify/easy-coding-standard": "^13.2"
"symplify/easy-coding-standard": "^13.3.2"
},
"require-dev": {
"php-forge/baseline": "^0.1",
"php-forge/baseline": "^0.2",
"yii2-extensions/scaffold": "^0.2"
},
"autoload": {
Expand All @@ -50,6 +50,7 @@
}
},
"scripts": {
"tests": "php tests/ecs.php",
"ecs": "./vendor/bin/ecs check src --config src/ecs-83.php --fix",
"rector": "./vendor/bin/rector process src --config src/rector-83.php"
}
Expand Down
26 changes: 4 additions & 22 deletions scaffold-lock.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"providers": {
"php-forge/baseline": {
"version": "0.1.3",
"version": "0.2.0",
"path": "vendor/php-forge/baseline"
}
},
Expand All @@ -19,7 +19,7 @@
"mode": "replace"
},
".gitignore": {
"hash": "sha256:9e5e968a4f71578af06247a009998c24d27682fa88f4c0883de2e4bec80d45ca",
"hash": "sha256:c2f25a729e950d919448fae89454bdb53cb22700a4d19da6dce4303fcf5d00a3",
"provider": "php-forge/baseline",
"source": "metadata/.gitignore",
"mode": "append"
Expand All @@ -30,38 +30,20 @@
"source": "metadata/.styleci.yml",
"mode": "replace"
},
".prettierignore": {
"hash": "sha256:f4b6198902354d400815e6169439b5805da5ce8fb50797f9ec79c6f91e6c22a4",
"provider": "php-forge/baseline",
"source": "metadata/.prettierignore",
"mode": "replace"
},
".prettierrc.json": {
"hash": "sha256:4bf1ad096981736c7bd00136026e046f4b23fcefa1f8db84dcd0bacac19e97a2",
"provider": "php-forge/baseline",
"source": "metadata/.prettierrc.json",
"mode": "replace"
},
".stylelintignore": {
"hash": "sha256:12186f0a5c42b4f894f7bdda1b1ca5ebc69f92d906aa9075a459d4d08fe4edc1",
"provider": "php-forge/baseline",
"source": "metadata/.stylelintignore",
"mode": "replace"
},
"composer-require-checker.json": {
"hash": "sha256:f4fbbc7876fa3f695b69dd7dc7ad4637d33dfab97fe445b476de26480f85055d",
"provider": "php-forge/baseline",
"source": "metadata/composer-require-checker.json",
"mode": "preserve"
},
".github/linters/.codespellrc": {
"hash": "sha256:b1a66a59f2042ac1601a277d09b21326aa8c85da8ba18592a138d1681760c9c7",
"hash": "sha256:0ec9825d6022c7b0edcdbc6f8a8e3fdea30bbd65f76084cc9f046bdd432bdc1f",
"provider": "php-forge/baseline",
"source": "metadata/.github/linters/.codespellrc",
"mode": "replace"
},
".github/linters/.editorconfig-checker.json": {
"hash": "sha256:83ce0f9e83f68fb23500061cb17836eaa5e3107df93cc4ccfb578a7500b7f958",
"hash": "sha256:17587db6b4d163e43b47dd1f55809b2ab6f3a2d9b170ca88fdd23d703feb3064",
"provider": "php-forge/baseline",
"source": "metadata/.github/linters/.editorconfig-checker.json",
"mode": "replace"
Expand Down
19 changes: 5 additions & 14 deletions src/ecs-81.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,12 @@
/**
* ECS configuration targeting PHP `8.1` syntax.
*
* Adds the `@PHP81Migration` PHP-CS-Fixer set on top of the shared base configuration.
* Adds explicit ECS rules equivalent to the `@PHP81Migration` PHP-CS-Fixer set.
*
* ```php
* <?php
*
* declare(strict_types=1);
*
* /** @var \Symplify\EasyCodingStandard\Configuration\ECSConfigBuilder $builder *\/
* $builder = require __DIR__ . '/vendor/php-forge/coding-standard/src/ecs-81.php';
*
* return $builder->withPaths([__DIR__ . '/src', __DIR__ . '/tests']);
* ```
*
* @var \Symplify\EasyCodingStandard\Configuration\ECSConfigBuilder $builder
* @var \Symplify\EasyCodingStandard\Configuration\ECSConfigBuilder
*/
$builder = require __DIR__ . '/ecs.php';

return $builder->withPhpCsFixerSets(php81Migration: true);
return $builder->withSets(
[__DIR__ . '/sets/php-81.php'],
);
19 changes: 5 additions & 14 deletions src/ecs-82.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,12 @@
/**
* ECS configuration targeting PHP `8.2` syntax.
*
* Adds the `@PHP82Migration` PHP-CS-Fixer set on top of the shared base configuration.
* Adds explicit ECS rules equivalent to the `@PHP82Migration` PHP-CS-Fixer set.
*
* ```php
* <?php
*
* declare(strict_types=1);
*
* /** @var \Symplify\EasyCodingStandard\Configuration\ECSConfigBuilder $builder *\/
* $builder = require __DIR__ . '/vendor/php-forge/coding-standard/src/ecs-82.php';
*
* return $builder->withPaths([__DIR__ . '/src', __DIR__ . '/tests']);
* ```
*
* @var \Symplify\EasyCodingStandard\Configuration\ECSConfigBuilder $builder
* @var \Symplify\EasyCodingStandard\Configuration\ECSConfigBuilder
*/
$builder = require __DIR__ . '/ecs.php';

return $builder->withPhpCsFixerSets(php82Migration: true);
return $builder->withSets(
[__DIR__ . '/sets/php-82.php'],
);
Loading
Loading