diff options
| -rw-r--r-- | .idea/workspace.xml | 45 | ||||
| -rw-r--r-- | src/AppBundle/Controller/EmailController.php | 2 |
2 files changed, 26 insertions, 21 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 47cda54..61d3c4b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,7 @@ <component name="ChangeListManager"> <list default="true" id="c02a68ca-4895-49ef-94e1-572ab8cf87ba" name="Default" comment=""> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/AppBundle/Controller/EmailController.php" afterPath="$PROJECT_DIR$/src/AppBundle/Controller/EmailController.php" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -56,8 +57,8 @@ <file leaf-file-name="EmailController.php" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/EmailController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="28" column="41" lean-forward="false" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" /> + <state relative-caret-position="180"> + <caret line="27" column="22" lean-forward="false" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> <element signature="e#122#181#0#PHP" expanded="true" /> @@ -76,16 +77,6 @@ </provider> </entry> </file> - <file leaf-file-name="parameters.yml" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/config/parameters.yml"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="195"> - <caret line="13" column="26" lean-forward="true" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" /> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="parameters.yml.dist" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/app/config/parameters.yml.dist"> <provider selected="true" editor-type-id="text-editor"> @@ -341,21 +332,29 @@ <option name="project" value="LOCAL" /> <updated>1512042339566</updated> </task> - <option name="localTasksCounter" value="2" /> + <task id="LOCAL-00002" summary="Merge."> + <created>1512042380391</created> + <option name="number" value="00002" /> + <option name="presentableId" value="LOCAL-00002" /> + <option name="project" value="LOCAL" /> + <updated>1512042380391</updated> + </task> + <option name="localTasksCounter" value="3" /> <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="15991000" /> + <option name="totallyTimeSpent" value="16666000" /> </component> <component name="ToolWindowManager"> <frame x="293" y="47" width="1366" height="741" extended-state="6" /> + <editor active="true" /> <layout> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12884334" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <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="6" 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.39968404" sideWeight="0.5036573" order="7" side_tool="true" content_ui="tabs" /> + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32917318" sideWeight="0.50292826" order="7" side_tool="true" 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="3" 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.32917318" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> - <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32917318" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32917318" sideWeight="0.49707174" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917318" sideWeight="0.4956076" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25429016" sideWeight="0.4848485" order="7" side_tool="false" content_ui="tabs" /> @@ -417,7 +416,8 @@ <MESSAGE value="Added sending e-mails test." /> <MESSAGE value="Added parameters back." /> <MESSAGE value="Added email controller." /> - <option name="LAST_COMMIT_MESSAGE" value="Added email controller." /> + <MESSAGE value="Merge." /> + <option name="LAST_COMMIT_MESSAGE" value="Merge." /> </component> <component name="XDebuggerManager"> <breakpoint-manager> @@ -601,6 +601,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="18"> <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> + <folding /> </state> </provider> </entry> @@ -616,6 +617,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -623,6 +625,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -630,6 +633,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> </state> </provider> </entry> @@ -637,6 +641,7 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="18"> <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" /> + <folding /> </state> </provider> </entry> @@ -781,8 +786,8 @@ </entry> <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/EmailController.php"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="420"> - <caret line="28" column="41" lean-forward="false" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" /> + <state relative-caret-position="180"> + <caret line="27" column="22" lean-forward="false" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" /> <folding> <element signature="e#6#87#0#PHP" expanded="true" /> <element signature="e#122#181#0#PHP" expanded="true" /> diff --git a/src/AppBundle/Controller/EmailController.php b/src/AppBundle/Controller/EmailController.php index 6d78105..86094b9 100644 --- a/src/AppBundle/Controller/EmailController.php +++ b/src/AppBundle/Controller/EmailController.php @@ -25,7 +25,7 @@ class EmailController extends Controller ->setBody( $this->renderView( // app/Resources/views/Emails/registration.html.twig - 'Emails/registration.html.twig', + 'emails/registration.html.twig', array('name' => "Test") ), 'text/html' |