[wip] add phpmetrics on ci

2023-09-28 21:46:03 +02:00 · 2023-09-28 21:35:36 +02:00 · 2023-09-28 21:34:40 +02:00 · 2023-09-28 21:32:54 +02:00 · 2023-09-28 21:31:17 +02:00 · 2023-09-28 21:29:12 +02:00
24 changed files with 33588 additions and 5568 deletions
--- a/.mage.yml.dist
+++ b/.mage.yml.dist
@ -18,7 +18,6 @@ magephp:
                - "/var/cache/*"
                - "/var/log/*"
                - "/public/media"
-                - "/.secrets"
            hosts:
                - ssh_host
            on-deploy:
--- a/.novops.yml
+++ b/.novops.yml
@ -1,39 +0,0 @@
-environments:
-  build:
-    variables:
-      - name: MYSQLDUMP
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: mysqldump
-
-  deploy:
-    variables:
-      - name: SSH_USER
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: ssh_user
-
-      - name: SSH_HOST
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: ssh_host
-
-      - name: SSH_PRIV_KEY
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: ssh_priv_key
-
-      - name: APP_DIRECTORY
-        value:
-          hvault_kv2:
-            mount: kv
-            path: deblan/deblan.io-murph
-            key: app_directory
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@ -1,77 +1,99 @@
 variables:
-  volumes: &volumes
-    - node_cache:/root/.npm
-    - /data/${CI_REPO}:/builds
+  - &volumes
+    - node16_cache:/root/.npm
+    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph

 when:
  event: [push, pull_request, tag, manual]
  branch: [master, master-*, develop, develop-*, feature/*]

 steps:
-  "Wait the database":
-    image: gitnet.fr/deblan/timeout:latest
-    commands:
-      - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done'
+  # db-wait:
+  #   image: gitnet.fr/deblan/timeout:latest
+  #   commands:
+  #     - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done'
+  #
+  # db-create:
+  #   image: mariadb:10.3
+  #   secrets: [mysqldump]
+  #   commands:
+  #     - mysql -hdb -uroot -proot -e "CREATE DATABASE app"
+  #     - eval "$MYSQLDUMP" | mysql -hdb -uroot -proot app
+  #
+  # app-config:
+  #   image: deblan/php:8.1
+  #   commands:
+  #     - echo APP_ENV=prod >> .env.local
+  #     - echo APP_SECRET=$(openssl rand -hex 32) >> .env.local
+  #     - echo DATABASE_URL=mysql://root:root@db/app >> .env.local
+  #
+  # php-composer:
+  #   image: deblan/php:8.1
+  #   commands:
+  #     - apt-get update && apt-get -y install git
+  #     - composer install --no-scripts
+  #
+  # db-migrate:
+  #   image: deblan/php:8.1
+  #   environment:
+  #     - PHP=php
+  #   commands:
+  #     - ./bin/doctrine-migrate
+  #
+  # app-jsroutes:
+  #   image: deblan/php:8.1
+  #   commands:
+  #     - php bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
+  #
+  # node-build:
+  #   image: node:16-alpine
+  #   environment:
+  #     - CPU_COUNT=3
+  #   volumes: *volumes
+  #   commands:
+  #     - apk add --no-cache git
+  #     - npm install -g svg2ttf ttf2eot ttf2woff2
+  #     - svg2ttf assets/fonts/deblan/src/deblan-icon.svg assets/fonts/deblan/deblan-icon.ttf
+  #     - cat assets/fonts/deblan/deblan-icon.ttf | ttf2woff2 > assets/fonts/deblan/deblan-icon.woff2
+  #     - ttf2eot assets/fonts/deblan/deblan-icon.ttf assets/fonts/deblan/deblan-icon.eot
+  #     - yarn
+  #     - test -f public/js/fos_js_routes.json || echo "{}" > public/js/fos_js_routes.json
+  #     - npm run build
+  #
+  # security-check:
+  #   image: gitnet.fr/deblan/osv-detector:v0.9
+  #   commands:
+  #     - osv-detector composer.lock yarn.lock
+  #   failure: ignore
+  #
+  # cache-build:
+  #   image: deblan/php:8.1
+  #   volumes: *volumes
+  #   commands:
+  #     - apt-get update && apt-get -y install rsync
+  #     - cd /data/deblan/deblan.io-murph/
+  #     - rsync -az "$CI_WORKSPACE/" "$CI_COMMIT_SHA"

-  "Create database":
-    image: mariadb:10.3
-    secrets: [mysqldump]
-    commands:
-      - mysql -hdb -uroot -proot -e "CREATE DATABASE app"
-      - eval "$MYSQLDUMP" | mysql -hdb -uroot -proot app
-
-  "Configure app":
+  phpmetrics:
    image: deblan/php:8.1
+    secrets: [surge_token]
    commands:
-      - echo APP_ENV=prod >> .env.local
-      - echo APP_SECRET=$(openssl rand -hex 32) >> .env.local
-      - echo DATABASE_URL=mysql://root:root@db/app >> .env.local
+      - echo $SURGE_TOKEN | cut -da -f2-
+      - composer global require phpmetrics/phpmetrics
+      - $HOME/.config/composer/vendor/bin/phpmetrics --report-html=./var/phpmetrics src

-  "Installs PHP dependencies":
-    image: deblan/php:8.1
-    commands:
-      - apt-get update && apt-get -y install git
-      - composer install --no-scripts
-
-  "Migrates database":
-    image: deblan/php:8.1
-    environment:
-      - PHP=php
-    commands:
-      - ./bin/doctrine-migrate
-
-  "Generates JS routes":
-    image: deblan/php:8.1
-    commands:
-      - php bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json
-
-  "Build assets":
-    image: node:16-alpine
-    environment:
-      - CPU_COUNT=3
-    volumes: *volumes
-    commands:
-      - apk add --no-cache git
-      - npm install -g svg2ttf ttf2eot ttf2woff2
-      - svg2ttf assets/fonts/deblan/src/deblan-icon.svg assets/fonts/deblan/deblan-icon.ttf
-      - cat assets/fonts/deblan/deblan-icon.ttf | ttf2woff2 > assets/fonts/deblan/deblan-icon.woff2
-      - ttf2eot assets/fonts/deblan/deblan-icon.ttf assets/fonts/deblan/deblan-icon.eot
-      - yarn
-      - test -f public/js/fos_js_routes.json || echo "{}" > public/js/fos_js_routes.json
-      - npm run build
-
-  "Check dependencies":
-    image: gitnet.fr/deblan/osv-detector:v0.9
-    commands:
-      - osv-detector composer.lock yarn.lock
-    failure: ignore
-
-  "Build the cache":
-    image: deblan/mage
-    volumes: *volumes
-    commands:
-      - cd /builds
-      - rsync -az "$CI_WORKSPACE/" "$CI_COMMIT_SHA"
+  phpmetrics-deploy:
+    image: woodpeckerci/plugin-surge-preview
+    settings:
+      path: var/phpmetrics
+      surge_token:
+        from_secret: surge_token
+      forge_type: gitea
+      forge_url: https://gitnet.fr
+      forge_repo_token:
+        from_secret: gitea_token
+    when:
+      event: pull_request

 services:
  db:
@ -80,4 +102,4 @@ services:
      - MARIADB_ROOT_PASSWORD=root

 volumes:
-  node_cache:
+  node16_cache:
--- a/.woodpecker/deploy.yml
+++ b/.woodpecker/deploy.yml
@ -1,25 +1,25 @@
 variables:
-  volumes: &volumes
-    - /data/${CI_REPO}:/builds
+  - &volumes
+    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph

 when:
  event: [deployment]

-skip_clone: true
-
 steps:
-  "Deploy":
-    image: deblan/mage
-    secrets: [ssh_priv_key, ssh_user, ssh_host, app_directory]
+  app-deploy:
+    image: deblan/php:8.1
+    secrets: [ssh_user, ssh_host, ssh_priv_key, app_directory]
    volumes: *volumes
    commands:
-      - cd "/builds/$CI_COMMIT_SHA"
+      - apt-get update && apt-get -y install rsync openssh-client
+      - cd "/data/deblan/deblan.io-murph/$CI_COMMIT_SHA"
      - mkdir "$HOME/.ssh"
      - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
      - chmod 700 "$HOME/.ssh"
      - chmod 600 "$HOME/.ssh/id_ed25519"
+      - composer global require andres-montanez/magallanes
      - cp .mage.yml.dist .mage.yml
      - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
      - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
      - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
-      - mage deploy "$CI_PIPELINE_DEPLOY_TARGET"
+      - /root/.config/composer/vendor/bin/mage deploy "$CI_BUILD_DEPLOY_TARGET"
--- a/assets/css/admin.scss
+++ b/assets/css/admin.scss
@ -1,63 +1,57 @@
-@import '../../vendor/murph/murph-core/src/core/Resources/assets/css/admin.scss';
-@import '@kangc/v-md-editor/lib/style/base-editor.css';
-@import '@kangc/v-md-editor/lib/theme/style/vuepress.css';
+@import "../../vendor/murph/murph-core/src/core/Resources/assets/css/admin.scss";
+@import "~simplemde/dist/simplemde.min.css";
+
+.CodeMirror-fullscreen, .editor-toolbar.fullscreen {
+    z-index: 2000;
+}

 .ejs-link {
-  margin: 10px auto;
-  max-width: 80%;
-  border: 2px solid #333;
-  border-radius: 5px;
+    margin: 10px auto;
+    max-width: 80%;
+    border: 2px solid #333;
+    border-radius: 5px;

-  &--anchor {
-    display: block;
-    padding: 30px;
-  }
-
-  &-content {
-    display: inline-block;
-    vertical-align: top;
-
-    &--title {
-      font-weight: bold;
+    &--anchor {
+        display: block;
+        padding: 30px;
    }

-    &--description {
-      font-size: 15px;
+    &-content {
+        display: inline-block;
+        vertical-align: top;
+
+        &--title {
+            font-weight: bold;
+        }
+
+        &--description {
+            font-size: 15px;
+        }
+
+        &--link {
+            padding-top: 10px;
+            font-size: 14px;
+            line-height: 20px;
+        }
    }

-    &--link {
-      padding-top: 10px;
-      font-size: 14px;
-      line-height: 20px;
+    $image-size: 85px;
+
+    &--anchor--with-image &-content {
+        width: calc(100% - $image-size - 5px);
+        padding-right: 25px;
    }
-  }

-  $image-size: 85px;
-
-  &--anchor--with-image &-content {
-    width: calc(100% - $image-size - 5px);
-    padding-right: 25px;
-  }
-
-  &--image {
-    display: inline-block;
-    width: $image-size;
-    height: $image-size;
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-  }
+    &--image {
+        display: inline-block;
+        width: $image-size;
+        height: $image-size;
+        background-position: center center;
+        background-repeat: no-repeat;
+        background-size: cover;
+    }
 }

 .choices__list--dropdown {
  z-index: 3;
 }
-
-.v-md-editor {
-  border: 1px solid $input-border-color;
-  box-shadow: none;
-}
-
-.v-md-editor--fullscreen {
-  z-index: 3000;
-}
--- a/assets/css/app.scss
+++ b/assets/css/app.scss
@ -411,9 +411,6 @@ pre[class*="language-"] {
  .h1 {
    font-weight: normal;
    font-size: 40px;
-    font-family: MainFont;
-    text-shadow: none;
-    color: hsla(0, 0%, 100%, 0.7);
  }

  .h3 {
--- a/assets/js/admin.js
+++ b/assets/js/admin.js
@ -1,6 +1,6 @@
 import '../../vendor/murph/murph-core/src/core/Resources/assets/js/admin.js'

-require('./admin_modules/md-editor')()
+require('./admin_modules/simplemde')()

 const $ = require('jquery')
 const Sortable = require('sortablejs').Sortable
--- a/assets/js/admin_modules/md-editor.js
+++ b/assets/js/admin_modules/md-editor.js
@ -1,34 +0,0 @@
-const Vue = require('vue').default
-const VueMarkdownEditor = require('@kangc/v-md-editor')
-const githubTheme = require('@kangc/v-md-editor/lib/theme/github.js')
-const fr = require('@kangc/v-md-editor/lib/lang/fr-FR').default
-const hljs = require('highlight.js')
-
-VueMarkdownEditor.use(githubTheme, {Hljs: hljs})
-VueMarkdownEditor.lang.use('fr-FR', fr)
-Vue.use(VueMarkdownEditor)
-
-module.exports = () => {
-  const components = document.querySelectorAll('.markdown-editor')
-
-  components.forEach((component) => {
-    return new Vue({
-      el: component,
-      template: `
-        <div>
-          <textarea :name="name" v-model="value" class="d-none"></textarea>
-          <v-md-editor v-model="value" mode="edit"></v-md-editor>
-        </div>
-      `,
-      data() {
-        return {
-          name: component.getAttribute('data-name'),
-          value: JSON.parse(component.getAttribute('data-value')),
-        }
-      },
-      components: {
-        VueMarkdownEditor
-      }
-    })
-  })
-}
--- a/bin/messenger
+++ b/bin/messenger
@ -22,7 +22,7 @@ help() {
    -l debug|info|notice|warning|error
          Debug level

-	-a start|stop|restart|status
+	-a start|stop|restart
 EOH
 }

@ -34,23 +34,52 @@ on_interrupt() {
 }

 start_messenger() {
-	nohup php8.1 bin/console messenger:consume 2>/dev/null >/dev/null &
-	log -t -l notice "Started"
+	started=0
+	pid=
+
+	if [ -f "$pid_file" ]; then
+		pid="$(cat "$pid_file")"
+	fi
+
+	if [ -n "$pid" ]; then
+		if [ -d "/proc/$pid" ]; then
+			log -t -l warning "Already running"
+			started=1
+		fi
+	fi
+
+	if [ "$started" -eq 0 ]; then
+		nohup php8.1 bin/console messenger:consume 2>/dev/null >/dev/null &
+		echo -n $! > "$pid_file"
+		log -t -l notice "Started"
+	fi
 }

 stop_messenger() {
-	php8.1 bin/console messenger:stop-workers 2>/dev/null >/dev/null
-	log -t -l notice "Stopped"
-}
+	pid=

-get_pid() {
-	pgrep -f messenger:consume
+	if [ -f "$pid_file" ]; then
+		pid="$(cat "$pid_file")"
+	fi
+
+	if [ -n "$pid" ]; then
+		if [ ! -d "/proc/$pid" ]; then
+			log -t -l warning "Not started"
+		else
+			kill -9 "$pid"
+			log -t -l notice "Stopped"
+		fi
+
+		rm "$pid_file"
+	else
+		log -t -l warning "Not started"
+	fi
 }

 main() {
 	cd "$(dirname "0")"

-	ACTION=
+	pid_file=var/messenger.pid

 	while getopts "l:ha:" option; do
 		case "${option}" in
@ -68,12 +97,10 @@ main() {
 	elif [ "$ACTION" = "restart" ]; then
 		stop_messenger
 		start_messenger
-	elif [ "$ACTION" = "status" ]; then
-		get_pid
-	else
-		log -l error "Action is required."
 	fi

+	# log [-t] [-l debug|info|notice|warning|error] message
+
 	exit 0
 }

--- a/config/packages/twig.yaml
+++ b/config/packages/twig.yaml
@ -1,6 +1,6 @@
 twig:
    default_path: '%kernel.project_dir%/templates'
-    form_themes: ['form/bootstrap_4_form_theme.html.twig']
+    form_themes: ['@Core/form/bootstrap_4_form_theme.html.twig']
    auto_reload: true
    paths:
        '%kernel.project_dir%/templates/core/': Core
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -8,15 +8,13 @@
        "build": "./node_modules/.bin/encore production"
    },
    "dependencies": {
-        "@kangc/v-md-editor": "^1.7.12",
        "daisyui": "^2.31.0",
-        "editorjs-hyperlink": "^1.0.6",
-        "editorjs-inline-tool": "^0.4.0",
        "encore": "^0.0.30-beta",
        "lozad": "^1.16.0",
-        "murph-project": "^1.9.4",
+        "murph-project": "^1",
        "particles.js": "^2.0.0",
        "prismjs": "^1.23.0",
+        "simplemde": "^1.11.2",
        "tingle.js": "^0.16.0",
        "vanillajs-datepicker": "^1.1.4",
        "vue": "^2.6.14"
--- a/src/Controller/Blog/PostAdminController.php
+++ b/src/Controller/Blog/PostAdminController.php
@ -2,30 +2,31 @@

 namespace App\Controller\Blog;

-use App\Analytic\DateRangeAnalytic;
 use App\Core\Controller\Admin\Crud\CrudController;
 use App\Core\Crud\CrudConfiguration;
 use App\Core\Crud\Field\DatetimeField;
 use App\Core\Crud\Field\TextField;
-use App\Core\Entity\EntityInterface;
 use App\Core\Form\FileUploadHandler;
 use App\Core\Manager\EntityManager;
-use App\Core\Repository\Site\NodeRepository;
-use App\Entity\Blog\Post;
 use App\Entity\Blog\Post as Entity;
 use App\Factory\Blog\PostFactory as EntityFactory;
 use App\Form\Blog\Filter\PostFilterType;
 use App\Form\Blog\PostType;
+use App\Form\Blog\PostType as EntityType;
 use App\Repository\Blog\PostRepositoryQuery as RepositoryQuery;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
-use Symfony\Component\Form\Form;
-use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Form\Form;
+use App\Core\Entity\EntityInterface;
+use App\Entity\Blog\Post;
+use App\Analytic\DateRangeAnalytic;
+use App\Core\Repository\Site\NodeRepository;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;

 #[Route(path: '/admin/blog/post')]
 class PostAdminController extends CrudController
@ -67,7 +68,7 @@ class PostAdminController extends CrudController
                'attr' => ['class' => 'miw-400'],
            ])
            ->setField('index', 'ID', TextField::class, [
-                'property_builder' => function (EntityInterface $entity) {
+                'property_builder' => function(EntityInterface $entity) {
                    return sprintf('#%d', $entity->getId());
                },
                'sort' => ['id', '.id'],
@ -84,7 +85,7 @@ class PostAdminController extends CrudController
                'format' => 'd/m/Y H:i',
                'sort' => ['publishedAt', '.publishedAt'],
                'attr' => ['class' => 'miw-200'],
-                'inline_form' => function (FormBuilderInterface $builder) {
+                'inline_form' => function(FormBuilderInterface $builder) {
                    $builder->add(
                        'publishedAt',
                        DateTimeType::class,
@ -106,7 +107,7 @@ class PostAdminController extends CrudController
                'view' => 'blog/post_admin/field/status.html.twig',
                'sort' => ['status', '.status'],
                'attr' => ['class' => 'miw-100'],
-                'inline_form' => function (FormBuilderInterface $builder) {
+                'inline_form' => function(FormBuilderInterface $builder) {
                    $builder->add(
                        'status',
                        ChoiceType::class,
@ -124,15 +125,15 @@ class PostAdminController extends CrudController
                            ],
                        ]
                    );
-                },
+                }
            ])
-            ->setBatchAction('index', 'delete', 'Delete', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'delete', 'Delete', function(EntityInterface $entity, EntityManager $manager) {
                $manager->delete($entity);
            })
-            ->setBatchAction('index', 'draft', 'Statut : publier', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'draft', 'Statut : publier', function(EntityInterface $entity, EntityManager $manager) {
                $manager->update($entity->setStatus(Post::PUBLISHED));
            })
-            ->setBatchAction('index', 'publish', 'Statut : brouillon', function (EntityInterface $entity, EntityManager $manager) {
+            ->setBatchAction('index', 'publish', 'Statut : brouillon', function(EntityInterface $entity, EntityManager $manager) {
                $manager->update($entity->setStatus(Post::DRAFT));
            })
        ;
@ -151,7 +152,7 @@ class PostAdminController extends CrudController
            $factory->create($this->getUser()),
            $entityManager,
            $request,
-            function (Entity $entity, Form $form, Request $request) use ($fileUpload) {
+            function(Entity $entity, Form $form, Request $request) use ($fileUpload) {
                $directory = 'uploads/post/'.date('Y');

                $fileUpload->handleForm(
@ -172,7 +173,7 @@ class PostAdminController extends CrudController
            $entity,
            $entityManager,
            $request,
-            function (Entity $entity, Form $form, Request $request) use ($fileUpload) {
+            function(Entity $entity, Form $form, Request $request) use ($fileUpload) {
                $directory = 'uploads/post/'.date('Y');

                $fileUpload->handleForm(
@ -186,7 +187,7 @@ class PostAdminController extends CrudController
        );
    }

-    #[Route(path: '/inline_edit/{entity}/{context}/{label}', name: 'admin_blog_post_inline_edit', methods: ['GET', 'POST'])]
+    #[Route(path: "/inline_edit/{entity}/{context}/{label}", name: 'admin_blog_post_inline_edit', methods: ['GET', 'POST'])]
    public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response
    {
        return $this->doInlineEdit($context, $label, $entity, $entityManager, $request);
@ -267,7 +268,8 @@ class PostAdminController extends CrudController
        DateRangeAnalytic $analytic,
        NodeRepository $nodeRepository,
        string $range = '7days'
-    ): Response {
+    ): Response
+    {
        if (!in_array($range, ['7days', '30days', '90days', '1year'])) {
            throw $this->createNotFoundException();
        }
--- a/src/Controller/Blog/PostController.php
+++ b/src/Controller/Blog/PostController.php
@ -20,7 +20,6 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use App\Factory\Blog\PostFollowFactory;
 use App\Manager\PostFollowManager;
 use App\Core\Twig\Extension\EditorJsExtension;
-use App\Core\Twig\Extension\BuilderExtension;

 class PostController extends PageController
 {
@ -166,11 +165,7 @@ class PostController extends PageController
        return $query;
    }

-    public function rss(
-        PostParser $parser,
-        EditorJsExtension $editorJsExtension,
-        BuilderExtension $builderExtension
-    ): Response
+    public function rss(PostParser $parser, EditorJsExtension $editorJsExtension): Response
    {
        $entities = $this->createQuery()->paginate(1, 20);
        $items = [];
@ -178,8 +173,6 @@ class PostController extends PageController
        foreach ($entities as $entity) {
            if ($entity->getContentFormat() === 'editorjs') {
                $description = $editorJsExtension->buildHtml($entity->getContent());
-            } elseif ($entity->getContentFormat() === 'builder') {
-                $description = $builderExtension->buildHtml($entity->getContent());
            } else {
                $description = $parser->transformMarkdown($entity->getContent());
            }
--- a/src/Entity/Page/SimplePage.php
+++ b/src/Entity/Page/SimplePage.php
@ -7,7 +7,6 @@ use App\Core\Entity\Site\Page\FileBlock;
 use App\Form\Type\SimpleMdTextareaBlockType;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Form\FormBuilderInterface;
-use App\Form\MarkdownBlockType;

 #[ORM\Entity]
 class SimplePage extends TitledPage
@ -18,7 +17,7 @@ class SimplePage extends TitledPage

        $builder->add(
            'content',
-            MarkdownBlockType::class,
+            SimpleMdTextareaBlockType::class,
            [
                'label' => 'Contenu',
                'options' => [
--- a/src/Form/Blog/PostType.php
+++ b/src/Form/Blog/PostType.php
@ -25,8 +25,6 @@ use App\Form\Type\SimpleMdTextareaType;
 use App\Core\Form\Type\EditorJsTextareaType;
 use App\Core\Form\FileManager\FilePickerType;
 use App\Core\Form\Type\CollectionType as MurphCollectionType;
-use App\Form\MarkdownType;
-use App\Core\Form\Type\BuilderType;

 class PostType extends AbstractType
 {
@ -53,7 +51,6 @@ class PostType extends AbstractType
                'required' => true,
                'choices' => [
                    'Markdown' => 'markdown',
-                    'Builder' => 'builder',
                    'HTML' => 'html',
                    'Editor JS' => 'editorjs',
                ],
@ -64,9 +61,8 @@ class PostType extends AbstractType
        );

        $types = [
-            'markdown' => MarkdownType::class,
-            'builder' => BuilderType::class,
-            'html' => MarkdownType::class,
+            'markdown' => SimpleMdTextareaType::class,
+            'html' => SimpleMdTextareaType::class,
            'editorjs' => EditorJsTextareaType::class,
        ];

--- a/src/Form/MarkdownBlockType.php
+++ b/src/Form/MarkdownBlockType.php
@ -1,21 +0,0 @@
-<?php
-
-namespace App\Form;
-
-use App\Core\Form\Site\Page\TextareaBlockType;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class MarkdownBlockType extends TextareaBlockType
-{
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add(
-            'value',
-            MarkdownType::class,
-            array_merge([
-                'required' => false,
-                'label' => false,
-            ], $options['options']),
-        );
-    }
-}
--- a/src/Form/MarkdownType.php
+++ b/src/Form/MarkdownType.php
@ -1,13 +0,0 @@
-<?php
-
-namespace App\Form;
-
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-
-class MarkdownType extends TextareaType
-{
-    public function getBlockPrefix()
-    {
-        return 'markdown';
-    }
-}
--- a/src/Kernel.php
+++ b/src/Kernel.php
@ -2,9 +2,7 @@

 namespace App;

-use App\Core\DependencyInjection\Compiler\BuilderBlockPass;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
 use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
@ -37,9 +35,4 @@ class Kernel extends BaseKernel
            (require $path)($routes->withPath($path), $this);
        }
    }
-
-    protected function build(ContainerBuilder $container): void
-    {
-        $container->addCompilerPass(new BuilderBlockPass());
-    }
 }
--- a/src/Repository/Blog/PostRepositoryQuery.php
+++ b/src/Repository/Blog/PostRepositoryQuery.php
@ -59,7 +59,9 @@ class PostRepositoryQuery extends RepositoryQuery
        $keywords = explode(' ', $keywords);

        $filterWords = fn ($keyword) => '' !== trim($keyword) && preg_match('/[a-zA-Z]+/', $keyword);
-        $keywords = array_filter($keywords, $filterWords);
+        $filter = fn ($keyword) => '' !== trim($keyword) && preg_match('/[a-zA-Z]+/', $keyword);
+
+        $keywords = array_filter($keywords, $filter);

        if ($keywords) {
            $conn = $this->repository->getEm()->getConnection();
--- a/templates/form/bootstrap_4_form_theme.html.twig
+++ b/templates/form/bootstrap_4_form_theme.html.twig
@ -1,8 +0,0 @@
-{% extends '@Core/form/bootstrap_4_form_theme.html.twig' %}
-
-{% block markdown_widget %}
-    <div {% for attr, value in row_attr %}{{ attr }}="{{ value }}" {% endfor %}>
-        <div class="markdown-editor" data-value="{{ value|json_encode }}" data-name="{{ full_name }}" data-id="{{ id }}">
-        </div>
-    </div>
-{% endblock %}
--- a/templates/page/post/_post.html.twig
+++ b/templates/page/post/_post.html.twig
@ -55,8 +55,6 @@
                    {{- post.content|murph_url|file_attributes|post -}}
                {% elseif post.contentFormat == 'markdown' %}
                    {{- post.content|murph_url|file_attributes|markdown('post')|lazy_load -}}
-                {% elseif post.contentFormat == 'builder' %}
-                    {{- post.content|block_to_html|lazy_load -}}
                {% elseif post.contentFormat == 'editorjs' %}
                    {{- post.content|murph_url|file_attributes|editorjs_to_html|raw -}}
                {% endif %}
--- a/templates/page/simple/projects.html.twig
+++ b/templates/page/simple/projects.html.twig
@ -13,27 +13,29 @@
        </div>
    </div>

-     <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
-         {% for project in projects %}
-             <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
-                {% if project.image %}
-                    <figure>
-                        <img src="{{ asset(project.image)|imagine_filter('project_preview_filter') }}" alt="{{ project.label }}">
-                    </figure>
-                {% endif %}
-                <div class="card-body">
-                    <h2 class="card-title">{{ project.label }}</h2>
+    <div class="grid grid-flow-row-dens grid-cols-12 md:p-8 gap-5">
+        {% for project in projects %}
+            <div class="card shadow-md col-span-12 md:col-span-6 lg:col-span-4 m-3 bg-box">
+                <div class="card">
+                    {% if project.image %}
+                        <figure>
+                            <img src="{{ asset(project.image)|imagine_filter('project_preview_filter') }}" alt="{{ project.label }}">
+                        </figure>
+                    {% endif %}
+                    <div class="card-body">
+                        <h2 class="card-title">{{ project.label }}</h2>

-                    {{- project.description|murph_url|markdown('post') -}}
+                        {{- project.description|murph_url|markdown('post') -}}

-                    <div class="card-actions mt-5">
-                        {% for link in project.links %}
-                            <a class="btn btn-xs" href="{{ link.url|murph_url }}" target="_blank">
-                                {{- link.label -}}
-                            </a>
-                        {% endfor %}
-                     </div>
-                 </div>
+                        <div class="card-actions mt-5">
+                            {% for link in project.links %}
+                                <a class="btn btn-xs" href="{{ link.url|murph_url }}" target="_blank">
+                                    {{- link.label -}}
+                                </a>
+                            {% endfor %}
+                        </div>
+                    </div>
+                </div>
            </div>
        {% endfor %}
    </div>
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Simon Vieille	22558c8501	[wip] add phpmetrics on ci All checks were successful ci/woodpecker/push/build Pipeline was successful Details ci/woodpecker/pr/build Pipeline was successful Details	2023-09-28 21:46:03 +02:00
Simon Vieille	2f75204043	[wip] add phpmetrics on ci Some checks failed ci/woodpecker/push/build Pipeline is pending Details ci/woodpecker/pr/build Pipeline failed Details	2023-09-28 21:35:36 +02:00
Simon Vieille	abe8c80faf	[wip] add phpmetrics on ci Some checks failed ci/woodpecker/push/build Pipeline is pending Details ci/woodpecker/pr/build Pipeline failed Details	2023-09-28 21:34:40 +02:00
Simon Vieille	fb5f5f5603	replace pipeline with steps Some checks failed ci/woodpecker/push/build Pipeline is pending Details ci/woodpecker/pr/build Pipeline failed Details	2023-09-28 21:32:54 +02:00
Simon Vieille	91f357d0a0	replace pipeline with steps	2023-09-28 21:31:17 +02:00
Simon Vieille	b6c3e98377	[wip] add phpmetrics on ci	2023-09-28 21:29:12 +02:00