Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

CS fixes #26

Merged
merged 2 commits into from
Oct 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"composer/composer": ">=1.0.0-alpha10",
"phpunit/phpunit": "^4.7",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^2.5",
"squizlabs/php_codesniffer": "^2.7",
"mikey179/vfsStream": "^1.6"
},
"autoload": {
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
<!-- inherit rules from: -->
<rule ref="PSR2"/>
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
<rule ref="Generic.Formatting.SpaceAfterNot"/>
<rule ref="Squiz.WhiteSpace.OperatorSpacing">
<properties>
<property name="ignoreNewlines" value="true"/>
</properties>
</rule>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
<properties>
<property name="ignoreBlankLines" value="false"/>
Expand Down
2 changes: 1 addition & 1 deletion test/ComponentInstallerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@ public function testModuleIsAppended()
$modules = $config['modules'];
$this->assertEquals([
'Some\Component',
'Some\Module'
'Some\Module',
], $modules);
}

Expand Down
2 changes: 1 addition & 1 deletion test/ConfigDiscoveryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public function createApplicationConfig()

public function createDevelopmentConfig($dist = true)
{
$configFileName = 'config/development.config.php' . ($dist?'.dist':'');
$configFileName = 'config/development.config.php' . ($dist ? '.dist' : '');
vfsStream::newFile($configFileName)
->at($this->projectRoot)
->setContent('<' . "?php\nreturn [\n 'modules' => [\n ]\n];");
Expand Down