Skip to content
This repository has been archived by the owner on Jun 26, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
k-holy committed Mar 19, 2014
2 parents 572e9b9 + 6f8127f commit b0628ce
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 36 deletions.
2 changes: 1 addition & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
src_dir: .
src_dir: ./src
coverage_clover: build/logs/clover.xml
json_path: build/logs/coveralls-upload.json
exclude_no_stmt: true
20 changes: 0 additions & 20 deletions Tests/bootstrap.php

This file was deleted.

8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "volcanus/radix-converter",
"homepage": "https://github.com/k-holy/volcanus-radix-converter",
"type": "library",
"version": "0.1.2",
"version": "0.1.3",
"license": "MIT",
"authors": [
{
Expand All @@ -11,12 +11,10 @@
}
],
"autoload": {
"psr-0": { "Volcanus\\RadixConverter": "." }
"psr-0": { "Volcanus\\RadixConverter": "src/" }
},
"target-dir": "Volcanus/RadixConverter",
"require": {
"php": ">=5.3",
"ext-bcmath" : "*"
"php": ">=5.3.3"
},
"require-dev": {
"satooshi/php-coveralls": "dev-master"
Expand Down
11 changes: 4 additions & 7 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<phpunit
backupGlobals="false"
backupStaticAttributes="false"
bootstrap="Tests/bootstrap.php"
bootstrap="tests/bootstrap.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
Expand All @@ -18,19 +18,16 @@
>
<testsuites>
<testsuite name="Volcanus_RadixConverter">
<directory suffix="Test.php">./Tests/</directory>
<directory suffix="Test.php">./tests/Volcanus/RadixConverter/Test/</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>.</directory>
<directory>./src</directory>
<exclude>
<directory>./Tests</directory>
<directory>./tests</directory>
<directory>./vendor</directory>
</exclude>
</whitelist>
</filter>
<logging>
<log type="coverage-text" target="php://stdout" showUncoveredFiles="true"/>
</logging>
</phpunit>
File renamed without changes.
5 changes: 3 additions & 2 deletions testrunner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ general:
test_targets:
recursive: true
resources:
- Tests
- tests
autotest:
enabled: false
watch_dirs:
- Tests
- src
- tests
notify: true

phpunit:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* @copyright 2011-2013 k-holy <k.holy74@gmail.com>
* @license The MIT License (MIT)
*/
namespace Volcanus\RadixConverter\Tests;
namespace Volcanus\RadixConverter\Test;

use Volcanus\RadixConverter\RadixConverter;

Expand Down
11 changes: 11 additions & 0 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php
/**
* Volcanus libraries for PHP
*
* @copyright 2011-2013 k-holy <k.holy74@gmail.com>
* @license The MIT License (MIT)
*/
error_reporting(E_ALL | E_STRICT | E_DEPRECATED);

$loader = include realpath(__DIR__ . '/../vendor/autoload.php');
$loader->add('Volcanus\RadixConverter\Test', __DIR__);

0 comments on commit b0628ce

Please sign in to comment.