Skip to content

Commit

Permalink
updated composer.json, TestCaseEnvironment and FilteUtilTest
Browse files Browse the repository at this point in the history
  • Loading branch information
Konstantin Wagner committed Feb 21, 2018
1 parent d07153c commit 2a4778b
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 62 deletions.
105 changes: 52 additions & 53 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,57 +1,56 @@
{
"name": "heimrichhannot/contao-utils-bundle",
"type": "contao-bundle",
"description": "This bundle offers various utility functionality for the Contao CMS.",
"license": "LGPL-3.0-or-later",
"require": {
"php": ">=7.1.0",
"contao/core-bundle": "^4.4",
"heimrichhannot/contao-request": "^1.2",
"roderik/pwgen-php": ">=0.1.5",
"contao-community-alliance/composer-client": "~0.14"
"name": "heimrichhannot/contao-utils-bundle",
"type": "contao-bundle",
"description": "This bundle offers various utility functionality for the Contao CMS.",
"license": "LGPL-3.0-or-later",
"require": {
"php": ">=7.1.0",
"contao/core-bundle": "^4.4",
"heimrichhannot/contao-request": "^1.2",
"roderik/pwgen-php": ">=0.1.5"
},
"require-dev": {
"contao/manager-plugin": "^2.0",
"friendsofphp/php-cs-fixer": "^2.2",
"phpunit/phpunit": "^6.0",
"satooshi/php-coveralls": "^1.0",
"contao/test-case": "^1.1",
"php-http/guzzle6-adapter": "^1.1"
},
"autoload": {
"psr-4": {
"HeimrichHannot\\UtilsBundle\\": "src/"
},
"require-dev": {
"contao/manager-plugin": "^2.0",
"friendsofphp/php-cs-fixer": "^2.2",
"phpunit/phpunit": "^6.0",
"satooshi/php-coveralls": "^1.0",
"contao/test-case": "^1.1",
"php-http/guzzle6-adapter": "^1.1"
},
"autoload": {
"psr-4": {
"HeimrichHannot\\UtilsBundle\\": "src/"
},
"classmap": [
"src/"
],
"exclude-from-classmap": [
"src/Resources/contao/config/",
"src/Resources/contao/dca/",
"src/Resources/contao/languages/",
"src/Resources/contao/templates/"
]
},
"autoload-dev": {
"psr-4": {
"HeimrichHannot\\UtilsBundle\\Test\\": "tests/"
}
},
"config": {
"preferred-install": "dist",
"component-dir": "../assets/components"
},
"extra": {
"contao-manager-plugin": "HeimrichHannot\\UtilsBundle\\ContaoManager\\Plugin"
},
"repositories": [
{
"type": "composer",
"url": "https://legacy-packages-via.contao-community-alliance.org/"
},
{
"type": "artifact",
"url": "packages"
}
"classmap": [
"src/"
],
"exclude-from-classmap": [
"src/Resources/contao/config/",
"src/Resources/contao/dca/",
"src/Resources/contao/languages/",
"src/Resources/contao/templates/"
]
},
"autoload-dev": {
"psr-4": {
"HeimrichHannot\\UtilsBundle\\Test\\": "tests/"
}
},
"config": {
"preferred-install": "dist",
"component-dir": "../assets/components"
},
"extra": {
"contao-manager-plugin": "HeimrichHannot\\UtilsBundle\\ContaoManager\\Plugin"
},
"repositories": [
{
"type": "composer",
"url": "https://legacy-packages-via.contao-community-alliance.org/"
},
{
"type": "artifact",
"url": "packages"
}
]
}
15 changes: 13 additions & 2 deletions composer.json~
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,20 @@
}
},
"config": {
"preferred-install": "dist"
"preferred-install": "dist",
"component-dir": "../assets/components"
},
"extra": {
"contao-manager-plugin": "HeimrichHannot\\UtilsBundle\\ContaoManager\\Plugin"
}
},
"repositories": [
{
"type": "composer",
"url": "https://legacy-packages-via.contao-community-alliance.org/"
},
{
"type": "artifact",
"url": "packages"
}
]
}
2 changes: 1 addition & 1 deletion tests/File/FileUtilTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ public function testGetFileLineCount()
$this->assertSame(1, $lines);

$lines = $fileUtil->getFileLineCount('foo');
$this->assertSame('fopen(/home/kwagner/Kunden/github/contao-utils-bundle/tests/foo): failed to open stream: No such file or directory', $lines);
$this->assertSame('fopen('.TL_ROOT.'/foo): failed to open stream: No such file or directory', $lines);
}

public function testGetFolderFromDca()
Expand Down
6 changes: 0 additions & 6 deletions tests/TestCaseEnvironment.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,8 @@ public static function tearDownAfterClass(): void
{
parent::tearDownAfterClass();

$tmpDir = self::getTempDir();

$fs = new Filesystem();

if ($fs->exists($tmpDir)) {
$fs->remove($tmpDir);
}

if ($fs->exists(TL_ROOT.'/tmp')) {
$fs->remove(TL_ROOT.'/tmp');
}
Expand Down

0 comments on commit 2a4778b

Please sign in to comment.