Skip to content

Commit

Permalink
Upgrade Ibexa to 4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
emodric committed May 26, 2023
1 parent 8803d7c commit d77390d
Show file tree
Hide file tree
Showing 14 changed files with 400 additions and 178 deletions.
18 changes: 9 additions & 9 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@ APP_SECRET=ThisTokenIsNotSoSecretChangeIt
# MAILER_DSN=null://null
###< symfony/mailer ###

###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
#
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8&charset=utf8mb4"
DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
###< doctrine/doctrine-bundle ###

###> ibexa/oss ###
SEARCH_ENGINE=legacy
# Uncomment following line if you want to change the purge type.
Expand Down Expand Up @@ -84,6 +75,15 @@ GOOGLE_RECAPTCHA_SECRET=
MAILER_URL=null://localhost
###< symfony/swiftmailer-bundle ###

###> doctrine/doctrine-bundle ###
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
#
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
# DATABASE_URL="mysql://app:[email protected]:3306/app?serverVersion=8&charset=utf8mb4"
DATABASE_URL="postgresql://app:[email protected]:5432/app?serverVersion=15&charset=utf8"
###< doctrine/doctrine-bundle ###

###> lexik/jwt-authentication-bundle ###
JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private.pem
JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public.pem
Expand Down
6 changes: 0 additions & 6 deletions .env.test

This file was deleted.

10 changes: 0 additions & 10 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@
/vendor/
###< symfony/framework-bundle ###

###> symfony/phpunit-bridge ###
.phpunit.result.cache
/phpunit.xml
###< symfony/phpunit-bridge ###

###> phpunit/phpunit ###
/phpunit.xml
.phpunit.result.cache
###< phpunit/phpunit ###

###> symfony/webpack-encore-bundle ###
/node_modules/
/public/build/
Expand Down
360 changes: 360 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

