diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f8ee0564952e524723606482fcf58d0f1801ad75..3c7801913e0c222b10018b4316d858d97341788f 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> + <component name="AutoImportSettings"> + <option name="autoReloadType" value="SELECTIVE" /> + </component> <component name="ChangeListManager"> - <list default="true" id="377c0a23-f30c-4ff0-85a4-04e91db7c38b" name="Default Changelist" comment="" /> - <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <list default="true" id="377c0a23-f30c-4ff0-85a4-04e91db7c38b" name="Default Changelist" comment=""> + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> + </list> <option name="SHOW_DIALOG" value="false" /> <option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> @@ -10,6 +14,7 @@ </component> <component name="ComposerSettings" synchronizationState="SYNCHRONIZE"> <pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath> + <execution /> </component> <component name="Git.Settings"> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> @@ -32,6 +37,10 @@ <component name="PropertiesComponent"> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" /> + <property name="node.js.detected.package.eslint" value="true" /> + <property name="node.js.detected.package.tslint" value="true" /> + <property name="node.js.selected.package.eslint" value="(autodetect)" /> + <property name="node.js.selected.package.tslint" value="(autodetect)" /> <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" /> @@ -39,18 +48,6 @@ <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> @@ -98,6 +95,17 @@ <component name="TypeScriptGeneratedFilesManager"> <option name="version" value="1" /> </component> + <component name="Vcs.Log.Tabs.Properties"> + <option name="TAB_STATES"> + <map> + <entry key="MAIN"> + <value> + <State /> + </value> + </entry> + </map> + </option> + </component> <component name="masterDetails"> <states> <state key="ScopeChooserConfigurable.UI"> diff --git a/composer.json b/composer.json index 703cec237ade668c30151e954e6e0066a0d0ea23..77b02ecf6d1c0822a6a504123d9bbda0419a1cbf 100755 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require": { "php": "^7.4 || ^8.0", - "doctrine/doctrine-laminas-hydrator": "^3.0", + "doctrine/doctrine-laminas-hydrator": "^2.0 || ^3.0", "doctrine/doctrine-orm-module": "^5.0", "laminas/laminas-dependency-plugin": "^2.0", "laminas/laminas-form": "^3.0",