From f1f71e2cd1dd6f6eb83998c2e6716349bff60770 Mon Sep 17 00:00:00 2001
From: Michael Mayer <michael@schnittstabil.de>
Date: Mon, 22 May 2017 19:43:58 +0200
Subject: [PATCH] bump dependencies

---
 .travis.yml                                   | 26 +++++++++++--------
 composer.json                                 | 12 ++++-----
 tests/Console/ApplicationTest.php             |  2 +-
 .../Command/SugaredCommandTraitTest.php       |  8 +++---
 tests/SamiFactoryAwareTraitTest.php           |  2 +-
 tests/SamiFactoryTest.php                     |  2 +-
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a6272e..565de61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/composer.json b/composer.json
index 11b4855..e80f792 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {
@@ -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"
     }
 }
diff --git a/tests/Console/ApplicationTest.php b/tests/Console/ApplicationTest.php
index 2f75b8c..e17bbe3 100644
--- a/tests/Console/ApplicationTest.php
+++ b/tests/Console/ApplicationTest.php
@@ -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)
diff --git a/tests/Console/Command/SugaredCommandTraitTest.php b/tests/Console/Command/SugaredCommandTraitTest.php
index 223dfce..67a6686 100644
--- a/tests/Console/Command/SugaredCommandTraitTest.php
+++ b/tests/Console/Command/SugaredCommandTraitTest.php
@@ -10,7 +10,7 @@
 /**
  * @coversDefaultClass \SugaredRim\Sami\Console\Command\SugaredCommandTrait
  */
-class SugaredCommandTraitTest extends \PHPUnit_Framework_TestCase
+class SugaredCommandTraitTest extends \PHPUnit\Framework\TestCase
 {
     /*
      * @covers ::configure
@@ -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)
      */
@@ -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()
     {
@@ -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()
     {
diff --git a/tests/SamiFactoryAwareTraitTest.php b/tests/SamiFactoryAwareTraitTest.php
index bdee83d..e7985d4 100644
--- a/tests/SamiFactoryAwareTraitTest.php
+++ b/tests/SamiFactoryAwareTraitTest.php
@@ -2,7 +2,7 @@
 
 namespace SugaredRim\Sami;
 
-class SamiFactoryAwareTraitTest extends \PHPUnit_Framework_TestCase
+class SamiFactoryAwareTraitTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {
diff --git a/tests/SamiFactoryTest.php b/tests/SamiFactoryTest.php
index ad0adfd..2a9694d 100644
--- a/tests/SamiFactoryTest.php
+++ b/tests/SamiFactoryTest.php
@@ -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()
     {