Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

include php blade plugin in php cluster #7618

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
433f8a8
include php blade plugin in php cluster
haidubogdan Jul 28, 2024
53e6c82
feedback resolve: license header, tab -> whitespace on project.xml, /…
haidubogdan Jul 31, 2024
37b8bc9
image license, use a fallback blade icon, license on generated lexer,
Aug 4, 2024
fe1458c
remove laravel from friend package list, move icon path in ResourceUt…
haidubogdan Aug 5, 2024
98e30a4
fix duplicated project.xml, using new switch syntax, // NOI18N
haidubogdan Aug 5, 2024
bf8347e
batch of reviews, adding // NOI18N, refactoring the switch syntax, mo…
haidubogdan Aug 7, 2024
ad1a7e0
batch of reviews, first set of unit tests, remove old test base
haidubogdan Aug 8, 2024
bc66ee0
batch of reviews changes //NOI18N for strings, permission refactoring…
haidubogdan Aug 12, 2024
f47f3af
switch refacotr, // NOI18N, safe case for null pointer
haidubogdan Aug 12, 2024
0c9d843
remove BladeLanguage commented scripts
haidubogdan Aug 12, 2024
944088e
cover all possilities for some 17 syntax switch rules
haidubogdan Aug 12, 2024
4f12f9f
reviews on PhpFunctionElement - modify namespace access, use List.of …
haidubogdan Aug 12, 2024
e48a1a4
review updates for 12 august
haidubogdan Aug 20, 2024
2dd76c9
comment update, syncronize blade project properties cleanup
haidubogdan Aug 20, 2024
ba6ca25
batch of java code compliance changes for hyperlinkprovider, blade co…
haidubogdan Sep 4, 2024
43c7e7d
refactor+ wip compliance code on blade parser, remove comment
haidubogdan Sep 4, 2024
235ff63
refactor, code compliance, update lexer for css at rules, embedding t…
haidubogdan Sep 13, 2024
be1b8b4
improve embedded php brace matcher freeze issue, remove hyperlink, ph…
haidubogdan Sep 27, 2024
052177f
internationalization comments, remove unecessary CompletionRequest co…
haidubogdan Sep 30, 2024
3bbf32e
switch case code review, NOI18N, use Set instead of List for contains…
haidubogdan Oct 1, 2024
9649e83
add test action for php module workflow, add sample files in license …
haidubogdan Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nbbuild/cluster.properties
Original file line number Diff line number Diff line change
Expand Up @@ -955,6 +955,7 @@ nb.cluster.php=\
php.api.testing,\
php.apigen,\
php.atoum,\
php.blade,\
php.code.analysis,\
php.codeception,\
php.composer,\
Expand Down
1 change: 1 addition & 0 deletions php/php.api.editor/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<friend>org.nbphpcouncil.modules.php.yii2</friend>
<friend>org.netbeans.modules.php.api.framework</friend>
<friend>org.netbeans.modules.php.api.testing</friend>
<friend>org.netbeans.modules.php.blade</friend>
<friend>org.netbeans.modules.php.atoum</friend>
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.codeception</friend>
Expand Down
1 change: 1 addition & 0 deletions php/php.api.framework/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
<friend>org.nbphpcouncil.modules.php.laravel4</friend>
<friend>org.nbphpcouncil.modules.php.yii</friend>
<friend>org.nbphpcouncil.modules.php.yii2</friend>
<friend>org.netbeans.modules.php.blade</friend>
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.doctrine2</friend>
<friend>org.netbeans.modules.php.fuel</friend>
Expand Down
1 change: 1 addition & 0 deletions php/php.api.phpmodule/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@
<friend>org.netbeans.modules.php.api.testing</friend>
<friend>org.netbeans.modules.php.apigen</friend>
<friend>org.netbeans.modules.php.atoum</friend>
<friend>org.netbeans.modules.php.blade</friend>
haidubogdan marked this conversation as resolved.
Show resolved Hide resolved
<friend>org.netbeans.modules.php.cake3</friend>
<friend>org.netbeans.modules.php.code.analysis</friend>
<friend>org.netbeans.modules.php.codeception</friend>
Expand Down
52 changes: 52 additions & 0 deletions php/php.blade/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<project basedir="." default="build" name="php/php.blade">
<description>Builds, tests, and runs the project org.netbeans.modules.php.blade</description>
<import file="../../nbbuild/templates/projectized.xml"/>
<target name="generate-antlr-parser" description="Regenerate the ANTLRv4 parser" depends="init">
<property name="v10.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/v10"/>
<property name="formatter.outdir" location="${src.dir}/org/netbeans/modules/php/blade/syntax/antlr4/formatter"/>

<java classname="org.antlr.v4.Tool" fork="true" dir="${v10.outdir}">
<arg value="-o"/>
<arg value="${v10.outdir}"/>
<arg value="BladeAntlrLexer.g4"/>
<arg value="BladeAntlrParser.g4"/>
</java>
<java classname="org.antlr.v4.Tool" fork="true" dir="${v10.outdir}">
<arg value="-o"/>
<arg value="${v10.outdir}"/>
<arg value="BladeAntlrColoringLexer.g4"/>
</java>

<java classname="org.antlr.v4.Tool" fork="true" dir="${formatter.outdir}">
<arg value="-o"/>
<arg value="${formatter.outdir}"/>
<arg value="BladeAntlrFormatterLexer.g4"/>
<arg value="BladeAntlrFormatterParser.g4"/>
</java>
<delete dir="${v10.outdir}" includes="*.tokens"/>
<delete dir="${v10.outdir}" includes="*.interp"/>
<delete dir="${formatter.outdir}" includes="*.tokens"/>
<delete dir="${formatter.outdir}" includes="*.interp"/>
</target>
</project>
37 changes: 37 additions & 0 deletions php/php.blade/licenseinfo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

-->
<licenseinfo>
<fileset>
<file>src/org/netbeans/modules/php/blade/resources/highlightBlade.blade.php</file>
<license ref="Apache-2.0-ASF" />
<comment type="GUI_USABILITY"/>
</fileset>
<fileset>
<file>tools/skeleton.netbeans</file>
<file>src/org/netbeans/modules/php/blade/resources/icon.png</file>
<file>src/org/netbeans/modules/php/blade/resources/icons/at.png</file>
<file>src/org/netbeans/modules/php/blade/resources/icons/blade_file.png</file>
<file>src/org/netbeans/modules/php/blade/resources/icons/layout.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
</licenseinfo>
7 changes: 7 additions & 0 deletions php/php.blade/manifest.mf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Manifest-Version: 1.0
AutoUpdate-Show-In-Client: true
OpenIDE-Module: org.netbeans.modules.php.blade/1
OpenIDE-Module-Layer: org/netbeans/modules/php/blade/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/blade/resources/Bundle.properties
OpenIDE-Module-Specification-Version: 1.0.0

20 changes: 20 additions & 0 deletions php/php.blade/nbproject/project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

javac.compilerargs=-Xlint -Xlint:-serial
spec.version.base.fatal.warning=false
javac.release=17
Loading