Switch to the new dbp package names

composer.json

@@ -4,8 +4,8 @@
     "license": "AGPL-3.0-or-later",
     "require": {
         "php": "^7.3",
-        "dbp/api-core-bundle": "^0.1.7",
-        "dbp/api-keycloak-bundle": "^0.1.0",
+        "dbp/relay-core-bundle": "^0.1.10",
+        "dbp/relay-keycloak-bundle": "^0.1.1",
         "symfony/apache-pack": "^1.0",
         "symfony/console": "^5.2",
         "symfony/dotenv": "^5.2",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "98d2d7cf81a4001a3204d518f50ed689",
+    "content-hash": "a47adaded0fc690c92b125ace4691f60",
     "packages": [
         {
             "name": "api-platform/core",
@@ -222,74 +222,69 @@
             "time": "2021-01-20T22:51:39+00:00"
         },
         {
-            "name": "dbp/api-core-bundle",
-            "version": "v0.1.8",
+            "name": "dbp/relay-core-bundle",
+            "version": "v0.1.11",
             "source": {
                 "type": "git",
-                "url": "https://gitlab.tugraz.at/dbp/dbp-api/api-core-bundle",
-                "reference": "d80dc0293652bce9a830403a26e5c0cda8d2a10e"
+                "url": "https://gitlab.tugraz.at/dbp/relay/dbp-relay-core-bundle",
+                "reference": "5ab31546f7f8f85b876523de75ddf559f572cb0d"
             },
             "require": {
                 "api-platform/core": "^2.6.3",
                 "doctrine/annotations": "^1.0",
                 "ext-json": "*",
                 "guzzlehttp/guzzle": "^7.0",
-                "kevinrob/guzzle-cache-middleware": "^3.3",
-                "monolog/monolog": "^1.4||^2.1",
                 "nelmio/cors-bundle": "^2.1.0",
                 "php": "^7.3",
                 "phpdocumentor/reflection-docblock": "^3.0 || ^4.0 || ^5.0",
-                "symfony/asset": "^5.2",
-                "symfony/config": "^5.2",
-                "symfony/expression-language": "^5.2",
-                "symfony/framework-bundle": "^5.2",
-                "symfony/security-bundle": "^5.2",
-                "symfony/security-core": "^5.2",
-                "symfony/security-guard": "^5.2",
-                "symfony/twig-bundle": "^5.2",
-                "symfony/validator": "^5.2",
-                "symfony/yaml": "^5.2",
-                "web-token/jwt-easy": "^2.1",
-                "web-token/jwt-signature-algorithm-rsa": "^2.1"
+                "symfony/asset": "^5.3",
+                "symfony/config": "^5.3",
+                "symfony/expression-language": "^5.3",
+                "symfony/framework-bundle": "^5.3",
+                "symfony/security-bundle": "^5.3",
+                "symfony/security-core": "^5.3",
+                "symfony/security-guard": "^5.3",
+                "symfony/twig-bundle": "^5.3",
+                "symfony/validator": "^5.3",
+                "symfony/yaml": "^5.3"
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^3.0",
                 "phpstan/phpstan": "^0.12.33",
                 "phpstan/phpstan-phpunit": "^0.12.13",
-                "symfony/browser-kit": "^5.2",
-                "symfony/http-client": "^5.2",
-                "symfony/phpunit-bridge": "^5.2",
+                "symfony/browser-kit": "^5.3",
+                "symfony/http-client": "^5.3",
+                "symfony/phpunit-bridge": "^5.3",
                 "vimeo/psalm": "^4.4"
             },
             "type": "symfony-bundle",
             "autoload": {
                 "psr-4": {
-                    "DBP\\API\\CoreBundle\\": "src/"
+                    "Dbp\\Relay\\CoreBundle\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "AGPL-3.0-or-later"
             ],
-            "time": "2021-07-29T10:18:16+00:00"
+            "time": "2021-08-03T09:36:08+00:00"
         },
         {
-            "name": "dbp/api-keycloak-bundle",
-            "version": "v0.1.0",
+            "name": "dbp/relay-keycloak-bundle",
+            "version": "v0.1.1",
             "source": {
                 "type": "git",
-                "url": "https://gitlab.tugraz.at/dbp/dbp-api/api-keycloak-bundle",
-                "reference": "5ab2c886a2968f23d0668dbdecf4d91ea7d3350e"
+                "url": "https://gitlab.tugraz.at/dbp/relay/dbp-relay-keycloak-bundle",
+                "reference": "a7f0ade430e4dafacd745ac8acb63df1d1eea600"
             },
             "require": {
-                "dbp/api-core-bundle": "^0.1.6",
+                "dbp/relay-core-bundle": "^0.1.10",
                 "ext-json": "*",
                 "guzzlehttp/guzzle": "^7.0",
                 "kevinrob/guzzle-cache-middleware": "^3.3",
                 "php": "^7.3",
                 "symfony/framework-bundle": "^5.2",
                 "symfony/security-core": "^5.2",
-                "symfony/security-guard": "^5.2",
                 "symfony/yaml": "^5.2",
                 "web-token/jwt-easy": "^2.1",
                 "web-token/jwt-signature-algorithm-rsa": "^2.1"
@@ -306,14 +301,14 @@
             "type": "symfony-bundle",
             "autoload": {
                 "psr-4": {
-                    "DBP\\API\\KeycloakBundle\\": "src/"
+                    "Dbp\\Relay\\KeycloakBundle\\": "src/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "AGPL-3.0-or-later"
             ],
-            "time": "2021-07-26T09:32:55+00:00"
+            "time": "2021-08-03T09:19:56+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -858,29 +853,32 @@
         },
         {
             "name": "guzzlehttp/psr7",
-            "version": "1.8.2",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/psr7.git",
-                "reference": "dc960a912984efb74d0a90222870c72c87f10c91"
+                "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91",
-                "reference": "dc960a912984efb74d0a90222870c72c87f10c91",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/1dc8d9cba3897165e16d12bb13d813afb1eb3fe7",
+                "reference": "1dc8d9cba3897165e16d12bb13d813afb1eb3fe7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0",
-                "ralouphie/getallheaders": "^2.0.5 || ^3.0.0"
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.0",
+                "ralouphie/getallheaders": "^3.0"
             },
             "provide": {
+                "psr/http-factory-implementation": "1.0",
                 "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "ext-zlib": "*",
-                "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10"
+                "bamarni/composer-bin-plugin": "^1.4.1",
+                "http-interop/http-factory-tests": "^0.9",
+                "phpunit/phpunit": "^8.5.8 || ^9.3.10"
             },
             "suggest": {
                 "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
@@ -888,16 +886,13 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
                     "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -912,6 +907,11 @@
                 {
                     "name": "Tobias Schultze",
                     "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
                 }
             ],
             "description": "PSR-7 message implementation that also provides common utility methods",
@@ -927,27 +927,26 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.2"
+                "source": "https://github.com/guzzle/psr7/tree/2.0.0"
             },
-            "time": "2021-04-26T09:17:50+00:00"
+            "time": "2021-06-30T20:03:07+00:00"
         },
         {
             "name": "kevinrob/guzzle-cache-middleware",
-            "version": "v3.4.1",
+            "version": "v3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Kevinrob/guzzle-cache-middleware.git",
-                "reference": "122e309f64934511146a88d5645599f561b6fae3"
+                "reference": "d40eb54f08362d01da598da1b0e7421e8c3a52f6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/122e309f64934511146a88d5645599f561b6fae3",
-                "reference": "122e309f64934511146a88d5645599f561b6fae3",
+                "url": "https://api.github.com/repos/Kevinrob/guzzle-cache-middleware/zipball/d40eb54f08362d01da598da1b0e7421e8c3a52f6",
+                "reference": "d40eb54f08362d01da598da1b0e7421e8c3a52f6",
                 "shasum": ""
             },
             "require": {
                 "guzzlehttp/guzzle": "^6.0 || ^7.0",
-                "guzzlehttp/psr7": "^1.7.0",
                 "php": ">=5.5.0"
             },
             "require-dev": {
@@ -1010,9 +1009,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Kevinrob/guzzle-cache-middleware/issues",
-                "source": "https://github.com/Kevinrob/guzzle-cache-middleware/tree/v3.4.1"
+                "source": "https://github.com/Kevinrob/guzzle-cache-middleware/tree/v3.4.0"
             },
-            "time": "2021-07-11T09:00:28+00:00"
+            "time": "2021-07-02T15:53:35+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -1528,6 +1527,61 @@
             },
             "time": "2020-06-29T06:28:15+00:00"
         },
+        {
+            "name": "psr/http-factory",
+            "version": "1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0.0",
+                "psr/http-message": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory/tree/master"
+            },
+            "time": "2019-04-30T12:38:16+00:00"
+        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",

config/bundles.php

 <?php
 
-declare(strict_types=1);
-
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
-    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
-    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => false],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
-    DBP\API\KeycloakBundle\DbpKeycloakBundle::class => ['all' => true],
-    DBP\API\CoreBundle\DbpCoreBundle::class => ['all' => true],
+    Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
+    Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
+    ApiPlatform\Core\Bridge\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
+    Dbp\Relay\KeycloakBundle\DbpRelayKeycloakBundle::class => ['all' => true],
+    Dbp\Relay\CoreBundle\DbpRelayCoreBundle::class => ['all' => true],
 ];

