Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ http {
include /etc/nginx/conf.d/*.conf;

server {
listen 80;
listen [::]:80;
listen 443 default_server ssl http2;
listen [::]:443 ssl http2;
listen 80;
listen [::]:80;
listen 443 default_server ssl;
listen [::]:443 ssl;
http2 on;
server_name _;
root /app/public;

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 7 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
/.gitignore
/buddy.yml
/ansible
/docker
!/docker/nginx/cert
/.docker
!/.docker/nginx/cert
/tests
/var/*
/phpstan*
/docker-compose.yml
/Dockerfile
/*.md
/.codecov.yml

###> php-cs-fixer/shim ###
/.php-cs-fixer.cache
Expand Down
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ APP_SECRET=c7dbd995176e079f857b6649b60ccf68
###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8"
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=17&charset=utf8"
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
DATABASE_URL=postgresql://127.0.0.1:5432/main?serverVersion=11&charset=utf8
DATABASE_URL=postgresql://127.0.0.1:5432/main?serverVersion=17&charset=utf8
###< doctrine/doctrine-bundle ###

###> symfony/messenger ###
Expand Down
6 changes: 3 additions & 3 deletions .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ APP_HOST=repman.wip
APP_DOMAIN_SEPARATOR=.
APP_ORGANIZATION_SEPARATOR=.
APP_URL_SCHEME=https
APP_ALLOWED_PACKAGE_TYPES=git,github,gitlab,bitbucket,subversion,mercurial,pear,artifact,path
APP_ALLOWED_PACKAGE_TYPES=git,github,gitlab,bitbucket,pear,artifact,path
APP_GITLAB_API_URL=https://gitlab.com
###< app ###

Expand All @@ -37,9 +37,9 @@ APP_SECRET=c7dbd995176e079f857b6649b60ccf68
###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8"
# For a PostgreSQL database, use: "postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=17&charset=utf8"
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
DATABASE_URL=postgresql://main:main@database:5432/main?serverVersion=11&charset=utf8
DATABASE_URL=postgresql://main:main@database:5432/main?serverVersion=17&charset=utf8
###< doctrine/doctrine-bundle ###

###> symfony/messenger ###
Expand Down
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/ansible export-ignore
/bin/coverage-checker export-ignore
/docker export-ignore
/.docker export-ignore
/tests export-ignore
/.codecov.yml export-ignore
/.dockerignore export-ignore
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,14 @@ jobs:
fail-fast: false
matrix:
php:
- "7.4"
- "8.0"
postgresql:
- "11"
- "17"
include:
- php: "7.4"
php-version: "7.4.2"
- php: "8.0"
php-version: "8.0.30"
- postgresql: "11"
postgresql-version: "11.7"
- postgresql: "17"
postgresql-version: "17.7"

steps:
- name: "Install OS dependencies"
Expand Down
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

###> Docker ###
docker-compose.*.yml
/docker/logs/nginx/*
!/docker/logs/nginx/.gitkeep
/docker/nginx/ssl/certs/*
!/docker/nginx/ssl/certs/.gitkeep
/docker/nginx/ssl/private/*
!/docker/nginx/ssl/private/.gitkeep
/.docker/logs/nginx/*
!/.docker/logs/nginx/.gitkeep
/.docker/nginx/ssl/certs/*
!/.docker/nginx/ssl/certs/.gitkeep
/.docker/nginx/ssl/private/*
!/.docker/nginx/ssl/private/.gitkeep
###< Docker ###

composer.phar
Expand Down
13 changes: 8 additions & 5 deletions .php-cs-fixer.dist.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
<?php

$finder = PhpCsFixer\Finder::create()
->in(__DIR__.'/bin')
->in(__DIR__.'/config')
->in(__DIR__.'/src')
->in(__DIR__.'/public')
->in(__DIR__.'/tests')
;

$config = new PhpCsFixer\Config();
return $config->setRiskyAllowed(true)
->setRules([
'@PHP74Migration' => true,
'@PHP81Migration' => true,
'@Symfony' => true,
'array_syntax' => ['syntax' => 'short'],
'blank_line_between_import_groups' => false,
Expand All @@ -19,6 +22,7 @@
'no_useless_return' => true,
'no_unused_imports' => true,
'declare_strict_types' => true,
'native_function_invocation' => false,
'ordered_imports' => [
'imports_order' => ['class', 'function', 'const'],
'sort_algorithm' => 'alpha',
Expand All @@ -30,12 +34,11 @@
'increment_style' => true,
'single_quote' => true,
'trim_array_spaces' => true,
'single_blank_line_before_namespace' => true,
'yoda_style' => false,
'global_namespace_import' => [
'import_classes' => false,
'import_constants' => false,
'import_functions' => false,
'import_classes' => true,
'import_constants' => true,
'import_functions' => true,
],
// risky -->
'strict_param' => true,
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.0.19-fpm-alpine
FROM php:8.1-fpm-alpine

ARG TIMEZONE="UTC"

Expand Down
2 changes: 2 additions & 0 deletions bin/console
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/usr/bin/env php
<?php

declare(strict_types=1);

use Buddy\Repman\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;
use Symfony\Component\Console\Input\ArgvInput;
Expand Down
10 changes: 5 additions & 5 deletions buddy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
type: "BUILD"
working_directory: "/buddy/repman"
docker_image_name: "library/php"
docker_image_tag: "8.0.19"
docker_image_tag: "8.0"
execute_commands:
- "composer validate"
- "composer install"
Expand Down Expand Up @@ -44,7 +44,7 @@
"git config --global user.name \"buddy.works\""
services:
- type: "POSTGRE_SQL"
version: "11.6-alpine"
version: "17-alpine"
connection:
host: "postgres"
port: 5432
Expand All @@ -66,7 +66,7 @@
next_pipeline_name: "deploy"
variables:
- key: "DATABASE_URL"
value: "postgresql://main:main@postgres:5432/main?serverVersion=11&charset=utf8"
value: "postgresql://main:main@postgres:5432/main?serverVersion=17&charset=utf8"
id: 352921
description: ""
- pipeline: "security"
Expand All @@ -83,7 +83,7 @@
type: "BUILD"
working_directory: "/buddy/repman"
docker_image_name: "library/php"
docker_image_tag: "8.0.19"
docker_image_tag: "8.0"
execute_commands:
- "/local-php-security-checker"
setup_commands:
Expand All @@ -102,7 +102,7 @@
integration_hash: "5f4f3794fd5a7366872df494"
variables:
- key: "DATABASE_URL"
value: "postgresql://main:main@postgres:5432/main?serverVersion=11&charset=utf8"
value: "postgresql://main:main@postgres:5432/main?serverVersion=17&charset=utf8"
- pipeline: "setup"
trigger_mode: "MANUAL"
ref_name: "refs/heads/*"
Expand Down
78 changes: 37 additions & 41 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,33 @@
],
"license": "MIT",
"require": {
"php": "^7.4.2 || ^8.0",
"php": "^8.1",
"ext-ctype": "*",
"ext-curl": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-pdo_pgsql": "*",
"ext-zip": "*",
"ext-simplexml": "*",
"async-aws/ses": "^1.4",
"bitbucket/client": "^4.0",
"buddy-works/buddy-works-php-api": "^1.3",
"buddy-works/buddy-works-php-api": "^1.4",
"buddy-works/oauth2-client": "^1.0",
"cbschuld/browser.php": "^1.9",
"clue/mq-react": "^1.2",
"composer/composer": "^1.10.22",
"composer/semver": "^1.5",
"composer/composer": "^2.8.5",
"composer/semver": "^3.4.3",
"doctrine/doctrine-bundle": "^2.1",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.7",
"excelwebzone/recaptcha-bundle": "^1.5",
"guzzlehttp/guzzle": "^6.5",
"knplabs/github-api": "^3.0",
"knpuniversity/oauth2-client-bundle": "^2.0",
"league/commonmark": "^1.5",
"league/flysystem-aws-s3-v3": "^1.0",
"league/flysystem-bundle": "^1.5",
"league/flysystem-cached-adapter": "^1.1",
"league/commonmark": "^2.6",
"league/flysystem-aws-s3-v3": "^2.5",
"league/flysystem-bundle": "^2.4",
"league/oauth2-github": "^3.0",
"m4tthumphrey/php-gitlab-api": "^11.0",
"munusphp/munus": "^0.4.0",
Expand All @@ -50,30 +51,32 @@
"omines/oauth2-gitlab": "^3.2",
"ramsey/uuid-doctrine": "^1.5",
"react/http": "^1.0",
"sensio/framework-extra-bundle": "^5.5",
"sensio/framework-extra-bundle": "*",
"sentry/sentry-symfony": "^4.0",
"stevenmaguire/oauth2-bitbucket": "^3.0",
"symfony/amazon-mailer": "5.4.*",
"symfony/asset": "5.4.*",
"symfony/console": "5.4.*",
"symfony/doctrine-messenger": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/amazon-mailer": "6.4.*",
"symfony/asset": "6.4.*",
"symfony/cache": "6.4.*",
"symfony/console": "6.4.*",
"symfony/doctrine-messenger": "6.4.*",
"symfony/dotenv": "6.4.*",
"symfony/flex": "^1.3.1",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/lock": "5.4.*",
"symfony/mailer": "5.4.*",
"symfony/messenger": "5.4.*",
"symfony/form": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/http-client": "6.4.*",
"symfony/intl": "6.4.*",
"symfony/lock": "6.4.*",
"symfony/mailer": "6.4.*",
"symfony/messenger": "6.4.*",
"symfony/monolog-bundle": "^3.5",
"symfony/process": "5.4.*",
"symfony/security-bundle": "5.4.*",
"symfony/twig-bundle": "5.4.*",
"symfony/validator": "5.4.*",
"symfony/yaml": "5.4.*",
"twig/extra-bundle": "^2.12 || ^3.0",
"twig/twig": "^2.12 || ^3.0"
"symfony/process": "6.4.*",
"symfony/security-bundle": "6.4.*",
"symfony/twig-bundle": "6.4.*",
"symfony/validator": "6.4.*",
"symfony/yaml": "6.4.*",
"twig/extra-bundle": "^3.0",
"twig/twig": "^3.0",
"ext-libxml": "*"
},
"replace": {
"paragonie/random_compat": "2.*",
Expand All @@ -89,12 +92,12 @@
},
"require-dev": {
"coduo/php-matcher": "^6.0",
"dama/doctrine-test-bundle": "^6.3",
"dama/doctrine-test-bundle": "^v8.2.2",
"doctrine/doctrine-fixtures-bundle": "^3.3",
"ekino/phpstan-banned-code": "^1.0.0",
"fakerphp/faker": "^1.9",
"johnkary/phpunit-speedtrap": "^4.0",
"league/flysystem-memory": "^1.0",
"league/flysystem-memory": "^3.13",
"php-cs-fixer/shim": "^3.9",
"phpspec/prophecy-phpunit": "^2.0",
"phpstan/extension-installer": "^1.0",
Expand All @@ -105,21 +108,23 @@
"phpstan/phpstan-strict-rules": "^1.1.0",
"phpstan/phpstan-symfony": "^1.0.4",
"phpunit/phpunit": "^9",
"rector/rector": "^1.2",
"symfony/browser-kit": "*",
"symfony/maker-bundle": "^1.14",
"symfony/stopwatch": "*",
"symfony/web-profiler-bundle": "*"
},
"config": {
"platform": {
"php": "7.4.2"
"php": "8.1"
},
"preferred-install": {
"*": "dist"
},
"sort-packages": true,
"allow-plugins": {
"composer/package-versions-deprecated": true,
"php-http/discovery": true,
"phpstan/extension-installer": true,
"symfony/flex": true
},
Expand All @@ -130,7 +135,7 @@
"extra": {
"symfony": {
"allow-contrib": false,
"require": "5.4.*"
"require": "6.4.*"
}
},
"autoload": {
Expand All @@ -143,15 +148,6 @@
"Buddy\\Repman\\Tests\\": "tests/"
}
},
"repositories": [
{
"type": "composer",
"url": "https://repo.repman.io"
},
{
"packagist": false
}
],
"scripts": {
"post-install-cmd": [
"bin/console assets:install --symlink"
Expand Down
Loading