Skip to content

Commit

Permalink
Merge b321ccb into 3bff247
Browse files Browse the repository at this point in the history
  • Loading branch information
pgrimaud committed Apr 29, 2020
2 parents 3bff247 + b321ccb commit 9f6eefa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docs/file-loader.md
Expand Up @@ -174,7 +174,7 @@ Because the included file's scope references the Config instance, it is possible
$this->addFile('path/to/config.json');
```

In Charcoal, this approach is used to load environment-bound configuration files and seperate an application's settings into different topics.
In Charcoal, this approach is used to load environment-bound configuration files and separate an application's settings into different topics.



Expand Down
2 changes: 1 addition & 1 deletion phpcs.xml.dist
Expand Up @@ -159,7 +159,7 @@

<!-- Do not allow multiple PHP statements (;) on a same line -->
<rule ref="Generic.Formatting.DisallowMultipleStatements" />
<!-- Make sure all adjacent assigments are properly aligned, for the extra-pedantic in you -->
<!-- Make sure all adjacent assignments are properly aligned, for the extra-pedantic in you -->
<!--<rule ref="Generic.Formatting.MultipleStatementAlignment" />-->

<!-- Ensure there are no spaces after a typecast Ex: (array)$x -->
Expand Down
2 changes: 1 addition & 1 deletion tests/Charcoal/Config/Mixin/SeparatorAwareTest.php
Expand Up @@ -82,7 +82,7 @@ public function testSeparatorAwareInterface()



// Test Seperator Token
// Test Separator Token
// =========================================================================

/**
Expand Down

0 comments on commit 9f6eefa

Please sign in to comment.