Skip to content

Commit 5d91ba3

Browse files
rhuksterrhukster
committed
Merge branch 'release/5.2.1'
2 parents 1d6111f + 65d5f07 commit 5d91ba3

34 files changed

+213
-126
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v5.2.1
2+
## 01/06/2025
3+
4+
1. [](#improved)
5+
* Updated to latest Shortcode library v0.7.6 with PHP 8.4 support
6+
17
# v5.2.0
28
## 06/02/2024
39

‎blueprints.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Shortcode Core
22
slug: shortcode-core
33
type: plugin
4-
version: 5.2.0
4+
version: 5.2.1
55
description: "This plugin provides the core functionality for shortcode plugins"
66
icon: code
77
author:

‎composer.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/composer/InstalledVersions.php‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@ private static function getInstalled()
322322
}
323323

324324
$installed = array();
325+
$copiedLocalDir = false;
325326

326327
if (self::$canGetVendors) {
327328
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
@@ -330,9 +331,11 @@ private static function getInstalled()
330331
} elseif (is_file($vendorDir.'/composer/installed.php')) {
331332
/** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
332333
$required = require $vendorDir.'/composer/installed.php';
333-
$installed[] = self::$installedByVendor[$vendorDir] = $required;
334-
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335-
self::$installed = $installed[count($installed) - 1];
334+
self::$installedByVendor[$vendorDir] = $required;
335+
$installed[] = $required;
336+
if (strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
337+
self::$installed = $required;
338+
$copiedLocalDir = true;
336339
}
337340
}
338341
}
@@ -350,7 +353,7 @@ private static function getInstalled()
350353
}
351354
}
352355

353-
if (self::$installed !== array()) {
356+
if (self::$installed !== array() && !$copiedLocalDir) {
354357
$installed[] = self::$installed;
355358
}
356359

‎vendor/composer/installed.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"packages": [
33
{
44
"name": "thunderer/shortcode",
5-
"version": "v0.7.5",
6-
"version_normalized": "0.7.5.0",
5+
"version": "v0.7.6",
6+
"version_normalized": "0.7.6.0",
77
"source": {
88
"type": "git",
99
"url": "https://github.com/thunderer/Shortcode.git",
10-
"reference": "a4fee30613bd46efb421f8305aff0466a3268a99"
10+
"reference": "9f81424b4909007483d93c5defc0917d8a58debd"
1111
},
1212
"dist": {
1313
"type": "zip",
14-
"url": "https://api.github.com/repos/thunderer/Shortcode/zipball/a4fee30613bd46efb421f8305aff0466a3268a99",
15-
"reference": "a4fee30613bd46efb421f8305aff0466a3268a99",
14+
"url": "https://api.github.com/repos/thunderer/Shortcode/zipball/9f81424b4909007483d93c5defc0917d8a58debd",
15+
"reference": "9f81424b4909007483d93c5defc0917d8a58debd",
1616
"shasum": ""
1717
},
1818
"require": {
@@ -27,7 +27,7 @@
2727
"ext-json": "if you want to use JSON serializer",
2828
"symfony/yaml": "if you want to use YAML serializer"
2929
},
30-
"time": "2022-01-13T18:53:33+00:00",
30+
"time": "2024-12-15T21:57:40+00:00",
3131
"type": "library",
3232
"installation-source": "dist",
3333
"autoload": {
@@ -55,7 +55,7 @@
5555
],
5656
"support": {
5757
"issues": "https://github.com/thunderer/Shortcode/issues",
58-
"source": "https://github.com/thunderer/Shortcode/tree/v0.7.5"
58+
"source": "https://github.com/thunderer/Shortcode/tree/v0.7.6"
5959
},
6060
"install-path": "../thunderer/shortcode"
6161
}

‎vendor/composer/installed.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
'name' => 'getgrav/shortcode-core',
44
'pretty_version' => 'dev-develop',
55
'version' => 'dev-develop',
6-
'reference' => 'be1b12ecc2b9807da0a5415ef7432a6ae2ac9cee',
6+
'reference' => 'd92a78d8a9dca623ae6beab5614655ae0fb1a463',
77
'type' => 'grav-plugin',
88
'install_path' => __DIR__ . '/../../',
99
'aliases' => array(),
@@ -13,16 +13,16 @@
1313
'getgrav/shortcode-core' => array(
1414
'pretty_version' => 'dev-develop',
1515
'version' => 'dev-develop',
16-
'reference' => 'be1b12ecc2b9807da0a5415ef7432a6ae2ac9cee',
16+
'reference' => 'd92a78d8a9dca623ae6beab5614655ae0fb1a463',
1717
'type' => 'grav-plugin',
1818
'install_path' => __DIR__ . '/../../',
1919
'aliases' => array(),
2020
'dev_requirement' => false,
2121
),
2222
'thunderer/shortcode' => array(
23-
'pretty_version' => 'v0.7.5',
24-
'version' => '0.7.5.0',
25-
'reference' => 'a4fee30613bd46efb421f8305aff0466a3268a99',
23+
'pretty_version' => 'v0.7.6',
24+
'version' => '0.7.6.0',
25+
'reference' => '9f81424b4909007483d93c5defc0917d8a58debd',
2626
'type' => 'library',
2727
'install_path' => __DIR__ . '/../thunderer/shortcode',
2828
'aliases' => array(),

‎vendor/thunderer/shortcode/.github/workflows/test-old.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: TestOld
2+
3+
on:
4+
push:
5+
branches: ['master']
6+
pull_request: ~
7+
workflow_dispatch: ~
8+
9+
jobs:
10+
test:
11+
runs-on: '${{ matrix.os }}'
12+
strategy:
13+
matrix:
14+
php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3']
15+
os: ['ubuntu-latest']
16+
steps:
17+
- name: 'Checkout'
18+
uses: 'actions/checkout@v4'
19+
- name: 'Install PHP'
20+
uses: 'shivammathur/setup-php@v2'
21+
with:
22+
php-version: '${{ matrix.php }}'
23+
tools: 'composer:v1'
24+
coverage: 'xdebug'
25+
- name: 'PHP'
26+
run: 'php -v'
27+
28+
- name: 'Composer'
29+
run: 'composer install'
30+
continue-on-error: '${{ matrix.failure }}'
31+
- name: 'PHPUnit'
32+
run: 'php vendor/bin/phpunit --coverage-text'

‎vendor/thunderer/shortcode/.github/workflows/test.yaml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@ on:
44
push:
55
branches: ['master']
66
pull_request: ~
7+
workflow_dispatch: ~
78

89
jobs:
910
test:
1011
runs-on: '${{ matrix.os }}'
1112
strategy:
1213
matrix:
13-
php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
14+
php: ['7.4', '8.0', '8.1', '8.2', '8.3']
1415
os: ['ubuntu-latest']
1516
failure: [false]
1617
include:
17-
- { php: '8.2', os: 'ubuntu-latest', failure: true } # '8.2' means 'nightly'
18+
- { php: '8.4', os: 'ubuntu-latest', failure: true } # Psalm does not support PHP 8.4 yet
19+
- { php: '8.5', os: 'ubuntu-latest', failure: true } # '8.5' means 'nightly'
1820
steps:
1921
- name: 'Checkout'
20-
uses: 'actions/checkout@v2'
22+
uses: 'actions/checkout@v4'
2123
- name: 'Install PHP'
2224
uses: 'shivammathur/setup-php@v2'
2325
with:
@@ -35,13 +37,13 @@ jobs:
3537
continue-on-error: '${{ matrix.failure }}'
3638
- name: 'Psalm'
3739
run: |
38-
composer require --dev vimeo/psalm
40+
composer remove --dev -W 'phpunit/phpunit'
41+
composer require --dev -W 'vimeo/psalm=^5.0' 'nikic/php-parser=^4.0'
3942
php vendor/bin/psalm --shepherd --php-version=${{ matrix.php }}
40-
if: '${{ matrix.php >= 7.1 }}'
4143
continue-on-error: '${{ matrix.failure }}'
4244
- name: 'Infection'
4345
run: |
44-
composer require --dev --with-all-dependencies infection/infection
46+
composer remove --dev -W 'vimeo/psalm'
47+
composer require --dev -W phpunit/phpunit infection/infection
4548
php vendor/bin/infection
46-
if: '${{ matrix.php >= 7.1 }}'
4749
continue-on-error: '${{ matrix.failure }}'

‎vendor/thunderer/shortcode/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.idea
12
.phpunit.result.cache
23
infection.log
34
vendor

‎vendor/thunderer/shortcode/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2015-2022 Tomasz Kowalczyk
1+
Copyright (c) 2015-2025 Tomasz Kowalczyk
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)