Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lolli 1 #3

Merged
merged 4 commits into from
Oct 21, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
php: ['7.2', '7.3', '7.4']

steps:
- uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[![Tests](https://github.com/lolli42/FineDiff/actions/workflows/tests.yml/badge.svg)](https://github.com/lolli42/FineDiff/actions/workflows/tests.yml)

FineDiff
========

Originally written by Raymond Hill ([https://github.com/gorhill/PHP-FineDiff](https://github.com/gorhill/PHP-FineDiff)) FineDiff has been tweaked to bring it up to date with the modern world. That means documented, nicely formatted, tested code that can be easily extended.

[![Build Status](https://travis-ci.org/cogpowered/FineDiff.png?branch=master)](https://travis-ci.org/cogpowered/FineDiff)

Installation
------------

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
],
"type": "library",
"require": {
"php": ">=5.3.0"
"php": "^7.2"
},
"require-dev": {
"mockery/mockery": "*",
"phpunit/phpunit": ">4.8 <8"
"phpunit/phpunit": "^7"
},
"autoload": {
"psr-0": { "cogpowered\\FineDiff": "src/" }
Expand Down
17 changes: 0 additions & 17 deletions tests/BaseTestCase.php

This file was deleted.

4 changes: 2 additions & 2 deletions tests/Delimiters/ConstantsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Delimiters;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Delimiters;
use PHPUnit\Framework\TestCase;

class ConstantsTest extends BaseTestCase
class ConstantsTest extends TestCase
{
public function testParagraphConstant()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Delimiters/EnumTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace FineDiffTests\Delimiters;

use FineDiffTests\BaseTestCase;
use PHPUnit\Framework\TestCase;

class EnumTest extends BaseTestCase
class EnumTest extends TestCase
{
public function testCantInstantiate()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Diff/DefaultsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Diff;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Diff;
use PHPUnit\Framework\TestCase;

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

namespace FineDiffTests\Diff;

use FineDiffTests\BaseTestCase;
use Mockery as m;
use cogpowered\FineDiff\Diff;
use PHPUnit\Framework\TestCase;

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

namespace FineDiffTests\Diff;

use FineDiffTests\BaseTestCase;
use Mockery as m;
use cogpowered\FineDiff\Diff;
use PHPUnit\Framework\TestCase;

class SetTest extends BaseTestCase
class SetTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Granularity/CharacterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Granularity;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Delimiters;
use cogpowered\FineDiff\Granularity\Character;
use PHPUnit\Framework\TestCase;

class CharacterTest extends BaseTestCase
class CharacterTest extends TestCase
{
protected $delimiters = array(
Delimiters::PARAGRAPH,
Expand Down
4 changes: 2 additions & 2 deletions tests/Granularity/ParagraphTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Granularity;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Delimiters;
use cogpowered\FineDiff\Granularity\Paragraph;
use PHPUnit\Framework\TestCase;

class ParagraphTest extends BaseTestCase
class ParagraphTest extends TestCase
{
protected $delimiters = array(
Delimiters::PARAGRAPH,
Expand Down
4 changes: 2 additions & 2 deletions tests/Granularity/SentenceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Granularity;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Delimiters;
use cogpowered\FineDiff\Granularity\Sentence;
use PHPUnit\Framework\TestCase;

class SentenceTest extends BaseTestCase
class SentenceTest extends TestCase
{
protected $delimiters = array(
Delimiters::PARAGRAPH,
Expand Down
4 changes: 2 additions & 2 deletions tests/Granularity/WordTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Granularity;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Delimiters;
use cogpowered\FineDiff\Granularity\Word;
use PHPUnit\Framework\TestCase;

class WordTest extends BaseTestCase
class WordTest extends TestCase
{
protected $delimiters = array(
Delimiters::PARAGRAPH,
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/OpcodesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Parser;

use FineDiffTests\BaseTestCase;
use Mockery as m;
use cogpowered\FineDiff\Parser\Opcodes;
use PHPUnit\Framework\TestCase;

class OpcodesTest extends BaseTestCase
class OpcodesTest extends TestCase
{
public function tearDown()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/Operations/CopyTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Parser\Operations;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Parser\Operations\Copy;
use PHPUnit\Framework\TestCase;

class CopyTest extends BaseTestCase
class CopyTest extends TestCase
{
public function testImplementsOperationInterface()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/Operations/DeleteTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Parser\Operations;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Parser\Operations\Delete;
use PHPUnit\Framework\TestCase;

class DeleteTest extends BaseTestCase
class DeleteTest extends TestCase
{
public function testImplementsOperationInterface()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/Operations/InsertTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Parser\Operations;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Parser\Operations\Insert;
use PHPUnit\Framework\TestCase;

class InsertTest extends BaseTestCase
class InsertTest extends TestCase
{
public function testImplementsOperationInterface()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/Operations/ReplaceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Parser\Operations;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Parser\Operations\Replace;
use PHPUnit\Framework\TestCase;

class ReplaceTest extends BaseTestCase
class ReplaceTest extends TestCase
{
public function testImplementsOperationInterface()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Parser/ParserTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

namespace FineDiffTests\Parser;

use FineDiffTests\BaseTestCase;
use Mockery as m;
use cogpowered\FineDiff\Granularity\Character;
use cogpowered\FineDiff\Parser\Parser;
use PHPUnit\Framework\TestCase;

class ParserTest extends BaseTestCase
class ParserTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Render/Html/CallbackTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Render\Html;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Render\Html;
use PHPUnit\Framework\TestCase;

class CallbackTest extends BaseTestCase
class CallbackTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Render/Html/ProcessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Render\Html;

use FineDiffTests\BaseTestCase;
use Mockery as m;
use cogpowered\FineDiff\Render\Html;
use PHPUnit\Framework\TestCase;

class ProcessTest extends BaseTestCase
class ProcessTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Render/Text/CallbackTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

namespace FineDiffTests\Render\Text;

use FineDiffTests\BaseTestCase;
use cogpowered\FineDiff\Render\Text;
use PHPUnit\Framework\TestCase;

class CallbackTest extends BaseTestCase
class CallbackTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Render/Text/ProcessTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

namespace FineDiffTests\Render\Text;

use FineDiffTests\BaseTestCase;
use Mockery as m;
use cogpowered\FineDiff\Render\Text;
use PHPUnit\Framework\TestCase;

class ProcessTest extends BaseTestCase
class ProcessTest extends TestCase
{
public function setUp()
{
Expand Down
4 changes: 2 additions & 2 deletions tests/Usage/Base.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

namespace FineDiffTests\Usage;

use FineDiffTests\BaseTestCase;
use PHPUnit\Framework\TestCase;

abstract class Base extends BaseTestCase
abstract class Base extends TestCase
{
protected function getFile($file)
{
Expand Down