Skip to content

Commit 98d8c61

Browse files
committed
Remove blacklist + update defaults for whitelist
1 parent 90e50a1 commit 98d8c61

File tree

3 files changed

+3
-47
lines changed

3 files changed

+3
-47
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1111
- Update PHP requirement to `>=5.6` (from `>=5.3.10`)
1212
- Update `guzzlehttp/guzzle` from `~3.0` to `~4.0`.
1313
- Update `phpunit/php-code-coverage` from `~2.2` to `~4.0||~5.0`.
14+
- Removed blacklist functionality from configuration files (use `whiltelisted`
15+
directories with `include`/`exclude` instead).
1416
- Add/implement missing tests for Xml and Crap4j reporters
1517
- Mark `phpdbg` or `xdebug` specific tests so they are skipped automatically
1618
(using phpunit's @requires).

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,6 @@ default:
135135
- `exclude` - a list of files or directories to exclude from whitelist:
136136
- `directories` - key containing whitelisted directories to exclude.
137137
- `files` - key containing whitelisted files to exclude.
138-
- `blacklist` - blacklist specific options:
139-
- `include` - a list of files or directories to include in blacklist:
140-
- `directories` - key containing blacklisted directories to include.
141-
- `files` - key containing blacklisted files to include.
142-
- `exclude` - a list of files or directories to exclude from blacklist:
143-
- `directories` - key containing blacklisted directories to exclude.
144-
- `files` - key containing blacklisted files to exclude.
145138
- `report` - reporter options:
146139
- `format` - specify report format (`html`, `clover`, `php`, `text`)
147140
- `options` - format options:

src/Extension.php

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -148,46 +148,7 @@ public function configure(ArrayNodeDefinition $builder)
148148
->useAttributeAsKey('name')
149149
->prototype('array')
150150
->children()
151-
->scalarNode('prefix')->defaultValue('')->end()
152-
->scalarNode('suffix')->defaultValue('.php')->end()
153-
->end()
154-
->end()
155-
->end()
156-
->arrayNode('files')
157-
->prototype('scalar')->end()
158-
->end()
159-
->end()
160-
->end()
161-
->arrayNode('exclude')
162-
->addDefaultsIfNotSet()
163-
->children()
164-
->arrayNode('directories')
165-
->useAttributeAsKey('name')
166-
->prototype('array')
167-
->children()
168-
->scalarNode('prefix')->defaultValue('')->end()
169-
->scalarNode('suffix')->defaultValue('.php')->end()
170-
->end()
171-
->end()
172-
->end()
173-
->arrayNode('files')
174-
->prototype('scalar')->end()
175-
->end()
176-
->end()
177-
->end()
178-
->end()
179-
->end()
180-
->arrayNode('blacklist')
181-
->addDefaultsIfNotSet()
182-
->children()
183-
->arrayNode('include')
184-
->addDefaultsIfNotSet()
185-
->children()
186-
->arrayNode('directories')
187-
->useAttributeAsKey('name')
188-
->prototype('array')
189-
->children()
190-
->scalarNode('prefix')->defaultValue('')->end()
151+
->scalarNode('prefix')->defaultValue('src')->end()
191152
->scalarNode('suffix')->defaultValue('.php')->end()
192153
->end()
193154
->end()

0 commit comments

Comments
 (0)