From f4bed2a106cdbb4c783f5d7dcfd7c4cff3856cdd Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Wed, 25 Nov 2015 19:44:45 +0300
Subject: [PATCH] PHP color scheme fixes (related to WI-29606 Colors for
 parameters, class, instance method, static method, predefined symbols are the
 same in Default scheme) - remerged

---
 colorSchemes/src/colorSchemes/all_hallows_eve.xml | 2 ++
 colorSchemes/src/colorSchemes/blackboard.xml      | 2 ++
 colorSchemes/src/colorSchemes/cobalt.xml          | 2 ++
 colorSchemes/src/colorSchemes/rails_casts.xml     | 2 ++
 colorSchemes/src/colorSchemes/twilight.xml        | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/colorSchemes/src/colorSchemes/all_hallows_eve.xml b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
index f4db04f1cc4c..3344e5ef301b 100644
--- a/colorSchemes/src/colorSchemes/all_hallows_eve.xml
+++ b/colorSchemes/src/colorSchemes/all_hallows_eve.xml
@@ -1009,6 +1009,8 @@
     </option>
     <option baseAttributes="TEXT" name="PARAMETER_ATTRIBUTES" />
     <option baseAttributes="CLASS_REFERENCE" name="PROTOCOL_REFERENCE" />
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
diff --git a/colorSchemes/src/colorSchemes/blackboard.xml b/colorSchemes/src/colorSchemes/blackboard.xml
index 6030009df140..56c8781cc3fb 100644
--- a/colorSchemes/src/colorSchemes/blackboard.xml
+++ b/colorSchemes/src/colorSchemes/blackboard.xml
@@ -985,6 +985,8 @@
         <option name="FOREGROUND" value="FF6400" />
       </value>
     </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />
diff --git a/colorSchemes/src/colorSchemes/cobalt.xml b/colorSchemes/src/colorSchemes/cobalt.xml
index d511d7810bd6..aea19f037931 100644
--- a/colorSchemes/src/colorSchemes/cobalt.xml
+++ b/colorSchemes/src/colorSchemes/cobalt.xml
@@ -1229,6 +1229,8 @@
         <option name="FOREGROUND" value="FFDD00" />
       </value>
     </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="FOREGROUND" value="F8F8F8" />
diff --git a/colorSchemes/src/colorSchemes/rails_casts.xml b/colorSchemes/src/colorSchemes/rails_casts.xml
index d142c57c82d8..44880ef961e7 100644
--- a/colorSchemes/src/colorSchemes/rails_casts.xml
+++ b/colorSchemes/src/colorSchemes/rails_casts.xml
@@ -1089,6 +1089,8 @@
         <option name="FOREGROUND" value="FFFFFF" />
       </value>
     </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="FOREGROUND" value="FFFFFF" />
diff --git a/colorSchemes/src/colorSchemes/twilight.xml b/colorSchemes/src/colorSchemes/twilight.xml
index 2fc8860cda20..e6ae7faea106 100644
--- a/colorSchemes/src/colorSchemes/twilight.xml
+++ b/colorSchemes/src/colorSchemes/twilight.xml
@@ -1096,6 +1096,8 @@
         <option name="FOREGROUND" value="9B703F" />
       </value>
     </option>
+    <option name="PHP_VAR" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
+    <option name="PHP_PARAMETER" baseAttributes="DEFAULT_PARAMETER" />
     <option name="PUPPET_BAD_CHARACTER">
       <value>
         <option name="BACKGROUND" value="6e3b3b" />