config/packages/dbp_core.yaml → config/packages/dbp_relay_core.yaml

-dbp_core:
+dbp_relay_core:
     build_info: '%env(API_BUILDINFO)%'
     build_info_url: '%env(API_BUILDINFO_URL)%'

config/packages/dbp_keycloak.yaml → config/packages/dbp_relay_keycloak.yaml

-dbp_keycloak:
+dbp_relay_keycloak:
   server_url: '%env(KEYCLOAK_SERVER_URL)%'
   realm: '%env(KEYCLOAK_REALM)%'
   client_id: '%env(KEYCLOAK_CLIENT_ID)%'

config/routes/dbp_route.yaml

-DbpCoreBundle:
-    resource: "@DbpCoreBundle/Resources/config/routing.yaml"
\ No newline at end of file
+DbpRelayCoreBundle:
+    resource: "@DbpRelayCoreBundle/Resources/config/routing.yaml"
\ No newline at end of file

symfony.lock

@@ -14,7 +14,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "master",
             "version": "2.5",
-            "ref": "a93061567140e386f107be75340ac2aee3f86cbf"
+            "ref": "f132b33c43cf47b4451d91d2b57057eacb6b8e1d"
         },
         "files": [
             "config/packages/api_platform.yaml",
@@ -23,7 +23,7 @@
         ]
     },
     "brick/math": {
-        "version": "0.9.1"
+        "version": "0.9.2"
     },
     "composer/package-versions-deprecated": {
         "version": "1.11.99.1"
@@ -34,11 +34,11 @@
     "composer/xdebug-handler": {
         "version": "1.4.4"
     },
-    "dbp/api-core-bundle": {
-        "version": "dev-main"
+    "dbp/relay-core-bundle": {
+        "version": "v0.1.10"
     },
-    "dbp/api-keycloak-bundle": {
-        "version": "dev-main"
+    "dbp/relay-keycloak-bundle": {
+        "version": "v0.1.0"
     },
     "dnoegel/php-xdg-base-dir": {
         "version": "v0.1.1"
@@ -71,7 +71,7 @@
         ]
     },
     "doctrine/inflector": {
-        "version": "1.4.3"
+        "version": "2.0.3"
     },
     "doctrine/lexer": {
         "version": "1.2.1"
@@ -86,10 +86,10 @@
         "version": "v1.5.0"
     },
     "fgrosse/phpasn1": {
-        "version": "v2.2.0"
+        "version": "v2.3.0"
     },
     "fig/link-util": {
-        "version": "1.1.1"
+        "version": "1.1.2"
     },
     "friendsofphp/php-cs-fixer": {
         "version": "2.2",
@@ -104,19 +104,19 @@
         ]
     },
     "guzzlehttp/guzzle": {
-        "version": "6.5.5"
+        "version": "7.3.0"
     },
     "guzzlehttp/promises": {
-        "version": "1.4.0"
+        "version": "1.4.1"
     },
     "guzzlehttp/psr7": {
-        "version": "1.7.0"
+        "version": "2.0.0"
     },
     "illuminate/contracts": {
         "version": "v8.12.0"
     },
     "kevinrob/guzzle-cache-middleware": {
-        "version": "v3.3.1"
+        "version": "v3.4.0"
     },
     "league/uri": {
         "version": "6.3.0"
@@ -133,7 +133,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "master",
             "version": "1.5",
-            "ref": "6388de23860284db9acce0a7a5d9d13153bcb571"
+            "ref": "6bea22e6c564fba3a1391615cada1437d0bde39c"
         },
         "files": [
             "config/packages/nelmio_cors.yaml"
@@ -203,7 +203,7 @@
         "version": "4.0.4"
     },
     "spomky-labs/base64url": {
-        "version": "v2.0.3"
+        "version": "v2.0.4"
     },
     "symfony/apache-pack": {
         "version": "1.0",
@@ -218,7 +218,7 @@
         ]
     },
     "symfony/asset": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/browser-kit": {
         "version": "v4.4.19"
