Merge remote-tracking branch 'origin/develop' into develop

.gitignore

@@ -1 +1,4 @@
 /.idea/workspace.xml
+/.idea/shelf
+/src-php/huii.sql
+/src-php/.phpunit.result.cache

.idea/internship-playground.iml

@@ -0,0 +1,66 @@
+<?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$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src-php/app/internship" isTestSource="false" packagePrefix="custom\" />
+      <sourceFolder url="file://$MODULE_DIR$/src-php/test/internship" isTestSource="true" packagePrefix="custom\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/myclabs/deep-copy" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/nikic/php-parser" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/composer" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-composer-module-installer" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-config" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/hangar" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-io" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-mail" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-log4php" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-reflection" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-impl-web-dispatch" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-test" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-util" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-impl-web-ui" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/phpbob" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-web" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phar-io/manifest" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-impl-persistence-meta" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phar-io/version" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/hangar-api" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-persistence" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-context" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-impl-persistence-orm" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-l10n" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/doctrine/instantiator" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/theseer/tokenizer" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/cli-parser" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/code-unit" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/code-unit-reverse-lookup" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/comparator" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/complexity" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/diff" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phpunit/php-code-coverage" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/environment" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phpunit/php-file-iterator" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/exporter" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phpunit/php-invoker" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/global-state" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phpunit/php-text-template" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/lines-of-code" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phpunit/php-timer" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/object-enumerator" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/phpunit/phpunit" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/object-reflector" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/recursion-context" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/n2n/n2n-batch" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/resource-operations" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/type" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/sebastian/version" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/psr/container" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/psr/http-factory" />
+      <excludeFolder url="file://$MODULE_DIR$/src-php/vendor/psr/http-message" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/internship-playground.iml" filepath="$PROJECT_DIR$/.idea/internship-playground.iml" />
+    </modules>
+  </component>
+</project>

.idea/php-test-framework.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpTestFrameworkVersionCache">
+    <tools_cache>
+      <tool tool_name="PHPUnit">
+        <cache>
+          <versions>
+            <info id="Local" version="9.5.27" />
+          </versions>
+        </cache>
+      </tool>
+    </tools_cache>
+  </component>
+</project>

.idea/php.xml

@@ -0,0 +1,82 @@
+<?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="transferred" value="true" />
+  </component>
+  <component name="PhpIncludePathManager">
+    <include_path>
+      <path value="$PROJECT_DIR$/vendor/n2n/n2n-composer-module-installer" />
+      <path value="$PROJECT_DIR$/src-php/vendor/myclabs/deep-copy" />
+      <path value="$PROJECT_DIR$/src-php/vendor/nikic/php-parser" />
+      <path value="$PROJECT_DIR$/src-php/vendor/composer" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-composer-module-installer" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-config" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/hangar" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-io" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-mail" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-log4php" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-reflection" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-impl-web-dispatch" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-test" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-util" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-impl-web-ui" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/phpbob" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-web" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phar-io/manifest" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-impl-persistence-meta" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phar-io/version" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/hangar-api" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-persistence" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-context" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-impl-persistence-orm" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-l10n" />
+      <path value="$PROJECT_DIR$/src-php/vendor/doctrine/instantiator" />
+      <path value="$PROJECT_DIR$/src-php/vendor/theseer/tokenizer" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/cli-parser" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/code-unit" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/code-unit-reverse-lookup" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/comparator" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/complexity" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/diff" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phpunit/php-code-coverage" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/environment" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phpunit/php-file-iterator" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/exporter" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phpunit/php-invoker" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/global-state" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phpunit/php-text-template" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/lines-of-code" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phpunit/php-timer" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/object-enumerator" />
+      <path value="$PROJECT_DIR$/src-php/vendor/phpunit/phpunit" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/object-reflector" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/recursion-context" />
+      <path value="$PROJECT_DIR$/src-php/vendor/n2n/n2n-batch" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/resource-operations" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/type" />
+      <path value="$PROJECT_DIR$/src-php/vendor/sebastian/version" />
+      <path value="$PROJECT_DIR$/src-php/vendor/psr/container" />
+      <path value="$PROJECT_DIR$/src-php/vendor/psr/http-factory" />
+      <path value="$PROJECT_DIR$/src-php/vendor/psr/http-message" />
+    </include_path>
+  </component>
+  <component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
+  <component name="PhpStanOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+  <component name="PhpUnit">
+    <phpunit_settings>
+      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/src-php/vendor/autoload.php" phpunit_phar_path="" />
+    </phpunit_settings>
+  </component>
+  <component name="PsalmOptionsConfiguration">
+    <option name="transferred" value="true" />
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

