Modernize library and improve tests

.gitattributes

@@ -0,0 +1,6 @@
+/.gitattributes   export-ignore
+/.gitignore       export-ignore
+/.travis.yml      export-ignore
+/phpunit.xml.dist export-ignore
+/tests            export-ignore
+/util             export-ignore

.gitignore

@@ -1,3 +1,4 @@
-/vendor/
 /build/
-composer.phar
+/vendor/
+composer.lock
+composer.phar

.travis.yml

@@ -1,21 +1,74 @@
-language: php
+language: python
 
-php:
-  - 5.5
-  - 5.4
-  - 5.3
+sudo: false
+
+python:
+  - 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
+
+env:
+  global:
+    - PATH="$HOME/.phpenv/bin:$HOME/.phpenv/shims:$PATH"
+  matrix:
+    - PHP_VERSION=7.1 PYGMENTS_VERSION=1.6
+    - PHP_VERSION=7.1 PYGMENTS_VERSION=2.0
+    - PHP_VERSION=7.1 PYGMENTS_VERSION=2.1
+    - PHP_VERSION=7.1 PYGMENTS_VERSION=2.2
+    - PHP_VERSION=7.0 PYGMENTS_VERSION=1.6
+    - PHP_VERSION=7.0 PYGMENTS_VERSION=2.0
+    - PHP_VERSION=7.0 PYGMENTS_VERSION=2.1
+    - PHP_VERSION=7.0 PYGMENTS_VERSION=2.2
+    - PHP_VERSION=5.6 PYGMENTS_VERSION=1.6
+    - PHP_VERSION=5.6 PYGMENTS_VERSION=2.0
+    - PHP_VERSION=5.6 PYGMENTS_VERSION=2.1
+    - PHP_VERSION=5.6 PYGMENTS_VERSION=2.2
+
+matrix:
+  fast_finish: true
+  include:
+    - python: 3.2
+      env: PHP_VERSION=7.1 PYGMENTS_VERSION=1.6
+    - python: 3.2
+      env: PHP_VERSION=7.0 PYGMENTS_VERSION=1.6
+    - python: 3.2
+      env: PHP_VERSION=5.6 PYGMENTS_VERSION=1.6
+  allow_failures:
+    - python: 2.6
+      env: PHP_VERSION=7.1 PYGMENTS_VERSION=2.2
+    - python: 2.6
+      env: PHP_VERSION=7.0 PYGMENTS_VERSION=2.2
+    - python: 2.6
+      env: PHP_VERSION=5.6 PYGMENTS_VERSION=2.2
+
+addons:
+  apt:
+    packages:
+      - libc-client-dev
+      - libtidy-dev
+      - libmcrypt-dev
 
 before_install:
-  - sudo easy_install Pygments
+  - ./util/install-php.sh
+  - eval "$(phpenv init -)" && phpenv rehash
+  - php --version
+  - php composer.phar --version
+
+install:
+  - travis_retry pip install Pygments==$PYGMENTS_VERSION
+  - travis_retry php composer.phar require --no-update satooshi/php-coveralls:^1.0
+  - travis_retry php composer.phar install --no-interaction --prefer-dist
 
 before_script:
-  - composer require --no-update satooshi/php-coveralls:dev-master sensiolabs/security-checker:dev-master
-  - composer update --dev --no-interaction
+  - mkdir -p build/logs
 
 script:
-  - mkdir -p build/logs
-  - phpunit -c phpunit.xml.dist --coverage-clover build/logs/clover.xml
-  - php vendor/bin/security-checker security:check composer.lock
+  - ./vendor/bin/parallel-lint src tests
+  - ./vendor/bin/phpunit --verbose --coverage-clover build/logs/clover.xml
+  - ./vendor/bin/phpcs src tests --standard=psr2 -sp
 
-after_script:
-  - php vendor/bin/coveralls
+after_success:
+  - travis_retry php vendor/bin/coveralls

LICENSE

