Merge branch 'release/v2.2.0'

roadiz · Dec 12, 2023 · 06bf63d · 06bf63d
2 parents 0fca740 + 9bd3900
commit 06bf63d
Show file tree

Hide file tree

Showing 932 changed files with 18,215 additions and 12,960 deletions.
diff --git a/.data/solr/.gitkeep b/.data/solr/.gitkeep
diff --git a/.env b/.env
@@ -1,5 +1,7 @@
 APP_DEBUG=1
 APP_CACHE=0
+APP_ROUTER_DEFAULT_URI=http://roadiz-core-app.test
+APP_COOKIE_SECURE=0
 APP_NAMESPACE=dev
 APP_TITLE="Roadiz development app"
 APP_DESCRIPTION="Roadiz development app"
@@ -15,6 +17,7 @@ APP_HEALTH_CHECK_TOKEN=
 USER_UID=1000
 
 VARNISH_URL=http://varnish
+VARNISH_DOMAIN=varnish
 HTTP_CACHE_MAX_AGE=60
 HTTP_CACHE_SHARED_MAX_AGE=600
 
@@ -68,13 +71,6 @@ IR_DRIVER=gd
 MESSENGER_TRANSPORT_DSN=redis://redis:6379/messages
 ###< symfony/messenger ###
 
-# blackfire.io
-BLACKFIRE_LOG_LEVEL=4
-BLACKFIRE_SERVER_ID=
-BLACKFIRE_SERVER_TOKEN=
-BLACKFIRE_CLIENT_ID=
-BLACKFIRE_CLIENT_TOKEN=
-
 TRUSTED_PROXIES=127.0.0.1,172.19.0.1,172.19.0.2,REMOTE_ADDR
 
 ###> sentry/sentry-symfony ###

diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
@@ -19,7 +19,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php-version: ['8.0', '8.1']
+                php-version: ['8.1', '8.2', '8.3']
         steps:
             - uses: shivammathur/setup-php@v2
               with:
@@ -42,23 +42,10 @@ jobs:
               run: |
                   vendor/bin/atoum -d ./lib/Documents/tests
                   vendor/bin/atoum -f ./lib/EntityGenerator/tests/units/*
+                  vendor/bin/phpunit -v  lib/Models/tests
             - name: Run PHP Code Sniffer
               run: |
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/DocGenerator/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Documents/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/DtsGenerator/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/EntityGenerator/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Jwt/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Markdown/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Models/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/OpenId/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Random/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCompatBundle/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizCoreBundle/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizFontBundle/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizRozierBundle/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/RoadizUserBundle/src
-                  php -d "memory_limit=-1" vendor/bin/phpcbf -p ./lib/Rozier/src
+                  php -d "memory_limit=-1" vendor/bin/phpcs --report=full -p
             - name: Run PHP Stan
               run: |
                   php -d "memory_limit=-1" vendor/bin/phpstan analyse -c phpstan.neon
@@ -70,3 +57,4 @@ jobs:
                   php -d "memory_limit=-1" bin/console lint:twig ./lib/RoadizRozierBundle/templates
                   php -d "memory_limit=-1" bin/console lint:twig ./lib/RoadizFontBundle/templates
                   php -d "memory_limit=-1" bin/console lint:twig ./lib/RoadizCoreBundle/templates
+                  php -d "memory_limit=-1" bin/console lint:twig ./lib/RoadizTwoFactorBundle/templates
diff --git a/.github/workflows/split.yaml b/.github/workflows/split.yaml
@@ -81,6 +81,10 @@ jobs:
                         local_path: 'Rozier'
                         split_repository: 'rozier'
                         default_branch: 'main'
+                    -
+                        local_path: 'RoadizTwoFactorBundle'
+                        split_repository: 'two-factor-bundle'
+                        default_branch: 'main'
 
 
         steps:

diff --git a/.phpcs.xml b/.phpcs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Roadiz">
+    <description>The coding standard for Roadiz monorepo.</description>
+    <arg name="colors"/>
+    <arg name="extensions" value="php"/>
+    <rule ref="PSR12">
+        <exclude name="Generic.Files.LineLength"/>
+    </rule>
+
+    <exclude-pattern>*/node_modules/*</exclude-pattern>
+    <exclude-pattern>*/bower_components/*</exclude-pattern>
+
+    <file>lib/DocGenerator/src</file>
+    <file>lib/Documents/src</file>
+    <file>lib/DtsGenerator/src</file>
+    <file>lib/EntityGenerator/src</file>
+    <file>lib/Jwt/src</file>
+    <file>lib/Markdown/src</file>
+    <file>lib/Models/src</file>
+    <file>lib/OpenId/src</file>
+    <file>lib/Random/src</file>
+    <file>lib/RoadizCompatBundle/src</file>
+    <file>lib/RoadizCoreBundle/src</file>
+    <file>lib/RoadizFontBundle/src</file>
+    <file>lib/RoadizRozierBundle/src</file>
+    <file>lib/RoadizUserBundle/src</file>
+    <file>lib/RoadizTwoFactorBundle/src</file>
+    <file>lib/Rozier/src</file>
+</ruleset>