src-php/composer.json → composer.json

@@ -5,31 +5,32 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "n2n/n2n": "^7.2.0",
-        "n2n/n2n-batch": "^7.2.0",
-        "n2n/n2n-context": "^7.2.0",
-        "n2n/n2n-mail": "^7.2.0",
-        "n2n/n2n-impl-persistence-meta": "^7.2.0",
-        "n2n/n2n-impl-persistence-orm": "^7.2.0",
-        "n2n/n2n-impl-web-dispatch": "^7.2.0",
-        "n2n/n2n-impl-web-ui": "^7.2.0"
+        "n2n/n2n": "^7.3",
+        "n2n/n2n-batch": "^7.3",
+        "n2n/n2n-context": "^7.3",
+        "n2n/n2n-mail": "^7.3",
+        "n2n/n2n-impl-persistence-meta": "^7.3",
+        "n2n/n2n-impl-persistence-orm": "^7.3",
+        "n2n/n2n-impl-web-dispatch": "^7.3",
+        "n2n/n2n-impl-web-ui": "^7.3"
     },
     "require-dev": {
         "n2n/hangar": "^7.2.0",
-        "n2n/n2n-test" : "^7.2.0",
+        "n2n/n2n-test" : "^7.3",
         "phpunit/phpunit" : "^9.5"
     },
     "autoload" : {
         "psr-4" : {
-            "custom\\" : "app/custom"
+            "custom\\" : "src-php/app/internship"
         }
     },
     "autoload-dev" : {
         "psr-4" : {
-            "custom\\" : "test/custom"
+            "custom\\" : "src-php/test/internship"
         }
     },
     "config": {
+        "vendor-dir" : "src-php/vendor",
         "allow-plugins": {
             "n2n/n2n-composer-module-installer": true
         }

src-php/composer.lock → composer.lock

@@ -4,32 +4,31 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "24a98ac746c817ab503dcf087edc0627",
+    "content-hash": "a0280d3ba5b2388582a915028033ccf3",
     "packages": [
         {
             "name": "n2n/n2n",
-            "version": "v7.3.0",
+            "version": "7.3.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/n2n/n2n.git",
-                "reference": "b28faa99ea46b395238f7640c8aad9f7bd31d76d"
+                "reference": "fe7b47dc26592a2284da589f685b94751d8018b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/n2n/n2n/zipball/b28faa99ea46b395238f7640c8aad9f7bd31d76d",
-                "reference": "b28faa99ea46b395238f7640c8aad9f7bd31d76d",
+                "url": "https://api.github.com/repos/n2n/n2n/zipball/fe7b47dc26592a2284da589f685b94751d8018b8",
+                "reference": "fe7b47dc26592a2284da589f685b94751d8018b8",
                 "shasum": ""
             },
             "require": {
                 "n2n/n2n-composer-module-installer": "^7.1.5",
-                "n2n/n2n-config": "^7.3",
-                "n2n/n2n-context": "^7.3",
-                "n2n/n2n-l10n": "^7.3",
-                "n2n/n2n-log4php": "^7.3",
-                "n2n/n2n-mail": "^7.3",
-                "n2n/n2n-reflection": "^7.3",
-                "n2n/n2n-util": "^7.3",
-                "php": ">=8.0"
+                "n2n/n2n-config": "~7.3",
+                "n2n/n2n-context": "~7.3",
+                "n2n/n2n-l10n": "~7.3",
+                "n2n/n2n-log4php": "~7.3",
+                "n2n/n2n-mail": "~7.3",
+                "n2n/n2n-reflection": "~7.3.3",
+                "n2n/n2n-util": "~7.3"
             },
             "require-dev": {
                 "phpunit/phpunit": "^9.5"
@@ -66,11 +65,7 @@
                 "framework",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n/issues",
-                "source": "https://github.com/n2n/n2n/tree/v7.3.0"
-            },
-            "time": "2022-10-27T22:28:37+00:00"
+            "time": "2022-12-09T01:25:23+00:00"
         },
         {
             "name": "n2n/n2n-batch",
@@ -117,10 +112,6 @@
                 "batch job",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-batch/issues",
-                "source": "https://github.com/n2n/n2n-batch/tree/v7.3.0"
-            },
             "time": "2021-07-30T17:36:59+00:00"
         },
         {
@@ -170,10 +161,6 @@
                 "module",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-composer-module-installer/issues",
-                "source": "https://github.com/n2n/n2n-composer-module-installer/tree/v7.1.5"
-            },
             "time": "2022-05-10T13:18:10+00:00"
         },
         {
@@ -220,30 +207,25 @@
                 "batch job",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-config/issues",
-                "source": "https://github.com/n2n/n2n-config/tree/v7.3.0"
-            },
             "time": "2022-10-07T14:09:56+00:00"
         },
         {
             "name": "n2n/n2n-context",
-            "version": "v7.3.0",
+            "version": "7.3.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/n2n/n2n-context.git",
-                "reference": "edba74692234db9f898754bad51276be218b0d0f"
+                "reference": "b5631f0f729e62cba14c8070274e64a9aa3bd821"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/n2n/n2n-context/zipball/edba74692234db9f898754bad51276be218b0d0f",
-                "reference": "edba74692234db9f898754bad51276be218b0d0f",
+                "url": "https://api.github.com/repos/n2n/n2n-context/zipball/b5631f0f729e62cba14c8070274e64a9aa3bd821",
+                "reference": "b5631f0f729e62cba14c8070274e64a9aa3bd821",
                 "shasum": ""
             },
             "require": {
-                "n2n/n2n-reflection": "^7.3",
-                "n2n/n2n-util": "^7.3",
-                "php": ">=8.0"
+                "n2n/n2n-reflection": "~7.3.3",
+                "n2n/n2n-util": "~7.3"
             },
             "provide": {
                 "psr/container-implementation": "1.0.0"
@@ -278,11 +260,7 @@
                 "scope",
                 "session scope"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-context/issues",
-                "source": "https://github.com/n2n/n2n-context/tree/v7.3.0"
-            },
-            "time": "2022-09-27T14:35:53+00:00"
+            "time": "2022-12-19T13:02:08+00:00"
         },
         {
             "name": "n2n/n2n-impl-persistence-meta",
@@ -335,10 +313,6 @@
                 "n2n",
                 "persistence"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-impl-persistence-meta/issues",
-                "source": "https://github.com/n2n/n2n-impl-persistence-meta/tree/v7.3.0"
-            },
             "time": "2022-10-24T19:56:30+00:00"
         },
         {
@@ -390,10 +364,6 @@
                 "orm",
                 "persistence"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-impl-persistence-orm/issues",
-                "source": "https://github.com/n2n/n2n-impl-persistence-orm/tree/v7.3.5"
-            },
             "time": "2022-12-20T16:33:17+00:00"
         },
         {
@@ -445,10 +415,6 @@
                 "n2n",
                 "web"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-impl-web-dispatch/issues",
-                "source": "https://github.com/n2n/n2n-impl-web-dispatch/tree/v7.3.1"
-            },
             "time": "2022-12-12T15:58:33+00:00"
         },
         {
@@ -500,10 +466,6 @@
                 "n2n",
                 "xml"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-impl-web-ui/issues",
-                "source": "https://github.com/n2n/n2n-impl-web-ui/tree/v7.3.0"
-            },
             "time": "2022-05-31T13:53:32+00:00"
         },
         {
@@ -551,10 +513,6 @@
                 "io",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-io/issues",
-                "source": "https://github.com/n2n/n2n-io/tree/v7.3.1"
-            },
             "time": "2022-12-06T14:58:17+00:00"
         },
         {
@@ -601,10 +559,6 @@
                 "l10n",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-l10n/issues",
-                "source": "https://github.com/n2n/n2n-l10n/tree/v7.3.0"
-            },
             "time": "2022-10-24T19:47:50+00:00"
         },
         {
@@ -640,10 +594,6 @@
                 "log4php",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-log4php/issues",
-                "source": "https://github.com/n2n/n2n-log4php/tree/v7.3.0"
-            },
             "time": "2022-05-30T14:43:08+00:00"
         },
         {
@@ -690,10 +640,6 @@
                 "mail",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-mail/issues",
-                "source": "https://github.com/n2n/n2n-mail/tree/v7.3.0"
-            },
             "time": "2022-10-31T16:33:35+00:00"
         },
         {
@@ -743,10 +689,6 @@
                 "orm",
                 "persistence"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-persistence/issues",
-                "source": "https://github.com/n2n/n2n-persistence/tree/v7.3.2"
-            },
             "time": "2022-12-06T18:09:19+00:00"
         },
         {
@@ -793,10 +735,6 @@
                 "awesome",
                 "framework"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-reflection/issues",
-                "source": "https://github.com/n2n/n2n-reflection/tree/v7.3.3"
-            },
             "time": "2022-12-06T18:09:19+00:00"
         },
         {
@@ -844,10 +782,6 @@
                 "n2n",
                 "util"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-util/issues",
-                "source": "https://github.com/n2n/n2n-util/tree/v7.3.1"
-            },
             "time": "2022-11-09T15:02:13+00:00"
         },
         {
@@ -903,10 +837,6 @@
                 "n2n",
                 "rest"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-web/issues",
-                "source": "https://github.com/n2n/n2n-web/tree/v7.3.3"
-            },
             "time": "2022-11-15T00:54:19+00:00"
         },
         {
@@ -956,10 +886,6 @@
                 "container-interop",
                 "psr"
             ],
