Skip to content

Commit

Permalink
chore(dev-deps): upgrade dev deps to newer versions
Browse files Browse the repository at this point in the history
chore(dev-deps): upgrade integration test app dev deps
  • Loading branch information
abacaphiliac committed Jan 4, 2020
1 parent fae822a commit 618e7f3
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 10,153 deletions.
27 changes: 3 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
language: php

dist: trusty

php:
- 5.4
- 5.5
- 5.6
- 7.1
- 7.2
- 7.3
- 7.4snapshot
- 7.4

env:
- DEPS=latest
Expand All @@ -23,23 +18,7 @@ script:
- composer test:units

jobs:
allow_failures:
- php: 7.4snapshot
include:
- stage: test
php: 5.3
dist: precise
env: DEPS=latest
script:
- composer update --no-interaction --prefer-source
- composer test:units
- stage: test
php: 5.3
dist: precise
env: DEPS=lowest
script:
- composer update --no-interaction --prefer-source --prefer-lowest
- composer test:units
- stage: test
name: 'Lint Syntax'
php: 7.1
Expand Down Expand Up @@ -67,14 +46,14 @@ jobs:
- composer test:mutations
- stage: test
name: 'ZF2 Integration'
php: 5.6
php: 7.1
script:
- cd test/ZF2
- composer install --no-interaction --prefer-source
- vendor/bin/phpunit
- stage: test
name: 'ZF3 Integration'
php: 5.6
php: 7.1
script:
- cd test/ZF3
- composer install --no-interaction --prefer-source
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,18 @@
}
},
"require": {
"php": "^7.1",
"monolog/monolog": "^1.0.2",
"zendframework/zend-modulemanager": "^2",
"zendframework/zend-stdlib": "^2 || ^3",
"zendframework/zend-servicemanager": "^2 || ^3"
},
"require-dev": {
"container-interop/container-interop": "^1.0",
"jakub-onderka/php-parallel-lint": "^0.9",
"johnkary/phpunit-speedtrap": "^1.0",
"squizlabs/php_codesniffer": "^2.9",
"phpunit/phpunit": "^5|^4.8"
"jakub-onderka/php-parallel-lint": "^1.0",
"johnkary/phpunit-speedtrap": "^3.0",
"squizlabs/php_codesniffer": "^3.0",
"phpunit/phpunit": "^8 | ^7.5.15"
},
"autoload": {
"psr-4": {
Expand All @@ -45,7 +46,6 @@
"lint:beautify": "vendor/bin/phpcbf --standard=PSR2 --extensions=php -v --ignore=*/vendor/* .",
"lint:style": "vendor/bin/phpcs --standard=PSR2 --extensions=php -v --ignore=*/vendor/* .",
"lint:syntax": "vendor/bin/parallel-lint --exclude vendor --exclude test/ZF2/vendor --exclude test/ZF3/vendor .",
"lint:syntax-php53": "vendor/bin/parallel-lint --exclude src/EnliteMonolog/Service/MonologServiceAwareTrait.php config/ src/ test/",
"test:coverage": "vendor/bin/phpunit --coverage-text",
"test:mutations": "vendor/bin/infection && cat infection.txt",
"test:units": "vendor/bin/phpunit"
Expand Down
3 changes: 2 additions & 1 deletion test/EnliteMonologTest/ModuleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
namespace EnliteMonologTest\Module;

use EnliteMonolog\Module;
use PHPUnit\Framework\TestCase;

/**
* @covers \EnliteMonolog\Module
*/
class ModuleTest extends \PHPUnit_Framework_TestCase
class ModuleTest extends TestCase
{
/** @var Module */
private $sut;
Expand Down
3 changes: 2 additions & 1 deletion test/EnliteMonologTest/Service/MonologOptionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@
namespace EnliteMonologTest\Service;

use EnliteMonolog\Service\MonologOptions;
use PHPUnit\Framework\TestCase;

/**
* @covers \EnliteMonolog\Service\MonologOptions
*/
class MonologOptionsTest extends \PHPUnit_Framework_TestCase
class MonologOptionsTest extends TestCase
{
/** @var MonologOptions */
private $sut;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,13 @@
namespace EnliteMonologTest\Service;

use EnliteMonolog\Service\MonologServiceAbstractFactory;
use PHPUnit\Framework\TestCase;
use Zend\ServiceManager\ServiceManager;

/**
* @covers \EnliteMonolog\Service\MonologServiceAbstractFactory
*/
class MonologServiceAbstractFactoryTest extends \PHPUnit_Framework_TestCase
class MonologServiceAbstractFactoryTest extends TestCase
{

public function testGetConfigWithNoneConfig()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@

use EnliteMonolog\Service\MonologServiceAwareTrait;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
use Zend\ServiceManager\ServiceManager;

/**
* @requires PHP 5.4
* @covers \EnliteMonolog\Service\MonologServiceAwareTrait
*/
class MonologServiceAwareTraitTest extends \PHPUnit_Framework_TestCase
class MonologServiceAwareTraitTest extends TestCase
{
public function testSetMonologService()
{
Expand Down
3 changes: 2 additions & 1 deletion test/EnliteMonologTest/Service/MonologServiceFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
use EnliteMonolog\Service\MonologServiceFactory;
use Monolog\Formatter\FormatterInterface;
use Monolog\Formatter\LineFormatter;
use PHPUnit\Framework\TestCase;
use Zend\ServiceManager\ServiceManager;

/**
* @covers \EnliteMonolog\Service\MonologServiceFactory
*/
class MonologServiceFactoryTest extends \PHPUnit_Framework_TestCase
class MonologServiceFactoryTest extends TestCase
{

public function testCreateService()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
use EnliteMonolog\Service\MonologServiceAwareInterface;
use EnliteMonolog\Service\MonologServiceInitializer;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
use Zend\ServiceManager\Config;
use Zend\ServiceManager\ServiceManager;

/**
* @covers \EnliteMonolog\Service\MonologServiceInitializer
*/
class MonologServiceInitializerTest extends \PHPUnit_Framework_TestCase
class MonologServiceInitializerTest extends TestCase
{
public function testInitialize()
{
Expand Down
1 change: 1 addition & 0 deletions test/ZF2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
composer.lock
2 changes: 1 addition & 1 deletion test/ZF2/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@
"require-dev": {
"monolog/monolog": "^1.0.2",
"zendframework/zendframework": "^2.0",
"phpunit/phpunit": "^5.0"
"phpunit/phpunit": "^7.5.15"
}
}
Loading

0 comments on commit 618e7f3

Please sign in to comment.