Bumped

roadiz · Feb 21, 2024 · 9a268dd · 9a268dd
1 parent 895506f
commit 9a268dd
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 121 deletions.
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.1', '8.2', '8.3']
+                php-version: ['8.0', '8.1']
         steps:
             - uses: shivammathur/setup-php@v2
               with:

diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,14 @@
+language: php
+php:
+    - '8.0'
+    - '8.1'
+    - 'nightly'
+jobs:
+    allow_failures:
+        - php: 'nightly'
+install:
+    - composer install --dev --no-scripts --no-suggest
+
+script:
+    - vendor/bin/phpcs -p ./src
+    - vendor/bin/phpstan analyse -c phpstan.neon
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
 # Roadiz Font bundle
-**Manage and expose web fonts with Roadiz CMS**
 
 ![Run test status](https://github.com/roadiz/font-bundle/actions/workflows/run-test.yml/badge.svg?branch=develop)
 

diff --git a/composer.json b/composer.json
@@ -1,11 +1,9 @@
 {
     "name": "roadiz/font-bundle",
-    "description": "Manage and expose web fonts with Roadiz CMS",
     "license": "MIT",
     "keywords": [
         "cms",
         "backoffice",
-        "roadiz",
         "rezo zero"
     ],
     "authors": [
@@ -17,17 +15,16 @@
         }
     ],
     "type": "symfony-bundle",
-    "prefer-stable": true,
     "require": {
-        "php": ">=8.1",
+        "php": ">=8.0",
         "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.8.1",
         "doctrine/doctrine-migrations-bundle": "^3.1",
-        "doctrine/orm": "~2.17.0",
+        "doctrine/orm": "<2.17",
         "jms/serializer": "^3.9.0",
         "league/flysystem": "^3.0",
-        "roadiz/models": "2.2.*",
-        "roadiz/rozier": "2.2.*",
+        "roadiz/models": "^2.1",
+        "roadiz/rozier": "^2.1",
         "sensio/framework-extra-bundle": "^6.1",
         "symfony/asset": "5.4.*",
         "symfony/cache": "5.4.*",
@@ -43,7 +40,7 @@
         "symfony/twig-bundle": "5.4.*",
         "symfony/validator": "5.4.*",
         "symfony/yaml": "5.4.*",
-        "twig/extra-bundle": "^3.0",
+        "twig/extra-bundle": "^2.12|^3.0",
         "twig/intl-extra": "*",
         "twig/string-extra": "*",
         "twig/twig": "^3.1"
@@ -57,11 +54,11 @@
         "symfony/browser-kit": "5.4.*",
         "symfony/phpunit-bridge": "5.4.*",
         "symfony/stopwatch": "5.4.*",
-        "roadiz/core-bundle": "2.2.*",
-        "roadiz/compat-bundle": "2.2.*",
-        "roadiz/rozier-bundle": "2.2.*",
-        "roadiz/documents": "2.2.*",
-        "roadiz/entity-generator": "2.2.*"
+        "roadiz/core-bundle": "^2.1",
+        "roadiz/compat-bundle": "^2.1",
+        "roadiz/rozier-bundle": "^2.1",
+        "roadiz/documents": "^2.1",
+        "roadiz/entity-generator": "^2.1"
     },
     "config": {
         "optimize-autoloader": true,
@@ -88,8 +85,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.2.x-dev",
-            "dev-develop": "2.3.x-dev"
+            "dev-main": "2.1.x-dev",
+            "dev-develop": "2.2.x-dev"
         }
     }
 }
diff --git a/migrations/Version20230607134442.php b/migrations/Version20230607134442.php
diff --git a/migrations/Version20230828092912.php b/migrations/Version20230828092912.php
diff --git a/phpstan.neon b/phpstan.neon
@@ -26,8 +26,6 @@ parameters:
         - '#Doctrine\\ORM\\Mapping\\GeneratedValue constructor expects#'
         - '#type mapping mismatch: property can contain Doctrine\\Common\\Collections\\Collection<int, [^\>]+> but database expects Doctrine\\Common\\Collections\\Collection&iterable<[^\>]+>#'
         - '#should return Doctrine\\Common\\Collections\\Collection<int, [^\>]+Interface> but returns Doctrine\\Common\\Collections\\Collection<int, [^\>]+>#'