-            "support": {
-                "issues": "https://github.com/php-fig/container/issues",
-                "source": "https://github.com/php-fig/container/tree/2.0.2"
-            },
             "time": "2021-11-05T16:47:00+00:00"
         },
         {
@@ -1012,9 +938,6 @@
                 "request",
                 "response"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/master"
-            },
             "time": "2019-04-30T12:38:16+00:00"
         },
         {
@@ -1065,9 +988,6 @@
                 "request",
                 "response"
             ],
-            "support": {
-                "source": "https://github.com/php-fig/http-message/tree/master"
-            },
             "time": "2016-08-06T14:39:51+00:00"
         }
     ],
@@ -1122,10 +1042,6 @@
                 "constructor",
                 "instantiate"
             ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.5.0"
-            },
             "funding": [
                 {
                     "url": "https://www.doctrine-project.org/sponsorship.html",
@@ -1189,10 +1105,6 @@
                 "object",
                 "object graph"
             ],
-            "support": {
-                "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
-            },
             "funding": [
                 {
                     "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
@@ -1245,10 +1157,6 @@
                 "hangar",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/hangar/issues",
-                "source": "https://github.com/n2n/hangar/tree/v7.3.0"
-            },
             "time": "2022-10-24T14:51:09+00:00"
         },
         {
@@ -1299,10 +1207,6 @@
                 "hangar",
                 "n2n"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/hangar-api/issues",
-                "source": "https://github.com/n2n/hangar-api/tree/1.0.x"
-            },
             "time": "2021-07-31T17:30:07+00:00"
         },
         {
@@ -1351,10 +1255,6 @@
                 "test",
                 "utils"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/n2n-test/issues",
-                "source": "https://github.com/n2n/n2n-test/tree/v7.3.0"
-            },
             "time": "2022-06-29T10:50:22+00:00"
         },
         {
@@ -1402,10 +1302,6 @@
                 "n2n",
                 "phpbob"
             ],
