Skip to content

Commit

Permalink
Merge branch 'develop' into home-incluir-link-nas-imagens/textos-refe…
Browse files Browse the repository at this point in the history
…rente-secoes
  • Loading branch information
lpirola authored Aug 28, 2024
2 parents 019fa3d + efb3543 commit 73cd820
Show file tree
Hide file tree
Showing 144 changed files with 23,883 additions and 9,037 deletions.
56 changes: 56 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Testing

on:
pull_request:
branches:
- "**"

jobs:
phpunit:
strategy:
matrix:
operating-system: [ubuntu-20.04]
php-versions: ["8.2"]
runs-on: ${{ matrix.operating-system }}
steps:
- name: Checkout Code
uses: actions/checkout@v2
with:
submodules: recursive

- name: Add hosts to /etc/hosts
run: |
sudo echo "127.0.0.1 db" | sudo tee -a /etc/hosts
- uses: hoverkraft-tech/[email protected]
with:
compose-file: "dev/docker-compose.yml"
services: "db"
up-flags: "-d"
down-flags: "-v"

- name: Install composer and dependencies
uses: php-actions/composer@v6

- name: Run migrations
run: |
mkdir var/private-files/dbupdate_documento
php src/tools/apply-updates.php
env:
APP_MODE: development

- name: PHPUnit Tests
uses: php-actions/phpunit@v3
env:
XDEBUG_MODE: coverage
with:
configuration: phpunit.xml
php_extensions: pdo_pgsql xdebug mbstring curl xml
args: tests --coverage-clover ./coverage.xml

- name: Upload to Codecov
uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODE_COV_TOKEN }}
files: ./coverage.xml
verbose: true
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,10 @@ src/themes/BaseV1/assets/css/main.css.map
.idea
.phpunit.result.cache
.php-cs-fixer.cache
docker-data
docker-data
media-query.js.LICENSE.txt
public/assets/
src/.phpdoc
.phpunit*
.phpdocs*
.env
3 changes: 3 additions & 0 deletions app/src/DataFixtures/EventFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class EventFixtures extends Fixture implements DependentFixtureInterface
'linkedin' => 'teste',
'vimeo' => 'teste',
'spotify' => 'teste',
'tiktok' => 'teste',
'youtube' => 'cultura',
'pinterest' => 'teste',
'event_attendance' => 50,
Expand Down Expand Up @@ -62,6 +63,7 @@ class EventFixtures extends Fixture implements DependentFixtureInterface
'linkedin' => 'teste',
'vimeo' => 'teste',
'spotify' => 'teste',
'tiktok' => 'teste',
'youtube' => 'cultura',
'pinterest' => 'teste',
'event_attendance' => 50,
Expand Down Expand Up @@ -90,6 +92,7 @@ class EventFixtures extends Fixture implements DependentFixtureInterface
'vimeo' => 'teste',
'spotify' => 'teste',
'youtube' => 'cultura',
'tiktok' => 'teste',
'pinterest' => 'teste',
'event_attendance' => 50,
'terms' => [
Expand Down
3 changes: 3 additions & 0 deletions app/src/DataFixtures/ProjectFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class ProjectFixtures extends Fixture implements DependentFixtureInterface
'spotify' => 'spotify',
'youtube' => 'youtube',
'pinterest' => 'pinterest',
'tiktok' => 'tiktok',
'emailPublico' => '[email protected]',
'emailPrivado' => '[email protected]',
'telefonePublico' => '(85) 99999-9999',
Expand All @@ -58,6 +59,7 @@ class ProjectFixtures extends Fixture implements DependentFixtureInterface
'spotify' => 'spotfy',
'youtube' => 'youtube',
'pinterest' => 'pinterest',
'tiktok' => 'tiktok',
'emailPublico' => '[email protected]',
'emailPrivado' => '[email protected]',
'telefonePublico' => '(85) 99999-9999',
Expand All @@ -83,6 +85,7 @@ class ProjectFixtures extends Fixture implements DependentFixtureInterface
'spotify' => 'spotify',
'youtube' => 'youtube',
'pinterest' => 'pinterest',
'tiktok' => 'tiktok',
'emailPublico' => '[email protected]',
'emailPrivado' => '[email protected]',
'telefonePublico' => '(85) 99999-9999',
Expand Down
1 change: 1 addition & 0 deletions app/tests/fixtures/AgentTestFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public static function partial(): self
'youtube' => 'agent',
'spotify' => 'agent',
'pinterest' => 'agent',
'tiktok' => 'agent',
]);
}

Expand Down
35 changes: 30 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,40 @@
{
"name": "mapasculturais/mapasculturais",
"version": "7.3.45",
"description": " Mapas Culturais é uma plataforma colaborativa que reúne informações sobre agentes, espaços, eventos e projetos culturais, fornecendo ao poder público uma radiografia da área de cultura e ao cidadão um mapa de espaços e eventos culturais da região",
"keywords": ["php", "docker", "gis", "postgres"],
"type": "project",
"license": "AGPL",
"require-dev": {
"phpunit/phpunit": "^10.5",
"squizlabs/php_codesniffer": "3.*",
"vimeo/psalm": "^5.17",
"zircote/swagger-php": "^4.8"
},
"require": {
"acelaya/doctrine-enum-type": "^2.3",
"php": "^7.3 || ^8",
"acelaya/doctrine-enum-type": "^2.5",
"akrabat/ip-address-middleware": "^2.1",
"creof/doctrine2-spatial": "^1",
"doctrine/annotations": "^2.0",
"doctrine/dbal": "^3.6",
"doctrine/orm": "2.16.*",
"firebase/php-jwt": "^6.4",
"league/csv": "^9.6.2",
"michelf/php-markdown": "1.*",
"monolog/monolog": "^3.4",
"mustache/mustache": "^2.11",
"nyholm/psr7": "^1.4",
"opauth/authentik": "*",
"opauth/logincidadao": "*",
"opauth/openid": "*",
"opauth/logincidadao" : "*",
"opauth/authentik" : "*",
"php-curl-class/php-curl-class": "^9.18",
"pomo/pomo": "^1.5",
"psy/psysh": "^0.11.12",
"respect/validation": "^2.2",
"sinergi/browser-detector": "^6.1",
"slim/psr7": "^1.6",
"slim/slim": "4.*",
"slim/slim": "^4.0",
"smottt/wideimage": "*",
"symfony/amazon-mailer": "^6.3",
"symfony/cache": "^6.2",
Expand All @@ -32,17 +49,25 @@
"symfony/console": "^6.4.6",
"symfony/serializer": "^7.0",
"symfony/property-access": "^7.0",
"symfony/validator": "^7.0"
"symfony/validator": "^7.0",
"symfony/console": "^6.4.6",
"league/csv": "^9.6.2"
},
"autoload": {
"psr-4": {
"App\\": "app/src",
"App\\Tests\\": "app/tests",
"MapasCulturaisTests\\": "tests/unit/classes",
"MapasCulturais\\": "src/core",
"MapasCulturais\\Modules\\": "src/modules",
"MapasCulturais\\Themes\\": "src/themes"
}
},
"config": {
"preferred-install": "dist",
"sort-packages": true,
"optimize-autoloader": true
},
"repositories": [
{
"type": "git",
Expand Down
Loading

0 comments on commit 73cd820

Please sign in to comment.