Skip to content
This repository has been archived by the owner on Sep 18, 2023. It is now read-only.

Commit

Permalink
Merge pull request #129 from deanblackborough/4.00.0
Browse files Browse the repository at this point in the history
4.00.0
  • Loading branch information
deanblackborough authored Feb 16, 2021
2 parents 11d3c7c + c4f8cce commit bcaa787
Show file tree
Hide file tree
Showing 41 changed files with 2,131 additions and 788 deletions.
2 changes: 0 additions & 2 deletions .coveralls.yml

This file was deleted.

2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.idea/
dev/
vendor/
.phpunit.result.cache
1 change: 1 addition & 0 deletions .phpunit.result.cache

Large diffs are not rendered by default.

19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@

Full changelog for PHP Quill Renderer

## v4.00.0 - 2021-02-16

* Update requirements to PHP 8 or PHP 7.4.
* Update tests to run on latest version of PHP Unit.
* Removed Travis config, will switch to GitHub actions at some point soon.

## v3.18.1 - 2019-12-10

* Videos with custom attributes supported, thank you [Nicholas Humphries](https://github.com/Humni).
Expand Down
27 changes: 9 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
[![Latest Stable Version](https://img.shields.io/packagist/v/deanblackborough/php-quill-renderer.svg?style=flat-square)](https://packagist.org/packages/deanblackborough/php-quill-renderer)
![Packagist](https://img.shields.io/packagist/dt/deanblackborough/php-quill-renderer.svg)
[![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/deanblackborough/php-quill-renderer/blob/master/LICENSE)
[![Minimum PHP Version](https://img.shields.io/badge/php->=7.1-8892BF.svg)](https://php.net/)
[![Build Status](https://travis-ci.org/deanblackborough/php-quill-renderer.svg?branch=master)](https://travis-ci.org/deanblackborough/php-quill-renderer)
[![Coverage Status](https://coveralls.io/repos/github/deanblackborough/php-quill-renderer/badge.svg?branch=master)](https://coveralls.io/github/deanblackborough/php-quill-renderer?branch=master)
[![Minimum PHP Version](https://img.shields.io/badge/php->=7.4-8892BF.svg)](https://php.net/)

# PHP Quill Renderer

Expand All @@ -16,24 +14,17 @@ supported are listed in the table below, the goal is to eventually support every

[Quill](https://github.com/quilljs/quill) is a modern WYSIWYG editor built for compatibility and extensibility.

## Planned features (v4.00.0 dev starting soon, 2019-11-25)
## v4.00.0 and continued development

If you check the table below you will note that I don't support all of Quills
features, that is definitely the plan, however, before I add support for new
attributes I want to add a major new feature.
I released version 4.00.0 to update dependencies to PHP 7.4 and PHP 8.0. After
a hiatus, I'm back to use Quill in commercial projects so will be upgrading the
library at some point this year.

#### Plugins
Initially, the work will be towards supporting PHP 8 and 7.4 features and a
general cleanup, the code needs to be updated to be more modular and allow
plugins that you can pick and choose what functions to support.

I'm planning to add support for plugins, all the existing features will become
plugins, therefore, based on your particular needs you will be able to disable plugins/deltas
you don't need, in addition, this will allow me to add support for third-party plugins.

Plugin support, will, of course, be a breaking change so once I have resolved all
the known bugs and completed my planned refactoring I will start work on plugins
in the v4 branch.

I will continue to support v3 after the eventual release of v4, some features may
be back-ported, it very much depends on the particular feature.
No timeline, I'm working on this in my limited free time.

## Installation

Expand Down
4 changes: 1 addition & 3 deletions Tests/Api/BugTest.php
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Api;

require __DIR__ . '../../../vendor/autoload.php';
namespace Tests\Api;

use DBlackborough\Quill\Render as QuillRender;

Expand Down
2 changes: 1 addition & 1 deletion Tests/Api/MultipleTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Api;
namespace Tests\Api;

use DBlackborough\Quill\RenderMultiple;

Expand Down
2 changes: 1 addition & 1 deletion Tests/Api/StockTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Api;
namespace Tests\Api;

require __DIR__ . '../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/GitHubMarkdown/HeaderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\GitHubMarkdown;
namespace Tests\Attributes\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/GitHubMarkdown/HrefTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\GitHubMarkdown;
namespace Tests\Attributes\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/GitHubMarkdown/ImageTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\GitHubMarkdown;
namespace Tests\Attributes\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/GitHubMarkdown/ListTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\GitHubMarkdown;
namespace Tests\Attributes\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/GitHubMarkdown/TypographyTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\GitHubMarkdown;
namespace Tests\Attributes\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/GitHubMarkdown/VideoTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\GitHubMarkdown;
namespace Tests\Attributes\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Html/HeaderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Attributes\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Html/HrefTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Attributes\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Html/ImageTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Attributes\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Html/ListTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Attributes\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Html/TypographyTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Attributes\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Html/VideoTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Attributes\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Markdown/HeaderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Markdown;
namespace Tests\Attributes\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Markdown/HrefTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Markdown;
namespace Tests\Attributes\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Markdown/ImageTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Markdown;
namespace Tests\Attributes\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Markdown/ListTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Markdown;
namespace Tests\Attributes\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Markdown/TypographyTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Markdown;
namespace Tests\Attributes\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Attributes/Markdown/VideoTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Markdown;
namespace Tests\Attributes\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/GitHubMarkdown/BreaksTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\GitHubMarkdown;
namespace Tests\Combined\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
4 changes: 2 additions & 2 deletions Tests/Combined/GitHubMarkdown/HeaderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\GitHubMarkdown;
namespace Tests\Combined\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand All @@ -10,7 +10,7 @@
/**
* Header tests
*/
final class HeaderMarkdown extends \PHPUnit\Framework\TestCase
final class HeaderTest extends \PHPUnit\Framework\TestCase
{
private $delta_header_then_text = '{"ops":[{"insert":"This is a heading"},{"attributes":{"header":2},"insert":"\n"},{"insert":"\nNow some normal text.\n"}]}';
private $delta_header_then_text_then_header = '{"ops":[{"insert":"This is a heading"},{"attributes":{"header":2},"insert":"\n"},{"insert":"\nNow some normal text.\n\nNow another heading"},{"attributes":{"header":1},"insert":"\n"}]}';
Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/GitHubMarkdown/ListTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\GitHubMarkdown;
namespace Tests\Combined\GitHubMarkdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Html/BoldColorTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Attributes\Html;
namespace Tests\Combined\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Html/BreaksTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Html;
namespace Tests\Combined\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Html/HeaderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Html;
namespace Tests\Combined\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Html/ListTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Html;
namespace Tests\Combined\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Html/MixTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Html;
namespace Tests\Combined\Html;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Markdown/BreaksTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Markdown;
namespace Tests\Combined\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
4 changes: 2 additions & 2 deletions Tests/Combined/Markdown/HeaderTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Markdown;
namespace Tests\Combined\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand All @@ -10,7 +10,7 @@
/**
* Header tests
*/
final class HeaderMarkdown extends \PHPUnit\Framework\TestCase
final class HeaderTest extends \PHPUnit\Framework\TestCase
{
private $delta_header_then_text = '{"ops":[{"insert":"This is a heading"},{"attributes":{"header":2},"insert":"\n"},{"insert":"\nNow some normal text.\n"}]}';
private $delta_header_then_text_then_header = '{"ops":[{"insert":"This is a heading"},{"attributes":{"header":2},"insert":"\n"},{"insert":"\nNow some normal text.\n\nNow another heading"},{"attributes":{"header":1},"insert":"\n"}]}';
Expand Down
2 changes: 1 addition & 1 deletion Tests/Combined/Markdown/ListTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace DBlackborough\Quill\Tests\Composite\Markdown;
namespace Tests\Combined\Markdown;

require __DIR__ . '../../../../vendor/autoload.php';

Expand Down
13 changes: 9 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
"DBlackborough\\Quill\\" : "src/"
}
},
"autoload-dev": {
"psr-4": {
"Tests\\": "Tests/"
}
},
"homepage": "http://www.transmute-coffee.com/php-quill-renderer.php",
"keywords": [ "quill", "quilljs", "renderer", "delta", "parse", "html", "php", "markdown"],
"authors": [
Expand All @@ -15,15 +20,15 @@
}
],
"require": {
"php": "^7.1",
"php": "^7.4|^8",
"ext-json": "*"
},
"require-dev": {
"phpunit/phpunit": "^7",
"php-coveralls/php-coveralls": "^2"
"phpunit/phpunit": "^9",
"php-coveralls/php-coveralls": "^v2.4.3"
},
"suggest": {
"php": "^7.2"
"php": "^8.0"
},
"repositories": [
{
Expand Down
Loading

0 comments on commit bcaa787

Please sign in to comment.