Skip to content

Commit 8646e78

Browse files
committed
License, Travis, Composer
* Updated license from New BSD License to MIT * Updated Travis minimum PHP version * Updated to account for changes in Composer
1 parent c85ea7f commit 8646e78

File tree

6 files changed

+21
-28
lines changed

6 files changed

+21
-28
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
vendor
1+
composer.lock
22
build
3+
vendor

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: php
22

33
php:
4-
- 5.3.2
4+
- 5.3.3
55
- 5.3
66
- 5.4
77

LICENSE

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
1-
Copyright (c) 2011, Dragonfly Development Inc
2-
All rights reserved.
1+
Copyright (c) 2012 Dragonfly Development Inc.
32

4-
Redistribution and use in source and binary forms, with or without
5-
modification, are permitted provided that the following conditions are met:
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is furnished
8+
to do so, subject to the following conditions:
69

7-
* Redistributions of source code must retain the above copyright notice,
8-
this list of conditions and the following disclaimer.
9-
* Redistributions in binary form must reproduce the above copyright
10-
notice, this list of conditions and the following disclaimer in the
11-
documentation and/or other materials provided with the distribution.
12-
* Neither the name of Dragonfly Development Inc nor the names of its
13-
contributors may be used to endorse or promote products derived from
14-
this software without specific prior written permission.
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
1512

16-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19-
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
20-
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21-
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22-
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24-
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25-
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26-
POSSIBILITY OF SUCH DAMAGE.
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19+
THE SOFTWARE.

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Ant Path Matcher Utility",
55
"homepage": "http://github.com/dflydev/dflydev-util-antPathMatcher",
66
"keywords": ["ant", "pattern", "path", "matcher"],
7-
"license": "New BSD License",
7+
"license": "MIT",
88
"authors": [
99
{
1010
"name": "Dragonfly Development Inc.",

composer.lock

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/bootstrap.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
* file that was distributed with this source code.
99
*/
1010

11-
$loader = require dirname(__DIR__).'/vendor/.composer/autoload.php';
11+
$loader = require dirname(__DIR__).'/vendor/autoload.php';
1212
$loader->add('dflydev\\tests\\util\\antPathMatcher', 'tests');

0 commit comments

Comments
 (0)