Skip to content

Commit

Permalink
Merge branch 'master' into feature/use-symfony-mailer
Browse files Browse the repository at this point in the history
  • Loading branch information
tchapi committed Dec 22, 2021
2 parents 47e8a11 + 79c9806 commit 84fa027
Show file tree
Hide file tree
Showing 12 changed files with 176 additions and 93 deletions.
6 changes: 6 additions & 0 deletions .env.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# define your env variables for the test env here
KERNEL_CLASS='App\Kernel'
APP_SECRET='$ecretf0rt3st'
SYMFONY_DEPRECATIONS_HELPER=999999
PANTHER_APP_ENV=panther
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
76 changes: 76 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
name: CI

on: ["push", "pull_request"]

env:
COMPOSER_ALLOW_SUPERUSER: '1'
SYMFONY_DEPRECATIONS_HELPER: max[self]=0

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
container:
image: php:8.0-alpine
options: >-
--tmpfs /tmp:exec
--tmpfs /var/tmp:exec
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install Composer
run: wget -qO - https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
- name: Cache Composer dependencies
uses: actions/cache@v1
with:
path: ~/.composer/cache
key: composer-php${{ matrix.php }}-highest-
restore-keys: |
composer-php${{ matrix.php }}-highest-
composer-
- name: Validate Composer
run: composer validate
- name: Install highest dependencies with Composer
run: composer update --no-progress --ansi
- name: Analyze
run: vendor/bin/php-cs-fixer fix --ansi

phpunit:
name: PHPUnit (PHP ${{ matrix.php }} Deps ${{ matrix.dependencies }})
runs-on: ubuntu-latest
container:
image: php:${{ matrix.php }}-alpine
options: >-
--tmpfs /tmp:exec
--tmpfs /var/tmp:exec
strategy:
matrix:
php:
- '7.3'
- '7.4'
- '8.0'
dependencies:
- lowest
- highest
fail-fast: false
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Install Composer
run: wget -qO - https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer --quiet
- name: Cache Composer dependencies
uses: actions/cache@v1
with:
path: ~/.composer/cache
key: composer-php${{ matrix.php }}-${{ matrix.dependencies }}-
restore-keys: |
composer-php${{ matrix.php }}-${{ matrix.dependencies }}-
composer-
- name: Install lowest dependencies with Composer
if: matrix.dependencies == 'lowest'
run: composer update --no-progress --prefer-stable --prefer-lowest --ansi
- name: Install highest dependencies with Composer
if: matrix.dependencies == 'highest'
run: composer update --no-progress --ansi
- name: Run tests with PHPUnit
run: vendor/bin/phpunit --colors=always
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Davis
---