@@ -0,0 +1,20 @@
+Pygments.php - A Thin Wrapper for the Python Pygments
+Copyright (c) 2013-2017 Kazuyuki Hayashi <hayashi@valnur.net>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -6,26 +6,34 @@ Pygments.php - A Thin Wrapper for the Python Pygments
 [![Coverage Status](https://coveralls.io/repos/kzykhys/Pygments.php/badge.png)](https://coveralls.io/r/kzykhys/Pygments.php)
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/3efddd61-f6e2-4f4a-949d-9ca7230f6e56/mini.png)](https://insight.sensiolabs.com/projects/3efddd61-f6e2-4f4a-949d-9ca7230f6e56)
 
-A PHP wrapper for the Python Pygments syntax highlighter
+A PHP wrapper for [Pygments](http://pygments.org/), the Python syntax highlighter.
 
 Requirements
 ------------
 
-* PHP5.3+
-* Python 2.4+
-* Pygments (`sudo easy_install Pygments`)
+* PHP 5.6+
+* Python
+* Pygments (`pip install Pygments`)
+
+Python and Pygments versions supported:
+
+| Pygments:  | 1.6 | 2.0 | 2.1 | 2.2 |
+| :--------- | :-: | :-: | :-: | :-: |
+| Python 2.6 | ✔   | ✔   | ✔   | -   |
+| Python 2.7 | ✔   | ✔   | ✔   | ✔   |
+| Python 3.2 | ✔   | -   | -   | -   |
+| Python 3.3 | ✔   | ✔   | ✔   | ✔   |
+| Python 3.4 | ✔   | ✔   | ✔   | ✔   |
+| Python 3.5 | ✔   | ✔   | ✔   | ✔   |
+| Python 3.6 | ✔   | ✔   | ✔   | ✔   |
 
 Installation
 ------------
 
-Create or update your composer.json and run `composer update`
+Use [Composer](https://getcomposer.org) to require this package:
 
-``` json
-{
-    "require": {
-        "kzykhys/pygments": ">=1.0"
-    }
-}
+```
+composer require kzykhys/pygments
 ```
 
 Usage

composer.json

@@ -11,15 +11,33 @@
     ],
     "minimum-stability": "stable",
     "require": {
-        "php": ">=5.3.2",
-        "symfony/process": ">=2.3"
+        "php": "^5.6 || ^7.0",
+        "symfony/process": "^3.0"
     },
     "require-dev": {
-        "symfony/finder": ">=2.3"
+        "jakub-onderka/php-parallel-lint": "^0.9.2",
+        "phpunit/phpunit": "^5.7 || ^6.0",
+        "squizlabs/php_codesniffer": "^2.8",
+        "symfony/finder": "^3.0"
     },
     "autoload": {
-        "psr-0": {
-            "": "src"
+        "psr-4": {
+            "KzykHys\\Pygments\\": "src"
         }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "KzykHys\\Pygments\\Test\\": "tests"
+        }
+    },
+    "scripts": {
+        "lint": "parallel-lint src tests",
+        "phpunit": "phpunit --verbose --colors=always",
+        "phpcs": "phpcs src tests --standard=psr2 -sp --colors",
+        "test": [
+            "@lint",
+            "@phpunit",
+            "@phpcs"
+        ]
     }
 }

phpunit.xml.dist

@@ -1,28 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-    backupGlobals = "false"
-    backupStaticAttributes = "false"
-    colors = "true"
-    convertErrorsToExceptions = "true"
-    convertNoticesToExceptions = "true"
-    convertWarningsToExceptions = "true"
-    processIsolation = "false"
-    stopOnFailure = "false"
-    syntaxCheck = "false"
-    bootstrap = "vendor/autoload.php" >
-
-  <testsuites>
-    <testsuite name="Project Test Suite">
-      <directory>test</directory>
-    </testsuite>
-  </testsuites>
-
-  <filter>
-    <whitelist>
-      <directory>src</directory>
-    </whitelist>
-  </filter>
-
-</phpunit>
+<phpunit bootstrap="./tests/bootstrap.php" colors="true" backupGlobals="false">
+    <testsuites>
+        <testsuite>
+            <directory>./tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="PYGMENTIZE_PATH" value="pygmentize"/>
+    </php>
+</phpunit>