Skip to content

Commit 184e45b

Browse files
committed
Issue #11 - Updating email address, license, and semantic versioning.
1 parent 97cdbc8 commit 184e45b

File tree

5 files changed

+82
-31
lines changed

5 files changed

+82
-31
lines changed

CREDITS

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
jsmin - JavaScript Minifier for PHP
2-
Michael Squires (sqmk)
1+
jsmin
2+
Michael Squires

LICENSE

+62-16
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,68 @@
1-
Software Copyright License Agreement (BSD License)
1+
--------------------------------------------------------------------
2+
The PHP License, version 3.01
3+
Copyright (c) 1999 - 2012 The PHP Group. All rights reserved.
4+
--------------------------------------------------------------------
25

3-
Copyright (c) 2012, Michael Squires
4-
All rights reserved.
6+
Redistribution and use in source and binary forms, with or without
7+
modification, is permitted provided that the following conditions
8+
are met:
59

6-
Redistribution and use of this software in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form must reproduce the above copyright
14+
notice, this list of conditions and the following disclaimer in
15+
the documentation and/or other materials provided with the
16+
distribution.
17+
18+
3. The name "PHP" must not be used to endorse or promote products
19+
derived from this software without prior written permission. For
20+
written permission, please contact [email protected].
21+
22+
4. Products derived from this software may not be called "PHP", nor
23+
may "PHP" appear in their name, without prior written permission
24+
from [email protected]. You may indicate that your software works in
25+
conjunction with PHP by saying "Foo for PHP" instead of calling
26+
it "PHP Foo" or "phpfoo"
27+
28+
5. The PHP Group may publish revised and/or new versions of the
29+
license from time to time. Each version will be given a
30+
distinguishing version number.
31+
Once covered code has been published under a particular version
32+
of the license, you may always continue to use it under the terms
33+
of that version. You may also choose to use such covered code
34+
under the terms of any subsequent version of the license
35+
published by the PHP Group. No one other than the PHP Group has
36+
the right to modify the terms applicable to covered code created
37+
under this License.
738

8-
* Redistributions of source code must retain the above
9-
copyright notice, this list of conditions and the
10-
following disclaimer.
39+
6. Redistributions of any form whatsoever must retain the following
40+
acknowledgment:
41+
"This product includes PHP software, freely available from
42+
<http://www.php.net/software/>".
1143

12-
* Redistributions in binary form must reproduce the above
13-
copyright notice, this list of conditions and the
14-
following disclaimer in the documentation and/or other
15-
materials provided with the distribution.
44+
THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
45+
ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
46+
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
47+
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP
48+
DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
49+
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
50+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
51+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
52+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
53+
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
55+
OF THE POSSIBILITY OF SUCH DAMAGE.
1656

17-
* Neither the name of John Jawed nor the names of its
18-
contributors may be used to endorse or promote products
19-
derived from this software without specific prior
20-
written permission of John Jawed
57+
--------------------------------------------------------------------
2158

22-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
59+
This software consists of voluntary contributions made by many
60+
individuals on behalf of the PHP Group.
61+
62+
The PHP Group can be contacted via Email at [email protected].
63+
64+
For more information on the PHP Group and the PHP project,
65+
please see <http://www.php.net>.
66+
67+
PHP includes the Zend Engine, freely available at
68+
<http://www.zend.com>.

package.xml

+16-11
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,41 @@
77
<lead>
88
<name>Michael K. Squires</name>
99
<user>sqmk</user>
10-
<email>[email protected]</email>
10+
<email>[email protected]</email>
1111
<active>yes</active>
1212
</lead>
13-
<date>2012-09-16</date>
14-
<time>14:10:08</time>
13+
<date>2012-10-22</date>
14+
<time>18:24:05</time>
1515
<version>
16-
<release>0.1</release>
17-
<api>0.1</api>
16+
<release>0.1.0</release>
17+
<api>0.1.0</api>
1818
</version>
1919
<stability>
2020
<release>beta</release>
2121
<api>beta</api>
2222
</stability>
23-
<license filesource="LICENSE">BSD</license>
23+
<license filesource="LICENSE">PHP License</license>
2424
<notes>
2525
- Initial release
2626
</notes>
2727
<contents>
2828
<dir name="/">
29-
<file name="LICENSE" role="doc" />
29+
<file name="EXPERIMENTAL" role="doc" />
3030
<file name="CREDITS" role="doc" />
31+
<file name="LICENSE" role="doc" />
3132
<file name="config.m4" role="src" />
3233
<file name="config.w32" role="src" />
3334
<file name="php_jsmin.c" role="src" />
3435
<file name="php_jsmin.h" role="src" />
3536
<file name="jsmin.c" role="src" />
3637
<file name="jsmin.h" role="src" />
3738
<dir name="tests">
38-
<file name="strip-comments.phpt" role="test" />
39+
<file name="call-multiple-times.phpt" role="test" />
40+
<file name="false-on-failure.phpt" role="test" />
41+
<file name="issue-03-string-type-on-empty-arg.phpt" />
42+
<file name="issue-07-no-unexpected-bytes-on-empty.phpt" />
3943
<file name="missing-argument.phpt" role="test" />
44+
<file name="strip-comments.phpt" role="test" />
4045
<file name="unterminated-comment.phpt" role="test" />
4146
<file name="unterminated-regex.phpt" role="test" />
4247
<file name="unterminated-string.phpt" role="test" />
@@ -54,10 +59,10 @@
5459
<extsrcrelease />
5560
<changelog>
5661
<release>
57-
<date>2012-09-16</date>
62+
<date>2012-10-22</date>
5863
<version>
59-
<release>0.1</release>
60-
<api>0.1</api>
64+
<release>0.1.0</release>
65+
<api>0.1.0</api>
6166
</version>
6267
<stability>
6368
<release>beta</release>

php_jsmin.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Author: Michael Squires <[email protected]> |
15+
| Author: Michael Squires <[email protected]> |
1616
+----------------------------------------------------------------------+
1717
*/
1818

php_jsmin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
| obtain it through the world-wide-web, please send a note to |
1313
| [email protected] so we can mail you a copy immediately. |
1414
+----------------------------------------------------------------------+
15-
| Author: Michael Squires <[email protected]> |
15+
| Author: Michael Squires <[email protected]> |
1616
+----------------------------------------------------------------------+
1717
*/
1818

0 commit comments

Comments
 (0)