diff --git a/.travis.yml b/.travis.yml index d09d6d5..b23dd45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,13 @@ language: php sudo: false +dist: xenial php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - 7.0 - 7.1 + - 7.2 + - 7.3 matrix: fast_finish: true diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb702c..c49df12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Changelog ========= +Unreleased +---------- + +* Add Vagrant Box + 1.1.4 ----- diff --git a/README.md b/README.md index e35c5af..f76629f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -Linkify -======= +Linkify Fork +============ -[![Build Status](https://secure.travis-ci.org/misd-service-development/php-linkify.png)](http://travis-ci.org/misd-service-development/php-linkify) +[![Build Status](https://api.travis-ci.org/JMB-Technology-Limited/php-linkify.png)](http://travis-ci.org/misd-service-development/php-linkify) Converts URLs and email addresses into clickable links. It works on both snippets of HTML (or plain text) and complete HTML pages. @@ -9,10 +9,13 @@ There are many regex variations shared on the internet for performing this task, It does not cover every possible valid-yet-never-used URLs and email addresses in order to handle 'real world' usage (eg no 'gopher://'). This means, for example, that it copes better with punctuation errors. +It was forked in March 2019 as the original maintainers have stopped responding. See https://github.com/misd-service-development/php-linkify + Authors ------- * Chris Wilkinson +* JMB Technology https://www.jmbtechnology.co.uk/ It uses regex based on John Gruber's [Improved Liberal, Accurate Regex Pattern for Matching URLs](http://daringfireball.net/2010/07/improved_regex_for_matching_urls). @@ -91,3 +94,8 @@ $linkify = new \Misd\Linkify\Linkify(array('callback' => function($url, $caption })); echo $linkify->process('This link will be converted to bold: www.example.com.')); ``` + +Developers +---------- + +There is a vagrant box. Simply ssh in and type `test` to test. diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..5a5e8da --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,24 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure(2) do |config| + + config.vm.box = "boxcutter/ubuntu1604" + + config.vm.define "app" do |normal| + + config.vm.synced_folder ".", "/vagrant", :owner=> 'vagrant', :group=>'users', :mount_options => ['dmode=777', 'fmode=777'] + + config.vm.provider "virtualbox" do |vb| + # Display the VirtualBox GUI when booting the machine + vb.gui = false + + # Customize the amount of memory on the VM: + vb.memory = "512" + end + + config.vm.provision :shell, path: "vagrant/bootstrap.sh" + + end + +end diff --git a/composer.json b/composer.json index 6c1a165..cd3660b 100644 --- a/composer.json +++ b/composer.json @@ -1,15 +1,15 @@ { - "name": "misd/linkify", + "name": "jmbtechnologylimited/linkify", "type": "library", "description": "Converts URLs and email addresses in text into HTML links", "keywords": ["url", "email address", "convert", "link"], - "homepage": "https://github.com/misd-service-development/php-linkify", + "homepage": "https://github.com/JMB-Technology-Limited/php-linkify", "license": "MIT", "support": { - "issues": "https://github.com/misd-service-development/php-linkify/issues" + "issues": "https://github.com/JMB-Technology-Limited/php-linkify/issues" }, "require": { - "php": ">=5.3.0" + "php": ">=7.0.0" }, "require-dev": { "phpunit/phpunit": "^4.0 || ^5.0" diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh new file mode 100644 index 0000000..3fe46b1 --- /dev/null +++ b/vagrant/bootstrap.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + + +sudo apt-get update +sudo apt-get install -y php-cli php-mbstring php-intl composer zip php-zip php-xml + +echo "cd /vagrant" >> /home/vagrant/.bashrc +echo "alias test=\"/vagrant/vendor/bin/phpunit -c /vagrant/\"" >> /home/vagrant/.bashrc