Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Use stable release of robo-digipolis-package.
  Fix tests.
  Also remove dot folders (.git).
  Also remove dot folders (.git).
  Require dev on develop branch.
  • Loading branch information
Jelle-S committed Feb 17, 2017
2 parents 62a27b2 + 1f093a1 commit c7a4b0c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"consolidation/robo": "~1.0",
"php": ">=5.5.0",
"digipolisgent/robo-digipolis-package": "^0.1.0@alpha"
"digipolisgent/robo-digipolis-package": "^0.1"
},
"require-dev": {
"phpunit/phpunit": "~4.4",
Expand Down
4 changes: 3 additions & 1 deletion src/PackageDrupal8.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ protected function cleanMirrorDir()
$folders->in($this->tmpDir);
$folders->depth(0);
$folders->notPath('/^(web|vendor|config)$/');
$folders->ignoreDotFiles(false);
$this->fs->remove($folders);

if (empty($this->ignoreFileNames)) {
Expand All @@ -45,10 +46,11 @@ protected function cleanMirrorDir()
$files = new Finder();
$files->in($this->tmpDir);
$files->ignoreDotFiles(false);
$files->files();

$dotfiles = clone $files;

$files->files();

// Ignore files defined by the dev.
foreach ($this->ignoreFileNames as $fileName) {
$files->name($fileName);
Expand Down
3 changes: 2 additions & 1 deletion tests/PackageDrupal8Test.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function testRun()
{
$projectPath = realpath(__DIR__ . '/../testfiles');
$this->getConfig()->set('digipolis.root.project', $projectPath);
$result = $this->taskPackageDrupal8($this->tarname)->run();
$result = $this->taskPackageDrupal8($this->tarname)->useTmpDir()->run();

// Assert response.
$this->assertEquals('', $result->getMessage());
Expand All @@ -72,6 +72,7 @@ public function testRun()
}
$expected = [
'config/config.yml',
'vendor/vendorlib',
'vendor/vendorlib/libfile.php',
'web/.htaccess',
'web/index.php',
Expand Down

0 comments on commit c7a4b0c

Please sign in to comment.