Merge pull request #881 from xPaw/merge-1.8.x

Merge `1.8.x-beta` into `master`

.github/workflows/unit-tests.yaml

@@ -0,0 +1,37 @@
+on:
+    - push
+    - pull_request
+
+jobs:
+    phpunit:
+        runs-on: ubuntu-latest
+
+        strategy:
+            matrix:
+                php:
+                    - '7.1'
+                    - '7.2'
+                    - '7.3'
+                    - '7.4'
+                    - '8.0'
+                    - '8.1'
+                    - '8.2'
+                    - '8.3'
+                    - '8.4'
+
+        steps:
+            - name: Checkout the source code
+              uses: actions/checkout@v4
+
+            - name: Set up PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                  php-version: '${{ matrix.php }}'
+
+            - name: Install dependencies
+              run: composer install
+
+            - name: Run tests
+              run: |
+                  vendor/bin/phpunit
+                  vendor/bin/phpunit test/CommonMarkTestWeak.php || true

.gitignore

@@ -1,2 +1,3 @@
 composer.lock
 vendor/
+.phpunit.result.cache

.travis.yml

@@ -1,30 +0,0 @@
-language: php
-
-matrix:
-  include:
-    - php: 5.3
-      dist: precise
-    - php: 5.4
-      dist: trusty
-    - php: 5.5
-      dist: trusty
-    - php: 5.6
-      dist: xenial
-    - php: 7.0
-      dist: xenial
-    - php: 7.1
-      dist: bionic
-    - php: 7.2
-      dist: bionic
-    - php: 7.3
-      dist: bionic
-    - php: 7.4
-      dist: bionic
-
-install:
-  - composer install --prefer-dist --no-interaction --no-progress
-
-script:
-  - vendor/bin/phpunit
-  - vendor/bin/phpunit test/CommonMarkTestWeak.php || true
-  - '[ -z "$TRAVIS_TAG" ] || [ "$TRAVIS_TAG" == "$(php -r "require(\"Parsedown.php\"); echo Parsedown::version;")" ]'

composer.json

@@ -13,11 +13,11 @@
         }
     ],
     "require": {
-        "php": ">=5.3.0",
+        "php": ">=7.1",
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8.35"
+        "phpunit/phpunit": "^7.5|^8.5|^9.6"
     },
     "autoload": {
         "psr-0": {"Parsedown": ""}

test/CommonMarkTestStrict.php

@@ -1,17 +1,19 @@
 <?php
 
+use PHPUnit\Framework\TestCase;
+
 /**
  * Test Parsedown against the CommonMark spec
  *
  * @link http://commonmark.org/ CommonMark
  */
-class CommonMarkTestStrict extends PHPUnit_Framework_TestCase
+class CommonMarkTestStrict extends TestCase
 {
     const SPEC_URL = 'https://raw.githubusercontent.com/jgm/CommonMark/master/spec.txt';
 
     protected $parsedown;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         $this->parsedown = new TestParsedown();
         $this->parsedown->setUrlsLinked(false);

test/CommonMarkTestWeak.php

@@ -17,7 +17,7 @@ class CommonMarkTestWeak extends CommonMarkTestStrict
 {
     protected $textLevelElementRegex;
 
-    protected function setUp()
+    protected function setUp() : void
     {
         parent::setUp();
 

test/data/fenced_code_block.html

@@ -15,4 +15,6 @@ still a fenced code block</code></pre>
 <pre><code>foo
 
 
-bar</code></pre>
+bar</code></pre>
+<pre><code class="language-php">&lt;?php
+echo "Hello World";</code></pre>

test/data/fenced_code_block.md

@@ -35,4 +35,9 @@ foo
 
 
 bar
+```
+
+```php some-class
+<?php
+echo "Hello World";
 ```