diff options
| author | Hannes Kindströmmer <hannes@kindstrommer.se> | 2017-03-16 08:52:12 +0100 |
|---|---|---|
| committer | Hannes Kindströmmer <hannes@kindstrommer.se> | 2017-03-16 08:52:12 +0100 |
| commit | c61334a3b12576c70863b605bc2f11afb4ee3a2d (patch) | |
| tree | 6cbfaa87c72f8df94df5801e4f16ddbe08596a7d | |
| parent | 6eed547091396ae3cfe7b425c430bd8646b7f084 (diff) | |
| download | ip1-php-sdk-c61334a3b12576c70863b605bc2f11afb4ee3a2d.zip ip1-php-sdk-c61334a3b12576c70863b605bc2f11afb4ee3a2d.tar.gz ip1-php-sdk-c61334a3b12576c70863b605bc2f11afb4ee3a2d.tar.bz2 | |
Merge files from other remote
Signed-off-by: Hannes Kindströmmer <hannes@kindstrommer.se>
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | composer.lock | 18 | ||||
| -rw-r--r-- | phpunit.xml | 8 |
4 files changed, 16 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index 15236c5..924836b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,11 +11,11 @@ matrix: allow_failures: - php: '7.0' - php: nightly - - php: hhvm + - php: hhvm before_script: - composer install --ignore-platform-reqs script: - - phpunit --configuration phpunit.xml + - phpunit - ./vendor/bin/phpcs --standard=codestandard.xml src diff --git a/composer.json b/composer.json index a69f6bc..da0e070 100644 --- a/composer.json +++ b/composer.json @@ -13,8 +13,7 @@ ], "autoload": { "psr-4": { - "IP1\\RESTClient\\": "src", - "IP1\\RESTClient\\Test\\": "tests" + "IP1\\RESTClient\\": "src" } }, "require" : { diff --git a/composer.lock b/composer.lock index 606b7a6..6013d45 100644 --- a/composer.lock +++ b/composer.lock @@ -1723,16 +1723,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.0.9", + "version": "6.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9bd36d990884d8fb3313232e0002ed4cdf79f428" + "reference": "47ee3fa1bca5c50f1d25105201eb20df777bd7b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9bd36d990884d8fb3313232e0002ed4cdf79f428", - "reference": "9bd36d990884d8fb3313232e0002ed4cdf79f428", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/47ee3fa1bca5c50f1d25105201eb20df777bd7b6", + "reference": "47ee3fa1bca5c50f1d25105201eb20df777bd7b6", "shasum": "" }, "require": { @@ -1743,18 +1743,18 @@ "ext-xml": "*", "myclabs/deep-copy": "^1.3", "php": "^7.0", - "phpspec/prophecy": "^1.7", + "phpspec/prophecy": "^1.6.2", "phpunit/php-code-coverage": "^5.0", "phpunit/php-file-iterator": "^1.4", "phpunit/php-text-template": "^1.2", "phpunit/php-timer": "^1.0.6", "phpunit/phpunit-mock-objects": "^4.0", - "sebastian/comparator": "^2.0", + "sebastian/comparator": "^1.2.4 || ^2.0", "sebastian/diff": "^1.2", "sebastian/environment": "^2.0", - "sebastian/exporter": "^3.0", + "sebastian/exporter": "^2.0 || ^3.0", "sebastian/global-state": "^1.1 || ^2.0", - "sebastian/object-enumerator": "^3.0.2", + "sebastian/object-enumerator": "^2.0 || ^3.0", "sebastian/resource-operations": "^1.0", "sebastian/version": "^2.0" }, @@ -1801,7 +1801,7 @@ "testing", "xunit" ], - "time": "2017-03-15T13:04:13+00:00" + "time": "2017-03-02T15:24:03+00:00" }, { "name": "phpunit/phpunit-mock-objects", diff --git a/phpunit.xml b/phpunit.xml index 51b431d..2c49f33 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -4,16 +4,16 @@ convertWarningsToExceptions="true"> <testsuites> <testsuite name="recipient"> - <directory>tests/Recipient</directory> + <directory>tests/recipient</directory> </testsuite> <testsuite name="sms"> - <directory>tests/SMS</directory> + <directory>tests/sms</directory> </testsuite> <testsuite name="general"> - <directory>tests/General</directory> + <directory>tests/general</directory> </testsuite> <testsuite name="core"> - <directory>tests/Core</directory> + <directory>tests/core</directory> </testsuite> </testsuites> </phpunit> |