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

Fix CS bis #1706

Merged
merged 6 commits into from
Nov 19, 2019
Merged

Fix CS bis #1706

merged 6 commits into from
Nov 19, 2019

Conversation

deguif
Copy link
Collaborator

@deguif deguif commented Nov 18, 2019

This PR add two new rules for coding style:

@deguif deguif closed this Nov 18, 2019
@deguif deguif reopened this Nov 18, 2019
@deguif deguif force-pushed the fix-cs-bis branch 2 times, most recently from 5817b5b to bcdf6f7 Compare November 18, 2019 18:27
@deguif
Copy link
Collaborator Author

deguif commented Nov 19, 2019

Not yet ready. I will add a new comment when it’s ready.

@@ -35,7 +35,7 @@ public function setBucketsPath(string $bucketsPath)
*
* @return $this
Copy link
Collaborator

Choose a reason for hiding this comment

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

The return $this should be removed too :)

Copy link
Owner

Choose a reason for hiding this comment

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

Lets separate PR's which are fully automated and manual changes ;-)

@@ -32,7 +32,7 @@ class HttpAdapter extends AbstractTransport
*
* @param Connection $connection
*/
public function __construct(Connection $connection = null, HttpAdapterInterface $httpAdapter)
public function __construct(?Connection $connection = null, HttpAdapterInterface $httpAdapter)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There is a glitch here, optional argument before a non optional argument.

Copy link
Owner

Choose a reason for hiding this comment

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

If we don't make it optional, would things break?

@deguif deguif force-pushed the fix-cs-bis branch 3 times, most recently from 31bbeda to d0213d4 Compare November 19, 2019 10:17
@ruflin
Copy link
Owner

ruflin commented Nov 19, 2019

@deguif Any chance you could update the PR description to contain a bit more details on the change? I'm aware the comment is linked but if someone comes back to this and asking why this all changed, would be nice to have it in a single place summarised.

Copy link
Owner

@ruflin ruflin left a comment

Choose a reason for hiding this comment

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

Change LGTM. We can still follow up with more minor changes.

@thePanz WDYT?

.php_cs.dist Show resolved Hide resolved
@thePanz
Copy link
Collaborator

thePanz commented Nov 19, 2019

@ruflin Ok to merge! I'd squash the changes, just to keep the git history clean. wdyt?

@thePanz thePanz self-requested a review November 19, 2019 13:53
@ruflin ruflin merged commit 0d32a39 into ruflin:master Nov 19, 2019
@ruflin
Copy link
Owner

ruflin commented Nov 19, 2019

@thePanz Yes, I always squash. Commit message is now not optimal because I took just the PR one but well ... @deguif Could you still update the PR description?

@deguif
Copy link
Collaborator Author

deguif commented Nov 19, 2019

@ruflin @thePanz Yes, will do that

@deguif deguif deleted the fix-cs-bis branch November 19, 2019 14:24
@deguif
Copy link
Collaborator Author

deguif commented Nov 19, 2019

@ruflin @thePanz description should now better reflect the changes introduced here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants