From 63ef554fe48a042088066fc97a7422cbfe983205 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Sat, 27 Apr 2019 22:31:13 +0200 Subject: [PATCH] Move copyright/license headers to CONTRIBUTING.md These are more like a general contribution guidelines for the new files added to the php-src repository. --- CONTRIBUTING.md | 25 +++++++++++++++++++++++++ Zend/header | 17 ----------------- header | 17 ----------------- 3 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 Zend/header delete mode 100644 header diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d819e579215..b8a5d0ed944 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 e98bffc4966..00000000000 --- 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 af9d762f5fe..00000000000 --- 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: | - +----------------------------------------------------------------------+ -*/