Skip to content

Commit

Permalink
bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
schnittstabil committed May 22, 2017
1 parent eef058b commit f1f71e2
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 24 deletions.
26 changes: 15 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,30 @@
language: php

php:
- 5.6
- 7
- hhvm

sudo: false
matrix:
include:
- php: 7
env: LINT=yes QA=yes
- php: 7.1
- php: hhvm
- php: nightly
allow_failures:
- php: hhvm
- php: nightly

install:
- composer selfupdate
- if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then composer global require --update-no-dev sugared-rim/cs; fi
- composer install
- if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then composer global require --update-no-dev codeclimate/php-test-reporter satooshi/php-coveralls; fi
- if [ "$LINT" == "yes" ]; then composer global require --update-no-dev sugared-rim/cs; fi
- if [ "$QA" == "yes" ]; then composer global require --update-no-dev codeclimate/php-test-reporter:dev-master satooshi/php-coveralls; fi
- export PATH=$PATH:`composer global config bin-dir --absolute`

script:
- composer travis
- if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then composer lint; fi
- if [ "$LINT" == "yes" ]; then composer lint; fi

after_success:
- if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then test-reporter; fi
- if [ "$TRAVIS_PHP_VERSION" == "5.6" ]; then coveralls -v; fi
- if [ "$QA" == "yes" ]; then coveralls -v; fi
- if [ "$QA" == "yes" ]; then test-reporter; fi

addons:
code_climate:
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"psr-4": { "SugaredRim\\Sami\\": "tests" }
},
"require": {
"php": ">=5.6.0",
"sami/sami": "^3.2",
"schnittstabil/composer-extra": "^0.5",
"php": ">=7",
"sami/sami": "^4.0",
"schnittstabil/composer-extra": "^2.0",
"schnittstabil/get": "^2.0"
},
"require-dev": {
"sugared-rim/phpunit": "^0.5",
"sugared-rim/phpunit": "^6.0",
"symfony/event-dispatcher": "^3.1"
},
"extra": {
Expand All @@ -47,10 +47,10 @@
"sugared-rim-cs"
],
"test": [
"sugared-phpunit",
"sugared-rim-phpunit",
"./sugared-rim-sami --help",
"composer lint"
],
"travis": "sugared-phpunit"
"travis": "sugared-rim-phpunit"
}
}
2 changes: 1 addition & 1 deletion tests/Console/ApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
use SugaredRim\Sami\Console\Command\UpdateCommand;
use Symfony\Component\Filesystem\Filesystem;

class ApplicationTest extends \PHPUnit_Framework_TestCase
class ApplicationTest extends \PHPUnit\Framework\TestCase
{
/**
* @SuppressWarnings(PHPMD.StaticAccess)
Expand Down
8 changes: 4 additions & 4 deletions tests/Console/Command/SugaredCommandTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
/**
* @coversDefaultClass \SugaredRim\Sami\Console\Command\SugaredCommandTrait
*/
class SugaredCommandTraitTest extends \PHPUnit_Framework_TestCase
class SugaredCommandTraitTest extends \PHPUnit\Framework\TestCase
{
/*
* @covers ::configure
Expand All @@ -26,7 +26,7 @@ public function testConfigArgumentIsOptional()
/**
* @group integration
* @covers ::initialize
* @covers SugaredRim\Sami\Console\Command\ParseCommand
* @covers \SugaredRim\Sami\Console\Command\ParseCommand
*
* @SuppressWarnings(PHPMD.StaticAccess)
*/
Expand All @@ -53,7 +53,7 @@ public function testExecuteShouldUseDefaultConfigArgument()
/**
* @group integration
* @covers ::initialize
* @covers SugaredRim\Sami\Console\Command\UpdateCommand
* @covers \SugaredRim\Sami\Console\Command\UpdateCommand
*/
public function testExecuteShouldAllowConfigArgument()
{
Expand All @@ -77,7 +77,7 @@ public function testExecuteShouldAllowConfigArgument()
/**
* @group integration
* @covers ::initialize
* @covers SugaredRim\Sami\Console\Command\RenderCommand
* @covers \SugaredRim\Sami\Console\Command\RenderCommand
*/
public function testExecuteShouldAllowOnlyVersionOption()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/SamiFactoryAwareTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace SugaredRim\Sami;

class SamiFactoryAwareTraitTest extends \PHPUnit_Framework_TestCase
class SamiFactoryAwareTraitTest extends \PHPUnit\Framework\TestCase
{
public function setUp()
{
Expand Down
2 changes: 1 addition & 1 deletion tests/SamiFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use Sami\Parser\Filter\DefaultFilter;
use Sami\Parser\Filter\FilterInterface;

class SamiFactoryTest extends \PHPUnit_Framework_TestCase
class SamiFactoryTest extends \PHPUnit\Framework\TestCase
{
public function testInvokeShouldReturnSamiInstance()
{
Expand Down

0 comments on commit f1f71e2

Please sign in to comment.