M3 2 Update

2023-11-15 19:09:52 +01:00
parent 72ecc1e836
commit 8994cc40d6
18 changed files with 401 additions and 58 deletions
--- a/M2/.idea/.gitignore
+++ b/M2/.idea/.gitignore
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
--- a/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch
+++ b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch
@@ -0,0 +1,210 @@
+Index: ../M1/.idea/vcs.xml
+===================================================================
+diff --git a/../M1/.idea/vcs.xml b/../M1/.idea/vcs.xml
+deleted file mode 100644
+--- a/../M1/.idea/vcs.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,6 +0,0 @@
+-<?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
+Index: ../M1/.idea/.gitignore
+===================================================================
+diff --git a/../M1/.idea/.gitignore b/../M1/.idea/.gitignore
+deleted file mode 100644
+--- a/../M1/.idea/.gitignore	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-# Default ignored files
+-/shelf/
+-/workspace.xml
+-# Editor-based HTTP Client requests
+-/httpRequests/
+-# Datasource local storage ignored files
+-/dataSources/
+-/dataSources.local.xml
+Index: ../.idea/modules.xml
+===================================================================
+diff --git a/../.idea/modules.xml b/../.idea/modules.xml
+deleted file mode 100644
+--- a/../.idea/modules.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project version="4">
+-  <component name="ProjectModuleManager">
+-    <modules>
+-      <module fileurl="file://$PROJECT_DIR$/.idea/DBWT-Praktika.iml" filepath="$PROJECT_DIR$/.idea/DBWT-Praktika.iml" />
+-    </modules>
+-  </component>
+-</project>
+\ No newline at end of file
+Index: ../M1/.idea/M1.iml
+===================================================================
+diff --git a/../M1/.idea/M1.iml b/../M1/.idea/M1.iml
+deleted file mode 100644
+--- a/../M1/.idea/M1.iml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<module type="WEB_MODULE" version="4">
+-  <component name="NewModuleRootManager">
+-    <content url="file://$MODULE_DIR$" />
+-    <orderEntry type="inheritedJdk" />
+-    <orderEntry type="sourceFolder" forTests="false" />
+-  </component>
+-</module>
+\ No newline at end of file
+Index: ../.idea/php.xml
+===================================================================
+diff --git a/../.idea/php.xml b/../.idea/php.xml
+deleted file mode 100644
+--- a/../.idea/php.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,20 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project version="4">
+-  <component name="MessDetectorOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PHPCSFixerOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PHPCodeSnifferOptionsConfiguration">
+-    <option name="highlightLevel" value="WARNING" />
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
+-  <component name="PhpStanOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PsalmOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-</project>
+\ No newline at end of file
+Index: ../.idea/DBWT-Praktika.iml
+===================================================================
+diff --git a/../.idea/DBWT-Praktika.iml b/../.idea/DBWT-Praktika.iml
+deleted file mode 100644
+--- a/../.idea/DBWT-Praktika.iml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<module type="WEB_MODULE" version="4">
+-  <component name="NewModuleRootManager">
+-    <content url="file://$MODULE_DIR$" />
+-    <orderEntry type="inheritedJdk" />
+-    <orderEntry type="sourceFolder" forTests="false" />
+-  </component>
+-</module>
+\ No newline at end of file
+Index: ../M1/.idea/php.xml
+===================================================================
+diff --git a/../M1/.idea/php.xml b/../M1/.idea/php.xml
+deleted file mode 100644
+--- a/../M1/.idea/php.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,19 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project version="4">
+-  <component name="MessDetectorOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PHPCSFixerOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PHPCodeSnifferOptionsConfiguration">
+-    <option name="highlightLevel" value="WARNING" />
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PhpStanOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-  <component name="PsalmOptionsConfiguration">
+-    <option name="transferred" value="true" />
+-  </component>
+-</project>
+\ No newline at end of file
+Index: ../.idea/.gitignore
+===================================================================
+diff --git a/../.idea/.gitignore b/../.idea/.gitignore
+deleted file mode 100644
+--- a/../.idea/.gitignore	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-# Default ignored files
+-/shelf/
+-/workspace.xml
+-# Editor-based HTTP Client requests
+-/httpRequests/
+-# Datasource local storage ignored files
+-/dataSources/
+-/dataSources.local.xml
+Index: .idea/.gitignore
+===================================================================
+diff --git a/.idea/.gitignore b/.idea/.gitignore
+deleted file mode 100644
+--- a/.idea/.gitignore	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-# Default ignored files
+-/shelf/
+-/workspace.xml
+-# Editor-based HTTP Client requests
+-/httpRequests/
+-# Datasource local storage ignored files
+-/dataSources/
+-/dataSources.local.xml
+Index: ../M1/.idea/modules.xml
+===================================================================
+diff --git a/../M1/.idea/modules.xml b/../M1/.idea/modules.xml
+deleted file mode 100644
+--- a/../M1/.idea/modules.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,8 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project version="4">
+-  <component name="ProjectModuleManager">
+-    <modules>
+-      <module fileurl="file://$PROJECT_DIR$/.idea/M1.iml" filepath="$PROJECT_DIR$/.idea/M1.iml" />
+-    </modules>
+-  </component>
+-</project>
+\ No newline at end of file
+Index: ../.idea/vcs.xml
+===================================================================
+diff --git a/../.idea/vcs.xml b/../.idea/vcs.xml
+deleted file mode 100644
+--- a/../.idea/vcs.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ /dev/null	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+@@ -1,6 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<project version="4">
+-  <component name="VcsDirectoryMappings">
+-    <mapping directory="" vcs="Git" />
+-  </component>
+-</project>
+\ No newline at end of file
+Index: .idea/php.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+><?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<project version=\"4\">\r\n  <component name=\"MessDetectorOptionsConfiguration\">\r\n    <option name=\"transferred\" value=\"true\" />\r\n  </component>\r\n  <component name=\"PHPCSFixerOptionsConfiguration\">\r\n    <option name=\"transferred\" value=\"true\" />\r\n  </component>\r\n  <component name=\"PHPCodeSnifferOptionsConfiguration\">\r\n    <option name=\"highlightLevel\" value=\"WARNING\" />\r\n    <option name=\"transferred\" value=\"true\" />\r\n  </component>\r\n  <component name=\"PhpProjectSharedConfiguration\" php_language_level=\"8.0\" />\r\n  <component name=\"PhpStanOptionsConfiguration\">\r\n    <option name=\"transferred\" value=\"true\" />\r\n  </component>\r\n  <component name=\"PsalmOptionsConfiguration\">\r\n    <option name=\"transferred\" value=\"true\" />\r\n  </component>\r\n</project>
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/.idea/php.xml b/.idea/php.xml
+--- a/.idea/php.xml	(revision 1b5faa0d69e292e2649269e271b773eaad28f5d1)
+++ b/.idea/php.xml	(date 1700047317911)
+@@ -10,7 +10,6 @@
+     <option name="highlightLevel" value="WARNING" />
+     <option name="transferred" value="true" />
+   </component>
+-  <component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
+   <component name="PhpStanOptionsConfiguration">
+     <option name="transferred" value="true" />
+   </component>
--- a/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24__Changes_.xml
+++ b/M2/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]" date="1700047474245" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Checkout_at_15_11_2023_12_24_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Checkout at 15.11.2023 12:24 [Changes]" />
+</changelist>
--- a/M2/.idea/workspace.xml
+++ b/M2/.idea/workspace.xml
@@ -0,0 +1,74 @@
+<?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="3addb60f-b39d-430d-91ac-acb76c147edc" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/../.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../.idea/DBWT-Praktika.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../.idea/modules.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../.idea/php.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../M1/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../M1/.idea/M1.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../M1/.idea/modules.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../M1/.idea/php.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/../M1/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
+    </list>
+    <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">
+    <execution />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$/.." value="dev/m2_safak" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="PhpWorkspaceProjectConfiguration" interpreter_name="C:\Program Files\php-8.2.11-Win32-vs16-x64\php.exe" />
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 8
+}</component>
+  <component name="ProjectId" id="2YD5QUlQAhlJaWMg3ierW7DDTbq" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "WebServerToolWindowFactoryState": "false",
+    "git-widget-placeholder": "dev/m3__safak",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="3addb60f-b39d-430d-91ac-acb76c147edc" name="Changes" comment="" />
+      <created>1700047295160</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1700047295160</updated>
+      <workItem from="1700047298386" duration="519000" />
+      <workItem from="1700071102317" duration="365000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+</project>