Skip to content

Commit b8995d5

Browse files
Upgraded dev dependencies
1 parent bc9b033 commit b8995d5

File tree

6 files changed

+40
-39
lines changed

6 files changed

+40
-39
lines changed

.php_cs

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
11
<?php
22

3-
use Symfony\CS\Config\Config;
4-
use Symfony\CS\Finder\DefaultFinder;
5-
use Symfony\CS\Fixer\Contrib\HeaderCommentFixer;
6-
use Symfony\CS\FixerInterface;
3+
$finder = PhpCsFixer\Finder::create()->in(['src', 'tests']);
74

8-
$finder = DefaultFinder::create()->in('src');
9-
10-
return Config::create()
11-
->level(FixerInterface::SYMFONY_LEVEL)
12-
->fixers([
13-
'ereg_to_preg',
14-
'multiline_spaces_before_semicolon',
15-
'newline_after_open_tag',
16-
'no_blank_lines_before_namespace',
17-
'ordered_use',
18-
'php4_constructor',
19-
'phpdoc_order',
20-
'-phpdoc_params',
21-
'short_array_syntax',
22-
'short_echo_tag',
23-
'strict',
24-
'strict_param',
5+
return PhpCsFixer\Config::create()
6+
->setRules([
7+
'@Symfony' => true,
8+
'@PhpCsFixer' => true,
9+
'ereg_to_preg' => true,
10+
'no_php4_constructor' => true,
11+
'strict_comparison' => true,
12+
'strict_param' => true,
13+
'php_unit_internal_class' => false,
14+
'php_unit_test_class_requires_covers' => false,
15+
'no_superfluous_phpdoc_tags' => false,
16+
'function_declaration' => [
17+
'closure_function_spacing' => 'none',
18+
],
19+
'phpdoc_align' => [
20+
'align' => 'left',
21+
],
22+
'multiline_whitespace_before_semicolons' => [
23+
'strategy' => 'no_multi_line',
24+
],
2525
])
26-
->setUsingCache(true)
27-
->finder($finder);
26+
->setFinder($finder);

.travis.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
language: php
2+
os: linux
3+
dist: xenial
24

3-
matrix:
5+
jobs:
46
fast_finish: true
57
include:
68
- php: 7.2
9+
env: VERSIONS=--prefer-lowest
710
- php: 7.3
811
- php: 7.4
912

@@ -12,5 +15,6 @@ before_install:
1215

1316
install:
1417
- travis_retry composer install --prefer-source --no-interaction
18+
- travis_retry composer update $VERSIONS
1519

1620
script: vendor/bin/phpunit

composer.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "aloha/twilio",
33
"description": "Twilio API for Laravel",
44
"type": "library",
5-
"keywords": ["sms","ivr","laravel","twilio"],
5+
"keywords": ["sms", "ivr", "laravel", "twilio"],
66
"authors": [
77
{
88
"name": "Travis J Ryan",
@@ -17,13 +17,13 @@
1717
"license": "MIT",
1818
"require": {
1919
"php": ">=7.2.0",
20-
"twilio/sdk": "6.*"
20+
"twilio/sdk": "^6.0"
2121
},
2222
"require-dev": {
23-
"friendsofphp/php-cs-fixer": "^1.9",
2423
"illuminate/console": "~4||~5",
2524
"illuminate/support": "~4||~5",
26-
"phpunit/phpunit": "~4.5"
25+
"friendsofphp/php-cs-fixer": "^2.16",
26+
"phpunit/phpunit": "^8.0"
2727
},
2828
"autoload": {
2929
"psr-4": {
@@ -36,10 +36,9 @@
3636
}
3737
},
3838
"scripts": {
39-
"test": "phpunit",
40-
"cs": "php-cs-fixer fix src/ --level=psr2"
39+
"tests": "phpunit",
40+
"lint": "php-cs-fixer fix --allow-risky=yes"
4141
},
42-
"minimum-stability": "stable",
4342
"extra": {
4443
"laravel": {
4544
"providers": [

phpunit.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
convertWarningsToExceptions="true"
99
processIsolation="false"
1010
stopOnFailure="false"
11-
syntaxCheck="false"
1211
>
1312
<testsuites>
1413
<testsuite name="Package Test Suite">
1514
<directory suffix=".php">./tests/</directory>
1615
</testsuite>
1716
</testsuites>
18-
</phpunit>
17+
</phpunit>

tests/TwilioCallCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
namespace Aloha\Twilio\Tests;
33

44
use Aloha\Twilio\Commands\TwilioCallCommand;
5-
use PHPUnit_Framework_TestCase;
5+
use PHPUnit\Framework\TestCase;
66

7-
class TwilioCallCommandTest extends PHPUnit_Framework_TestCase
7+
class TwilioCallCommandTest extends TestCase
88
{
99
/**
1010
* Test the name of the command
1111
*/
1212
public function testName()
1313
{
1414
// Arrange
15-
$stub = $this->getMock('Aloha\Twilio\TwilioInterface');
15+
$stub = $this->createMock('Aloha\Twilio\TwilioInterface');
1616
$command = new TwilioCallCommand($stub);
1717

1818
// Act

tests/TwilioSmsCommandTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
namespace Aloha\Twilio\Tests;
33

44
use Aloha\Twilio\Commands\TwilioSmsCommand;
5-
use PHPUnit_Framework_TestCase;
5+
use PHPUnit\Framework\TestCase;
66

7-
class TwilioSmsCommandTest extends PHPUnit_Framework_TestCase
7+
class TwilioSmsCommandTest extends TestCase
88
{
99
/**
1010
* Test the name of the command
1111
*/
1212
public function testName()
1313
{
1414
// Arrange
15-
$stub = $this->getMock('Aloha\Twilio\TwilioInterface');
15+
$stub = $this->createMock('Aloha\Twilio\TwilioInterface');
1616
$command = new TwilioSmsCommand($stub);
1717

1818
// Act

0 commit comments

Comments
 (0)