Skip to content
Snippets Groups Projects
Commit 400c87f6 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Corrections pour passer à ZF3.

parent 81666568
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 234 additions and 7 deletions
.idea/encodings.xml 0 → 100644
+ 6
− 0
View file @ 400c87f6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM">
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
.idea/faq.iml 0 → 100644
+ 10
− 0
View file @ 400c87f6
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/inspectionProfiles/Project_Default.xml 0 → 100644
+ 10
− 0
View file @ 400c87f6
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
<option name="processCode" value="true" />
<option name="processLiterals" value="true" />
<option name="processComments" value="true" />
</inspection_tool>
</profile>
</component>
\ No newline at end of file
.idea/misc.xml 0 → 100644
+ 73
− 0
View file @ 400c87f6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="NodePackageJsonFileManager">
<packageJsonPaths />
</component>
<component name="ProjectDictionaryState">
<dictionary name="gauthierb" />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
<State>
<id>Bitwise operation issuesJavaScript</id>
</State>
<State>
<id>Blade files</id>
</State>
<State>
<id>CSS</id>
</State>
<State>
<id>Code StylePHP</id>
</State>
<State>
<id>Code quality toolsJavaScript</id>
</State>
<State>
<id>Data flow issuesJavaScript</id>
</State>
<State>
<id>GeneralPHP</id>
</State>
<State>
<id>JavaScript</id>
</State>
<State>
<id>Naming conventionsJavaScript</id>
</State>
<State>
<id>PHP</id>
</State>
<State>
<id>Potentially confusing code constructsJavaScript</id>
</State>
<State>
<id>Probable bugsJavaScript</id>
</State>
<State>
<id>SQL</id>
</State>
<State>
<id>XPath</id>
</State>
<State>
<id>XSLT</id>
</State>
</expanded-state>
<selected-state>
<State>
<id>Blade files</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
</project>
\ No newline at end of file
.idea/modules.xml 0 → 100644
+ 8
− 0
View file @ 400c87f6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/faq.iml" filepath="$PROJECT_DIR$/.idea/faq.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml 0 → 100644
+ 6
− 0
View file @ 400c87f6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml 0 → 100644
+ 116
− 0
View file @ 400c87f6
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="377c0a23-f30c-4ff0-85a4-04e91db7c38b" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="1745" />
<option name="y" value="-4" />
<option name="width" value="1855" />
<option name="height" value="1084" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="options.lastSelected" value="reference.settings.php.debug.xdebug.proxy" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="options.splitter.main.proportions" value="0.3" />
<property name="settings.editor.selected.configurable" value="database.main" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="SvnConfiguration">
<configuration>$USER_HOME$/.subversion</configuration>
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="377c0a23-f30c-4ff0-85a4-04e91db7c38b" name="Default Changelist" comment="" />
<created>1552311894042</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1552311894042</updated>
<workItem from="1552311895213" duration="5000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5000" />
</component>
<component name="ToolWindowManager">
<frame x="1745" y="-4" width="1855" height="1084" extended-state="6" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48175967" visible="true" weight="0.2697623" />
<window_info id="Structure" order="1" sideWeight="0.51824033" side_tool="true" visible="true" weight="0.2697623" />
<window_info id="Favorites" order="2" sideWeight="0.5043011" side_tool="true" weight="0.25815368" />
<window_info anchor="bottom" id="Database Changes" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32903227" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Messages" order="7" />
<window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.2731183" />
<window_info anchor="bottom" id="Terminal" order="10" weight="0.47419354" />
<window_info anchor="bottom" id="Docker" order="11" weight="0.41827956" />
<window_info anchor="bottom" id="Database Console" order="12" weight="0.32903227" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="3" />
<window_info anchor="right" id="Database" order="4" weight="0.21669431" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
</component>
<component name="masterDetails">
<states>
<state key="ScopeChooserConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
\ No newline at end of file
src/UnicaenFaq/Controller/Factory/FaqControllerFactory.php
+ 2
− 2
View file @ 400c87f6
......@@ -18,10 +18,10 @@ class FaqControllerFactory
*/
public function __invoke(ControllerManager $controllerManager)
{
$faqService = $this->getFaqService($controllerManager->getServiceLocator());
$faqService = $this->getFaqService($controllerManager);
/** @var FaqForm $form */
$form = $controllerManager->getServiceLocator()->get('FormElementManager')->get('UnicaenFaq\Form\FaqForm');
$form = $controllerManager->get('FormElementManager')->get('UnicaenFaq\Form\FaqForm');
$controller = new FaqController($form);
$controller->setFaqService($faqService);
......
src/UnicaenFaq/Form/Factory/FaqFormFactory.php
+ 3
− 5
View file @ 400c87f6
......@@ -4,16 +4,14 @@ namespace UnicaenFaq\Form\Factory;
use UnicaenFaq\Form\FaqForm;
use DoctrineModule\Stdlib\Hydrator\DoctrineObject;
use Zend\Form\FormElementManager;
use Zend\Form\FormElementManager\FormElementManagerV3Polyfill;
class FaqFormFactory
{
public function __invoke(FormElementManager $formElementManager)
public function __invoke(FormElementManagerV3Polyfill $formElementManager)
{
$sl = $formElementManager->getServiceLocator();
/** @var DoctrineObject $hydrator */
$hydrator = $sl->get('HydratorManager')->get('DoctrineModule\Stdlib\Hydrator\DoctrineObject');
$hydrator = $formElementManager->get('HydratorManager')->get('DoctrineModule\Stdlib\Hydrator\DoctrineObject');
$form = new FaqForm();
$form->setHydrator($hydrator);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment