diff options
author | Peter Kokot <peterkokot@gmail.com> | 2019-05-17 23:45:26 +0200 |
---|---|---|
committer | Peter Kokot <peterkokot@gmail.com> | 2019-05-17 23:45:26 +0200 |
commit | 31faa4df736e685c9087d81db084ddf4c892f402 (patch) | |
tree | b22410aafb27a5c774f3c0dbe844bae7fef6bdfb | |
parent | 739cb44bae083e8ff537e39b1766228a1afdf4af (diff) | |
parent | 63ef554fe48a042088066fc97a7422cbfe983205 (diff) | |
download | php-git-31faa4df736e685c9087d81db084ddf4c892f402.tar.gz |
Merge branch 'PHP-7.4'
* PHP-7.4:
Move copyright/license headers to CONTRIBUTING.md
-rw-r--r-- | CONTRIBUTING.md | 25 | ||||
-rw-r--r-- | Zend/header | 17 | ||||
-rw-r--r-- | header | 17 |
3 files changed, 25 insertions, 34 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2d32dc6a20..82ddcb6f0e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -24,6 +24,7 @@ had several contributions accepted, commit privileges are often quickly granted. * [What happens after submitting contribution?](#what-happens-after-submitting-contribution) * [What happens when your contribution is applied?](#what-happens-when-your-contribution-is-applied) * [Git commit rules](#git-commit-rules) +* [Copyright and license headers](#copyright-and-license-headers) ## Pull requests @@ -394,4 +395,28 @@ decreasing order under the fixed version. You can use [gitweb](https://git.php.net/) to look at PHP Git repository in various ways. +## Copyright and license headers + +New source code files should include the following header block: + +```c +/* + +----------------------------------------------------------------------+ + | PHP Version 7 | + +----------------------------------------------------------------------+ + | Copyright (c) The PHP Group | + +----------------------------------------------------------------------+ + | This source file is subject to version 3.01 of the PHP license, | + | that is bundled with this package in the file LICENSE, and is | + | available through the world-wide-web at the following url: | + | https://www.php.net/license/3_01.txt | + | If you did not receive a copy of the PHP license and are unable to | + | obtain it through the world-wide-web, please send a note to | + | license@php.net so we can mail you a copy immediately. | + +----------------------------------------------------------------------+ + | Author: | + +----------------------------------------------------------------------+ +*/ +``` + Thank you for contributing to PHP! diff --git a/Zend/header b/Zend/header deleted file mode 100644 index e98bffc496..0000000000 --- a/Zend/header +++ /dev/null @@ -1,17 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Zend Engine | - +----------------------------------------------------------------------+ - | Copyright (c) Zend Technologies Ltd. (http://www.zend.com) | - +----------------------------------------------------------------------+ - | This source file is subject to version 2.00 of the Zend license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.zend.com/license/2_00.txt. | - | If you did not receive a copy of the Zend license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@zend.com so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: | - +----------------------------------------------------------------------+ -*/ diff --git a/header b/header deleted file mode 100644 index af9d762f5f..0000000000 --- a/header +++ /dev/null @@ -1,17 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 7 | - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | https://php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: | - +----------------------------------------------------------------------+ -*/ |