aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.idea/workspace.xml140
-rw-r--r--src/AppBundle/Controller/EmailController.php49
-rw-r--r--src/AppBundle/Controller/NewDataController.php35
3 files changed, 132 insertions, 92 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3d42de0..47cda54 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,8 +20,8 @@
<file leaf-file-name="HomeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
+ <state relative-caret-position="262">
+ <caret line="36" column="0" lean-forward="true" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding>
<element signature="e#6#87#0#PHP" expanded="true" />
<element signature="e#122#181#0#PHP" expanded="true" />
@@ -30,11 +30,34 @@
</provider>
</entry>
</file>
+ <file leaf-file-name="AppBundle.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/AppBundle.php">
+ <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>
+ </file>
<file leaf-file-name="NewDataController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="525">
- <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
+ <state relative-caret-position="247">
+ <caret line="41" column="5" lean-forward="true" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+ <folding>
+ <element signature="e#6#87#0#PHP" expanded="true" />
+ <element signature="e#122#181#0#PHP" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <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" />
<folding>
<element signature="e#6#87#0#PHP" expanded="true" />
<element signature="e#122#181#0#PHP" expanded="true" />
@@ -53,7 +76,7 @@
</provider>
</entry>
</file>
- <file leaf-file-name="parameters.yml" pinned="false" current-in-tab="true">
+ <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">
@@ -73,16 +96,6 @@
</provider>
</entry>
</file>
- <file leaf-file-name="config.yml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/app/config/config.yml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-90">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="1" selection-end-column="34" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="index.html.twig" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig">
<provider selected="true" editor-type-id="text-editor">
@@ -145,9 +158,10 @@
<option value="$PROJECT_DIR$/bin/console" />
<option value="$PROJECT_DIR$/src/AppBundle/Controller/NewData.php" />
<option value="$PROJECT_DIR$/app/Resources/views/default/index.html.twig" />
- <option value="$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php" />
<option value="$PROJECT_DIR$/web/js/realtime.js" />
<option value="$PROJECT_DIR$/app/config/parameters.yml" />
+ <option value="$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php" />
+ <option value="$PROJECT_DIR$/src/AppBundle/Controller/EmailController.php" />
</list>
</option>
</component>
@@ -320,21 +334,28 @@
<workItem from="1511428524892" duration="6187000" />
<workItem from="1511512197156" duration="4678000" />
</task>
+ <task id="LOCAL-00001" summary="Added email controller.">
+ <created>1512042339566</created>
+ <option name="number" value="00001" />
+ <option name="presentableId" value="LOCAL-00001" />
+ <option name="project" value="LOCAL" />
+ <updated>1512042339566</updated>
+ </task>
+ <option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="14544000" />
+ <option name="totallyTimeSpent" value="15991000" />
</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="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="false" 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="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="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" />
@@ -395,7 +416,8 @@
<option name="CHECK_NEW_TODO" value="false" />
<MESSAGE value="Added sending e-mails test." />
<MESSAGE value="Added parameters back." />
- <option name="LAST_COMMIT_MESSAGE" value="Added parameters back." />
+ <MESSAGE value="Added email controller." />
+ <option name="LAST_COMMIT_MESSAGE" value="Added email controller." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -404,14 +426,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/app/AppKernel.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="468">
- <caret line="26" column="82" lean-forward="false" selection-start-line="26" selection-start-column="82" selection-end-line="26" selection-end-column="82" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -685,13 +699,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/AppBundle/AppBundle.php">
- <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" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/config/services.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-184">
@@ -700,17 +707,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="32" column="0" lean-forward="false" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
- <folding>
- <element signature="e#6#87#0#PHP" expanded="true" />
- <element signature="e#122#181#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/Resources/views/default/index.html.twig">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -729,17 +725,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="525">
- <caret line="77" column="0" lean-forward="true" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
- <folding>
- <element signature="e#6#87#0#PHP" expanded="true" />
- <element signature="e#122#181#0#PHP" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app/config/parameters.yml.dist">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -764,5 +749,46 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/NewDataController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="247">
+ <caret line="41" column="5" lean-forward="true" selection-start-line="41" selection-start-column="5" selection-end-line="41" selection-end-column="5" />
+ <folding>
+ <element signature="e#6#87#0#PHP" expanded="true" />
+ <element signature="e#122#181#0#PHP" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/Controller/HomeController.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="262">
+ <caret line="36" column="0" lean-forward="true" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+ <folding>
+ <element signature="e#6#87#0#PHP" expanded="true" />
+ <element signature="e#122#181#0#PHP" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/AppBundle/AppBundle.php">
+ <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>
+ <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" />
+ <folding>
+ <element signature="e#6#87#0#PHP" expanded="true" />
+ <element signature="e#122#181#0#PHP" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project> \ No newline at end of file
diff --git a/src/AppBundle/Controller/EmailController.php b/src/AppBundle/Controller/EmailController.php
new file mode 100644
index 0000000..6d78105
--- /dev/null
+++ b/src/AppBundle/Controller/EmailController.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: andy
+ * Date: 11/23/17
+ * Time: 10:21 AM
+ */
+
+namespace AppBundle\Controller;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+
+class EmailController extends Controller
+{
+ /**
+ * @Route("/email")
+ */
+ public function sendEmail()
+ {
+ $message = (new \Swift_Message('Hello Email'))
+ ->setFrom('***REMOVED***')
+ ->setTo('***REMOVED***@edu.easj.dk')
+ ->setBody(
+ $this->renderView(
+// app/Resources/views/Emails/registration.html.twig
+ 'Emails/registration.html.twig',
+ array('name' => "Test")
+ ),
+ 'text/html'
+ )/*
+* If you also want to include a plaintext version of the message
+->addPart(
+$this->renderView(
+'Emails/registration.txt.twig',
+array('name' => $name)
+),
+'text/plain'
+)
+*/
+ ;
+
+//$mailer->send($message);
+
+// or, you can also fetch the mailer service this way
+ $this->get('mailer')->send($message);
+ }
+} \ No newline at end of file
diff --git a/src/AppBundle/Controller/NewDataController.php b/src/AppBundle/Controller/NewDataController.php
index b6ed181..f63a7fa 100644
--- a/src/AppBundle/Controller/NewDataController.php
+++ b/src/AppBundle/Controller/NewDataController.php
@@ -37,43 +37,8 @@ class NewDataController extends Controller
$response = new Response($data);
$response->headers->set('Content-Type', 'application/json');
- $this->sendEmail("Marcin");
-
return $response;
}
- public function sendEmail($name)
- {
- $message = (new \Swift_Message('Hello Email'))
- ->setFrom('***REMOVED***')
- ->setTo('***REMOVED***@edu.easj.dk')
- ->setBody(
- $this->renderView(
- // app/Resources/views/Emails/registration.html.twig
- 'Emails/registration.html.twig',
- array('name' => $name)
- ),
- 'text/html'
- )
- /*
- * If you also want to include a plaintext version of the message
- ->addPart(
- $this->renderView(
- 'Emails/registration.txt.twig',
- array('name' => $name)
- ),
- 'text/plain'
- )
- */
- ;
-
- //$mailer->send($message);
-
- // or, you can also fetch the mailer service this way
- $this->get('mailer')->send($message);
-
- return $this->render(...);
- }
-
}