diff --git a/spellchecker.bindings.htmlxml/manifest.mf b/spellchecker.bindings.htmlxml/manifest.mf
--- a/spellchecker.bindings.htmlxml/manifest.mf
+++ b/spellchecker.bindings.htmlxml/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.htmlxml
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/htmlxml/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/htmlxml/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.28
+OpenIDE-Module-Specification-Version: 1.29
diff --git a/spellchecker.bindings.htmlxml/nbproject/project.xml b/spellchecker.bindings.htmlxml/nbproject/project.xml
--- a/spellchecker.bindings.htmlxml/nbproject/project.xml
+++ b/spellchecker.bindings.htmlxml/nbproject/project.xml
@@ -137,7 +137,10 @@
-
+
+ org.netbeans.modules.spellchecker.bindings.php
+ org.netbeans.modules.spellchecker.bindings.htmlxml
+
diff --git a/spellchecker.bindings.php/manifest.mf b/spellchecker.bindings.php/manifest.mf
--- a/spellchecker.bindings.php/manifest.mf
+++ b/spellchecker.bindings.php/manifest.mf
@@ -2,5 +2,5 @@
OpenIDE-Module: org.netbeans.modules.spellchecker.bindings.php
OpenIDE-Module-Layer: org/netbeans/modules/spellchecker/bindings/php/resources/layer.xml
OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/spellchecker/bindings/php/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 0.2
+OpenIDE-Module-Specification-Version: 0.3
diff --git a/spellchecker.bindings.php/nbproject/project.xml b/spellchecker.bindings.php/nbproject/project.xml
--- a/spellchecker.bindings.php/nbproject/project.xml
+++ b/spellchecker.bindings.php/nbproject/project.xml
@@ -107,6 +107,14 @@
+ org.netbeans.modules.spellchecker.bindings.htmlxml
+
+
+
+ 1.29
+
+
+
org.openide.filesystems
diff --git a/spellchecker.bindings.php/src/org/netbeans/modules/spellchecker/bindings/php/PHPTokenListProvider.java b/spellchecker.bindings.php/src/org/netbeans/modules/spellchecker/bindings/php/PHPTokenListProvider.java
--- a/spellchecker.bindings.php/src/org/netbeans/modules/spellchecker/bindings/php/PHPTokenListProvider.java
+++ b/spellchecker.bindings.php/src/org/netbeans/modules/spellchecker/bindings/php/PHPTokenListProvider.java
@@ -41,12 +41,16 @@
*/
package org.netbeans.modules.spellchecker.bindings.php;
+import java.util.ArrayList;
+import java.util.List;
import javax.swing.text.Document;
import org.netbeans.editor.BaseDocument;
import org.netbeans.modules.editor.NbEditorUtilities;
import org.netbeans.modules.php.api.util.FileUtils;
+import org.netbeans.modules.spellchecker.bindings.htmlxml.HtmlTokenList;
import org.netbeans.modules.spellchecker.spi.language.TokenList;
import org.netbeans.modules.spellchecker.spi.language.TokenListProvider;
+import org.netbeans.modules.spellchecker.spi.language.support.MultiTokenList;
import org.openide.util.lookup.ServiceProvider;
@ServiceProvider(service = TokenListProvider.class)
@@ -57,7 +61,10 @@
String mimeType = NbEditorUtilities.getMimeType(doc);
if (FileUtils.PHP_MIME_TYPE.equals(mimeType)
&& doc instanceof BaseDocument) {
- return new PHPTokenList(doc);
+ List tokens = new ArrayList<>(2);
+ tokens.add(new PHPTokenList(doc));
+ tokens.add(new HtmlTokenList((BaseDocument) doc, "PHP")); // NOI18N
+ return MultiTokenList.create(tokens);
}
return null;
}