Skip to content

Drop d9 #807

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.

Sign up for GitHub

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

Merged
merged 22 commits into from
Nov 19, 2024
Merged

Drop d9 #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a0c7de7
D10+ composer dependencies
Boegie Nov 15, 2024
8bf48c3
[Compser] D10+ composer dependencies
Boegie Nov 15, 2024
b3b513e
{CI} Drop D9 from testing matrices
Boegie Nov 15, 2024
46ad904
{Rules} Drop AccessDeprecatedConstantTest, and \mglaman\PHPStanDrupal…
Boegie Nov 15, 2024
181a5df
Revert "{Rules} Drop AccessDeprecatedConstantTest, and \mglaman\PHPSt…
Boegie Nov 15, 2024
005d2fe
Reapply "{Rules} Drop AccessDeprecatedConstantTest, and \mglaman\PHPS…
Boegie Nov 15, 2024
d114861
{Rules} Drop AccessDeprecatedConstantTest, and \mglaman\PHPStanDrupal…
Boegie Nov 15, 2024
9a0c2b6
{Rules} Drop \mglaman\PHPStanDrupal\Tests\Rules\ClassExtendsInternalC…
Boegie Nov 15, 2024
c3da108
[HACK]] Temporarily remove core_baseline test
Boegie Nov 15, 2024
8cd30d3
{Rules} Drop AccessDeprecatedConstantTest, \mglaman\PHPStanDrupal\Rul…
Boegie Nov 15, 2024
fd49bde
{Rules} Drop ConditionManagerCreateInstanceContextConfigurationRuleTe…
Boegie Nov 15, 2024
a8c7236
{Rules} Drop \mglaman\PHPStanDrupal\Tests\Rules\DeprecatedHookImpleme…
Boegie Nov 15, 2024
484c5cd
{Rules} Drop \mglaman\PHPStanDrupal\Tests\Rules\GetDeprecatedServiceR…
Boegie Nov 15, 2024
7401668
[Rule Tests] Adjust linenumber
Boegie Nov 15, 2024
185922c
{Rules} \mglaman\PHPStanDrupal\Tests\Rules\RequestStackGetMainRequest…
Boegie Nov 15, 2024
23f907e
{Rules} \mglaman\PHPStanDrupal\Tests\Rules\RequestStackGetMainRequest…
Boegie Nov 15, 2024
bfbf95d
{Rules} Dropped \mglaman\PHPStanDrupal\Tests\Rules\SymfonyCmfRouteObj…
Boegie Nov 15, 2024
773f4ea
[Tests] Cleanup
Boegie Nov 15, 2024
3cafcbc
Revert "[HACK]] Temporarily remove core_baseline test"
Boegie Nov 15, 2024
884ec5a
[Composer] Bump dependencies to match core 10.0.0 minimum
Boegie Nov 15, 2024
65401a3
Merge branch 'main' into drop-d9
Boegie Nov 19, 2024
f5ed930
Drop CircleCI
Boegie Nov 19, 2024
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
148 changes: 0 additions & 148 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions .circleci/generate-local-config.sh
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions .circleci/run-local-config.sh
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ jobs:
drupal:
- "^10"
include:
- php-version: "8.1"
drupal: "^9.0"
experimental: false
- php-version: "8.3"
drupal: "11.x-dev"
experimental: true
Expand All @@ -65,9 +62,6 @@ jobs:
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
- name: "Set drupal/core to ${{ matrix.drupal }}"
run: "composer require drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
- name: "Add phpspec/prophecy-phpunit"
run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
if: ${{ matrix.drupal == '^9.0' }}
- name: "Install dependencies"
uses: "ramsey/composer-install@v3"
- name: "PHPUnit"
Expand All @@ -89,9 +83,6 @@ jobs:
drupal:
- "^10"
include:
- php-version: "8.1"
drupal: "^9.0"
experimental: false
- php-version: "8.3"
drupal: "11.x-dev"
experimental: true
Expand Down Expand Up @@ -165,9 +156,6 @@ jobs:
drupal:
- "^10"
include:
- php-version: "8.1"
drupal: "^9.0"
experimental: false
- php-version: "8.3"
drupal: "11.x-dev"
experimental: true
Expand Down Expand Up @@ -245,7 +233,6 @@ jobs:
cd drupal
composer config repositories.0 composer https://packages.drupal.org/8
composer config repositories.1 path $GITHUB_WORKSPACE

