Skip to content
GitLab

Resolve "Update filters with allRulesMatched"

Merged vfolliguet requested to merge 48-update-filters-with-allrulesmatched into dev
1 unresolved thread
Viewing commit ae0a575e
Prev Next
Show latest version
3 files
+ 21
- 9
.i‎dea‎
worksp‎ace.xml‎ +19 -8
src/‎Tools‎
FilterEn‎coder.php‎ +1 -1
.giti‎gnore‎ +1 -0
.idea/workspace.xml
+ 19
- 8
@@ -19,13 +19,8 @@
<select />
</component>
<component name="ChangeListManager">
<list default="true" id="778b2a69-812a-4fe6-b49e-75a33012d464" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/antar-lib.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/antar-lib.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/php.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/php.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Models/Filter.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Models/Filter.php" afterDir="false" />
<list default="true" id="778b2a69-812a-4fe6-b49e-75a33012d464" name="Default Changelist" comment="Resolve update Filter.php">
<change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Tools/FilterEncoder.php" beforeDir="false" afterPath="$PROJECT_DIR$/src/Tools/FilterEncoder.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -160,8 +155,16 @@
<updated>1573120350066</updated>
<workItem from="1573120351579" duration="4931000" />
<workItem from="1578669995400" duration="1377000" />
<workItem from="1600245955119" duration="6271000" />
<workItem from="1600245955119" duration="6605000" />
</task>
<task id="LOCAL-00001" summary="Resolve update Filter.php">
<created>1600255717275</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1600255717275</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -193,6 +196,10 @@
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Resolve update Filter.php" />
<option name="LAST_COMMIT_MESSAGE" value="Resolve update Filter.php" />
</component>
<component name="WindowStateProjectService">
<state x="652" y="161" key="#PHP" timestamp="1600248585572">
<screen x="0" y="23" width="1920" height="977" />
@@ -206,6 +213,10 @@
<screen x="0" y="23" width="1920" height="977" />
</state>
<state x="783" y="442" key="NewPhpFileDialog/1920.23.1920.1057/0.23.1920.977@0.23.1920.977" timestamp="1600246669388" />
<state x="560" y="251" key="Vcs.Push.Dialog.v2" timestamp="1600255723873">
<screen x="0" y="23" width="1920" height="977" />
</state>
<state x="560" y="251" key="Vcs.Push.Dialog.v2/1920.23.1920.1057/0.23.1920.977@0.23.1920.977" timestamp="1600255723873" />
<state x="714" y="265" key="com.jetbrains.php.test.PhpNewTestDialog" timestamp="1600246540337">
<screen x="0" y="23" width="1920" height="977" />
</state>
src/Tools/FilterEncoder.php
+ 1
- 1
@@ -77,7 +77,7 @@ class FilterEncoder implements EncoderInterface, DecoderInterface
if (is_array($value)) {
$value = implode("|", $value);
}
$queryParameters[] = $name . ":" . ($value);
$queryParameters[] = $name . ":" . $value;
}
}
return implode(",", $queryParameters);
.gitignore
+ 1
- 0
@@ -13,6 +13,7 @@ composer.phar
### PhpStorm ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
.idea
# User-specific stuff
.idea/**/workspace.xml