Update project config & composer

master
Julien Rosset 5 years ago
parent c731143b84
commit 2a1d4a2c79

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true"> <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="VPS" uuid="596c281d-e55b-4525-bbd5-35106afba307"> <data-source source="LOCAL" name="Giftopic (dev)" uuid="596c281d-e55b-4525-bbd5-35106afba307">
<driver-ref>mariadb</driver-ref> <driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize> <synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver> <jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mariadb://localhost:3306/giftopic</jdbc-url> <jdbc-url>jdbc:mariadb://localhost:3306/giftopic_dev</jdbc-url>
</data-source> </data-source>
</component> </component>
</project> </project>

@ -2,12 +2,12 @@
<project version="4"> <project version="4">
<component name="WebServers"> <component name="WebServers">
<option name="servers"> <option name="servers">
<webServer id="e6d3992e-8264-446c-add3-a518ae9e1f20" name="giftopic" url="http://www.giftopic.fr"> <webServer id="e6d3992e-8264-446c-add3-a518ae9e1f20" name="giftopic-dev" url="https://dev.giftopic.fr">
<fileTransfer host="vps795523.ovh.net" port="4351" rootFolder="/giftopic" accessType="SFTP"> <fileTransfer host="giftopic.fr" port="4352" accessType="SFTP">
<advancedOptions> <advancedOptions>
<advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" /> <advancedOptions dataProtectionLevel="Private" passiveMode="true" shareSSLContext="true" />
</advancedOptions> </advancedOptions>
<option name="port" value="4351" /> <option name="port" value="4352" />
</fileTransfer> </fileTransfer>
</webServer> </webServer>
</option> </option>

914
composer.lock generated

File diff suppressed because it is too large Load Diff

@ -27,7 +27,9 @@ class SecurityController extends AbstractController {
$error = $authenticationUtils->getLastAuthenticationError(); $error = $authenticationUtils->getLastAuthenticationError();
$lastUsername = $authenticationUtils->getLastUsername(); $lastUsername = $authenticationUtils->getLastUsername();
return $this->render('security/login.html.twig', [ return $this->render(
'security/login.html.twig',
[
'last_username' => $lastUsername, 'last_username' => $lastUsername,
'error' => $error, 'error' => $error,
] ]

Loading…
Cancel
Save