From bd4f78c330dc2f4215983548c7fd14dc932c8955 Mon Sep 17 00:00:00 2001 From: Alexandre Daubois Date: Thu, 2 May 2024 13:02:31 +0200 Subject: [PATCH 1/3] Fix various warnings across components test suite --- Tests/Functional/AbstractWebTestCase.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/Functional/AbstractWebTestCase.php b/Tests/Functional/AbstractWebTestCase.php index f9363e82..51d4d781 100644 --- a/Tests/Functional/AbstractWebTestCase.php +++ b/Tests/Functional/AbstractWebTestCase.php @@ -33,7 +33,7 @@ public static function tearDownAfterClass(): void static::deleteTmpDir(); } - public function provideSecuritySystems() + public static function provideSecuritySystems() { yield [['enable_authenticator_manager' => true]]; yield [['enable_authenticator_manager' => false]]; From c63dcf53da7e3aca764bf9c70a70d5d39afc38f6 Mon Sep 17 00:00:00 2001 From: Alexandre Daubois Date: Fri, 26 Apr 2024 10:58:17 +0200 Subject: [PATCH 2/3] Remove calls to `getMockForAbstractClass()` --- .../Security/Factory/AbstractFactoryTest.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php index e46a36a4..f8c35cf9 100644 --- a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php +++ b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php @@ -145,7 +145,12 @@ public static function getSuccessHandlers() protected function callFactory($id, $config, $userProviderId, $defaultEntryPointId) { - $factory = $this->getMockForAbstractClass(AbstractFactory::class); + $factory = $this->getMockBuilder(AbstractFactory::class)->onlyMethods([ + 'createAuthProvider', + 'getListenerId', + 'getKey', + 'getPosition', + ])->getMock(); $factory ->expects($this->once()) From d977faacbaf0e6e551443b3b6c14315be6e7fe57 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Fri, 31 May 2024 16:33:22 +0200 Subject: [PATCH 3/3] Revert "minor #54653 Auto-close PRs on subtree-splits (nicolas-grekas)" This reverts commit 2c9352dd91ebaf37b8a3e3c26fd8e1306df2fb73, reversing changes made to 18c3e87f1512be2cc50e90235b144b13bc347258. --- .gitattributes | 3 +- .github/PULL_REQUEST_TEMPLATE.md | 8 ----- .github/workflows/check-subtree-split.yml | 37 ----------------------- 3 files changed, 2 insertions(+), 46 deletions(-) delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .github/workflows/check-subtree-split.yml diff --git a/.gitattributes b/.gitattributes index 14c3c359..84c7add0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ /Tests export-ignore /phpunit.xml.dist export-ignore -/.git* export-ignore +/.gitattributes export-ignore +/.gitignore export-ignore diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 4689c4da..00000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,8 +0,0 @@ -Please do not submit any Pull Requests here. They will be closed. ---- - -Please submit your PR here instead: -https://github.com/symfony/symfony - -This repository is what we call a "subtree split": a read-only subset of that main repository. -We're looking forward to your PR there! diff --git a/.github/workflows/check-subtree-split.yml b/.github/workflows/check-subtree-split.yml deleted file mode 100644 index 16be48ba..00000000 --- a/.github/workflows/check-subtree-split.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Check subtree split - -on: - pull_request_target: - -jobs: - close-pull-request: - runs-on: ubuntu-latest - - steps: - - name: Close pull request - uses: actions/github-script@v6 - with: - script: | - if (context.repo.owner === "symfony") { - github.rest.issues.createComment({ - owner: "symfony", - repo: context.repo.repo, - issue_number: context.issue.number, - body: ` - Thanks for your Pull Request! We love contributions. - - However, you should instead open your PR on the main repository: - https://github.com/symfony/symfony - - This repository is what we call a "subtree split": a read-only subset of that main repository. - We're looking forward to your PR there! - ` - }); - - github.rest.pulls.update({ - owner: "symfony", - repo: context.repo.repo, - pull_number: context.issue.number, - state: "closed" - }); - }