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

Enable include rule in php-cs-fixer #14418

Merged
merged 4 commits into from
Jul 10, 2017
Merged

Conversation

rob006
Copy link
Contributor

@rob006 rob006 commented Jul 9, 2017

@rob006 rob006 changed the title Cs fixer include Enable heredoc_to_nowdoc in php-cs-fixer Jul 9, 2017
@rob006 rob006 changed the title Enable heredoc_to_nowdoc in php-cs-fixer Enable include rule in php-cs-fixer Jul 9, 2017
@samdark samdark added this to the 2.0.13 milestone Jul 10, 2017
@samdark samdark self-assigned this Jul 10, 2017
@samdark
Copy link
Member

samdark commented Jul 10, 2017

Please resolve conflicts. Thanks.

# Conflicts:
#	framework/console/Application.php
#	framework/rbac/PhpManager.php
#	framework/test/ActiveFixture.php
#	framework/test/ArrayFixture.php
#	framework/test/BaseActiveFixture.php
@rob006
Copy link
Contributor Author

rob006 commented Jul 10, 2017

Done.

@samdark samdark merged commit a50d9d8 into yiisoft:master Jul 10, 2017
@samdark
Copy link
Member

samdark commented Jul 10, 2017

Merged. Thanks!

@rob006 rob006 deleted the cs-fixer-include branch July 10, 2017 10:20
@@ -97,7 +97,7 @@ configuration file for the [Basic Project Template](start-installation.md).
$config = [
'id' => 'basic',
'basePath' => dirname(__DIR__),
'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
'extensions' => require __DIR__ . '/../vendor/yiisoft/extensions.php',
Copy link
Member

Choose a reason for hiding this comment

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

Imo the function syntax is easier to read in cases where require is used to return something...

Copy link
Member

Choose a reason for hiding this comment

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

It's fine either way. Less characters — less noise.

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