|
@@ -2,13 +2,9 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="ddb2382b-0607-474c-bb0c-2ed75e2c2479" name="Default" comment="">
|
|
<list default="true" id="ddb2382b-0607-474c-bb0c-2ed75e2c2479" name="Default" comment="">
|
|
- <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/demo/UserConverter.php" />
|
|
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json" afterPath="$PROJECT_DIR$/composer.json" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.json" afterPath="$PROJECT_DIR$/composer.json" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.lock" afterPath="$PROJECT_DIR$/composer.lock" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/composer.lock" afterPath="$PROJECT_DIR$/composer.lock" />
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/app.php" afterPath="$PROJECT_DIR$/src/app.php" />
|
|
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/controllers.php" afterPath="$PROJECT_DIR$/src/controllers.php" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/controllers.php" afterPath="$PROJECT_DIR$/src/controllers.php" />
|
|
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/demo/User.php" afterPath="$PROJECT_DIR$/src/demo/User.php" />
|
|
|
|
</list>
|
|
</list>
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -18,7 +14,18 @@
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
- <leaf />
|
|
|
|
|
|
+ <leaf>
|
|
|
|
+ <file leaf-file-name="controllers.php" pinned="false" current-in-tab="true">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/controllers.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="232">
|
|
|
|
+ <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
|
|
+ </file>
|
|
|
|
+ </leaf>
|
|
</component>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<findStrings>
|
|
@@ -38,8 +45,8 @@
|
|
<option value="$PROJECT_DIR$/config/prod.php" />
|
|
<option value="$PROJECT_DIR$/config/prod.php" />
|
|
<option value="$PROJECT_DIR$/src/demo/User.php" />
|
|
<option value="$PROJECT_DIR$/src/demo/User.php" />
|
|
<option value="$PROJECT_DIR$/src/app.php" />
|
|
<option value="$PROJECT_DIR$/src/app.php" />
|
|
- <option value="$PROJECT_DIR$/src/controllers.php" />
|
|
|
|
<option value="$PROJECT_DIR$/src/demo/UserConverter.php" />
|
|
<option value="$PROJECT_DIR$/src/demo/UserConverter.php" />
|
|
|
|
+ <option value="$PROJECT_DIR$/src/controllers.php" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -128,30 +135,6 @@
|
|
<item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="templates" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="templates" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
</path>
|
|
</path>
|
|
- <path>
|
|
|
|
- <item name="silex-book" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="templates" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="errors" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="silex-book" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="silex-book" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="symfony" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
- <path>
|
|
|
|
- <item name="silex-book" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
- <item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="vendor" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="symfony" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- <item name="http-foundation" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
|
|
- </path>
|
|
|
|
<path>
|
|
<path>
|
|
<item name="silex-book" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="silex-book" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
<item name="silex-book" type="2a2b976b:PhpTreeStructureProvider$1" />
|
|
@@ -195,15 +178,16 @@
|
|
<option name="number" value="Default" />
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1511938962819</updated>
|
|
<updated>1511938962819</updated>
|
|
- <workItem from="1511938964059" duration="2966000" />
|
|
|
|
|
|
+ <workItem from="1511938964059" duration="3701000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="2966000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="3701000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="23" width="1676" height="1027" extended-state="6" />
|
|
<frame x="0" y="23" width="1676" height="1027" extended-state="6" />
|
|
|
|
+ <editor active="true" />
|
|
<layout>
|
|
<layout>
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
|
@@ -216,7 +200,7 @@
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.249694" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.249694" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
- <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39914164" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
|
|
|
|
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.39914164" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
@@ -235,7 +219,7 @@
|
|
</component>
|
|
</component>
|
|
<component name="XDebuggerManager">
|
|
<component name="XDebuggerManager">
|
|
<breakpoint-manager>
|
|
<breakpoint-manager>
|
|
- <option name="time" value="1" />
|
|
|
|
|
|
+ <option name="time" value="6" />
|
|
</breakpoint-manager>
|
|
</breakpoint-manager>
|
|
<watches-manager />
|
|
<watches-manager />
|
|
</component>
|
|
</component>
|
|
@@ -347,18 +331,26 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/vendor/symfony/http-kernel/HttpKernel.php">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="252">
|
|
|
|
+ <caret line="74" column="0" lean-forward="true" selection-start-line="74" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
|
|
|
|
+ <folding />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/src/app.php">
|
|
<entry file="file://$PROJECT_DIR$/src/app.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="330">
|
|
|
|
- <caret line="22" column="22" lean-forward="false" selection-start-line="22" selection-start-column="22" selection-end-line="22" selection-end-column="22" />
|
|
|
|
|
|
+ <state relative-caret-position="435">
|
|
|
|
+ <caret line="29" column="0" lean-forward="true" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/src/controllers.php">
|
|
<entry file="file://$PROJECT_DIR$/src/controllers.php">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="401">
|
|
|
|
- <caret line="49" column="0" lean-forward="false" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
|
|
|
|
|
|
+ <state relative-caret-position="232">
|
|
|
|
+ <caret line="40" column="0" lean-forward="false" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
|
|
<folding />
|
|
<folding />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|