47 changes: 5 additions & 42 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "netgen/media-site",
"type": "project",
"license": "GPL-2.0-only",
"license": ["(GPL-2.0-only or proprietary)"],
"description": "Netgen Media Site (Powered by Netgen Layouts & Ibexa DXP)",
"homepage": "https://netgen.io",
"authors": [
Expand All @@ -25,46 +25,14 @@
"ext-mbstring": "*",
"ext-ctype": "*",
"ext-iconv": "*",
"doctrine/annotations": "^1.0",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.14",
"ibexa/oss": "~4.4.0",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpdoc-parser": "^1.16",
"sensio/framework-extra-bundle": "^6.1",
"symfony/asset": "5.4.*",
"http-interop/http-factory-guzzle": "^1.2",
"ibexa/oss": "~4.5.0",
"symfony/console": "5.4.*",
"symfony/dom-crawler": "5.4.*",
"symfony/dotenv": "5.4.*",
"symfony/error-handler": "5.4.*",
"symfony/expression-language": "5.4.*",
"symfony/flex": "^1.17|^2",
"symfony/form": "5.4.*",
"symfony/framework-bundle": "5.4.*",
"symfony/http-client": "5.4.*",
"symfony/intl": "5.4.*",
"symfony/mailer": "5.4.*",
"symfony/mime": "5.4.*",
"symfony/monolog-bundle": "^3.1",
"symfony/notifier": "5.4.*",
"symfony/password-hasher": "5.4.*",
"symfony/process": "5.4.*",
"symfony/property-access": "5.4.*",
"symfony/property-info": "5.4.*",
"symfony/runtime": "5.4.*",
"symfony/security-bundle": "5.4.*",
"symfony/serializer": "5.4.*",
"symfony/string": "5.4.*",
"symfony/translation": "5.4.*",
"symfony/twig-bridge": "5.4.*",
"symfony/twig-bundle": "5.4.*",
"symfony/validator": "5.4.*",
"symfony/var-exporter": "5.4.*",
"symfony/web-link": "5.4.*",
"symfony/yaml": "5.4.*",
"twig/extra-bundle": "^2.12|^3.0",
"twig/twig": "^2.12|^3.0",

"novactive/ezseobundle": "^7.0",
"sentry/sentry-symfony": "^4.6",
Expand All @@ -87,13 +55,8 @@
"netgen/layouts-ibexa-tags-query": "^1.4"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "5.4.*",
"symfony/css-selector": "5.4.*",
"symfony/debug-bundle": "5.4.*",
"symfony/maker-bundle": "^1.0",
"symfony/phpunit-bridge": "^6.2",
"symfony/stopwatch": "5.4.*",
"symfony/maker-bundle": "^1.48",
"symfony/web-profiler-bundle": "5.4.*",

"netgen/git-hooks": "^2.3",
Expand All @@ -107,9 +70,9 @@
"config": {
"allow-plugins": {
"composer/package-versions-deprecated": true,
"ibexa/post-install": true,
"symfony/flex": true,
"symfony/runtime": true,
"ibexa/post-install": true,
"netgen/git-hooks": true,
"phpstan/extension-installer": true,
"*": false
Expand Down
10 changes: 5 additions & 5 deletions config/bundles.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

return [
Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
Bazinga\Bundle\JsTranslationBundle\BazingaJsTranslationBundle::class => ['all' => true],
FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
FOS\HttpCacheBundle\FOSHttpCacheBundle::class => ['all' => true],
Expand Down Expand Up @@ -46,6 +45,7 @@
Ibexa\Bundle\Search\IbexaSearchBundle::class => ['all' => true],
Overblog\GraphQLBundle\OverblogGraphQLBundle::class => ['all' => true],
Overblog\GraphiQLBundle\OverblogGraphiQLBundle::class => ['dev' => true],
Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
Hautelook\TemplatedUriBundle\HautelookTemplatedUriBundle::class => ['all' => true],
Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
Expand Down
10 changes: 10 additions & 0 deletions config/packages/http_discovery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
services:
Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory'
Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory'

http_discovery.psr17_factory:
class: Http\Discovery\Psr17Factory
1 change: 1 addition & 0 deletions config/packages/ibexa_admin_ui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ ibexa:
icon_sets:
default_icons: /bundles/ibexaadminui/img/ibexa-icons.svg
default_icon_set: default_icons
default_page: 'dashboard'
16 changes: 0 additions & 16 deletions config/packages/notifier.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions config/packages/nyholm_psr7.yaml

This file was deleted.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,12 @@
"style-loader": "^2.0.0",
"file-loader": "^6.0.0",
"webpack-notifier": "^1.6.0",
"@ckeditor/ckeditor5-alignment": "^35.3.2",
"@ckeditor/ckeditor5-build-inline": "^35.3.2",
"@ckeditor/ckeditor5-dev-utils": "^31.0.0",
"@ckeditor/ckeditor5-widget": "^35.3.2",
"@ckeditor/ckeditor5-theme-lark": "^35.3.2",
"@ckeditor/ckeditor5-code-block": "^35.3.2"
"@ckeditor/ckeditor5-alignment": "^36.0.1",
"@ckeditor/ckeditor5-build-inline": "^36.0.1",
"@ckeditor/ckeditor5-dev-utils": "^32.0.0",
"@ckeditor/ckeditor5-widget": "^36.0.1",
"@ckeditor/ckeditor5-theme-lark": "^36.0.1",
"@ckeditor/ckeditor5-code-block": "^36.0.1"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.8.1",
Expand Down
42 changes: 0 additions & 42 deletions phpunit.xml.dist

This file was deleted.

8 changes: 4 additions & 4 deletions symfony.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"google/recaptcha": {
"version": "1.2",
"version": "1.3",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
"branch": "main",
Expand All @@ -12,12 +12,12 @@
]
},
"ibexa/oss": {
"version": "4.4",
"version": "4.5",
"recipe": {
"repo": "github.com/ibexa/recipes",
"branch": "master",
"version": "4.4",
"ref": "7154537665bd5ca634b51253d0c3623abf2a2fe4"
"version": "4.5",
"ref": "121b6cbe1d15d9392810069518475046cdda9609"
},
"files": [
"config/packages/cache_pool/cache.memcached.yaml",
Expand Down
17 changes: 0 additions & 17 deletions tests/bootstrap.php

This file was deleted.

0 comments on commit d77390d

Please sign in to comment.