Skip to content

Commit

Permalink
Merge pull request #2 from myENA/feature/ansi-logger
Browse files Browse the repository at this point in the history
updating license key
  • Loading branch information
dcarbone authored Feb 9, 2018
2 parents 6c64043 + 2cab2c9 commit 3e78278
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 54 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ php:
- 5.6
- 7.0
- 7.1
- 7.2

before_script:
- composer install --no-interaction --no-suggest --optimize-autoloader
Expand Down
46 changes: 22 additions & 24 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
{
"name": "myena/default-logger",
"type": "library",
"description": "A simple PSR-3 compliant logger",
"license": "MPLv2.0",
"authors": [
{
"name": "Daniel Carbone",
"email": "dcarbone@ena.com"
}
],

"autoload": {
"psr-4": {
"MyENA\\": "src/"
}
},

"require": {
"psr/log": "1.*",
"bramus/ansi-php": "3.0.*"
},

"require-dev": {
"phpunit/phpunit": "5.7.*"
"name": "myena/default-logger",
"type": "library",
"description": "A simple PSR-3 compliant logger",
"license": "MPL-2.0",
"authors": [
{
"name": "Daniel Carbone",
"email": "dcarbone@ena.com"
}
],
"autoload": {
"psr-4": {
"MyENA\\": "src/"
}
},
"require": {
"php": ">=5.6",
"psr/log": "1.*",
"bramus/ansi-php": "3.0.*"
},
"require-dev": {
"phpunit/phpunit": "@stable"
}
}
14 changes: 1 addition & 13 deletions phpunit.local.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.7/phpunit.xsd"
bootstrap="./vendor/autoload.php"
backupGlobals="true"
backupStaticAttributes="false"
cacheTokens="false"
colors="true"
forceCoversAnnotation="false"
printerClass="PHPUnit_TextUI_ResultPrinter"
processIsolation="false"
stopOnError="true"
stopOnFailure="true"
stopOnIncomplete="false"
stopOnSkipped="false"
stopOnRisky="false"
testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
verbose="false">
>

<testsuites>
<testsuite name="default">
Expand Down
23 changes: 9 additions & 14 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.7/phpunit.xsd"
bootstrap="./vendor/autoload.php"
backupGlobals="true"
backupStaticAttributes="false"
cacheTokens="false"
colors="true"
forceCoversAnnotation="false"
printerClass="PHPUnit_TextUI_ResultPrinter"
processIsolation="false"
stopOnError="true"
stopOnFailure="true"
stopOnIncomplete="false"
stopOnSkipped="false"
stopOnRisky="false"
testSuiteLoaderClass="PHPUnit_Runner_StandardTestSuiteLoader"
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
verbose="false">
>

<testsuites>
<testsuite name="default">
Expand All @@ -28,8 +16,15 @@
<testsuite name="custom">
<file>./tests/CustomStateTest.php</file>
</testsuite>
<testsuite name="default-ansi">
<file>./tests/DefaultANSITest.php</file>
</testsuite>
</testsuites>


<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src/</directory>
</whitelist>
</filter>

</phpunit>
2 changes: 1 addition & 1 deletion tests/CustomStateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class CustomStateTest
*/
class CustomStateTest extends PHPUnit_Framework_TestCase
class CustomStateTest extends \PHPUnit\Framework\TestCase
{
const TMP_DIR = __DIR__.'/../tmp';
const TMP_LOGFILE = self::TMP_DIR.'/test.log';
Expand Down
2 changes: 1 addition & 1 deletion tests/DefaultANSITest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class DefaultANSITest
*/
class DefaultANSITest extends PHPUnit_Framework_TestCase {
class DefaultANSITest extends \PHPUnit\Framework\TestCase {
/**
* @return \MyENA\DefaultANSILogger
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/DefaultStateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/**
* Class DefaultStateTest
*/
class DefaultStateTest extends PHPUnit_Framework_TestCase
class DefaultStateTest extends \PHPUnit\Framework\TestCase
{
/**
* @return \MyENA\DefaultLogger
Expand Down

0 comments on commit 3e78278

Please sign in to comment.