Skip to content

Commit

Permalink
Merge branch 'main' of github.com:NatLibFi/Skosmos into vocab-search-…
Browse files Browse the repository at this point in the history
…language-menu
  • Loading branch information
joelit committed Oct 3, 2024
2 parents 8d350f1 + 5e4ea21 commit c971364
Show file tree
Hide file tree
Showing 72 changed files with 4,372 additions and 18,573 deletions.
19 changes: 19 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# In all environments, the following files are loaded if they exist,
# the latter taking precedence over the former:
#
# * .env contains default values for the environment variables needed by the app
# * .env.local uncommitted file with local overrides
# * .env.$APP_ENV committed environment-specific defaults
# * .env.$APP_ENV.local uncommitted environment-specific overrides
#
# Real environment variables win over .env files.
#
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
# https://symfony.com/doc/current/configuration/secrets.html
#
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration

###> symfony/lokalise-translation-provider ###
LOKALISE_DSN=lokalise://8890111966276e3b27f4e6.81990707:f16b6220b0cc08467720f1b5a618e6cd2f5b033f@default
###< symfony/lokalise-translation-provider ###
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php_version: ["8.0", "8.1", "8.2", "8.3"]
php_version: ["8.1", "8.2", "8.3"]
experimental: [false]

steps:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ tests/cypress/videos/
tests/cypress/screenshots/
/.idea
*.swp
var/
21 changes: 21 additions & 0 deletions bin/console
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#!/usr/bin/env php
<?php

use App\Kernel;
use Symfony\Bundle\FrameworkBundle\Console\Application;

if (!is_dir(dirname(__DIR__).'/vendor')) {
throw new LogicException('Dependencies are missing. Try running "composer install".');
}

if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
}

require_once dirname(__DIR__).'/vendor/autoload_runtime.php';

return function (array $context) {
$kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);

return new Application($kernel);
};
21 changes: 16 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,29 @@
"ext-mbstring": "*",
"ext-xsl": "*",
"monolog/monolog": "1.27.*",
"symfony/translation": "6.0.*",
"symfony/translation": "6.4.*",
"symfony/translation-contracts": "3.0.*",
"symfony/twig-bundle": "6.0.*",
"symfony/config": "6.0.*"
"symfony/twig-bundle": "6.4.*"
},
"require-dev": {
"phpunit/phpunit": "9.5.*",
"symfony/dom-crawler": "5.4.*",
"symfony/dom-crawler": "6.4.*",
"symfony/config": "6.4.*",
"symfony/runtime": "6.4.*",
"symfony/framework-bundle": "6.4.*",
"symfony/yaml": "^6.4",
"symfony/dotenv": "6.4.*",
"symfony/lokalise-translation-provider": "6.4.*",
"symfony/console": "6.4.*",
"mockery/mockery": "1.5.1",
"friendsofphp/php-cs-fixer": "3.64.*"
},
"autoload": {
"classmap": ["src/controller/", "src/model/", "src/model/sparql/"]
"classmap": ["src/", "src/controller/", "src/model/", "src/model/sparql/"]
},
"config": {
"allow-plugins": {
"symfony/runtime": true
}
}
}
6 changes: 6 additions & 0 deletions config/bundles.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?php

return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
];
3 changes: 3 additions & 0 deletions config/packages/framework.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# see https://symfony.com/doc/current/reference/configuration/framework.html
framework:
secret: '%env(APP_SECRET)%'
11 changes: 11 additions & 0 deletions config/packages/translation.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
framework:
default_locale: en
translator:
default_path: '%kernel.project_dir%/resource/translations'
fallbacks:
- en
providers:
lokalise:
dsn: '%env(LOKALISE_DSN)%'
locales: ['ar', 'da', 'de', 'en', 'es', 'fa', 'fi', 'fr', 'fy', 'it', 'lv', 'nb', 'nl', 'nn', 'pl', 'pt_BR', 'pt', 'ru', 'se', 'sv', 'zh']
domains: ['messages']
4 changes: 4 additions & 0 deletions config/packages/twig.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
twig:
default_path: '%kernel.project_dir%/src/view'
file_name_pattern: ['*.twig']

18 changes: 18 additions & 0 deletions config/services.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# This file is the entry point to configure your own services.
# Files in the packages/ subdirectory configure your dependencies.

# Put parameters here that don't need to change on each machine where the app is deployed
# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
parameters:

services:
# default configuration for services in *this* file
_defaults:
autowire: true # Automatically injects dependencies in your services.
autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.

# add more service definitions when explicit configuration is needed
# please note that last definitions always *replace* previous ones
LinkUrlExtension:
class: 'LinkUrlExtension'
public: true
40 changes: 0 additions & 40 deletions resource/translations/fetch-from-transifex

This file was deleted.

Loading

0 comments on commit c971364

Please sign in to comment.