-            "support": {
-                "issues": "https://github.com/n2n/phpbob/issues",
-                "source": "https://github.com/n2n/phpbob/tree/master"
-            },
             "time": "2021-08-30T16:19:56+00:00"
         },
         {
@@ -1458,10 +1354,6 @@
                 "parser",
                 "php"
             ],
-            "support": {
-                "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
-            },
             "time": "2022-11-12T15:38:23+00:00"
         },
         {
@@ -1518,10 +1410,6 @@
                 }
             ],
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "support": {
-                "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
-            },
             "time": "2021-07-20T11:28:43+00:00"
         },
         {
@@ -1569,10 +1457,6 @@
                 }
             ],
             "description": "Library for handling version information and constraints",
-            "support": {
-                "issues": "https://github.com/phar-io/version/issues",
-                "source": "https://github.com/phar-io/version/tree/3.2.1"
-            },
             "time": "2022-02-21T01:04:05+00:00"
         },
         {
@@ -1640,10 +1524,6 @@
                 "testing",
                 "xunit"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.23"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1700,10 +1580,6 @@
                 "filesystem",
                 "iterator"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1763,10 +1639,6 @@
             "keywords": [
                 "process"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
-                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1822,10 +1694,6 @@
             "keywords": [
                 "template"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1881,10 +1749,6 @@
             "keywords": [
                 "timer"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -1975,10 +1839,6 @@
                 "testing",
                 "xunit"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
-            },
             "funding": [
                 {
                     "url": "https://phpunit.de/sponsors.html",
@@ -2039,10 +1899,6 @@
             ],
             "description": "Library for parsing CLI options",
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2095,10 +1951,6 @@
             ],
             "description": "Collection of value objects that represent the PHP code units",
             "homepage": "https://github.com/sebastianbergmann/code-unit",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2150,10 +2002,6 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
-                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2224,10 +2072,6 @@
                 "compare",
                 "equality"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2281,10 +2125,6 @@
             ],
             "description": "Library for calculating the complexity of PHP code units",
             "homepage": "https://github.com/sebastianbergmann/complexity",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2347,10 +2187,6 @@
                 "unidiff",
                 "unified diff"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2410,10 +2246,6 @@
                 "environment",
                 "hhvm"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2487,10 +2319,6 @@
                 "export",
                 "exporter"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2551,10 +2379,6 @@
             "keywords": [
                 "global state"
             ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2608,10 +2432,6 @@
             ],
             "description": "Library for counting the lines of code in PHP source code",
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2665,10 +2485,6 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
-                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2720,10 +2536,6 @@
             ],
             "description": "Allows reflection of object attributes, including inherited and non-public ones",
             "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
-                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2783,10 +2595,6 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2838,10 +2646,6 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2894,10 +2698,6 @@
             ],
             "description": "Collection of value objects that represent the types of the PHP type system",
             "homepage": "https://github.com/sebastianbergmann/type",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/type/issues",