- name: "Install Drupal core dependencies"
uses: "ramsey/composer-install@v3"
with:
Expand Down
18 changes: 9 additions & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,21 @@
"php": "^8.1",
"phpstan/phpstan": "^2.0",
"phpstan/phpstan-deprecation-rules": "^2.0",
"symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0",
"symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0",
"symfony/finder": "^6.2 || ^7.0",
"symfony/yaml": "^6.2 || ^7.0",
"webflo/drupal-finder": "^1.3.1"
},
"require-dev": {
"behat/mink": "^1.8",
"behat/mink": "^1.10",
"composer/installers": "^1.9",
"drupal/core-recommended": "^10",
"drush/drush": "^10.0 || ^11 || ^12 || ^13@beta",
"phpstan/extension-installer": "1.4.3",
"drush/drush": "^11 || ^12 || ^13",
"phpstan/extension-installer": "^1.4.3",
"phpstan/phpstan-strict-rules": "^2.0",
"phpunit/phpunit": "^8.5 || ^9 || ^10 || ^11",
"slevomat/coding-standard": "^7.1",
"squizlabs/php_codesniffer": "^3.3",
"symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0"
"phpunit/phpunit": "^9 || ^10 || ^11",
"slevomat/coding-standard": "^8.6",
"squizlabs/php_codesniffer": "^3.7",
"symfony/phpunit-bridge": "^6.2 || ^7.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down
10 changes: 0 additions & 10 deletions phpstan-baseline.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,6 @@ parameters:
count: 1
path: src/Drupal/DrupalAutoloader.php

-
message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantArrayType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantArrays\\(\\) instead\\.$#"
count: 1
path: src/Rules/Deprecations/ConditionManagerCreateInstanceContextConfigurationRule.php

-
message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
count: 1
path: src/Rules/Deprecations/ConditionManagerCreateInstanceContextConfigurationRule.php

-
message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
count: 2
Expand Down
5 changes: 0 additions & 5 deletions rules.neon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ rules:
- mglaman\PHPStanDrupal\Rules\Drupal\Coder\DiscouragedFunctionsRule
- mglaman\PHPStanDrupal\Rules\Drupal\GlobalDrupalDependencyInjectionRule
- mglaman\PHPStanDrupal\Rules\Drupal\PluginManager\PluginManagerSetsCacheBackendRule
- mglaman\PHPStanDrupal\Rules\Deprecations\AccessDeprecatedConstant
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need this rule in case future constants are deprecated? Or does PHP now support reading comments from constants... I think it does, so this rule isn't needed. Worth double checking.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah it's been out for a while https://x.com/markusstaab/status/1765984217937154473

- mglaman\PHPStanDrupal\Rules\Deprecations\ConditionManagerCreateInstanceContextConfigurationRule
- mglaman\PHPStanDrupal\Rules\Drupal\RenderCallbackRule
- mglaman\PHPStanDrupal\Rules\Deprecations\StaticServiceDeprecatedServiceRule
- mglaman\PHPStanDrupal\Rules\Deprecations\GetDeprecatedServiceRule
Expand All @@ -13,9 +11,6 @@ rules:
- mglaman\PHPStanDrupal\Rules\Drupal\ModuleLoadInclude
- mglaman\PHPStanDrupal\Rules\Drupal\LoadIncludes
- mglaman\PHPStanDrupal\Rules\Drupal\EntityQuery\EntityQueryHasAccessCheckRule
- mglaman\PHPStanDrupal\Rules\Deprecations\SymfonyCmfRouteObjectInterfaceConstantsRule
- mglaman\PHPStanDrupal\Rules\Deprecations\SymfonyCmfRoutingInClassMethodSignatureRule
- mglaman\PHPStanDrupal\Rules\Drupal\RequestStackGetMainRequestRule
- mglaman\PHPStanDrupal\Rules\Drupal\TestClassesProtectedPropertyModulesRule

conditionalTags:
Expand Down
Loading
Loading