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
11 changes: 11 additions & 0 deletions .changelog/consistent-skill-sources.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
category: changed
type: patch
---

Synchronize the bundled local skill automatically and trust Fast Forward Composer
skill donors through `fast-forward/*`.
Resolve Changelog contributor skills from stable `0.4.x` releases without a
redundant skill allowlist.
Load the project autoloader for PHPDoc checks when DevTools is installed as a
dependency.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
/.changelog/ export-ignore
/CONTRIBUTING.md export-ignore
/skills.json export-ignore
/.php-cs-fixer.dist.php export-ignore
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ vendor/
composer.lock
*.cache
/.agents/
/.dev-tools/
38 changes: 38 additions & 0 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?php

declare(strict_types=1);

/**
* This file is part of fast-forward/fork.
*
* This source file is subject to the license bundled
* with this source code in the file LICENSE.
*
* @copyright Copyright (c) 2026 Felipe Sayão Lobato Abreu <github@mentordosnerds.com>
* @license https://opensource.org/licenses/MIT MIT License
*
* @see https://github.com/php-fast-forward/fork
* @see https://github.com/php-fast-forward
* @see https://datatracker.ietf.org/doc/html/rfc2119
*/

use FastForward\DevTools\Path\WorkingProjectPathResolver;
use PhpCsFixer\Config;
use PhpCsFixer\Finder;

require __DIR__ . '/vendor/autoload.php';

return (new Config())
->setRiskyAllowed(false)
->setFinder(Finder::create()->in(__DIR__)->exclude(WorkingProjectPathResolver::TOOLING_EXCLUDED_DIRECTORIES))
->setRules([
'phpdoc_indent' => true,
'phpdoc_order' => ['order' => ['param', 'return', 'throws']],
'phpdoc_separation' => true,
'phpdoc_trim' => true,
'phpdoc_trim_consecutive_blank_line_separation' => true,
'phpdoc_scalar' => true,
'phpdoc_types' => true,
'phpdoc_to_comment' => false,
'phpdoc_add_missing_param_annotation' => true,
]);
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,11 @@
"allow-plugins": {
"ergebnis/composer-normalize": true,
"fast-forward/dev-tools": true,
"llm/skills": true,
"phpdocumentor/shim": true,
"phpro/grumphp": true,
"pyrech/composer-changelogs": true,
"llm/skills": true
"phpro/grumphp-shim": true,
"pyrech/composer-changelogs": true
},
"platform": {
"php": "8.3.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @see https://datatracker.ietf.org/doc/html/rfc2119
*/

require dirname(__DIR__) . '/vendor/autoload.php';
require __DIR__ . '/../vendor/autoload.php';
require_once __DIR__ . '/Support/ExampleConsole.php';
require_once __DIR__ . '/Support/ExampleLogger.php';
require_once __DIR__ . '/Support/ExampleRuntime.php';
Expand Down
18 changes: 12 additions & 6 deletions skills.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
{
"$schema": "https://raw.githubusercontent.com/roxblnfk/skills/master/resources/skills.schema.json",
"$schema": "https://raw.githubusercontent.com/roxblnfk/skills/1.15.0/resources/skills.schema.json",
"target": ".agents/skills",
"aliases": [],
"discovery": false,
"auto-sync": true,
"vendor-sources": false,
"dependencies": {
"composer": false
"composer": {
"trusted": [
"fast-forward/*"
],
"trusted-replace": true
}
},
"sources": [
{
"from": "dir",
"path": "resources/skills"
},
{
"from": "github",
"package": "php-fast-forward/changelog",
"ref": "^0.3.0",
"skills": [
"fast-forward-changelog"
]
"ref": "^0.4.0"
}
]
}
1 change: 1 addition & 0 deletions src/Worker/Worker.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
use FastForward\Fork\Signal\Signal;
use Psr\Log\LoggerInterface;
use Throwable;

use function error_reporting;
use function getmypid;
use function max;
Expand Down
1 change: 1 addition & 0 deletions tests/Manager/ForkManagerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
use PHPUnit\Framework\Attributes\UsesClass;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;

use function getmypid;
use function pcntl_fork;
use function posix_getpid;
Expand Down
1 change: 1 addition & 0 deletions tests/Worker/WorkerStateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use PHPUnit\Framework\Attributes\UsesClass;
use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;

use function pcntl_fork;
use function pcntl_waitpid;
use function posix_kill;
Expand Down
3 changes: 1 addition & 2 deletions tests/Worker/WorkerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Log\LoggerInterface;

use function getmypid;
use function pcntl_fork;
use function pcntl_waitpid;
Expand Down Expand Up @@ -415,8 +416,6 @@ public static function provideNormalizedExitCodes(): iterable
* @param WorkerState $state
* @param callable $callback
* @param LoggerInterface|null $logger
*
* @return Worker
*/
private function createWorker(
ForkManagerInterface $manager,
Expand Down
Loading