Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ language: php
sudo: false

php:
- 5.6
- 7.0
- 7.1
- 7.2
- 7.3

env:
matrix:
- LARAVEL=5.4
- LARAVEL=5.5

before_script:
- export COMPOSER=tests/composer-$LARAVEL.json
Expand Down
2 changes: 1 addition & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<logging>
<log type="tap" target="build/report.tap"/>
<log type="junit" target="build/report.junit.xml"/>
<log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
<log type="coverage-html" target="build/coverage"/>
<log type="coverage-text" target="build/coverage.txt"/>
<log type="coverage-clover" target="build/logs/clover.xml"/>
</logging>
Expand Down
4 changes: 2 additions & 2 deletions tests/Facades/JsVaidatorFacadeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
namespace Proengsoft\JsValidation\Test\Facades;

use Mockery as m;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Facades\JsValidatorFacade;

class JsValidatorFacadeTest extends PHPUnit_Framework_TestCase {
class JsValidatorFacadeTest extends TestCase {

/**
* Calls Mockery::close
Expand Down
4 changes: 2 additions & 2 deletions tests/Javascript/JavascriptRulesTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Proengsoft\JsValidation\Tests\Javascript;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class JavascriptRulesTraitTest extends PHPUnit_Framework_TestCase
class JavascriptRulesTraitTest extends TestCase
{
protected $mockTrait;

Expand Down
4 changes: 2 additions & 2 deletions tests/Javascript/JavascriptValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

use Illuminate\Support\Facades\View;
use Mockery as m;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Exceptions\PropertyNotFoundException;
use Proengsoft\JsValidation\Javascript\JavascriptValidator;
use Proengsoft\JsValidation\Javascript\ValidatorHandler;

class JavascriptValidatorTest extends PHPUnit_Framework_TestCase
class JavascriptValidatorTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Javascript/MessageParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Proengsoft\JsValidation\Tests\Javascript;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Javascript\MessageParser;

class MessageParserTest extends PHPUnit_Framework_TestCase
class MessageParserTest extends TestCase
{
public function testGetMessage()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Javascript/RuleParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace Proengsoft\JsValidation\Tests\Javascript;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Javascript\RuleParser;

class RuleParserTest extends PHPUnit_Framework_TestCase
class RuleParserTest extends TestCase
{
public function testGetClientRule()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Javascript/ValidatorHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Proengsoft\JsValidation\Tests\Javascript;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Javascript\RuleParser;
use Proengsoft\JsValidation\Javascript\ValidatorHandler;

class ValidatorHandlerTest extends PHPUnit_Framework_TestCase
class ValidatorHandlerTest extends TestCase
{
public function testValidationData()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/JsValidationServiceProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Proengsoft\JsValidation\Tests;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class JsValidationServiceProviderTest extends PHPUnit_Framework_TestCase
class JsValidationServiceProviderTest extends TestCase
{
protected function getMockedService($app)
{
Expand Down
4 changes: 2 additions & 2 deletions tests/JsValidatorFactoryTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
namespace Proengsoft\JsValidation\Tests;

use Mockery as m;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\JsValidatorFactory;

require_once __DIR__.'/stubs/JsValidatorFactoryTest.php';

class JsValidatorFactoryTest extends PHPUnit_Framework_TestCase
class JsValidatorFactoryTest extends TestCase
{
protected function mockedApp($rules, $messages, $customAttributes, $data = [])
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Remote/ResolverTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
namespace Proengsoft\JsValidation\Tests\Remote;

use Illuminate\Http\Exceptions\HttpResponseException;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Remote\Resolver;

require_once __DIR__.'/../stubs/ResolverTest.php';

class ResolverTest extends PHPUnit_Framework_TestCase
class ResolverTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Remote/ValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
use Illuminate\Translation\Translator;
use Illuminate\Validation\ValidationException;
use Illuminate\Validation\Validator as LaravelValidator;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Javascript\ValidatorHandler;
use Proengsoft\JsValidation\Remote\Validator;
use Symfony\Component\Translation\Loader\ArrayLoader as SymfonyArrayLoader;
use Symfony\Component\Translation\MessageSelector;
use Symfony\Component\Translation\Translator as SymfonyTranslator;

class ValidatorTest extends PHPUnit_Framework_TestCase
class ValidatorTest extends TestCase
{
public function testValidateRemoteRulePasses()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/RemoteValidationMiddlewareTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace Proengsoft\JsValidation\Tests;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;
use Proengsoft\JsValidation\Remote\Validator;
use Proengsoft\JsValidation\RemoteValidationMiddleware;

class RemoteValidationMiddlewareTest extends PHPUnit_Framework_TestCase
class RemoteValidationMiddlewareTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Support/AccessProtectedTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Proengsoft\JsValidation\Support;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class ProtectedClassStubTest
{
Expand All @@ -14,7 +14,7 @@ protected function protectedMethod()
}
}

class AccessProtectedTraitTest extends PHPUnit_Framework_TestCase
class AccessProtectedTraitTest extends TestCase
{
private $mockTrait;
private $stubInstance;
Expand Down
4 changes: 2 additions & 2 deletions tests/Support/DelegatedValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
namespace Proengsoft\JsValidation\Support;

//use Proengsoft\JsValidation\Support\DelegatedValidator;
use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class DelegatedValidatorTest extends PHPUnit_Framework_TestCase
class DelegatedValidatorTest extends TestCase
{
/**
* Test getValidator method
Expand Down
4 changes: 2 additions & 2 deletions tests/Support/RuleListTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Proengsoft\JsValidation\Support;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class RuleListTraitTest extends PHPUnit_Framework_TestCase
class RuleListTraitTest extends TestCase
{
private $mockTrait;

Expand Down
4 changes: 2 additions & 2 deletions tests/Support/UseDelegatedValidatorTraitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace Proengsoft\JsValidation\Support;

use PHPUnit_Framework_TestCase;
use PHPUnit\Framework\TestCase;

class UseDelegatedValidatorTraitTest extends PHPUnit_Framework_TestCase
class UseDelegatedValidatorTraitTest extends TestCase
{
public function testGetterAndSetter()
{
Expand Down
26 changes: 0 additions & 26 deletions tests/composer-5.4.json

This file was deleted.

26 changes: 26 additions & 0 deletions tests/composer-5.5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"require": {
"php": ">=7.0.8",
"illuminate/support": "5.5.*",
"illuminate/validation": "5.5.*",
"illuminate/contracts": "5.5.*",
"illuminate/view": "5.5.*",
"illuminate/config": "5.5.*",
"illuminate/http": "5.5.*",
"illuminate/translation": "5.5.*"
},
"require-dev": {
"phpunit/phpunit": "~6.0",
"mockery/mockery": "^0.9.8"
},
"autoload": {
"psr-4": {
"Proengsoft\\JsValidation\\": "src"
}
},
"autoload-dev": {
"psr-4": {
"Proengsoft\\JsValidation\\Tests\\": "tests"
}
}
}