-        - '#but returns Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
-        - '#does not accept Doctrine\\Common\\Collections\\ReadableCollection<int, [^\>]+>#'
 
     reportUnmatchedIgnoredErrors: false
     checkGenericClassInNonGenericObjectType: false

diff --git a/src/Controller/Admin/FontsController.php b/src/Controller/Admin/FontsController.php
@@ -154,9 +154,6 @@ public function downloadAction(Request $request, int $id): BinaryFileResponse
         if ($font !== null) {
             // Prepare File
             $file = tempnam(sys_get_temp_dir(), "font_" . $font->getId());
-            if (false === $file) {
-                throw new \RuntimeException('Cannot create temporary file.');
-            }
             $zip = new \ZipArchive();
             $zip->open($file, \ZipArchive::CREATE);
 

diff --git a/src/Controller/FontFaceController.php b/src/Controller/FontFaceController.php
@@ -86,7 +86,7 @@ public function fontFileAction(Request $request, string $filename, int $variant,
         if (null !== $font) {
             [$fontData, $mime] = $this->getFontData($font, $extension);
 
-            if (\is_string($fontData)) {
+            if (null !== $fontData) {
                 $response = new Response(
                     '',
                     Response::HTTP_NOT_MODIFIED,
@@ -104,7 +104,7 @@ public function fontFileAction(Request $request, string $filename, int $variant,
                 if (!$response->isNotModified($request)) {
                     $response->setContent($fontData);
                     $response->setStatusCode(Response::HTTP_OK);
-                    $response->setEtag(md5($fontData));
+                    $response->setEtag(md5($response->getContent()));
                 }
 
                 return $response;
@@ -164,12 +164,13 @@ public function fontFacesAction(Request $request): Response
                 'variantHash' => $variantHash,
             ];
         }
-        $content = $this->templating->render(
-            '@RoadizFont/fonts/fontfamily.css.twig',
-            $assignation
+        $response->setContent(
+            $this->templating->render(
+                '@RoadizFont/fonts/fontfamily.css.twig',
+                $assignation
+            )
         );
-        $response->setContent($content);
-        $response->setEtag(md5($content));
+        $response->setEtag(md5($response->getContent()));
         $response->setStatusCode(Response::HTTP_OK);
 
         return $response;

diff --git a/src/Entity/Font.php b/src/Entity/Font.php
@@ -20,8 +20,6 @@
     ORM\Entity(repositoryClass: FontRepository::class),
     ORM\Table(name: "fonts"),
     ORM\UniqueConstraint(columns: ["name", "variant"]),
-    ORM\Index(columns: ["created_at"], name: "font_created_at"),
-    ORM\Index(columns: ["updated_at"], name: "font_updated_at"),
     UniqueEntity(fields: ["name", "variant"])
 ]
 class Font extends AbstractDateTimed
@@ -88,38 +86,31 @@ class Font extends AbstractDateTimed
     protected ?UploadedFile $otfFile = null;
     protected ?UploadedFile $svgFile = null;
 
-    #[ORM\Column(name: 'eot_filename', type: 'string', length: 100, nullable: true)]
-    #[Assert\Length(max: 100)]
+    #[ORM\Column(name: 'eot_filename', type: 'string', nullable: true)]
     private ?string $eotFilename = null;
 
-    #[ORM\Column(name: 'woff_filename', type: 'string', length: 100, nullable: true)]
-    #[Assert\Length(max: 100)]
+    #[ORM\Column(name: 'woff_filename', type: 'string', nullable: true)]
     private ?string $woffFilename = null;
 
-    #[ORM\Column(name: 'woff2_filename', type: 'string', length: 100, nullable: true)]
-    #[Assert\Length(max: 100)]
+    #[ORM\Column(name: 'woff2_filename', type: 'string', nullable: true)]
     private ?string $woff2Filename = null;
 
-    #[ORM\Column(name: 'otf_filename', type: 'string', length: 100, nullable: true)]
-    #[Assert\Length(max: 100)]
+    #[ORM\Column(name: 'otf_filename', type: 'string', nullable: true)]
     private ?string $otfFilename = null;
 
-    #[ORM\Column(name: 'svg_filename', type: 'string', length: 100, nullable: true)]
-    #[Assert\Length(max: 100)]
+    #[ORM\Column(name: 'svg_filename', type: 'string', nullable: true)]
     private ?string $svgFilename = null;
 
-    #[ORM\Column(type: 'string', length: 100, unique: false, nullable: false)]
+    #[ORM\Column(type: 'string', unique: false, nullable: false)]
     #[Assert\NotNull]
     #[Assert\NotBlank]
     #[Assert\Length(max: 100)]
     private string $name = '';
 
-    #[ORM\Column(type: 'string', length: 128, unique: false, nullable: false)]
-    #[Assert\Length(max: 128)]
+    #[ORM\Column(type: 'string', unique: false, nullable: false)]
     private string $hash = '';
 
-    #[ORM\Column(type: 'string', length: 100, nullable: false)]
-    #[Assert\Length(max: 100)]
+    #[ORM\Column(type: 'string', nullable: false)]
     private string $folder = '';
 
     #[ORM\Column(type: 'text', nullable: true)]

diff --git a/src/Repository/FontRepository.php b/src/Repository/FontRepository.php
@@ -31,8 +31,7 @@ public function getLatestUpdateDate(): ?\DateTimeInterface
     {
         $query = $this->_em->createQuery('
             SELECT MAX(f.updatedAt) FROM RZ\Roadiz\FontBundle\Entity\Font f');
-        $updatedAt = $query->getSingleScalarResult();
 
-        return \is_string($updatedAt) ? new \DateTimeImmutable($updatedAt) : null;
+        return new \DateTimeImmutable($query->getSingleScalarResult());
     }
 }
diff --git a/templates/admin/add.html.twig b/templates/admin/add.html.twig
@@ -22,7 +22,7 @@
         <fieldset data-uk-margin>
             {% apply spaceless %}
                 <button data-action-save="#edit-font-form"
-                        class="uk-button uk-button-success rz-action-save" type="submit">
+                        class="uk-button uk-button-primary rz-action-save" type="submit">
                     <span class="icon-container"><i class="uk-icon-rz-save"></i></span>
                     <span class="label"><span class="label-text">{% block content_form_submit_label %}
                                 {%- trans -%}save{%- endtrans -%}

diff --git a/templates/admin/edit.html.twig b/templates/admin/edit.html.twig
@@ -6,11 +6,11 @@
     <div class="content-table-cont metadata-list">
         <table class="uk-table content-table">
             <tr>
-                <th>{% trans %}created.at{% endtrans %}</th>
+                <td>{% trans %}created.at{% endtrans %}</td>
                 <td>{{ item.createdAt|format_datetime('long', locale=app.request.locale) }}</td>
             </tr>
             <tr>
-                <th>{% trans %}updated.at{% endtrans %}</th>
+                <td>{% trans %}updated.at{% endtrans %}</td>
                 <td>{{ item.updatedAt|format_datetime('long', locale=app.request.locale) }}</td>
             </tr>
         </table>

diff --git a/templates/admin/list.html.twig b/templates/admin/list.html.twig
@@ -68,7 +68,7 @@
                                    data-uk-tooltip="{animation:true}">
                                     <i class="uk-icon-rz-download"></i>
                                 </a>
-                                <a class="uk-button uk-button-content uk-button-small uk-button-danger"
+                                <a class="uk-button uk-button-content uk-button-small uk-button-table-delete"
                                    href="{{ path('fontsDeletePage', { id: item.id }) }}"
                                    title="{% trans %}delete{% endtrans %}"
                                    data-uk-tooltip="{animation:true}">