Skip to content

chore!: handle conflict phpunit 12+ conflict preload with rector #44

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore!: handle conflict phpunit 12+ conflict preload with rector #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44ec5ca
chore!: handle conflict phpunit+ conflict preload
samsonasik Jul 2, 2025
a2b78cb
chore!: clean up
samsonasik Jul 2, 2025
c2339e2
chore!: temporary use rector dev-main
samsonasik Jul 23, 2025
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
4 changes: 4 additions & 0 deletions build/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ logs/*
coverage/*
!coverage
!coverage/.gitkeep

coverage/*
!coverage
!coverage/.gitkeep
7 changes: 5 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"require": {
"php": "^8.1",
"rector/rector": "^1.0 || ^2.1"
"rector/rector": "dev-main#3c07e2ab69c55752e5f143ea99119b475e14ac19"
Copy link
Author

@samsonasik samsonasik Jul 23, 2025

Choose a reason for hiding this comment

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

@ostrolucky I temporary use rector/rector:dev-main so it can be checked that it works on this PR

Copy link
Owner

@ostrolucky ostrolucky Jul 23, 2025

Choose a reason for hiding this comment

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

Seems that it did the trick!

Copy link
Author

@samsonasik samsonasik Jul 23, 2025

Choose a reason for hiding this comment

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

@ostrolucky feel free to take care the rest when next rector released :)

},
"require-dev": {
"ramsey/devtools": "^2.0"
Expand All @@ -29,7 +29,10 @@
"autoload-dev": {
"psr-4": {
"Ostrolucky\\Test\\RectorRules\\": "tests/"
}
},
"files": [
"vendor/rector/rector/preload.php"
]
},
"config": {
"allow-plugins": {
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="./tests/bootstrap.php"
bootstrap="./vendor/autoload.php"
colors="true"
cacheDirectory="./build/cache/phpunit">

Expand Down
7 changes: 0 additions & 7 deletions tests/bootstrap.php
View file
Open in desktop

This file was deleted.