Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Fix for cachetool with old symfony.
  PartialCleanDir should also delete folders.
  • Loading branch information
Jelle-S committed Mar 2, 2017
2 parents bb2105c + e50862d commit b31a08c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"require-dev": {
"phpunit/phpunit": "~4.4",
"codeclimate/php-test-reporter": "dev-master",
"gordalina/cachetool": "^2.1"
"gordalina/cachetool": "^2.1|^1.11"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/PartialCleanDirs.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function __construct(array $dirs, Finder $finder = null, Filesystem $fs =
{
$this->dirs($dirs);
$this->finder = is_null($finder)
? (new Finder())->files()->ignoreDotFiles(false)->ignoreVCS(false)
? (new Finder())->ignoreDotFiles(false)->ignoreVCS(false)
: $finder;
$this->fs = is_null($fs)
? new Filesystem()
Expand Down

0 comments on commit b31a08c

Please sign in to comment.