@@ -287,7 +287,7 @@
         "version": "v1.1.9"
     },
     "symfony/expression-language": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/filesystem": {
         "version": "v4.4.16"
@@ -367,7 +367,7 @@
         "version": "v4.4.16"
     },
     "symfony/password-hasher": {
-        "version": "v5.3.3"
+        "version": "v5.3.4"
     },
     "symfony/phpunit-bridge": {
         "version": "5.1",
@@ -415,10 +415,10 @@
         "version": "v1.0.5"
     },
     "symfony/property-access": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/property-info": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/routing": {
         "version": "4.2",
@@ -435,31 +435,31 @@
         ]
     },
     "symfony/security-bundle": {
-        "version": "4.4",
+        "version": "5.3",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "master",
-            "version": "4.4",
-            "ref": "7b4408dc203049666fe23fabed23cbadc6d8440f"
+            "version": "5.3",
+            "ref": "8b35bfc00a7716db4ca5a764a4b338476ca3a704"
         },
         "files": [
             "config/packages/security.yaml"
         ]
     },
     "symfony/security-core": {
-        "version": "v4.4.16"
+        "version": "v5.3.6"
     },
     "symfony/security-csrf": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/security-guard": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/security-http": {
-        "version": "v4.4.16"
+        "version": "v5.3.6"
     },
     "symfony/serializer": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/service-contracts": {
         "version": "v2.2.0"
