Skip to content

Commit c261032

Browse files
committed
update qrcode
1 parent f5c2ca2 commit c261032

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+440
-308
lines changed

composer.json

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
{
2-
"name": "zoeyvid/booking",
3-
"description": "Ein Reservierungsystem mit Kontrolle per QRCode oder PIN",
4-
"type": "project",
5-
"homepage": "https://github.com/ZoeyVid/booking",
6-
"require": {
7-
"phpmailer/phpmailer": "6.9.2",
8-
"chillerlan/php-qrcode": "5.0.2",
9-
"google/recaptcha": "1.3.0",
10-
"ext-sqlite3": "*",
11-
"ext-curl": "*",
12-
"ext-ctype": "*",
13-
"ext-openssl": "*",
14-
"ext-session": "*"
15-
},
16-
"license": "AGPL-3.0",
17-
"version": "v0.1.0",
18-
"authors": [
19-
{
20-
"name": "Zoey",
21-
"email": "zoey@z0ey.de",
22-
"homepage": "https://z0ey.de"
23-
}
24-
],
25-
"support": {
26-
"email": "zoey@z0ey.de",
27-
"issues": "https://github.com/ZoeyVid/booking/issues",
28-
"forum": "https://github.com/ZoeyVid/booking/discussions",
29-
"wiki": "https://github.com/ZoeyVid/booking",
30-
"source": "https://github.com/ZoeyVid/booking",
31-
"docs": "https://github.com/ZoeyVid/booking"
32-
}
33-
}
1+
{
2+
"name": "zoeyvid/booking",
3+
"description": "Ein Reservierungsystem mit Kontrolle per QRCode oder PIN",
4+
"type": "project",
5+
"homepage": "https://github.com/ZoeyVid/booking",
6+
"require": {
7+
"phpmailer/phpmailer": "6.9.2",
8+
"chillerlan/php-qrcode": "5.0.3",
9+
"google/recaptcha": "1.3.0",
10+
"ext-sqlite3": "*",
11+
"ext-curl": "*",
12+
"ext-ctype": "*",
13+
"ext-openssl": "*",
14+
"ext-session": "*"
15+
},
16+
"license": "AGPL-3.0",
17+
"version": "v0.1.0",
18+
"authors": [
19+
{
20+
"name": "Zoey",
21+
"email": "zoey@z0ey.de",
22+
"homepage": "https://z0ey.de"
23+
}
24+
],
25+
"support": {
26+
"email": "zoey@z0ey.de",
27+
"issues": "https://github.com/ZoeyVid/booking/issues",
28+
"forum": "https://github.com/ZoeyVid/booking/discussions",
29+
"wiki": "https://github.com/ZoeyVid/booking",
30+
"source": "https://github.com/ZoeyVid/booking",
31+
"docs": "https://github.com/ZoeyVid/booking"
32+
}
33+
}

composer.lock

+26-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/chillerlan/php-qrcode/README.md

+22-17
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ It also features a QR Code reader based on a [PHP port](https://github.com/khana
1313
[![Packagist downloads][downloads-badge]][downloads]
1414
[![Documentation][readthedocs-badge]][readthedocs]
1515

16-
[php-badge]: https://img.shields.io/packagist/php-v/chillerlan/php-qrcode?logo=php&color=8892BF
16+
[php-badge]: https://img.shields.io/packagist/php-v/chillerlan/php-qrcode?logo=php&color=8892BF&logoColor=fff
1717
[php]: https://www.php.net/supported-versions.php
18-
[packagist-badge]: https://img.shields.io/packagist/v/chillerlan/php-qrcode.svg?logo=packagist
18+
[packagist-badge]: https://img.shields.io/packagist/v/chillerlan/php-qrcode.svg?logo=packagist&logoColor=fff
1919
[packagist]: https://packagist.org/packages/chillerlan/php-qrcode
20-
[gh-action-badge]: https://img.shields.io/github/actions/workflow/status/chillerlan/php-qrcode/ci.yml?branch=v5.0.x&logo=github
20+
[gh-action-badge]: https://img.shields.io/github/actions/workflow/status/chillerlan/php-qrcode/ci.yml?branch=v5.0.x&logo=github&logoColor=fff
2121
[gh-action]: https://github.com/chillerlan/php-qrcode/actions/workflows/ci.yml?query=branch%3Amain
22-
[coverage-badge]: https://img.shields.io/codecov/c/github/chillerlan/php-qrcode/v5.0.x?logo=codecov
22+
[coverage-badge]: https://img.shields.io/codecov/c/github/chillerlan/php-qrcode/v5.0.x?logo=codecov&logoColor=fff
2323
[coverage]: https://app.codecov.io/gh/chillerlan/php-qrcode/tree/v5.0.x
24-
[codacy-badge]: https://img.shields.io/codacy/grade/edccfc4fe5a34b74b1c53ee03f097b8d/v5.0.x?logo=codacy
24+
[codacy-badge]: https://img.shields.io/codacy/grade/edccfc4fe5a34b74b1c53ee03f097b8d/v5.0.x?logo=codacy&logoColor=fff
2525
[codacy]: https://app.codacy.com/gh/chillerlan/php-qrcode/dashboard?branch=v5.0.x
26-
[downloads-badge]: https://img.shields.io/packagist/dt/chillerlan/php-qrcode?logo=packagist
26+
[downloads-badge]: https://img.shields.io/packagist/dt/chillerlan/php-qrcode?logo=packagist&logoColor=fff
2727
[downloads]: https://packagist.org/packages/chillerlan/php-qrcode/stats
28-
[readthedocs-badge]: https://img.shields.io/readthedocs/php-qrcode/v5.0.x?logo=readthedocs
28+
[readthedocs-badge]: https://img.shields.io/readthedocs/php-qrcode/v5.0.x?logo=readthedocs&logoColor=fff
2929
[readthedocs]: https://php-qrcode.readthedocs.io/en/v5.0.x/
3030

31-
## Overview
31+
# Overview
3232

33-
### Features
33+
## Features
3434

3535
- Creation of [Model 2 QR Codes](https://www.qrcode.com/en/codes/model12.html), [Version 1 to 40](https://www.qrcode.com/en/about/version.html)
3636
- [ECC Levels](https://www.qrcode.com/en/about/error_correction.html) L/M/Q/H supported
@@ -52,7 +52,7 @@ It also features a QR Code reader based on a [PHP port](https://github.com/khana
5252
- QR Code reader (via GD and ImageMagick)
5353

5454

55-
### Requirements
55+
## Requirements
5656

5757
- PHP 7.4+
5858
- [`ext-mbstring`](https://www.php.net/manual/book.mbstring.php)
@@ -65,12 +65,17 @@ It also features a QR Code reader based on a [PHP port](https://github.com/khana
6565
For the QRCode reader, either `ext-gd` or `ext-imagick` is required!
6666

6767

68-
## Documentation
68+
# Documentation
6969

7070
- The user manual is at https://php-qrcode.readthedocs.io/ ([sources](https://github.com/chillerlan/php-qrcode/tree/v5.0.x/docs))
7171
- An API documentation created with [phpDocumentor](https://www.phpdoc.org/) can be found at https://chillerlan.github.io/php-qrcode/
7272
- The documentation for the `QROptions` container can be found here: [chillerlan/php-settings-container](https://github.com/chillerlan/php-settings-container#readme)
7373

74+
**Important: Please use the examples from the branch that matches your installed php-qrcode version (
75+
[v4.x](https://github.com/chillerlan/php-qrcode/tree/v4.3.x/examples),
76+
[v5.x](https://github.com/chillerlan/php-qrcode/tree/v5.0.x/examples),
77+
[dev-main](https://github.com/chillerlan/php-qrcode/tree/main/examples)
78+
)!**
7479

7580
## Installation with [composer](https://getcomposer.org)
7681

@@ -117,7 +122,7 @@ Also, have a look [in the examples folder](https://github.com/chillerlan/php-qrc
117122
</p>
118123

119124

120-
### Reading QR Codes
125+
## Reading QR Codes
121126

122127
Using the built-in QR Code reader is pretty straight-forward:
123128

@@ -139,30 +144,30 @@ catch(Throwable $e){
139144
```
140145

141146

142-
## Shameless advertising
147+
# Shameless advertising
143148

144149
Hi, please check out some of my other projects that are way cooler than qrcodes!
145150

146151
- [js-qrcode](https://github.com/chillerlan/js-qrcode) - a javascript port of this library
147152
- [php-authenticator](https://github.com/chillerlan/php-authenticator) - a Google Authenticator implementation (see [authenticator example](https://github.com/chillerlan/php-qrcode/blob/v5.0.x/examples/authenticator.php))
148153
- [php-httpinterface](https://github.com/chillerlan/php-httpinterface) - a PSR-7/15/17/18 implemetation
149-
- [php-oauth-core](https://github.com/chillerlan/php-oauth-core) - an OAuth 1/2 client library along with a bunch of [providers](https://github.com/chillerlan/php-oauth-providers)
154+
- [php-oauth](https://github.com/chillerlan/php-oauth) - an OAuth 1/2 client library, fully PSR-7/PSR-17/PSR-18 compatible
150155
- [php-database](https://github.com/chillerlan/php-database) - a database client & querybuilder for MySQL, Postgres, SQLite, MSSQL, Firebird
151156
- [php-tootbot](https://github.com/php-tootbot/tootbot-template) - a Mastodon bot library (see [@dwil](https://github.com/php-tootbot/dwil))
152157

153158

154-
## Disclaimer!
159+
# Disclaimer!
155160

156161
I don't take responsibility for molten CPUs, misled applications, failed log-ins etc.. Use at your own risk!
157162

158163

159-
### License notice
164+
## License notice
160165

161166
- Parts of this code are [ported to PHP](https://github.com/codemasher/php-qrcode-decoder) from the [ZXing project](https://github.com/zxing/zxing) and licensed under the [Apache License, Version 2.0](./NOTICE).
162167
- [The documentation](https://github.com/chillerlan/php-qrcode/tree/v5.0.x/docs) is licensed under the [Creative Commons Attribution 4.0 International (CC BY 4.0) License](https://creativecommons.org/licenses/by/4.0/).
163168

164169

165-
### Trademark Notice
170+
## Trademark Notice
166171

167172
The word "QR Code" is a registered trademark of *DENSO WAVE INCORPORATED*<br>
168173
https://www.qrcode.com/en/faq.html#patentH2Title

vendor/chillerlan/php-qrcode/composer.json

+25-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
2+
"$schema": "https://getcomposer.org/schema.json",
23
"name": "chillerlan/php-qrcode",
3-
"description": "A QR code generator and reader with a user friendly API. PHP 7.4+",
4+
"description": "A QR Code generator and reader with a user-friendly API. PHP 7.4+",
45
"homepage": "https://github.com/chillerlan/php-qrcode",
56
"license": [
67
"MIT", "Apache-2.0"
@@ -32,6 +33,12 @@
3233
"homepage":"https://github.com/chillerlan/php-qrcode/graphs/contributors"
3334
}
3435
],
36+
"funding": [
37+
{
38+
"type": "Ko-Fi",
39+
"url": "https://ko-fi.com/codemasher"
40+
}
41+
],
3542
"support": {
3643
"docs": "https://php-qrcode.readthedocs.io",
3744
"issues": "https://github.com/chillerlan/php-qrcode/issues",
@@ -42,15 +49,18 @@
4249
"require": {
4350
"php": "^7.4 || ^8.0",
4451
"ext-mbstring": "*",
45-
"chillerlan/php-settings-container": "^2.1.4 || ^3.1"
52+
"chillerlan/php-settings-container": "^2.1.6 || ^3.2.1"
4653
},
4754
"require-dev": {
48-
"chillerlan/php-authenticator": "^4.1 || ^5.1",
49-
"phan/phan": "^5.4",
55+
"ext-fileinfo": "*",
56+
"chillerlan/php-authenticator": "^4.3.1 || ^5.2.1",
57+
"phan/phan": "^5.4.5",
58+
"phpcompatibility/php-compatibility": "10.x-dev",
5059
"phpunit/phpunit": "^9.6",
5160
"phpmd/phpmd": "^2.15",
5261
"setasign/fpdf": "^1.8.2",
53-
"squizlabs/php_codesniffer": "^3.8"
62+
"slevomat/coding-standard": "^8.15",
63+
"squizlabs/php_codesniffer": "^3.11"
5464
},
5565
"suggest": {
5666
"chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.",
@@ -59,21 +69,26 @@
5969
},
6070
"autoload": {
6171
"psr-4": {
62-
"chillerlan\\QRCode\\": "src/"
72+
"chillerlan\\QRCode\\": "src"
6373
}
6474
},
6575
"autoload-dev": {
6676
"psr-4": {
67-
"chillerlan\\QRCodeTest\\": "tests/"
77+
"chillerlan\\QRCodeTest\\": "tests"
6878
}
6979
},
7080
"scripts": {
71-
"phpunit": "@php vendor/bin/phpunit",
72-
"phan": "@php vendor/bin/phan"
81+
"phan": "@php vendor/bin/phan",
82+
"phpcs": "@php vendor/bin/phpcs",
83+
"phpmd": "@php vendor/bin/phpmd src text ./phpmd.xml.dist",
84+
"phpunit": "@php vendor/bin/phpunit"
7385
},
7486
"config": {
7587
"lock": false,
7688
"sort-packages": true,
77-
"platform-check": true
89+
"platform-check": true,
90+
"allow-plugins": {
91+
"dealerdirect/phpcodesniffer-composer-installer": true
92+
}
7893
}
7994
}

0 commit comments

Comments
 (0)