Skip to content

Commit 6e10125

Browse files
committed
build: Update and formalise copyright notice
* Sync the copyright statements between: - the initial php-cssjanus commit (which predates the Node.js version becoming upstream instead of downstream). - the LICENSE.txt file. - the CSSJanus.php file. * Copy it to the NOTICE.txt file, as expected by the terms of the Apache 2.0 license. * Move list of principal authors to AUTHORS.txt. * Add several more major contributors based on `git shortlog -se | sort -rn`. * Add CODE_OF_CONDUCT.md, previously missing. * Fix code.google.com deadlink, and move to README.md. * Update outdated self-description in CSSJanus.php, this is now a port of the Node.js version.
1 parent 0ca7d5b commit 6e10125

File tree

7 files changed

+44
-17
lines changed

7 files changed

+44
-17
lines changed

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Ed Sanders <ejsanders@gmail.com>
2+
James Forrester <jforrester@wikimedia.org>
3+
Matthew Flaschen <mflaschen@wikimedia.org>

AUTHORS.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Principal authors and major contributors (alphabetically):
2+
3+
Bryon Engelhardt <ebryon77@gmail.com>
4+
Ed Sanders <ejsanders@gmail.com>
5+
James Forrester <jforrester@wikimedia.org>
6+
Lindsey Simon <elsigh@google.com>
7+
Roan Kattouw <roankattouw@gmail.com>
8+
Roozbeh Pournader <roozbeh@gmail.com>
9+
Timo Tijhof <krinklemail@gmail.com>
10+
Trevor Parscal <trevorparscal@gmail.com>

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This project adheres to the [Wikimedia Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).

NOTICE.txt

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
PHP port of CSSJanus. https://github.com/cssjanus/php-cssjanus
2+
3+
Copyright 2020 Timo Tijhof
4+
Copyright 2014 Trevor Parscal
5+
Copyright 2010 Roan Kattouw
6+
Copyright 2008 Google Inc.
7+
8+
Licensed under the Apache License, Version 2.0 (the "License");
9+
you may not use this file except in compliance with the License.
10+
You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing, software
15+
distributed under the License is distributed on an "AS IS" BASIS,
16+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17+
See the License for the specific language governing permissions and
18+
limitations under the License.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ If a rule is not meant to be flipped by CSSJanus, use a `/* @noflip */` comment
4444

4545
## Port
4646

47-
This is a PHP port of the Node.js implementation of CSSJanus.
47+
This is a PHP port of the Node.js implementation of CSSJanus, and was originally
48+
based on a [Google project](http://code.google.com/p/cssjanus/).
4849

49-
Feature requests and bugs related to the actual CSS transformation or test
50-
cases of it, should be submitted upstream at
51-
<https://github.com/cssjanus/cssjanus>.
50+
Feature requests and bugs related to the actual CSS transformation logic or test
51+
cases of it, should be submitted upstream at <https://github.com/cssjanus/cssjanus>.
5252

5353
Upstream releases will be ported here.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"license": "Apache-2.0",
55
"authors": [
66
{
7-
"name": "Trevor Parscal"
7+
"name": "Roan Kattouw"
88
},
99
{
10-
"name": "Roan Kattouw"
10+
"name": "Trevor Parscal"
1111
},
1212
{
1313
"name": "Timo Tijhof"

src/CSSJanus.php

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<?php
22
/**
3-
* PHP port of CSSJanus.
4-
* https://github.com/cssjanus/php-cssjanus
3+
* PHP port of CSSJanus. https://github.com/cssjanus/php-cssjanus
54
*
6-
* Copyright 2008 Google Inc.
5+
* Copyright 2020 Timo Tijhof
6+
* Copyright 2014 Trevor Parscal
77
* Copyright 2010 Roan Kattouw
8+
* Copyright 2008 Google Inc.
89
*
910
* Licensed under the Apache License, Version 2.0 (the "License");
1011
* you may not use this file except in compliance with the License.
@@ -22,13 +23,8 @@
2223
*/
2324

2425
/**
25-
* This is a PHP port of CSSJanus, a utility that transforms CSS style sheets
26-
* written for LTR to RTL.
27-
*
28-
* Original code: http://code.google.com/p/cssjanus/source/browse/trunk/cssjanus.py
29-
*
30-
* @author Lindsey Simon <elsigh@google.com>
31-
* @author Roan Kattouw
26+
* CSSJanus is a a utility that converts CSS stylesheets
27+
* from left-to-right (LTR) to right-to-left (RTL).
3228
*/
3329
class CSSJanus {
3430
// Patterns defined as null are built dynamically by buildPatterns()
@@ -476,7 +472,6 @@ private static function calculateNewBackgroundPosition($matches) {
476472
/**
477473
* Utility class used by CSSJanus that tokenizes and untokenizes things we want
478474
* to protect from being janused.
479-
* @author Roan Kattouw
480475
*/
481476
class CSSJanusTokenizer {
482477
private $regex;

0 commit comments

Comments
 (0)