Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Fix active classes #37

Merged
merged 4 commits into from
Aug 5, 2023
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/workflows/code_analysis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

-
name: 'Check Active Classes'
run: vendor/bin/easy-ci check-active-class src --ansi
run: vendor/bin/class-leak check src packages bin --ansi --skip-type="Symplify\MonorepoBuilder\Release\Contract\ReleaseWorker\ReleaseWorkerInterface" --skip-type="\Symplify\MonorepoBuilder\Merge\Contract\ComposerKeyMergerInterface" --skip-type="\Symplify\MonorepoBuilder\Merge\Contract\ComposerJsonDecoratorInterface"

name: ${{ matrix.actions.name }}
runs-on: ubuntu-latest
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/downgraded_release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- run: cp -r build/target-repository/. .

# clear the dev files
- run: rm -rf build prefix-code.sh monorepo-builder.php full-tool-build.sh easy-ci.php scoper.php rector.php rector-local packages-tests php-scoper.phar
- run: rm -rf build prefix-code.sh monorepo-builder.php full-tool-build.sh scoper.php rector.php rector-local packages-tests php-scoper.phar

# setup git user
-
Expand All @@ -62,4 +62,4 @@ jobs:
git add --all
git commit -m "release PHP 7.2 downgraded"
git tag "${GITHUB_REF#refs/tags/}.72"
git push origin "${GITHUB_REF#refs/tags/}.72"
git push origin "${GITHUB_REF#refs/tags/}.72"
52 changes: 0 additions & 52 deletions build/build-scoped.sh

This file was deleted.

11 changes: 6 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@
"require-dev": {
"phpunit/phpunit": "^9.5.26",
"cweagans/composer-patches": "^1.7",
"rector/rector": "^0.15.10",
"phpstan/phpstan": "^1.9.14",
"symplify/easy-coding-standard": "^11.2",
"symplify/easy-ci": "^11.2",
"rector/rector": "^0.17",
"phpstan/phpstan": "^1.10",
"symplify/easy-coding-standard": "^12.0",
"symplify/easy-ci": "^11.3",
"symplify/phpstan-extensions": "^11.1",
"phpstan/extension-installer": "^1.2",
"php-parallel-lint/php-parallel-lint": "^1.3",
"tracy/tracy": "^2.9"
"tracy/tracy": "^2.9",
"tomasvotruba/class-leak": "0.1.1.72"
},
"autoload": {
"psr-4": {
Expand Down
18 changes: 0 additions & 18 deletions easy-ci.php

This file was deleted.

1 change: 0 additions & 1 deletion ecs.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
$ecsConfig->paths([
__DIR__ . '/ecs.php',
__DIR__ . '/rector.php',
__DIR__ . '/easy-ci.php',
__DIR__ . '/config',
__DIR__ . '/src',
__DIR__ . '/tests',
Expand Down
4 changes: 2 additions & 2 deletions src/FileSystem/ComposerJsonProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public function getPackageFileInfoByName(string $packageName): SmartFileInfo

public function getRootComposerJson(): ComposerJson
{
$rootFileInfo = $this->packageComposerFinder->getRootPackageComposerFile();
return $this->composerJsonFactory->createFromFileInfo($rootFileInfo);
$rootPackageComposerFile = $this->packageComposerFinder->getRootPackageComposerFile();
return $this->composerJsonFactory->createFromFileInfo($rootPackageComposerFile);
}
}
3 changes: 3 additions & 0 deletions src/Git/MostRecentTagResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
use Symplify\MonorepoBuilder\Contract\Git\TagResolverInterface;
use Symplify\MonorepoBuilder\Release\Process\ProcessRunner;

/**
* @api used by default autowire
*/
final class MostRecentTagResolver implements TagResolverInterface
{
/**
Expand Down
2 changes: 1 addition & 1 deletion tests/DependencyUpdater/DependencyUpdaterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ protected function setUp(): void
{
$this->bootKernel(MonorepoBuilderKernel::class);

$this->dependencyUpdater = $this->getService(DependencyUpdater::class);
$this->dependencyUpdater = $this->getService(DependencyUpdater::class);
$this->smartFileSystem = $this->getService(SmartFileSystem::class);
}

Expand Down