Skip to content

Commit

Permalink
Merge pull request apache#922 from junichi11/change-phpstan-icon
Browse files Browse the repository at this point in the history
Change phpstan.png
  • Loading branch information
tmysik authored Sep 29, 2018
2 parents e1b1e9c + bc9144d commit 0e91862
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 1 deletion.
21 changes: 21 additions & 0 deletions nbbuild/licenses/MIT-phpstan
Original file line number Diff line number Diff line change
@@ -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.
1 change: 1 addition & 0 deletions nbbuild/licenses/names.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion php/php.code.analysis/licenseinfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 0e91862

Please sign in to comment.