Skip to content

Commit e97a4aa

Browse files
authored
Merge pull request #111 from mambax7/master
Debug updates
2 parents 0c3824c + b2f17a2 commit e97a4aa

File tree

9 files changed

+97
-12
lines changed

9 files changed

+97
-12
lines changed

.github/CONTRIBUTING.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
![alt XOOPS CMS](https://xoops.org/images/logoXoopsPhp81.png)
2+
# Contributing to [XOOPS CMS](https://xoops.org)
3+
[![XOOPS CMS Module](https://img.shields.io/badge/XOOPS%20CMS-Module-blue.svg)](https://xoops.org)
4+
[![Software License](https://img.shields.io/badge/license-GPL-brightgreen.svg?style=flat)](https://www.gnu.org/licenses/gpl-2.0.html)
5+
6+
Contributions are **welcome** and will be fully **credited**.
7+
8+
We accept contributions via Pull Requests on [GitHub](https://github.com/XoopsModules25x/mymenus).
9+
10+
## Pull Requests
11+
12+
- **[PSR-12 Coding Standard](https://www.php-fig.org/psr/psr-12/)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](http://pear.php.net/package/PHP_CodeSniffer).
13+
- **Add tests!** - We encourage providing tests for your contributions.
14+
- **Document any change in behavior** - Make sure the `/docs/changelog.txt` and any other relevant documentation are up-to-date.
15+
- **Consider our release cycle** - We try to follow [Semantic Versioning v2.0.0](http://semver.org/). Randomly breaking public APIs is not an option.
16+
- **Create feature branches** - Don't ask us to pull from your master branch.
17+
- **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
18+
- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please squash them before submitting.
19+
20+
Happy coding, and **_May the Source be with You_**!

.github/ISSUE_TEMPLATE/bug-report.yml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Bug Report
2+
description: Report a bug or error, providing details about the issue, steps to reproduce, and your environment setup.
3+
title: "[Bug]: "
4+
labels: ['Triage', 'Bug']
5+
body:
6+
- type: input
7+
attributes:
8+
label: XOOPS Version
9+
description: Provide the XOOPS version that you are using.
10+
value: 2.5.12
11+
validations:
12+
required: true
13+
- type: dropdown
14+
attributes:
15+
label: PHP Version
16+
description: Provide the PHP version that you are using.
17+
options: [ '7.4', '8.0','8.1','8.2','8.3', '8.4' ]
18+
multiple: true
19+
validations:
20+
required: true
21+
- type: dropdown
22+
attributes:
23+
label: Operating System
24+
description: Provide the operating system that you are using.
25+
options: ['Linux', 'MacOS', 'Windows', 'Other']
26+
multiple: true
27+
validations:
28+
required: true
29+
- type: textarea
30+
attributes:
31+
label: Description
32+
description: Please provide a detailed description of the issue you are running into.
33+
validations:
34+
required: true
35+
- type: textarea
36+
attributes:
37+
label: Steps to Reproduce
38+
description: Please provide detailed steps on how we can reproduce the issue you are reporting. For a shot at getting our "Perfect Storm" label, submit a PR with a failing test!
39+
validations:
40+
required: true
+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Feature Request
2+
description: XMF (XOOPS Module Framework) is a work in progress! Let us know about a feature you would like to see in the module.
3+
title: "[Feature Request]: "
4+
labels: ['Triage', 'Feature Request']
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: Description
9+
description: Please provide a detailed description of the feature you would like to see added.
10+
validations:
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: Benefits
15+
description: Please provide some thoughts on how this feature may benefit others using the module.
16+
validations:
17+
required: true

.github/workflows/pr_tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
php_version: ["8.1", "8.2", "8.3"]
30+
php_version: ["8.1", "8.2", "8.3" ]
3131
runs-on: ubuntu-latest
3232

3333
steps:
@@ -47,7 +47,7 @@ jobs:
4747
strategy:
4848
fail-fast: false
4949
matrix:
50-
php_version: ["8.2", "8.3"]
50+
php_version: ["8.2", "8.3", "8.4"]
5151
runs-on: ubuntu-latest
5252

5353
steps:

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ php:
55
- 8.1
66
- 8.2
77
- 8.3
8+
- 8.4
89

910
matrix:
1011
allow_failures:

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
},
1111
"require": {
1212
"php": ">=7.4.0",
13-
"kint-php/kint": "^5.1.1",
14-
"symfony/yaml": "^5.4.39",
13+
"kint-php/kint": "^6.0",
14+
"symfony/yaml": "^5.4.45",
1515
"paragonie/random_compat": "^9.99.100",
1616
"firebase/php-jwt": "^6.10.0",
1717
"webmozart/assert": "^1.11.0"

docs/changelog.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
xmf ChangeLog
22
=============
33

4+
Nov 27, 2024 v1.2.31
5+
------------------
6+
* updated Debug for Kint changes (mamba)
7+
* added Issues Template (mamba)
8+
* PHP 8.4 Implicitly nullable parameters (mamba)
9+
* Update PhpUnit versions (mamba)
10+
* upgrade Smarty to 4.5.5
11+
412
May 30, 2024 v1.2.30
513
------------------
614
* upgrade Smarty to 4.5.3

src/Debug.php

+6-7
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Xmf;
1313

14+
use Kint\Kint;
1415
/**
1516
* Debugging tools for developers
1617
*
@@ -22,7 +23,7 @@
2223
* @license GNU GPL 2.0 or later (https://www.gnu.org/licenses/gpl-2.0.html)
2324
* @link https://xoops.org
2425
*/
25-
class Debug extends \Kint
26+
class Debug extends Kint
2627
{
2728
/**
2829
* doOnce - do some local housekeeping on first use. Any method needing this
@@ -39,7 +40,7 @@ private static function doOnce()
3940
parent::$aliases[] = array($class, 'dump');
4041
parent::$aliases[] = array($class, 'backtrace');
4142
parent::$enabled_mode = true;
42-
parent::$mode_default = \Kint::MODE_RICH;
43+
parent::$mode_default = Kint::MODE_RICH;
4344
// display output inline ::folder = false, true puts all output at bottom of window
4445
\Kint\Renderer\RichRenderer::$folder = false;
4546
// options: 'original' (default), 'solarized', 'solarized-dark' and 'aante-light'
@@ -50,16 +51,14 @@ private static function doOnce()
5051
/**
5152
* Dump one or more variables
5253
*
53-
* @param mixed $data variable(s) to dump
54-
*
54+
* @psalm-param array ...$args
5555
* @return void
5656
*/
57-
public static function dump($data = null)
57+
public static function dump(...$args)
5858
{
59-
$args = func_get_args();
6059

6160
static::doOnce();
62-
forward_static_call_array(array('parent', 'dump'), $args);
61+
parent::dump(...$args);
6362
}
6463

6564
/**

src/Jwt/KeyFactory.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class KeyFactory
3838
*
3939
* @throws \InvalidArgumentException on unusable key name
4040
*/
41-
public static function build($keyName, StorageInterface $storage = null)
41+
public static function build($keyName, ?StorageInterface $storage = null)
4242
{
4343
if (empty($keyName) || !is_string($keyName)) {
4444
throw new \InvalidArgumentException('keyName must be a non-empty string');

0 commit comments

Comments
 (0)