[![Publish Docker image](https://github.com/tchapi/davis/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/tchapi/davis/actions/workflows/main.yml)
[![Build Status][ci_badge]][ci_link] [![Publish Docker image](https://github.com/tchapi/davis/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/tchapi/davis/actions/workflows/main.yml)

A simple, fully translatable admin interface and frontend for `sabre/dav` based on [Symfony 5](https://symfony.com/) and [Bootstrap 4](https://getbootstrap.com/), largely inspired by [Baïkal](https://github.com/sabre-io/Baikal).

Expand Down Expand Up @@ -250,3 +250,6 @@ _This project does not use any pipeline for the assets since the frontend side i
# Licence

This project is release under the MIT licence. See the LICENCE file

[ci_badge]: https://github.com/tchapi/davis/workflows/CI/badge.svg
[ci_link]: https://github.com/tchapi/davis/actions?query=workflow%3ACI
56 changes: 29 additions & 27 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,51 +1,53 @@
{
"name": "tchapi/davis",
"description": "A simple, fully translatable admin interface and frontend for sabre/dav based on Symfony",
"type": "project",
"license": "MIT",
"require": {
"php": "^7.3.0",
"ext-ctype": "*",
"ext-iconv": "*",
"composer/package-versions-deprecated": "1.11.99.3",
"composer-runtime-api": "^2",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/doctrine-migrations-bundle": "^3.1",
"doctrine/orm": "^2.9",
"phpdocumentor/reflection-docblock": "^5.2",
"sabre/dav": "^4.1",
"sensio/framework-extra-bundle": "^5.5",
"symfony/asset": "*",
"symfony/console": "*",
"symfony/dotenv": "*",
"symfony/expression-language": "*",
"symfony/flex": "^1.3.1",
"symfony/form": "*",
"symfony/framework-bundle": "*",
"symfony/http-client": "*",
"symfony/intl": "*",
"symfony/mailer": "*",
"symfony/asset": "^5.3",
"symfony/console": "^5.3",
"symfony/dotenv": "^5.3",
"symfony/expression-language": "^5.3",
"symfony/flex": "^1.10",
"symfony/form": "^5.3",
"symfony/framework-bundle": "^5.3",
"symfony/http-client": "^5.3",
"symfony/intl": "^5.3",
"symfony/mailer": "^5.3",
"symfony/monolog-bundle": "^3.1",
"symfony/process": "*",
"symfony/property-access": "5.3.*",
"symfony/property-info": "5.3.*",
"symfony/proxy-manager-bridge": "5.3.*",
"symfony/security-bundle": "*",
"symfony/serializer": "5.3.*",
"symfony/translation": "*",
"symfony/twig-bundle": "*",
"symfony/validator": "*",
"symfony/web-link": "*",
"symfony/yaml": "*"
"symfony/process": "^5.3",
"symfony/property-access": "^5.3",
"symfony/property-info": "^5.3",
"symfony/proxy-manager-bridge": "^5.3",
"symfony/security-bundle": "^5.3",
"symfony/serializer": "^5.3",
"symfony/translation": "^5.3",
"symfony/twig-bundle": "^5.3",
"symfony/validator": "^5.3",
"symfony/web-link": "^5.3",
"symfony/yaml": "^5.3"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.2",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "5.3.*",
"symfony/css-selector": "5.3.*",
"symfony/debug-bundle": "5.3.*",
"symfony/browser-kit": "^5.3",
"symfony/css-selector": "^5.3",
"symfony/debug-bundle": "^5.3",
"symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "^5.3",
"symfony/stopwatch": "5.3.*",
"symfony/web-profiler-bundle": "5.3.*"
"symfony/stopwatch": "^5.3",
"symfony/web-profiler-bundle": "^5.3"
},
"config": {
"preferred-install": {
Expand Down
45 changes: 23 additions & 22 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file removed migrations/.gitignore
Empty file.
70 changes: 27 additions & 43 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,46 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>

<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="bin/.phpunit/phpunit.xsd"
backupGlobals="false"
colors="true"
bootstrap="config/bootstrap.php"
>
<php>
<ini name="error_reporting" value="-1" />
<server name="APP_ENV" value="test" force="true" />
<server name="SHELL_VERBOSITY" value="-1" />
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
<server name="SYMFONY_PHPUNIT_VERSION" value="7.5" />
<!-- ###+ symfony/swiftmailer-bundle ### -->
<!-- For Gmail as a transport, use: "gmail://username:password@localhost" -->
<!-- For a generic SMTP server, use: "smtp://localhost:25?encryption=&auth_mode=" -->
<!-- Delivery is disabled by default via "null://localhost" -->
<env name="MAILER_URL" value="null://localhost"/>
<!-- ###- symfony/swiftmailer-bundle ### -->

<!-- ###+ symfony/framework-bundle ### -->
<env name="APP_ENV" value="dev"/>
<env name="APP_SECRET" value="48bfdfefe5bea124be17563bbf82859d"/>
<!-- env name="TRUSTED_PROXIES" value="127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16" -->
<!-- env name="TRUSTED_HOSTS" value="'^(localhost|example\.com)$'" -->
<!-- ###- symfony/framework-bundle ### -->
</php>

<testsuites>
<testsuite name="Project Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>

<filter>
<whitelist>
<directory>src</directory>
</whitelist>
</filter>

<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
</listeners>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="config/bootstrap.php">
<coverage>
<include>
<directory>src</directory>
</include>
</coverage>
<php>
<ini name="error_reporting" value="-1"/>
<server name="APP_ENV" value="test" force="true"/>
<server name="SHELL_VERBOSITY" value="-1"/>
<server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
<server name="SYMFONY_PHPUNIT_VERSION" value="7.5"/>
<!-- ###+ symfony/framework-bundle ### -->
<env name="APP_ENV" value="dev"/>
<env name="APP_SECRET" value="48bfdfefe5bea124be17563bbf82859d"/>
<!-- env name="TRUSTED_PROXIES" value="127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16" -->
<!-- env name="TRUSTED_HOSTS" value="'^(localhost|example\.com)$'" -->
<!-- ###- symfony/framework-bundle ### -->
</php>
<testsuites>
<testsuite name="Project Test Suite">
<directory>tests</directory>
</testsuite>
</testsuites>
<listeners>
<listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
</listeners>
</phpunit>
Empty file removed src/Controller/.gitignore
Empty file.
Empty file removed src/Entity/.gitignore
Empty file.
Empty file removed src/Migrations/.gitignore
Empty file.
Empty file removed src/Repository/.gitignore
Empty file.
Loading

0 comments on commit 84fa027

Please sign in to comment.