You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/09/29 12:10:07 UTC
[GitHub] tmysik closed pull request #922: Change phpstan.png
tmysik closed pull request #922: Change phpstan.png
URL: https://github.com/apache/incubator-netbeans/pull/922
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nbbuild/licenses/MIT-phpstan b/nbbuild/licenses/MIT-phpstan
new file mode 100644
index 0000000000..7c0f2b7b69
--- /dev/null
+++ b/nbbuild/licenses/MIT-phpstan
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Ondřej Mirtes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/nbbuild/licenses/names.properties b/nbbuild/licenses/names.properties
index bffd70f202..0832fc2992 100644
--- a/nbbuild/licenses/names.properties
+++ b/nbbuild/licenses/names.properties
@@ -56,6 +56,7 @@ MIT-isorelax=MIT license isorelax variant
MIT-sim=MIT license ios-sim variant, with license for code from contributors.
MIT-jquery=MIT license JQuery variant
MIT-nodejs=MIT license NodeJS variant plus node external libraries licenses
+MIT-phpstan=MIT license PHPStan variant
MIT-validator=MIT license validator variant
MPL-1.0=MPL 1.0 license
CDDL-SPL=CDDL 1.0 + SPL 1.0
diff --git a/php/php.code.analysis/licenseinfo.xml b/php/php.code.analysis/licenseinfo.xml
index 2b37e25714..b7acb61598 100644
--- a/php/php.code.analysis/licenseinfo.xml
+++ b/php/php.code.analysis/licenseinfo.xml
@@ -24,8 +24,12 @@
<file>src/org/netbeans/modules/php/analysis/ui/resources/code-sniffer.png</file>
<file>src/org/netbeans/modules/php/analysis/ui/resources/coding-standards-fixer.png</file>
<file>src/org/netbeans/modules/php/analysis/ui/resources/mess-detector.png</file>
- <file>src/org/netbeans/modules/php/analysis/ui/resources/phpstan.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/php/analysis/ui/resources/phpstan.png</file>
+ <license ref="MIT-phpstan" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
</licenseinfo>
diff --git a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/resources/phpstan.png b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/resources/phpstan.png
index 6fe428b794..d2a20b7a02 100644
Binary files a/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/resources/phpstan.png and b/php/php.code.analysis/src/org/netbeans/modules/php/analysis/ui/resources/phpstan.png differ
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists