Merge branch 'release/3.7.4'

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v3.7.4
+## 05/09/2023
+
+1. [](#improved)
+   * Removed `FILTER_SANITIZE_STRING` input filter in favor of `htmlspecialchars(strip_tags())` 
+   * Require Grav `v1.7.41` for new  `UserGroupObject::groupNames` to address deprecation message
+   * Updated to BaconQRCode `v2.0.8`
+
 # v3.7.3
 ## 02/17/2023
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Login
 slug: login
 type: plugin
-version: 3.7.3
+version: 3.7.4
 testing: false
 description: Enables user authentication and login screen.
 icon: sign-in
@@ -15,7 +15,7 @@ bugs: https://github.com/getgrav/grav-plugin-login/issues
 license: MIT
 
 dependencies:
-  - { name: grav, version: '>=1.7.38' }
+  - { name: grav, version: '>=1.7.41' }
   - { name: form, version: '>=6.0.0' }
   - { name: email, version: '>=3.1.6' }
 
@@ -309,7 +309,7 @@ form:
                         multiple: true
                         size: large
                         label: PLUGIN_ADMIN.GROUPS
-                        data-options@: '\Grav\Common\User\Group::groupNames'
+                        data-options@: 'Grav\Common\Flex\Types\UserGroups\UserGroupObject::groupNames'
                         classes: fancy
                         help: PLUGIN_LOGIN.GROUPS_HELP
                         validate:

classes/TwoFactorAuth/BaconQrProvider.php

@@ -9,22 +9,26 @@
 
 namespace Grav\Plugin\Login\TwoFactorAuth;
 
-use BaconQrCode\Renderer\Image\Png as BaconPng;
+use BaconQrCode\Renderer\Image\SvgImageBackEnd;
+use BaconQrCode\Renderer\ImageRenderer as BaconImageRenderer;
+use BaconQrCode\Renderer\RendererStyle\RendererStyle as BaconRendererStyle;
 use BaconQrCode\Writer as BaconWriter;
 use RobThree\Auth\Providers\Qr\IQRCodeProvider;
 
 class BaconQrProvider implements IQRCodeProvider
 {
     public function getMimeType()
     {
-        return 'image/png';
+        return 'image/svg+xml';
     }
 
     public function getQRCodeImage($qrtext, $size = 256)
     {
-        $renderer = new BaconPng();
-        $renderer->setHeight($size);
-        $renderer->setWidth($size);
+        $renderer = new BaconImageRenderer(
+            new BaconRendererStyle((int) $size),
+            new SvgImageBackEnd()
+        );
+
         $writer = new BaconWriter($renderer);
 
         return $writer->writeString($qrtext);

composer.json

@@ -30,7 +30,7 @@
         "ext-json": "*",
         "birke/rememberme": "^1.0",
         "robthree/twofactorauth": "^1.8",
-        "bacon/bacon-qr-code": "^1.0"
+        "bacon/bacon-qr-code": "^2.0"
     },
     "autoload": {
         "psr-4": {

vendor/autoload.php

@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderIniteed5e5cf0aa1e2139f2db7445511e366::getLoader();

vendor/bacon/bacon-qr-code/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Ben 'DASPRiD' Scholzen
+Copyright (c) 2017, Ben Scholzen 'DASPRiD'
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

vendor/bacon/bacon-qr-code/README.md

@@ -1,10 +1,13 @@
-QR Code generator
-=================
+# QR Code generator
 
-Master: [![Build Status](https://api.travis-ci.org/Bacon/BaconQrCode.png?branch=master)](http://travis-ci.org/Bacon/BaconQrCode)
+[![PHP CI](https://github.com/Bacon/BaconQrCode/actions/workflows/ci.yml/badge.svg)](https://github.com/Bacon/BaconQrCode/actions/workflows/ci.yml)
+[![codecov](https://codecov.io/gh/Bacon/BaconQrCode/branch/master/graph/badge.svg?token=rD0HcAiEEx)](https://codecov.io/gh/Bacon/BaconQrCode)
+[![Latest Stable Version](https://poser.pugx.org/bacon/bacon-qr-code/v/stable)](https://packagist.org/packages/bacon/bacon-qr-code)
+[![Total Downloads](https://poser.pugx.org/bacon/bacon-qr-code/downloads)](https://packagist.org/packages/bacon/bacon-qr-code)
+[![License](https://poser.pugx.org/bacon/bacon-qr-code/license)](https://packagist.org/packages/bacon/bacon-qr-code)
 
-Introduction
-------------
+
+## Introduction
 BaconQrCode is a port of QR code portion of the ZXing library. It currently
 only features the encoder part, but could later receive the decoder part as
 well.
@@ -13,12 +16,24 @@ As the Reed Solomon codec implementation of the ZXing library performs quite
 slow in PHP, it was exchanged with the implementation by Phil Karn.
 
 
-Example usage
--------------
+## Example usage
 ```php
-$renderer = new \BaconQrCode\Renderer\Image\Png();
-$renderer->setHeight(256);
-$renderer->setWidth(256);
-$writer = new \BaconQrCode\Writer($renderer);
+use BaconQrCode\Renderer\ImageRenderer;
+use BaconQrCode\Renderer\Image\ImagickImageBackEnd;
+use BaconQrCode\Renderer\RendererStyle\RendererStyle;
+use BaconQrCode\Writer;
+
+$renderer = new ImageRenderer(
+    new RendererStyle(400),
+    new ImagickImageBackEnd()
+);
+$writer = new Writer($renderer);
 $writer->writeFile('Hello World!', 'qrcode.png');
 ```
+
+## Available image renderer back ends
+BaconQrCode comes with multiple back ends for rendering images. Currently included are the following:
+
+- `ImagickImageBackEnd`: renders raster images using the Imagick library
+- `SvgImageBackEnd`: renders SVG files using XMLWriter
+- `EpsImageBackEnd`: renders EPS files