-                "source": "https://github.com/sebastianbergmann/type/tree/3.2.0"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2947,10 +2747,6 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
-            },
             "funding": [
                 {
                     "url": "https://github.com/sebastianbergmann",
@@ -2997,10 +2793,6 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "support": {
-                "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.1"
-            },
             "funding": [
                 {
                     "url": "https://github.com/theseer",
@@ -3017,5 +2809,5 @@
     "prefer-lowest": false,
     "platform": [],
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "1.1.0"
 }

src-php/app/internship/controller/ArticleController.php

@@ -1,9 +1,30 @@
 <?php
 namespace internship\controller;
 
-class ArticleController {
-	function getDoArticles() {
+use n2n\web\http\controller\ControllerAdapter;
+use internship\model\ArticleDao;
+use n2n\context\attribute\Inject;
 
+class ArticleController extends ControllerAdapter {
+	#[Inject()]
+	private ArticleDao $articleDao;
+
+	/**
+	 *
+	 * @param string|null $categoryName
+	 * @return void
+	 */
+	function getDoArticles(string $categoryName = null) {
+
+		echo 'irgendöpis';
+
+        $this->sendJson(['hello' => 'world']);
+
+
+	}
+
+	function getDoArticle(int $articleId) {
+		$this->sendJson($article);
 	}
 
 	function postDoArticle() {

src-php/app/internship/model/ArticleDao.php

@@ -7,19 +7,20 @@ use internship\bo\Article;
 class ArticleDao {
 	private EntityManager $em;
 
-	private function _init(EntityManager $em) {
+	private function _init(EntityManager $em): void {
 		$this->em = $em;
 	}
 
-	function getArticles() {
-		$this->em->createSimpleCriteria(Article::class)->toQuery()->fetchArray();
+	function getArticles(): array {
+		return $this->em->createSimpleCriteria(Article::class)->toQuery()->fetchArray();
 	}
 
-	function getArticlesByCategoryName(string $categoryName) {
-		$this->em->createSimpleCriteria(Article::class, array('categoryName' => $categoryName))->toQuery()->fetchArray();
+	function getArticlesByCategoryName(string $categoryName): array {
+		return $this->em->createSimpleCriteria(Article::class, array('categoryName' => $categoryName))->toQuery()
+				->fetchArray();
 	}
 
-	function getArticleById(int $id) {
-		return $this->em->createSimpleCriteria(Article::class, array('id' => $id));
+	function getArticleById(int $id): ?Article {
+		return $this->em->find(Article::class, $id);
 	}
 }

src-php/composer.master.json

@@ -1,45 +0,0 @@
-{
-    "name": "n2n/n2n-skeleton",
-    "description": "n2n skeleton application installable by Composer",
-    "type": "project",
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require": {
-        "n2n/n2n": "master-dev",
-        "n2n/n2n-batch": "master-dev",
-        "n2n/n2n-context": "master-dev",
-        "n2n/n2n-mail": "master-dev",
-        "n2n/n2n-impl-persistence-meta": "master-dev",
-        "n2n/n2n-impl-persistence-orm": "master-dev",
-        "n2n/n2n-impl-web-dispatch": "master-dev",
-        "n2n/n2n-impl-web-ui": "master-dev",
-        "n2n/rocket": "master-dev",
-        "n2n/page": "master-dev",
-        "hnm/bootstrap": "master-dev",
-        "hnm/ch-hnm-util": "master-dev",
-        "hnm/ci": "master-dev",
-        "hnm/bstmpl": "master-dev",
-	"hnm/simplefile": "master-dev",
-	"hnm/report" : "master-dev"
-    },
-    "require-dev": {
-        "n2n/hangar": "master-dev",
-        "n2n/n2n-test" : "master-dev",
-        "phpunit/phpunit" : "^7.5"
-    },
-    "autoload" : {
-        "psr-4" : {
-            "custom\\" : "app/custom"
-        }
-    },
-    "autoload-dev" : {
-        "psr-4" : {
-            "custom\\" : "test/custom"
-        }
-    },
-    "config": {
-        "allow-plugins": {
-            "n2n/n2n-composer-module-installer": true
-        }
-    }
-}

src-php/composer.stable.json

@@ -1,45 +0,0 @@
-{
-    "name": "n2n/n2n-skeleton",
-    "description": "n2n skeleton application installable by Composer",
-    "type": "project",
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require": {
-        "n2n/n2n": "^7.2.0",
-        "n2n/n2n-batch": "^7.2.0",
-        "n2n/n2n-context": "^7.2.0",
-        "n2n/n2n-mail": "^7.2.0",
-        "n2n/n2n-impl-persistence-meta": "^7.2.0",
-        "n2n/n2n-impl-persistence-orm": "^7.2.0",
-        "n2n/n2n-impl-web-dispatch": "^7.2.0",
-        "n2n/n2n-impl-web-ui": "^7.2.0",
-        "n2n/rocket": "^2.0.0",
-        "n2n/page": "^1.5.0",
-        "hnm/bootstrap": "~1.0.0",
-        "hnm/ch-hnm-util": "^7.2.0",
-        "hnm/ci": "^2.0.0",
-        "hnm/bstmpl": "^2.0.0",
-	"hnm/simplefile": "^1.3.0",
-	"hnm/report" : "^3.0.0"
-    },
-    "require-dev": {
-        "n2n/hangar": "^7.2.0",
-		"n2n/n2n-test" : "^7.2.0",
-		"phpunit/phpunit" : "^7.5"
-    },
-    "autoload" : {
-        "psr-4" : {
-            "custom\\" : "app/custom"
-        }
-    },
-    "autoload-dev" : {
-        "psr-4" : {
-            "custom\\" : "test/custom"
-        }
-    },
-    "config": {
-        "allow-plugins": {
-            "n2n/n2n-composer-module-installer": true
-        }
-    }
-}

src-php/test/bootstrap.php

@@ -30,8 +30,9 @@ $testSqlFsPath = N2N::getVarStore()->requestFileFsPath('bak', null, null, 'backu
 $sql = IoUtils::getContents($testSqlFsPath);
 
 $sql = preg_replace('/^(INSERT|VALUES|\().*/m', '', $sql);
-$sql = preg_replace('/^ALTER TABLE .* ADD (INDEX|UNIQUE|FULLTEXT).*/m', '', $sql);
-$sql = preg_replace('/ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE [^;]+/', '', $sql);
+$sql = preg_replace('/^ALTER TABLE `([^`]+)` ADD UNIQUE INDEX `([^`]+)`/m', 'CREATE UNIQUE INDEX $1_$2 ON $1 ', $sql);
+$sql = preg_replace('/^ALTER TABLE `([^`]+)` ADD (INDEX|FULLTEXT).*/m', '', $sql);
+$sql = preg_replace('/ENGINE=InnoDB DEFAULT CHARSET=utf8[\S]* COLLATE [^;]+/', '', $sql);
 $sql = preg_replace('/\\,(\\s)*PRIMARY KEY.*/m', '', $sql);
 $sql = preg_replace('/ENUM\([^\)]+\)/', 'VARCHAR(255)', $sql);
 $sql = preg_replace('/INT (UNSIGNED )?NOT NULL AUTO_INCREMENT/', 'INTEGER PRIMARY KEY AUTOINCREMENT', $sql);

src-php/test/internship/controller/ArticleControllerTest.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace internship\controller;
+
+use PHPUnit\Framework\TestCase;
+use n2n\test\TestEnv;
+use internship\test\ArticleTestEnv;
+use util\GeneralTestEnv;
+
+
+class ArticleControllerTest extends TestCase {
+
+	private int $article1Id;
+	private int $article2Id;
+	private int $article3Id;
+
+	function setUp(): void {
+		GeneralTestEnv::tearDown();
+
+		$tx = TestEnv::createTransaction();
+		$article1 = ArticleTestEnv::setUpArticle('Title 1', 'Loren ipsum 1', 'teaser');
+		$article2 = ArticleTestEnv::setUpArticle('Title 2', 'Loren ipsum 2', 'news');
+		$article3 = ArticleTestEnv::setUpArticle('Title 3', 'Loren ipsum 3', 'news');
+		$tx->commit();
+
+		$this->article1Id = $article1->getId();
+		$this->article2Id = $article2->getId();
+		$this->article3Id = $article3->getId();
+	}
+
+	function testGetDoArticles() {
+		$response = TestEnv::http()->newRequest()
+				->get(['api', 'articles'])
+				->exec();
+
+		$articleStructs = $response->parseJson();
+		$this->assertCount(3, $articleStructs);
+
+		$this->assertEquals('Title 3', $articleStructs[0]['title']);
+		$this->assertEquals('Title 2', $articleStructs[1]['title']);
+		$this->assertEquals('Title 1', $articleStructs[2]['title']);
+	}
+
+}

src-php/test/internship/test/ArticleTestEnv.php

@@ -0,0 +1,20 @@
+<?php
+namespace internship\test;
+
+use n2n\test\TestEnv;
+use internship\bo\Article;
+
+class ArticleTestEnv  {
+
+	static function setUpArticle(string $title, string $text, string $categoryName): Article {
+		$article = new Article();
+		$article->setTitle($title);
+		$article->setText($text);
+		$article->setCategoryName($categoryName);
+
+		TestEnv::em()->persist($article);
+		TestEnv::em()->flush();
+
+		return $article;
+	}
+ }

src-php/test/iplay/controller/ArticleControllerTest.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace iplay\controller;
-
-use PHPUnit\Framework\TestCase;
-use n2n\test\TestEnv;
-
-
-class ArticleControllerTest extends TestCase {
-
-	function setUp(): void {
-		GeneralTestEnv::tearDown();
-
-		$tx = TestEnv::createTransaction();
-
-		$authUser = AuthTestEnv::setUpAuthUser('testerich@von-testen.ch', 'super');
-		$authUser2 = AuthTestEnv::setUpAuthUser('testerine@von-testen.ch', 'super');
-
-		$subCurrency = SubSettingTestEnv::setUpSubCurrency('CHF');
-		$subCountry = SubSettingTestEnv::setUpSubCountry('CH', $subCurrency);
-
-		$subOrganisation = SubAccountTestEnv::setUpSubOrganisation('Super Organisation', $subCountry);
-		$subOrganisation2 = SubAccountTestEnv::setUpSubOrganisation('Super duper Organisation', $subCountry);
-		$deletedSubOrganisation = SubAccountTestEnv::setUpSubOrganisation('Deleted Organisation', $subCountry);
-		$deletedSubOrganisation->setDeletedDateTime(new DateTime());
-
-		ActivityTestEnv::setUpActivity(PgcPlatformId::EVAGIC, $subOrganisation, $authUser);
-		ActivityTestEnv::setUpActivity(PgcPlatformId::HELFEREINSATZ, $subOrganisation, $authUser);
-		ActivityTestEnv::setUpActivity(PgcPlatformId::EVAGIC, $subOrganisation2, $authUser);
-		ActivityTestEnv::setUpActivity(PgcPlatformId::HELFEREINSATZ, $deletedSubOrganisation, $authUser);
-
-		ActivityTestEnv::setUpActivity(PgcPlatformId::EVAGIC, $subOrganisation, $authUser2);
-
-		$tx->commit();
-
-		$this->authUser1PgcId = $authUser->getPgcId();
-		$this->authUser2PgcId = $authUser2->getPgcId();
-
-		$this->subOrganisation1PgcId = $subOrganisation->getPgcId();
-		$this->subOrganisation2PgcId = $subOrganisation2->getPgcId();
-	}
-}

src-php/test/iplay/controller/ArticleTestEnv.php

@@ -1,39 +0,0 @@
-<?php
-namespace pgc\test;
-
-use n2n\test\TestEnv;
-use pgc\sub\setting\bo\SubCountry;
-use pgc\sub\setting\bo\SubCurrency;
-use pgc\sub\plan\bo\SubPlatform;
-
-class ArticleTestEnv  {
-
-
-
-	static function setUpArticle(string $id): Article {
-		$subPlatform = new SubPlatform($id);
-		$subPlatform->setOrderIndex(0);
-		$subPlatform->setOnline(true);
-
-		TestEnv::em()->persist($subPlatform);
-
-		return $subPlatform;
-	}
-
-	static function setUpSubCurrency(string $code): SubCurrency {
-		$currency = new SubCurrency();
-		$currency->setCode($code);
-
-		TestEnv::tem()->persist($currency);
-
-		return $currency;
-	}
-
-	static function setUpSubCountry(string $code, SubCurrency $subCurrency): SubCountry {
-		$country = new SubCountry($code, $subCurrency);
-
-		TestEnv::tem()->persist($country);
-
-		return $country;
-	}
- }

src-php/test/util/GeneralTestEnv.php

@@ -1,5 +1,5 @@
 <?php
-namespace pgc\test;
+namespace util;
 
 use n2n\test\TestEnv;
 use n2n\persistence\PdoStatementException;
@@ -11,10 +11,10 @@ class GeneralTestEnv  {
 			TestEnv::container()->tm()->getRootTransaction()->rollBack();
 		}
 	    TestEnv::em()->clear();
-		\n2n\test\TestEnv::db()->truncate();
+		TestEnv::db()->truncate();
 
 		try {
-			\n2n\test\TestEnv::db()->pdo()->exec('DELETE FROM sqlite_sequence');
+			TestEnv::db()->pdo()->exec('DELETE FROM sqlite_sequence');
 		} catch (PdoStatementException $e) {
 		}
 

src-php/var/bak/backup.sql

@@ -5,8 +5,8 @@
 DROP TABLE IF EXISTS `article`;
 CREATE TABLE `article` (
         `id` INT NOT NULL AUTO_INCREMENT,
-        `categoryName` VARCHAR(255) NULL DEFAULT NULL,
+        `category_name` VARCHAR(255) NULL DEFAULT NULL,
         `title` VARCHAR(255) NULL DEFAULT NULL,
         `text` VARCHAR(10000) NULL DEFAULT NULL,
         PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_general_ci ;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE utf8mb4_unicode_ci ;

src-php/var/etc/app.ini

@@ -89,7 +89,7 @@ log.send_mail = true
 
 
 [database : live]
-default.dsn_uri = "mysql:host=localhost;dbname=livedbname"
+default.dsn_uri = "mysql:host=localhost;dbname=internship_playground"
 default.user = "dbuser"
 default.password = "pass"
 default.transaction_isolation_level = "SERIALIZABLE"
@@ -97,13 +97,20 @@ default.dialect = "n2n\impl\persistence\meta\mysql\MysqlDialect"
 
 
 [database : development]
-default.dsn_uri = "mysql:host=localhost;dbname=n2n7_test"
+default.dsn_uri = "mysql:host=localhost;dbname=internship_playground"
 default.user = "root"
 default.password = ""
 default.transaction_isolation_level = "SERIALIZABLE"
 default.dialect = "n2n\impl\persistence\meta\mysql\MysqlDialect"
 
 
+[database : test]
+default.dsn_uri = "sqlite::memory:"
+default.dialect = "n2n\impl\persistence\meta\sqlite\SqliteDialect"
+default.user = ""
+default.password = ""
+
+
 [orm]
 ; entities[] = "example\bo\Example"