From e4f645b8570b6bc0a152b007a03d50249ab14049 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Wed, 19 May 2021 11:30:51 +0200
Subject: [PATCH] Updates for GitLab path changes
---
.gitlab-ci.yml | 2 +-
.gitlab-ci/README.md | 2 +-
.gitlab-ci/build.sh | 2 +-
README.md | 4 ++--
composer.json | 4 ++--
composer.lock | 14 +++++++-------
6 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5de5176..53ac539 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-server-template/main:v1
+image: registry.gitlab.tugraz.at/dbp/dbp-api/api-server-template/main:v1
before_script:
- 'git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.tugraz.at/".insteadOf "git@gitlab.tugraz.at:"'
diff --git a/.gitlab-ci/README.md b/.gitlab-ci/README.md
index 3465c9b..fa39e34 100644
--- a/.gitlab-ci/README.md
+++ b/.gitlab-ci/README.md
@@ -1,4 +1,4 @@
* In case of an incompatible change increase the tag version number in build.sh
* ./build.sh
* (first time) sudo docker login registry.gitlab.tugraz.at
-* sudo docker push registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-server-template/main:v1
\ No newline at end of file
+* sudo docker push registry.gitlab.tugraz.at/dbp/dbp-api/api-server-template/main:v1
\ No newline at end of file
diff --git a/.gitlab-ci/build.sh b/.gitlab-ci/build.sh
index 52192df..e1cf566 100755
--- a/.gitlab-ci/build.sh
+++ b/.gitlab-ci/build.sh
@@ -1,7 +1,7 @@
#!/bin/bash
set -e
-TAG="registry.gitlab.tugraz.at/dbp/middleware/dbp-api/api-server-template/main:v1"
+TAG="registry.gitlab.tugraz.at/dbp/dbp-api/api-server-template/main:v1"
sudo docker build --tag "${TAG}" --file "Dockerfile" .
sudo docker run --rm --security-opt label=disable \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
diff --git a/README.md b/README.md
index f28915f..36387ef 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,8 @@ This repository can be used as a template/starting point for your own API instan
It consists of a minimally configures Symfony application and development environment
and includes/integrates:
-* The [dbp/api-core-bundle](https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle): Which provides authentication, some same base end points and entities and configuration for [api-platform](https://api-platform.com/)
-* The [dbp/api-starter-bundle](https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-starter-bundle): Which acts as a template for creating new bundles as
+* The [dbp/api-core-bundle](https://gitlab.tugraz.at/dbp/dbp-api/api-core-bundle): Which provides authentication, some same base end points and entities and configuration for [api-platform](https://api-platform.com/)
+* The [dbp/api-starter-bundle](https://gitlab.tugraz.at/dbp/dbp-api/api-starter-bundle): Which acts as a template for creating new bundles as
we as an example for what can be done in a bundle.
* A docker-compose based development environment
* Linter/Unittest integration
diff --git a/composer.json b/composer.json
index 67f0844..127e801 100644
--- a/composer.json
+++ b/composer.json
@@ -16,11 +16,11 @@
"repositories": [
{
"type": "vcs",
- "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle.git"
+ "url": "https://gitlab.tugraz.at/dbp/dbp-api/api-core-bundle.git"
},
{
"type": "vcs",
- "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-starter-bundle.git"
+ "url": "https://gitlab.tugraz.at/dbp/dbp-api/api-starter-bundle.git"
}
],
"config": {
diff --git a/composer.lock b/composer.lock
index ebb077b..2ee25de 100644
--- a/composer.lock
+++ b/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": "0eaab40bd6e1990a5a489e0f5e78de42",
+ "content-hash": "b645c9d169be4edf2c25919e106535bc",
"packages": [
{
"name": "api-platform/core",
@@ -225,7 +225,7 @@
"version": "dev-main",
"source": {
"type": "git",
- "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-core-bundle.git",
+ "url": "https://gitlab.tugraz.at/dbp/dbp-api/api-core-bundle.git",
"reference": "7ee0cb4d5e73b2926070d6c8d7e4213367b86e8c"
},
"require": {
@@ -252,7 +252,7 @@
"web-token/jwt-signature-algorithm-rsa": "^2.1"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.17",
+ "friendsofphp/php-cs-fixer": "^3.0",
"phpstan/phpstan": "^0.12.33",
"phpstan/phpstan-phpunit": "^0.12.13",
"symfony/browser-kit": "^5.2",
@@ -293,7 +293,7 @@
"@php vendor/bin/php-cs-fixer --ansi fix"
],
"cs": [
- "@php vendor/bin/php-cs-fixer --ansi fix --dry-run --diff --diff-format=udiff"
+ "@php vendor/bin/php-cs-fixer --ansi fix --dry-run --diff"
],
"coverage": [
"@php vendor/bin/simple-phpunit --coverage-html _coverage"
@@ -309,7 +309,7 @@
"version": "dev-main",
"source": {
"type": "git",
- "url": "https://gitlab.tugraz.at/dbp/middleware/dbp-api/api-starter-bundle.git",
+ "url": "https://gitlab.tugraz.at/dbp/dbp-api/api-starter-bundle.git",
"reference": "12182ca139a35339813b15448d7800e87288e870"
},
"require": {
@@ -320,7 +320,7 @@
"symfony/framework-bundle": "^5.2"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.16",
+ "friendsofphp/php-cs-fixer": "^3.0",
"phpstan/phpstan": "^0.12.33",
"phpstan/phpstan-phpunit": "^0.12.13",
"symfony/browser-kit": "^5.2",
@@ -361,7 +361,7 @@
"@php vendor/bin/php-cs-fixer --ansi fix"
],
"cs": [
- "@php vendor/bin/php-cs-fixer --ansi fix --dry-run --diff --diff-format=udiff"
+ "@php vendor/bin/php-cs-fixer --ansi fix --dry-run --diff"
],
"coverage": [
"@php vendor/bin/simple-phpunit --coverage-html _coverage"
--
GitLab