@@ -496,7 +496,7 @@
             "repo": "github.com/symfony/recipes",
             "branch": "master",
             "version": "4.3",
-            "ref": "d902da3e4952f18d3bf05aab29512eb61cabd869"
+            "ref": "3eb8df139ec05414489d55b97603c5f6ca0c44cb"
         },
         "files": [
             "config/packages/test/validator.yaml",
@@ -510,7 +510,7 @@
         "version": "v4.4.16"
     },
     "symfony/web-link": {
-        "version": "v4.4.16"
+        "version": "v5.3.4"
     },
     "symfony/web-profiler-bundle": {
         "version": "3.3",
@@ -548,22 +548,22 @@
         "version": "3.18.2"
     },
     "web-token/jwt-checker": {
-        "version": "v2.2.5"
+        "version": "v2.2.10"
     },
     "web-token/jwt-core": {
-        "version": "v2.2.5"
+        "version": "v2.2.10"
     },
     "web-token/jwt-easy": {
-        "version": "v2.2.5"
+        "version": "v2.2.10"
     },
     "web-token/jwt-encryption": {
-        "version": "v2.2.5"
+        "version": "v2.2.10"
     },
     "web-token/jwt-signature": {
-        "version": "v2.2.5"
+        "version": "v2.2.10"
     },
     "web-token/jwt-signature-algorithm-rsa": {
-        "version": "v2.2.5"
+        "version": "v2.2.10"
     },
     "webmozart/assert": {
         "version": "1.9.1"
@@ -572,6 +572,6 @@
         "version": "2.3.0"
     },
     "willdurand/negotiation": {
-        "version": "v2.3.1"
+        "version": "3.0.0"
     }
 }