Safak/DBWT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev/m5_safak' into dev/m5_safak

Browse Source 
# Conflicts:
#	M5/.idea/M5.iml
#	M5/.idea/dataSources.xml
#	M5/.idea/modules.xml
#	M5/.idea/php.xml
#	M5/Dossier/M5.md
#	M5/Werbeseite/index.php
#	M5/emensa/composer.json
#	M5/emensa/composer.lock
#	M5/emensa/config/db.php
#	M5/emensa/controllers/AnmeldungController.php
#	M5/emensa/controllers/MainController.php
#	M5/emensa/models/benutzer.php
#	M5/emensa/models/gerichte_main.php
#	M5/emensa/models/gerichte_self.php
#	M5/emensa/public/css/style.css
#	M5/emensa/public/index.php
#	M5/emensa/routes/web.php
#	M5/emensa/vendor/composer/autoload_psr4.php
#	M5/emensa/vendor/composer/autoload_static.php
#	M5/emensa/vendor/composer/installed.json
#	M5/emensa/vendor/composer/installed.php
#	M5/emensa/vendor/composer/platform_check.php
This commit is contained in:
Robert
2024-01-10 10:46:02 +01:00
parent 5ca6283aa3 e7eb81b896
commit 8ef27c6b85
46 changed files with 2165 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
M5/.idea/M5.iml generated
View File

@@ -2,8 +2,17 @@
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/emensa/spec" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/emensa/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/emensa/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/emensa/vendor/eftec/bladeone" />
<excludeFolder url="file://$MODULE_DIR$/emensa/vendor/monolog/monolog" />
<excludeFolder url="file://$MODULE_DIR$/emensa/vendor/psr/log" />
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/monolog/monolog" />
<excludeFolder url="file://$MODULE_DIR$/vendor/psr/log" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

18
M5/.idea/codeception.xml generated Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Codeception">
<option name="configurations">
<list>
<Configuration>
<option name="path" value="$PROJECT_DIR$/tests" />
</Configuration>
<Configuration>
<option name="path" value="$PROJECT_DIR$/emensa/tests" />
</Configuration>
<Configuration>
<option name="path" value="$PROJECT_DIR$/tests" />
</Configuration>
</list>
</option>
</component>
</project>

2
M5/.idea/dataSources.xml generated
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
<data-source source="LOCAL" name="emensawerbeseite" uuid="0a2c3473-febe-491a-b3f1-82e9ba5b153f">
<data-source source="LOCAL" name="@localhost" uuid="4d4a3631-9643-46e8-bf05-bcc46f8031b4">
<driver-ref>mariadb</driver-ref>
<synchronize>true</synchronize>
<jdbc-driver>org.mariadb.jdbc.Driver</jdbc-driver>

2
M5/.idea/modules.xml generated
View File

@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/M4.iml" filepath="$PROJECT_DIR$/.idea/M4.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/M5.iml" filepath="$PROJECT_DIR$/.idea/M5.iml" />
</modules>
</component>
</project>

21
M5/.idea/php.xml generated
View File

@@ -10,10 +10,29 @@
<option name="highlightLevel" value="WARNING" />
<option name="transferred" value="true" />
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.0" />
<component name="PhpIncludePathManager">
<include_path>
<path value="$PROJECT_DIR$/emensa/vendor/composer" />
<path value="$PROJECT_DIR$/emensa/vendor/eftec/bladeone" />
<path value="$PROJECT_DIR$/emensa/vendor/psr/log" />
<path value="$PROJECT_DIR$/emensa/vendor/monolog/monolog" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/monolog/monolog" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.3">
<option name="suggestChangeDefaultLanguageLevel" value="false" />
</component>
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>
<component name="PhpUnit">
<phpunit_settings>
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/emensa/vendor/autoload.php" />
<PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" />
</phpunit_settings>
</component>
<component name="PsalmOptionsConfiguration">
<option name="transferred" value="true" />
</component>

16
M5/.idea/phpspec.xml generated Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PHPSpec">
<suites>
<PhpSpecSuiteConfiguration>
<option name="myPath" value="$PROJECT_DIR$" />
</PhpSpecSuiteConfiguration>
<PhpSpecSuiteConfiguration>
<option name="myPath" value="$PROJECT_DIR$/emensa" />
</PhpSpecSuiteConfiguration>
<PhpSpecSuiteConfiguration>
<option name="myPath" value="$PROJECT_DIR$" />
</PhpSpecSuiteConfiguration>
</suites>
</component>
</project>

11
M5/.idea/phpunit.xml generated Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PHPUnit">
<option name="directories">
<list>
<option value="$PROJECT_DIR$/emensa/tests" />
<option value="$PROJECT_DIR$/tests" />
</list>
</option>
</component>
</project>