From 00dbc3dae1f14bfef27ee3629b21033993ea1bd5 Mon Sep 17 00:00:00 2001 From: Aaron Parecki Date: Fri, 28 Apr 2017 13:00:18 -0700 Subject: [PATCH] relicense under MIT --- LICENSE.txt | 22 ++++++++++++++++++---- README.md | 2 ++ composer.json | 15 +++++++++------ composer.lock | 2 +- lib/helpers.php | 2 +- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 21ebae4..42310e7 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,21 @@ -Copyright 2016 by Aaron Parecki +MIT License -Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at +Copyright (c) 2017 Aaron Parecki -http://www.apache.org/licenses/LICENSE-2.0 +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: -Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. +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. diff --git a/README.md b/README.md index d1a9c52..1bd38e0 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ The contents of the URL is checked in the following order: * A silo URL from one of the following websites: ** Instagram ** Twitter +** GitHub +** XKCD ** (more coming soon) * h-entry, h-event, h-card diff --git a/composer.json b/composer.json index c0afae7..39f5f63 100644 --- a/composer.json +++ b/composer.json @@ -1,20 +1,18 @@ { "name": "p3k/xray", "type": "library", + "license": "MIT", + "homepage": "https://github.com/aaronpk/XRay", + "description": "X-Ray returns structured data from any URL", "require": { "mf2/mf2": "~0.3", "ezyang/htmlpurifier": "4.*", "indieweb/link-rel-parser": "0.1.*", "dg/twitter-php": "3.6.*", "p3k/timezone": "*", - "p3k/http": "*", + "p3k/http": "0.1.*", "cebe/markdown": "1.1.*" }, - "require-dev": { - "league/plates": "3.*", - "league/route": "1.*", - "phpunit/phpunit": "5.7.*" - }, "autoload": { "psr-4": { "p3k\\XRay\\": "lib/XRay" @@ -23,6 +21,11 @@ "lib/helpers.php" ] }, + "require-dev": { + "league/plates": "3.*", + "league/route": "1.*", + "phpunit/phpunit": "5.7.*" + }, "autoload-dev": { "files": [ "controllers/Main.php", diff --git a/composer.lock b/composer.lock index ca69224..9c02d81 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "10235592166c486bf7cf2601c9811861", + "content-hash": "051bf8d4c39d861dc9a22aeec3b79b57", "packages": [ { "name": "cebe/markdown", diff --git a/lib/helpers.php b/lib/helpers.php index 2f69df8..66c644f 100644 --- a/lib/helpers.php +++ b/lib/helpers.php @@ -35,4 +35,4 @@ function should_follow_redirects($url) { } else { return true; } -} \ No newline at end of file +}